diff --git a/megamek/data/forcegenerator/3049.xml b/megamek/data/forcegenerator/3049.xml
index c50390c3d3b..02c80ecaf1f 100644
--- a/megamek/data/forcegenerator/3049.xml
+++ b/megamek/data/forcegenerator/3049.xml
@@ -7492,7 +7492,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>FWL:3+</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:8,MOC:8,General:8,FWL:8,MERC:8,DC:8</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3055.xml b/megamek/data/forcegenerator/3055.xml
index 3c193124774..c91138d6b38 100644
--- a/megamek/data/forcegenerator/3055.xml
+++ b/megamek/data/forcegenerator/3055.xml
@@ -8492,7 +8492,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>CS:2,MOC:2+,CC:3,FWL:3+,IS:2+,WOB:3,MERC:3+</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:8,MOC:8,General:8,FWL:8,MERC:8,DC:8</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3058.xml b/megamek/data/forcegenerator/3058.xml
index d219080e5b3..b68b8d6d6ae 100644
--- a/megamek/data/forcegenerator/3058.xml
+++ b/megamek/data/forcegenerator/3058.xml
@@ -9115,7 +9115,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>CS:2,MOC:2+,CC:3,FWL:3+,IS:2+,WOB:3,MERC:3+,DC:3</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:8,MOC:8,General:8,FWL:8,MERC:8,DC:8</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml
index 8164b33906e..c6407288d2f 100644
--- a/megamek/data/forcegenerator/3060.xml
+++ b/megamek/data/forcegenerator/3060.xml
@@ -11344,7 +11344,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>CS:3,MOC:3,CC:4,FWL:5,IS:3,WOB:4,MERC:4,DC:5</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:6,MOC:6,General:6,FWL:6,MERC:6,DC:6</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3067.xml b/megamek/data/forcegenerator/3067.xml
index 15e68774665..5cc4e62e05f 100644
--- a/megamek/data/forcegenerator/3067.xml
+++ b/megamek/data/forcegenerator/3067.xml
@@ -14442,7 +14442,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>CS:3,MOC:3,CC:5,FVC:3,FWL:6,IS:3,WOB:4,MERC:4,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:5,MOC:5,General:4,FWL:5,MERC:5,DC:5</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3075.xml b/megamek/data/forcegenerator/3075.xml
index e5b6555d17f..204774b36d5 100644
--- a/megamek/data/forcegenerator/3075.xml
+++ b/megamek/data/forcegenerator/3075.xml
@@ -15463,7 +15463,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,CS:3,DTA:6,FVC:2,IS:2,FWL:6,WOB:4,MERC:4,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:5,MOC:5,General:2,FWL:5,MERC:5,DC:5</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3078.xml b/megamek/data/forcegenerator/3078.xml
index ef0915df2a3..81b7d67deac 100644
--- a/megamek/data/forcegenerator/3078.xml
+++ b/megamek/data/forcegenerator/3078.xml
@@ -16273,7 +16273,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,DoO:6,IS:1,WOB:4,DO:6,DGM:6,MERC:4,CS:3,DTA:6,SC:6,FVC:1,MCM:6,ROS:4,FWL:6,TP:6,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:5,MOC:5,ROS:5,General:1,FWL:5,MERC:5,DC:5</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3082.xml b/megamek/data/forcegenerator/3082.xml
index 18f8d1fd02a..d4cf8e7ac84 100644
--- a/megamek/data/forcegenerator/3082.xml
+++ b/megamek/data/forcegenerator/3082.xml
@@ -15141,7 +15141,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,DoO:6,DO:6,DGM:6,MERC:4,DTA:6,SC:6,MCM:6,ROS:4,FWL:6,MSC:4,TP:6,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:4,MOC:4,ROS:4,FWL:4,MERC:4,DC:4</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3085.xml b/megamek/data/forcegenerator/3085.xml
index 5fb25220156..e5c75676caa 100644
--- a/megamek/data/forcegenerator/3085.xml
+++ b/megamek/data/forcegenerator/3085.xml
@@ -15855,7 +15855,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,DTA:6,OP:6,DoO:6,ROS:4,FWL:6,DO:6,MSC:6,TP:6,MERC:4,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:4,MOC:4,ROS:4,FWL:4,MERC:4,DC:4</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3100.xml b/megamek/data/forcegenerator/3100.xml
index 15c0cb1f927..5349eae1e83 100644
--- a/megamek/data/forcegenerator/3100.xml
+++ b/megamek/data/forcegenerator/3100.xml
@@ -16507,7 +16507,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,DTA:6,OP:6,ROS:4,FWL:6,MSC:6,MERC:4,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:3,MOC:3,ROS:3,FWL:3,MERC:3,DC:3</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3131.xml b/megamek/data/forcegenerator/3131.xml
index 0f12c1c6766..f1ff4e0e327 100644
--- a/megamek/data/forcegenerator/3131.xml
+++ b/megamek/data/forcegenerator/3131.xml
@@ -17465,7 +17465,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,DTA:6,OP:6,ROS:4,FWL:6,MSC:6,MERC:4,CP:6,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:3,MOC:3,ROS:3,FWL:3,MERC:3,CP:3,DC:3</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3145.xml b/megamek/data/forcegenerator/3145.xml
index 9f958a17dd3..89ff379131f 100644
--- a/megamek/data/forcegenerator/3145.xml
+++ b/megamek/data/forcegenerator/3145.xml
@@ -17621,7 +17621,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,ROS:4,FWL:6,MERC:4,CP:6,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:2,MOC:2,ROS:2,FWL:2,MERC:2,CP:2,DC:2</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3150.xml b/megamek/data/forcegenerator/3150.xml
index 57ce722660c..949d8028532 100644
--- a/megamek/data/forcegenerator/3150.xml
+++ b/megamek/data/forcegenerator/3150.xml
@@ -17724,7 +17724,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,ROS:4,FWL:6,MERC:4,CP:6,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:2,MOC:2,ROS:2,FWL:2,MERC:2,CP:2,DC:2</availability>
 		</model>
diff --git a/megamek/data/forcegenerator/3160.xml b/megamek/data/forcegenerator/3160.xml
index 8df1d61056f..51a0a0962c7 100644
--- a/megamek/data/forcegenerator/3160.xml
+++ b/megamek/data/forcegenerator/3160.xml
@@ -17060,7 +17060,7 @@
 	</chassis>
 	<chassis name='Tarantula' unitType='Mek'>
 		<availability>MOC:3,CC:5,FWL:6,MERC:4,CP:6,DC:6</availability>
-		<model name='ZPH-1A'>
+		<model name='ZPH-1'>
 			<roles>recon</roles>
 			<availability>CC:2,MOC:2,FWL:2,MERC:2,CP:2,DC:2</availability>
 		</model>
diff --git a/megamek/data/mechfiles/.gitignore b/megamek/data/mechfiles/.gitignore
deleted file mode 100644
index 3593716ddc3..00000000000
--- a/megamek/data/mechfiles/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Customs/
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [David].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [David].blk
index da758dc5550..ca049820348 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [David].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [David].blk	
@@ -109,7 +109,7 @@ Gibson,Irian,Washburn
 </primaryFactory>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Flamer].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Flamer].blk
index 67f4496f849..9327ab9eb2a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Flamer].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Flamer].blk	
@@ -77,7 +77,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Laser].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Laser].blk
index b7ed92637bc..57c4b55e4c3 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Laser].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Laser].blk	
@@ -73,7 +73,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <motion_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [MG].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [MG].blk
index 0023f296df6..6f70397507b 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [MG].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [MG].blk	
@@ -77,7 +77,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [TAG].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [TAG].blk
index 2011b652682..a801326a744 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [TAG].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [TAG].blk	
@@ -77,7 +77,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [WoB].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [WoB].blk
index 401756e76ba..a0c18f44704 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [WoB].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [WoB].blk	
@@ -79,7 +79,7 @@ IS BA Stealth (Improved):Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [David].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [David].blk
index f7d46d06180..5199a82579a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [David].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [David].blk	
@@ -112,7 +112,7 @@ Gibson,Irian,Washburn
 </primaryFactory>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Flamer].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Flamer].blk
index 8ca58558abc..9c0c3f43d97 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Flamer].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Flamer].blk	
@@ -77,7 +77,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Laser].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Laser].blk
index 532a1ac7b22..c6ed4f1509b 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Laser].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Laser].blk	
@@ -73,7 +73,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <motion_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [MG].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [MG].blk
index 7c1f057f070..9fb573ade2e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [MG].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [MG].blk	
@@ -77,7 +77,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [TAG].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [TAG].blk
index fcc7e4bb30d..282da277c1e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [TAG].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [TAG].blk	
@@ -77,7 +77,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [WoB].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [WoB].blk
index 67734eb9466..c5639f0aa47 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [WoB].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [WoB].blk	
@@ -67,7 +67,7 @@ IS BA Stealth (Improved):Body
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 6) [David].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 6) [David].blk
index f0e964d0f7f..b12eddddf81 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 6) [David].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 6) [David].blk	
@@ -115,7 +115,7 @@ Gibson,Irian,Washburn
 </primaryFactory>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Flamer].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Flamer].blk
index eef22bf72a8..e1fbfb1e2ca 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Flamer].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Flamer].blk	
@@ -78,7 +78,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Laser].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Laser].blk
index 779c794e3db..cece0814376 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Laser].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Laser].blk	
@@ -77,7 +77,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [MG].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [MG].blk
index 50bdee84b12..ccc140aeef1 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [MG].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [MG].blk	
@@ -77,7 +77,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [TAG].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [TAG].blk
index e170e4031b7..250f6905a1e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [TAG].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [TAG].blk	
@@ -115,7 +115,7 @@ Gibson,Irian,Washburn
 </primaryFactory>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [WoB].blk b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [WoB].blk
index 22d7d00aef7..e4d3a5ba1df 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [WoB].blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [WoB].blk	
@@ -85,7 +85,7 @@ IS BA Stealth (Improved):Body
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd4).blk
index 241f16b5b07..2fe1ef8123f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd4).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd5).blk
index 4bd93709909..b6a8a6caf05 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd5).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd6).blk
index 3acedfdf34f..7c7788947fe 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd4).blk
index b9593653cbd..1026c252a46 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd4).blk	
@@ -105,7 +105,7 @@ In German products the unit's proper name was translated to Chevalier, regardles
 </notes>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd5).blk
index 3c34642d011..6a210d5d973 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd5).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd6).blk
index 0ab08dc9c24..531c9a130f5 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd4).blk
index 9148909cce1..785fcd0247f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd4).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd5).blk
index 12ef76152e9..d1735b0f3c2 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd5).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd6).blk
index 9fbd6500414..c8779ae44fb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd4).blk
index 1237105d339..b980079171c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd4).blk	
@@ -78,7 +78,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd5).blk
index 6e4e3d0ceca..24362fa380f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd5).blk	
@@ -78,7 +78,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd6).blk
index 581dde9eb92..1d8d68fe895 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd6).blk	
@@ -66,7 +66,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd4).blk
index 236384bfa71..6c565a97766 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd4).blk	
@@ -70,7 +70,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd5).blk
index 2fc967e9982..fa37c1e0694 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd5).blk	
@@ -85,7 +85,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd6).blk
index 6ad061ddf60..bbfd2f6194c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA (Headhunter) (Sqd6).blk	
@@ -85,7 +85,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd3).blk
index eb58a8e2d87..1efe8b09c94 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd3).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd4).blk
index 69bad1614e4..41fb91289af 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd4).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd5).blk
index c7b97ce48b1..e77c56be521 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd5).blk	
@@ -84,7 +84,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd6).blk
index 02d733e64a4..7b322e1babb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [APG] (Sqd6).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd3).blk
index 08032f6ace1..3e2c7618b06 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd3).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd4).blk
index a7c24b96692..774b5c9c6b8 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd4).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd5).blk
index e606a5e342f..4e537a47361 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd5).blk	
@@ -84,7 +84,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd6).blk
index a9346f1755b..cda802d1951 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [ER Laser] (Sqd6).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd3).blk
index 48bf91b5c25..ed079f7a16b 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd3).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd4).blk
index d72a3d1464b..028462deeb3 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd4).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd5).blk
index a50c37fdc54..d8d2a850f89 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd5).blk	
@@ -84,7 +84,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd6).blk
index c8c30f5fb62..17e02041379 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Flamer] (Sqd6).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd3).blk
index a525959d955..f40321b08a3 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd3).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd4).blk
index c3dadd22c22..2f1d791fbb2 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd4).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd5).blk
index adf0d2f6643..e53168cfe8a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd5).blk	
@@ -84,7 +84,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd6).blk
index e9eafe1f311..c45f42c5ce2 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [HMG] (Sqd6).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd3).blk
index af9901a5e95..08476fb502a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd3).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd4).blk
index ad883a4bc83..60c266da8cb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd4).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd5).blk
index 10a1c4874e1..d176906c560 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd5).blk	
@@ -84,7 +84,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd6).blk
index 95eb586acb9..2804512dc8e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [Laser] (Sqd6).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd3).blk
index e4e613c33fa..37419de2003 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd3).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd4).blk
index 3048d54138a..68028aafef4 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd4).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd5).blk
index 6fd788817e7..704a17e6807 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd5).blk	
@@ -84,7 +84,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd6).blk
index 58f8f53edda..d001494d608 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MG] (Sqd6).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Succession Wars
+TRO: 3058U - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd3).blk
index 775198c4811..c5a75cf8d5f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd3).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd4).blk
index 15536550ba1..2a02cbe1525 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd4).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd5).blk
index 8153df54db5..c1924fe68a9 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd5).blk	
@@ -84,7 +84,7 @@ BABattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd6).blk
index 3aa9430a4cd..87daa0bd168 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Elemental BA [MicroPL] (Sqd6).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd4).blk
index 69249847698..7815ff5ffa8 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd4).blk	
@@ -89,7 +89,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd5).blk
index 53634caa86d..2196aec060e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd5).blk	
@@ -93,7 +93,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd6).blk
index a58b281e623..400e8211456 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Flamer] (Sqd6).blk	
@@ -126,7 +126,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd4).blk
index 2546581fe61..6660a4a1239 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd4).blk	
@@ -89,7 +89,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd5).blk
index 509dd41f02c..6e7d0059df8 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd5).blk	
@@ -93,7 +93,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd6).blk
index f43abc4b853..3f1887095bc 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [LRR] (Sqd6).blk	
@@ -97,7 +97,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd4).blk
index 622049b7c0b..d0f208fe9ec 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd4).blk	
@@ -89,7 +89,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd5).blk
index eb1e786239e..9e87ee20d30 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd5).blk	
@@ -93,7 +93,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd6).blk
index ff7e771f542..470d220ea53 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [Laser] (Sqd6).blk	
@@ -97,7 +97,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd4).blk
index dbf152bc674..94bb1a9f06e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd4).blk	
@@ -89,7 +89,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd5).blk
index 0f762e4f28c..965a2ee35ce 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd5).blk	
@@ -94,7 +94,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd6).blk
index 01813c3aaf2..38ff244e784 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [MG] (Sqd6).blk	
@@ -97,7 +97,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd4).blk
index bcf534349cf..79e66176df3 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd4).blk	
@@ -89,7 +89,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd5).blk
index afc0d80f7c3..82193ac33cd 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd5).blk	
@@ -93,7 +93,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd6).blk
index 5b85b207274..7672e5477e4 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fa Shih BA [TAG] (Sqd6).blk	
@@ -98,7 +98,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd4).blk
index 342c15f52d1..1f6eb2804c7 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd4).blk	
@@ -65,7 +65,7 @@ ISBAERMediumLaser:TU
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd5).blk
index 8436ad93b6b..2f2bf117297 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd5).blk	
@@ -68,7 +68,7 @@ ISBAERMediumLaser:TU
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd6).blk
index 610ccdd24ab..9aa12e5ca2d 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [ERML] (Sqd6).blk	
@@ -71,7 +71,7 @@ ISBAERMediumLaser:TU
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd4).blk
index 535414c3e03..7ce17e93ff1 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd4).blk	
@@ -70,7 +70,7 @@ Leg
 </armor_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd5).blk
index 505516a45ba..6ace8653010 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd5).blk	
@@ -85,7 +85,7 @@ Leg
 </armor_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd6).blk
index 6b3a642d9c4..cddc3af352f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MG] (Sqd6).blk	
@@ -88,7 +88,7 @@ Leg
 </armor_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd4).blk
index ea42668e5a1..bb109e80770 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd4).blk	
@@ -65,7 +65,7 @@ ISBAMediumPulseLaser:TU
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd5).blk
index cdf27569b0c..8a3641e4c52 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd5).blk	
@@ -68,7 +68,7 @@ ISBAMediumPulseLaser:TU
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd6).blk
index 1be9541cead..ed53cc038ae 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [MPL] (Sqd6).blk	
@@ -71,7 +71,7 @@ ISBAMediumPulseLaser:TU
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd4).blk
index 309b9b4aa58..ba9c7acb060 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd4).blk	
@@ -66,7 +66,7 @@ CLBAMG:TU
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd5).blk
index ef86859e1f4..c58dce3c01b 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd5).blk	
@@ -69,7 +69,7 @@ CLBAMG:TU
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd6).blk
index d8c9b6d7f3c..24d0261c7d7 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [Mortar] (Sqd6).blk	
@@ -72,7 +72,7 @@ CLBAMG:TU
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd4).blk
index a50a28d2f92..1cd5f123416 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd4).blk	
@@ -67,7 +67,7 @@ ISBASmallLaser:TU
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd5).blk
index 7aa904b8300..440839bcaf5 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd5).blk	
@@ -70,7 +70,7 @@ ISBASmallLaser:TU
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd6).blk
index 39e2db3c6c6..6bc88b9ba7f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SL] (Sqd6).blk	
@@ -73,7 +73,7 @@ ISBASmallLaser:TU
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd4).blk
index b70bf553716..fd0019bb4d8 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd4).blk	
@@ -66,7 +66,7 @@ ISBASmallPulseLaser:TU
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd5).blk
index 4d01f2136d1..633499a30fb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd5).blk	
@@ -69,7 +69,7 @@ ISBASmallPulseLaser:TU
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd6).blk
index be3a45593df..08daac895b6 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SPLAS] (Sqd6).blk	
@@ -72,7 +72,7 @@ ISBASmallPulseLaser:TU
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd4).blk
index 73fda482055..0edee32b454 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd4).blk	
@@ -66,7 +66,7 @@ BA-SRM4 Ammo:TU:Shots4#
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd5).blk
index d88b5c4c63b..1f064434993 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd5).blk	
@@ -69,7 +69,7 @@ BA-SRM4 Ammo:TU:Shots4#
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd6).blk
index 60cd76bbdfb..4902b62e4e5 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [SRM] (Sqd6).blk	
@@ -72,7 +72,7 @@ BA-SRM4 Ammo:TU:Shots4#
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd4).blk
index aec00d0379c..8755beb4017 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd4).blk	
@@ -66,7 +66,7 @@ CLBAHeavyGrenadeLauncher:TU
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd5).blk
index 52da622ed4a..1d3652726d0 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd5).blk	
@@ -69,7 +69,7 @@ CLBAHeavyGrenadeLauncher:TU
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd6).blk
index c098015c063..064e790269f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Fenrir BA [VSP] (Sqd6).blk	
@@ -72,7 +72,7 @@ CLBAHeavyGrenadeLauncher:TU
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd3).blk
index e3ec3d5b488..39a55b0a95e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd3).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd4).blk
index 10c6532b183..7fa3868f70f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd4).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd5).blk
index c983e530aa9..a78aae2f9cd 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd5).blk	
@@ -78,7 +78,7 @@ BAHeavyBattleClaw:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd6).blk
index 450bbb50039..b28a68584db 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Sqd6).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd4).blk
index d022058fdbe..9ed25a06cc9 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd4).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd5).blk
index 21fc82ff886..310059b58c7 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd5).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd6).blk
index dc7de8250b2..4aea71ce288 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Bearhunter] (Sqd6).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd4).blk
index ec381394a8b..a93dce79c39 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd4).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd5).blk
index 216b63e1cee..db8fbdcb69d 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd5).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd6).blk
index a7c2d599531..6b90fd31572 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [MRR] (Sqd6).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd4).blk
index fedb53f6af2..bcfbbde2309 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd4).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd5).blk
index a3349007d8d..5cc758af733 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd5).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd6).blk
index e6428fd5947..efe64514d19 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gnome BA (Upgrade) [Pulse] (Sqd6).blk	
@@ -64,7 +64,7 @@ BAHeavyBattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd4).blk
index 1903f1541c2..004c54cbcc0 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd4).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd5).blk
index 8912425d180..d7f9fdffe18 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd5).blk	
@@ -72,7 +72,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd6).blk
index 1b379547472..7224518bbec 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Scout (Sqd6).blk	
@@ -72,7 +72,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd4).blk
index 02cdbcd02b9..96b8465b2db 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd4).blk	
@@ -80,7 +80,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd5).blk
index 0612d05af38..460a3a8ff8c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd5).blk	
@@ -68,7 +68,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd6).blk
index cc2c2ab0231..9a4b8234928 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Flamer] (Sqd6).blk	
@@ -68,7 +68,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd4).blk
index bc7606cdb90..1a32ed298e3 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd4).blk	
@@ -80,7 +80,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd5).blk
index 73f06a6c9fa..798e3943262 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd5).blk	
@@ -68,7 +68,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd6).blk
index 5a6ee89f82f..e9819c36001 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [LRR] (Sqd6).blk	
@@ -68,7 +68,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd4).blk
index 8606cfda72d..e65cd020208 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd4).blk	
@@ -80,7 +80,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd5).blk
index 304f24b7858..cab807027fe 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd5).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd6).blk
index 4564d84e28b..46dcd191165 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [Laser] (Sqd6).blk	
@@ -68,7 +68,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd4).blk
index 52f60b08871..4cbb3378634 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd4).blk	
@@ -80,7 +80,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd5).blk
index 3c49c582448..dacffa6d4b1 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd5).blk	
@@ -68,7 +68,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd6).blk
index a8b46f490db..fc90776bf94 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [MG] (Sqd6).blk	
@@ -68,7 +68,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd4).blk
index ea30acb4a87..58050ac2fbd 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd4).blk	
@@ -81,7 +81,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd5).blk
index 514f87964ea..2c9007ac04c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd5).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd6).blk
index 2aa18d4fe51..b4a3aaaf746 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Gray Death Std Suit [SRM] (Sqd6).blk	
@@ -69,7 +69,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd4).blk
index 5f21f2f6b34..a04bffea0ef 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd4).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd5).blk
index 878fbb2390b..065e1cfd5b1 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd6).blk
index f5677e41b54..7de755ac9cb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Flamer] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd4).blk
index e4de5b30fad..0d3ff3e1123 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd4).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd5).blk
index 888d1cacfc2..884af51e50f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd6).blk
index a42dad8a3eb..56556895faf 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [LRR] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd4).blk
index 4b1cebd3258..b128826e817 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd4).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd5).blk
index 58a01a571d4..5e4a1074ad8 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd6).blk
index 8698dac067d..f0b0dd0e672 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [Laser] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd4).blk
index cc38b724aaf..20826a35e9e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd4).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd5).blk
index 3246f750f47..3d85bae9b37 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd6).blk
index 9ac7918d895..08e935117ce 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [MG] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd4).blk
index d10567ef01c..d859d733ce1 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd4).blk	
@@ -77,7 +77,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd5).blk
index f52a71e623c..56dd1917ab5 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd6).blk
index 656801f672b..7e9c3194ce1 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/IS Standard BA [SRM] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd4).blk
index 9bf10e388c4..524531f5590 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd4).blk	
@@ -73,7 +73,7 @@ IS BA Stealth (Prototype):Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd5).blk
index 258fbbf9752..db57d6ab6a3 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd5).blk	
@@ -73,7 +73,7 @@ IS BA Stealth (Prototype):Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd6).blk
index 6749bdf2afa..c165e5b6d5e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (SpecOps) (Sqd6).blk	
@@ -73,7 +73,7 @@ IS BA Stealth (Prototype):Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd4).blk
index 6f232e2bc08..f9a6dd43946 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd4).blk	
@@ -69,7 +69,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd5).blk
index 23203f8dee6..db89ea4397c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd5).blk	
@@ -69,7 +69,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd6).blk
index 51302a58d12..a6fcbc65a9d 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. I BA (Sqd6).blk	
@@ -69,7 +69,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd4).blk
index 7c109635745..86c2484c49a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd4).blk	
@@ -81,7 +81,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd5).blk
index 41a9a31c21b..5b238f99457 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd5).blk	
@@ -81,7 +81,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd6).blk
index d13974bdb61..b2e97bdba50 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sensor) (Sqd6).blk	
@@ -81,7 +81,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd4).blk
index f6c88a699e2..ae8ee9f4c7a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd4).blk	
@@ -78,7 +78,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd5).blk
index 30a29b98bb2..866a7d8cdab 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd5).blk	
@@ -78,7 +78,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd6).blk
index 061ee6526aa..1dd3b892712 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Infiltrator Mk. II BA (Sqd6).blk	
@@ -78,7 +78,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd4).blk
index 5b2b4a980fe..444c2e1e231 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd4).blk	
@@ -82,7 +82,7 @@ LegAttack
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd5).blk
index 9931342b970..b5271ea8458 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd5).blk	
@@ -104,6 +104,10 @@ biped
 1
 </weightclass>
 
+<source>
+TRO: 3058U - Clan Invasion
+</source>
+
 <overview>
 The Kage (Japanese: "shadow") Light Battle Armor was one of the first Battle Armor designs produced by the Draconis Combine after the Truce of Tukayyid. 
 </overview>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd6).blk
index 65852363f79..12c245f46b0 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (DEST) (Sqd6).blk	
@@ -88,7 +88,7 @@ LegAttack
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd4).blk
index 6c3ad10238c..a1250376a64 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd4).blk	
@@ -74,7 +74,7 @@ LegAttack
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd5).blk
index 98571cf5314..d0f63e3463c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd5).blk	
@@ -78,7 +78,7 @@ LegAttack
 
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd6).blk
index bf81e899105..2cfd20a2616 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA (Vibro-Claw) (Sqd6).blk	
@@ -80,7 +80,7 @@ LegAttack
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd4).blk
index e8c0c16aa40..0c36dacccca 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd4).blk	
@@ -76,7 +76,7 @@ IS BA ECM:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd5).blk
index 97c4b5082bc..e64700583f9 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd5).blk	
@@ -80,7 +80,7 @@ IS BA ECM:Body
 
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd6).blk
index 1fab3c78437..3dcf860432b 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [ECM] (Sqd6).blk	
@@ -83,7 +83,7 @@ IS BA ECM:Body
 
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd4).blk
index e8fa5b568d3..0bc3a7ec204 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd4).blk	
@@ -64,7 +64,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd5).blk
index 81160f537cb..5881622ded7 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd5).blk	
@@ -79,7 +79,7 @@ LegAttack
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd6).blk
index 5a9237e14ae..d898aa27e19 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Flamer] (Sqd6).blk	
@@ -82,7 +82,7 @@ LegAttack
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd4).blk
index 970434e06b4..996e83a7d63 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd4).blk	
@@ -83,7 +83,7 @@ LegAttack
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd5).blk
index 727649b87d8..92d4e0d9c8a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd5).blk	
@@ -86,7 +86,7 @@ LegAttack
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd6).blk
index c5607b38760..112eabd0afa 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [Laser] (Sqd6).blk	
@@ -89,7 +89,7 @@ LegAttack
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd4).blk
index 0777f10bfa4..2620e20c9ae 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd4).blk	
@@ -71,7 +71,7 @@ CLBAMG:SSWM:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd5).blk
index fdc4d721dc1..e84cdb541cb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd5).blk	
@@ -86,7 +86,7 @@ CLBAMG:SSWM:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd6).blk
index e67878aed74..bc0bae7ca35 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [MG] (Sqd6).blk	
@@ -89,7 +89,7 @@ CLBAMG:SSWM:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd4).blk
index a78ce5a4c60..86596d72404 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd4).blk	
@@ -84,7 +84,7 @@ LegAttack
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd5).blk
index 7aa737003f6..c0a77a922c4 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd5).blk	
@@ -87,7 +87,7 @@ LegAttack
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd6).blk
index 8d86979be84..109bd9935e0 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kage Light BA [TAG] (Sqd6).blk	
@@ -90,7 +90,7 @@ LegAttack
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd4).blk
index f4a4e11ff1f..1a6a2365818 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd4).blk	
@@ -64,7 +64,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd5).blk
index 7440c60243a..25c93154e87 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd5).blk	
@@ -64,7 +64,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd6).blk
index fb55ea067f3..11953d05b57 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA (Upgrade) [Battle Claw] (Sqd6).blk	
@@ -76,7 +76,7 @@ Infantry Auto Rifle:APM
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd4).blk
index 4e0a038ef36..826f908264a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd4).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd5).blk
index 3fa2413072b..3d861aac1b8 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd5).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd6).blk
index 8ae6e71e129..6ae718124cb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Battle Claw] (Sqd6).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd4).blk
index 76c667b6586..39f962ae5df 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd4).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd5).blk
index 473fb30cd96..925f8887efb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd5).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd6).blk
index 3e0abb2ef26..adb89bd9733 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Industrial Drill] (Sqd6).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd4).blk
index ddf29ec9f7c..2869fae9ec6 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd4).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd5).blk
index aa8de577374..bb5682ae571 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd5).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd6).blk
index 07cad037155..ade6077c893 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Kanazuchi Assault BA [Salvage Arm] (Sqd6).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd4).blk
index 869a286676c..72df4fe4a45 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd4).blk	
@@ -85,7 +85,7 @@ BABattleClaw:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd5).blk
index 771e12e0a3d..5458fcdc597 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd5).blk	
@@ -73,7 +73,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd6).blk
index 1530fbd2769..ef87056276f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [David] (Sqd6).blk	
@@ -91,7 +91,7 @@ BABattleClaw:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd4).blk
index 97a6bb3c99b..f3d8424af4c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd4).blk	
@@ -85,7 +85,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd5).blk
index a0d300b9ee0..dd8ebab481a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd5).blk	
@@ -73,7 +73,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd6).blk
index af0315ea0ce..ad4bd31e98a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Flamer] (Sqd6).blk	
@@ -91,7 +91,7 @@ BABattleClaw:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd4).blk
index 4c172d8ab9d..752c51e2846 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd4).blk	
@@ -85,7 +85,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd5).blk
index 23d2de77938..8338e60c388 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd5).blk	
@@ -73,7 +73,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd6).blk
index 6b60c56c925..0c686091757 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [Laser] (Sqd6).blk	
@@ -91,7 +91,7 @@ BABattleClaw:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd4).blk
index 750c89ceebc..3410200933c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd4).blk	
@@ -85,7 +85,7 @@ BABattleClaw:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd5).blk
index 823a16820b2..d2bb349c2b9 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd5).blk	
@@ -73,7 +73,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd6).blk
index 531f8a709e6..91a24d8288a 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Longinus BA [MG] (Sqd6).blk	
@@ -91,7 +91,7 @@ BABattleClaw:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd4).blk
index 6ec2e752aca..20fd563487e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd4).blk	
@@ -72,7 +72,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd5).blk
index 954beec0116..3ba3b9c75b8 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd5).blk	
@@ -72,7 +72,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd6).blk
index ce5683d3c00..a6d3af73724 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Laser] (Sqd6).blk	
@@ -72,7 +72,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd4).blk
index f6a179a09b7..71e9efedcbe 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd4).blk	
@@ -91,7 +91,7 @@ BA-Compact Narc Ammo:LA:Shots2#
 </Trooper 4 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd5).blk
index 48d4ae2ebad..457046749d3 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd5).blk	
@@ -96,7 +96,7 @@ BA-Compact Narc Ammo:LA:Shots2#
 </Trooper 5 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd6).blk
index b1c1447103b..77de69bdc9b 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [Narc] (Sqd6).blk	
@@ -101,7 +101,7 @@ BA-Compact Narc Ammo:LA:Shots2#
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd4).blk
index 8e2bf890049..c0e8f83da93 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd4).blk	
@@ -72,7 +72,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd5).blk
index 061a613c0db..3e01e484839 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd5).blk	
@@ -72,7 +72,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd6).blk
index 488e9d005f5..157fbd3e66e 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [PPC] (Sqd6).blk	
@@ -72,7 +72,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd4).blk
index 72cc24ea2cb..106afe83539 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd4).blk	
@@ -72,7 +72,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd5).blk
index 0adad738772..feb387d24a7 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd5).blk	
@@ -72,7 +72,7 @@ BABattleClaw:RA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd6).blk
index 6345ea6a5e1..bc2505301bf 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Purifier Adaptive BA [TAG] (Sqd6).blk	
@@ -90,7 +90,7 @@ BABattleClaw:RA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd4).blk
index 79a6509e568..3c328b75a7f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd4).blk	
@@ -71,7 +71,7 @@ Jump
 </armor_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd5).blk
index 478dad9c9e0..5324517965b 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd5).blk	
@@ -71,7 +71,7 @@ Jump
 </armor_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd6).blk
index ab1dfb080fd..fc783f7d0c5 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA (Original) (Sqd6).blk	
@@ -71,7 +71,7 @@ Jump
 </armor_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd4).blk
index 3586def2e3d..ed21309979c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd4).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd5).blk
index 179a42bba7b..96ebe73da0c 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd6).blk
index d57d06d8b53..7a879c14ac0 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Flamer] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd4).blk
index 11173dd14a9..ab8f25972b1 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd4).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd5).blk
index 5cbd9df6eb9..9910a576407 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd6).blk
index b0013e56d1f..c010ff79a49 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Laser] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd4).blk
index c1ee78be090..0d369b13134 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd4).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd5).blk
index ef3f5adfc4e..dae6c95858f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd6).blk
index 3d936fa511c..33c56a41db0 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MG] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd4).blk
index 6cb554a8eb7..8913e1dc930 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd4).blk	
@@ -66,7 +66,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd5).blk
index f4b020ff21e..56ac62ccd54 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd5).blk	
@@ -66,7 +66,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd6).blk
index 7f2cebf922a..9d3191eeacc 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [MRM] (Sqd6).blk	
@@ -66,7 +66,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd4).blk
index f83116f0980..d1040a77202 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd4).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd5).blk
index bd4efc2ee5c..cd8b7d686fb 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd5).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd6).blk
index 05c756acda1..0c763e20f31 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Raiden BA [Tsunami] (Sqd6).blk	
@@ -65,7 +65,7 @@ BABattleClaw:LA
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd4).blk
index 9cd24dd4b1b..60445005c79 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd4).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd5).blk
index 8e3feadf99f..572c00ca2c0 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd5).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd6).blk
index f278c017a7b..00a671a0e61 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (AI) (Sqd6).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd4).blk
index 5eca6f8a0ad..5d145d151d4 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd4).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd5).blk
index 929970ee82d..462d40c8be7 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd5).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd6).blk
index 45c945a46f1..a7828204490 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Laser) (Sqd6).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd3).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd3).blk
index 12ea4594ba6..91117bb0f8f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd3).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd3).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd4).blk
index dd0ae7c623d..c32dba9d05f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd4).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd5).blk
index 9fad1e1cb25..157a7d674c4 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd5).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd6).blk
index e1b4f39c678..a35a48799fc 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Salamander BA (Sqd6).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd4).blk
index 97844379569..3069866f8a6 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd4).blk	
@@ -62,7 +62,7 @@ BAMineLauncher:Body
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd5).blk
index 770928aa47e..de42c6169dc 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd5).blk	
@@ -62,7 +62,7 @@ BAMineLauncher:Body
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd6).blk
index 0f938132cee..4df533ff914 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sloth BA (Sqd6).blk	
@@ -62,7 +62,7 @@ BAMineLauncher:Body
 </Squad Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd4).blk
index 84e7f3420a8..03928d65b90 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd4).blk	
@@ -66,7 +66,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd5).blk
index 6959edc085f..d3ee7842a3b 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd5).blk	
@@ -66,7 +66,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd6).blk
index c637cd02cc6..870742128ed 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Sqd6).blk	
@@ -66,7 +66,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd4).blk
index 7feca4f627a..f5e289c7ffc 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd4).blk	
@@ -67,7 +67,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd5).blk
index ee8f84f2a33..195382ec495 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd5).blk	
@@ -67,7 +67,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd6).blk
index e6efc6c406d..68889521046 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Sylph BA (Upgrade) (Sqd6).blk	
@@ -67,7 +67,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Civil War
+TRO: 3058U - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd4).blk
index f712eb95f69..0430755b096 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd4).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd5).blk
index 229839979dc..4092d05f977 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd5).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd6).blk
index 42210a12663..0db1221c0ae 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Sqd6).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3058U - Clan Invasion
+TRO: 3058U - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd4).blk
index 8613980934c..324f6f9334f 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd4).blk	
@@ -67,7 +67,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd5).blk
index 789e11abd94..9f9346f6cfe 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd5).blk	
@@ -67,7 +67,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd6).blk
index 9523fd142aa..383971e717d 100644
--- a/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3058Uu/Undine BA (Upgrade) (Sqd6).blk	
@@ -67,7 +67,7 @@ BABattleClaw:LA
 </Point Equipment>
 
 <source>
-TRO 3058U - Jihad
+TRO: 3058U - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd4).blk
index 7cc1df4bae0..c763849e32a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd4).blk	
@@ -60,7 +60,7 @@ Clan BA Stealth (Standard):RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd5).blk
index c85604d599e..ad3ef17ca9f 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd5).blk	
@@ -60,7 +60,7 @@ Clan BA Stealth (Standard):RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd6).blk
index 06e05243dd1..a96394db4c1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Salvage) (Sqd6).blk	
@@ -60,7 +60,7 @@ Clan BA Stealth (Standard):RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd4).blk
index e6e4f3bf5d9..5dbaa567e2d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd4).blk	
@@ -65,7 +65,7 @@ CLBAExtendedLifeSupport:Body
 </Point Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd5).blk
index d9c02054745..020cec4837b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd5).blk	
@@ -65,7 +65,7 @@ CLBAExtendedLifeSupport:Body
 </Point Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd6).blk
index 2b82a1a4935..e9a479876ac 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Aerie PA(L) (Sqd6).blk	
@@ -80,7 +80,7 @@ CLBAExtendedLifeSupport:Body
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd4).blk
index 67c8393dd70..11fc8735f03 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd4).blk	
@@ -68,7 +68,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd5).blk
index 3693835edd3..87cc2790468 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd5).blk	
@@ -68,7 +68,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd6).blk
index c923092f5a7..d5c13c7358f 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (HH) (Sqd6).blk	
@@ -68,7 +68,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd4).blk
index 844b608ecbe..cc2f5e17c5a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd4).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd5).blk
index 7cbd1a42407..7988d73dd0f 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd5).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd6).blk
index 3e5be68e8bb..e657c1258d3 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (JF) (Sqd6).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd4).blk
index 2b4df18430b..9f0c49c2370 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd4).blk	
@@ -68,7 +68,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd5).blk
index 8e67e7e0144..a7d8222535e 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd5).blk	
@@ -69,7 +69,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd6).blk
index 4b58a9d6ba1..d930dc725ed 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Afreet Med BA (Sqd6).blk	
@@ -69,7 +69,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd4).blk
index 7f1759833ea..dd88f00fb6c 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd4).blk	
@@ -67,7 +67,7 @@ LegAttack
 
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd5).blk
index 6c75f845a0b..6eec0e85a0c 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd5).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd6).blk
index 1d44576eb22..4ce4062b238 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (Anti Infantry)(Sqd6).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd4).blk
index 6def018f240..18cc3b2764b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd4).blk	
@@ -64,7 +64,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd5).blk
index 447b447bb19..bac6ea51813 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd5).blk	
@@ -64,7 +64,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd6).blk
index 1ce4455426f..d85f4dd61c6 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA (SRM)(Sqd6).blk	
@@ -64,7 +64,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd4).blk
index 4306dc3b40f..90a23072621 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd4).blk	
@@ -65,7 +65,7 @@ ISBARL4:Body
 
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd5).blk
index cc3fc872b27..d4c0769eddd 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd5).blk	
@@ -64,7 +64,7 @@ ISBARL4:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd6).blk
index 15fd491d1ff..f525ae2363b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Asura Med BA(Sqd6).blk	
@@ -64,7 +64,7 @@ ISBARL4:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd4).blk
index d7c119d4db9..1785089cc43 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd4).blk	
@@ -62,7 +62,7 @@ CLBAExtendedLifeSupport:Body
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd5).blk
index 6fac78c74eb..d5e418cea61 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd5).blk	
@@ -62,7 +62,7 @@ CLBAExtendedLifeSupport:Body
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd6).blk
index d909d8eb991..cc55fae5ac8 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd6).blk	
@@ -62,7 +62,7 @@ CLBAExtendedLifeSupport:Body
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd4).blk
index 5cfbcd81af6..cb788fd0398 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd4).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 <armor_type>
 28
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd5).blk
index b7aa59ed313..bd2a0d88625 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd5).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 <armor_type>
 28
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd6).blk
index 62f0e0b7c93..dfb10f5be6a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Rapid) (Sqd6).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 <armor_type>
 28
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd4).blk
index 266e22aa012..6bcb3469567 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd4).blk	
@@ -69,7 +69,7 @@ LegAttack
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd5).blk
index b33edf39d58..a2dd70d53e3 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd5).blk	
@@ -108,7 +108,7 @@ Twycross
 </primaryFactory>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd6).blk
index a6ef0548779..bce2f093d9d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Clan Med BA (Volk) (Sqd6).blk	
@@ -69,7 +69,7 @@ LegAttack
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd4).blk
index 734bc230245..27872feaf29 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd4).blk	
@@ -60,7 +60,7 @@ BABattleClaw:RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd5).blk
index 131b40c520d..6606e6ae58d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd5).blk	
@@ -60,7 +60,7 @@ BABattleClaw:RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd6).blk
index c0b9fd1f6aa..c5334730448 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (SRM) (Sqd6).blk	
@@ -60,7 +60,7 @@ BABattleClaw:RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd4).blk
index be131e2b81b..e571c8da339 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd4).blk	
@@ -64,7 +64,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd5).blk
index 1878fe87934..c2d6ccab382 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd5).blk	
@@ -64,7 +64,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd6).blk
index 72a472035a9..f96a309c5c8 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Corona Heavy BA (Sqd6).blk	
@@ -65,7 +65,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd4).blk
index 2604eaa5763..ab5c0b4e41c 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd4).blk	
@@ -66,7 +66,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd5).blk
index babdb9b7259..92b9267d728 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd5).blk	
@@ -66,7 +66,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd6).blk
index 790cae02068..4764d83fa7f 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Sqd6).blk	
@@ -66,7 +66,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd4).blk
index 8b1fa95775e..bf2aa43b299 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd4).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd5).blk
index 231627cfd92..ae9d4a23cc1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd6).blk
index 0b7ab2083f5..019f7c4e159 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Djinn BA (Stealth) (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd4).blk
index 6665d3b4e67..eefc6fec3a6 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd4).blk	
@@ -59,7 +59,7 @@ InfantryAssaultRifle:LA:APM
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd5).blk
index af6bfd20584..0d5a6008731 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd5).blk	
@@ -59,7 +59,7 @@ InfantryAssaultRifle:LA:APM
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd6).blk
index 717588cb50c..80746822f62 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Fast Assault) (Sqd6).blk	
@@ -59,7 +59,7 @@ InfantryAssaultRifle:LA:APM
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd4).blk
index 73332d9e6b5..83766b38fe3 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd4).blk	
@@ -65,7 +65,7 @@ Clan BA Fire Resistant:Body
 
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd5).blk
index 27402139975..75f9fc68d39 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd5).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:Body
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd6).blk
index b0c4b32846c..c257f120a08 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Rock Golem) (Sqd6).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:Body
 </Point Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd4).blk
index 9e8a3d66e01..6b7e56633b0 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd4).blk	
@@ -63,7 +63,7 @@ Clan BA Fire Resistant:RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd5).blk
index 09501beb0c6..3c2629afb29 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd5).blk	
@@ -63,7 +63,7 @@ Clan BA Fire Resistant:RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd6).blk
index 533769a9906..992020f2546 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Golem AA (Sqd6).blk	
@@ -63,7 +63,7 @@ Clan BA Fire Resistant:RA
 </Point Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd4).blk
index e26b664f863..fbadca627b1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd4).blk	
@@ -61,7 +61,7 @@ BA-SRM5 Ammo:Body:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd5).blk
index afcb0051836..519dda1d720 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd5).blk	
@@ -61,7 +61,7 @@ BA-SRM5 Ammo:Body:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd6).blk
index 9a3e23b6503..3170295e8c5 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [MagShot] (Sqd6).blk	
@@ -61,7 +61,7 @@ BA-SRM5 Ammo:Body:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd4).blk
index 33b1a731808..231a64c05d5 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd4).blk	
@@ -80,7 +80,7 @@ BA-Compact Narc Ammo:LA:Shots3#
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd5).blk
index 9a46fe4192c..5d053f91466 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd5).blk	
@@ -85,7 +85,7 @@ BA-Compact Narc Ammo:LA:Shots3#
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd6).blk
index f6a2237639b..6af0e437ce9 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA (HK) [NARC] (Sqd6).blk	
@@ -90,7 +90,7 @@ BA-Compact Narc Ammo:LA:Shots3#
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd4).blk
index b7f676309ec..9454e4c552d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd4).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd5).blk
index d82059a9fe5..173f51b57c2 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd5).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd6).blk
index 7b653264a0c..e9c061faf3d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [Flamer] (Sqd6).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd4).blk
index 6754bc4e6a1..2687f58bebf 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd4).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd5).blk
index b1cc07c0e48..fe5e20e305b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd5).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd6).blk
index 6545148b6f1..cb91ec79a16 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [LRR] (Sqd6).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd4).blk
index c487225f968..8e1b9ad937b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd4).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd5).blk
index 4739603690f..0bdd48b9829 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd5).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd6).blk
index fe87a0cf031..3d2d73e6fc8 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [MagShot] (Sqd6).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd4).blk
index ae1980c7982..ed3721c2a70 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd4).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd5).blk
index ec1de8ae188..d3bb8aa6991 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd5).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd6).blk
index 347872cf95b..6fc25219230 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [SRM SL] (Sqd6).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd4).blk
index 210b274d21c..cdb297a11f9 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd4).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd5).blk
index cc2be19e8d5..a5edb793ac0 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd5).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd6).blk
index be6dbe3366f..599338c99e4 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Grenadier BA [TAG] (Sqd6).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd4).blk
index f6a611b844f..6a2489ed40d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd4).blk	
@@ -62,7 +62,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd5).blk
index 73fecfaeb28..367ea0aebc1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd5).blk	
@@ -74,7 +74,7 @@ IS BA Stealth (Improved):RA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd6).blk
index 84a9fad3217..c422ca26256 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Hauberk BA (Sqd6).blk	
@@ -74,7 +74,7 @@ IS BA Stealth (Improved):RA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd4).blk
index 8c3bfe86344..9398ebb65ec 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd4).blk	
@@ -61,7 +61,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd5).blk
index 1aef83ccc54..90880bf13b1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd5).blk	
@@ -61,7 +61,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd6).blk
index 1c75ddb742c..eac7432b464 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Hauberk II BA (Sqd6).blk	
@@ -61,7 +61,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd4).blk
index 6b300614bcc..55193ae3c1c 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd4).blk	
@@ -77,7 +77,7 @@ IS BA Stealth:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd5).blk
index d4a3d4dfb8f..1dfa65238f6 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd5).blk	
@@ -80,7 +80,7 @@ IS BA Stealth:Body
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd6).blk
index 360a3b9350c..1c1702c0d06 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL Flamer] (Sqd6).blk	
@@ -84,7 +84,7 @@ IS BA Stealth:Body
 
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd4).blk
index f0420e2a7f6..1b68d92b9c1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd4).blk	
@@ -77,7 +77,7 @@ ISBASmallPulseLaser:SSWM:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd5).blk
index 670a3fb8859..3f1da5e8e48 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd5).blk	
@@ -80,7 +80,7 @@ ISBASmallPulseLaser:SSWM:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd6).blk
index 321eda140ec..663aa51bfb6 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL SPL] (Sqd6).blk	
@@ -84,7 +84,7 @@ ISBASmallPulseLaser:SSWM:LA
 
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd4).blk
index e5391b5f0ba..10d76c5a3b7 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd4).blk	
@@ -77,7 +77,7 @@ ISBALightTAG:SSWM:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd5).blk
index 58efb07b74f..3c315efbf79 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd5).blk	
@@ -80,7 +80,7 @@ ISBALightTAG:SSWM:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd6).blk
index a4c5064417e..483fef48156 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [GL TAG] (Sqd6).blk	
@@ -84,7 +84,7 @@ ISBALightTAG:SSWM:LA
 
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd4).blk
index 3add8e8f437..b53ee83ec27 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd4).blk	
@@ -77,7 +77,7 @@ ISBAFlamer:SSWM:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd5).blk
index 10dde463a47..1aae07e5b32 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd5).blk	
@@ -80,7 +80,7 @@ ISBAFlamer:SSWM:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd6).blk
index a597e53b52f..6e0b6d93647 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL Flamer] (Sqd6).blk	
@@ -123,7 +123,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG]  (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG]  (Sqd6).blk
index 1d1eb0103df..78fbc9f9083 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG]  (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG]  (Sqd6).blk	
@@ -83,7 +83,7 @@ ISBALightTAG:SSWM:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG] (Sqd4).blk
index cf960ce9dd6..203e398b066 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG] (Sqd4).blk	
@@ -77,7 +77,7 @@ ISBALightTAG:SSWM:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG] (Sqd5).blk
index ccd7859e416..9ca161e9baa 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Kobold BA [SL TAG] (Sqd5).blk	
@@ -80,7 +80,7 @@ ISBALightTAG:SSWM:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd4).blk
index 3d7da2d8ff7..fdbdbaa7e17 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd4).blk	
@@ -82,7 +82,7 @@ ISBATaser:DWP
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd5).blk
index 8c105bb7f87..a0b5506cec6 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd5).blk	
@@ -87,7 +87,7 @@ ISBATaser:DWP
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd6).blk
index a6ac1688451..63376ece50b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (CapTeam)[HMG] (Sqd6).blk	
@@ -92,7 +92,7 @@ ISBATaser:DWP
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd4).blk
index b9bdff4da25..1d3b100250f 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd4).blk	
@@ -75,7 +75,7 @@ IS BA Mimetic:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd5).blk
index 1c70de3589a..6d13cd25202 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd5).blk	
@@ -78,7 +78,7 @@ IS BA Mimetic:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd6).blk
index 380c382353e..90d63e3fcae 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Gauss) (Sqd6).blk	
@@ -81,7 +81,7 @@ IS BA Mimetic:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd4).blk
index 1b68c59847e..dbf05c92b26 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd4).blk	
@@ -83,7 +83,7 @@ BA-Compact Narc Ammo:Body:Shots2#
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd5).blk
index 516845fd363..666d1603a2c 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd5).blk	
@@ -88,7 +88,7 @@ BA-Compact Narc Ammo:Body:Shots2#
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd6).blk
index c459f77bd2a..2380b381fad 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Narc) (Sqd6).blk	
@@ -93,7 +93,7 @@ BA-Compact Narc Ammo:Body:Shots2#
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd4).blk
index 78e18554dfc..d6421879ec1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd4).blk	
@@ -72,7 +72,7 @@ leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd5).blk
index bab6fb4e939..46680917c49 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd5).blk	
@@ -72,7 +72,7 @@ leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd6).blk
index dc15191da15..80a4aa15767 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Seeker) [MG] (Sqd6).blk	
@@ -72,7 +72,7 @@ leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd4).blk
index 609ad424582..0d2896db519 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd4).blk	
@@ -75,7 +75,7 @@ IS BA Mimetic:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd5).blk
index 6107c27eb50..304606ef049 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd5).blk	
@@ -78,7 +78,7 @@ IS BA Mimetic:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd6).blk
index 3c47261986e..05c9792edf8 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA (Sup) (Sqd6).blk	
@@ -81,7 +81,7 @@ IS BA Mimetic:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd4).blk
index dc4d13d8702..078ab305feb 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd4).blk	
@@ -75,7 +75,7 @@ IS BA Mimetic:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd5).blk
index 03974e1be61..c6cee072904 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd5).blk	
@@ -78,7 +78,7 @@ IS BA Mimetic:LA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd6).blk
index 8faf3ad1345..b862a011066 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nephilim Assault BA [Plasma] (Sqd6).blk	
@@ -81,7 +81,7 @@ IS BA Mimetic:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd4).blk
index 80305bc1bd8..fd731db8487 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd4).blk	
@@ -77,7 +77,7 @@ IS BA Stealth:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd5).blk
index 02ea0f6256c..20859026309 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd5).blk	
@@ -72,7 +72,7 @@ IS BA Stealth (Standard):LA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd6).blk
index 446971d8a29..2d11bfa5c61 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXI (Sqd6).blk	
@@ -87,7 +87,7 @@ IS BA Stealth:LA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd4).blk
index 4eb07e3e7cc..53d34cd3701 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd4).blk	
@@ -77,7 +77,7 @@ ISBAMicroGrenadeLauncher:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd5).blk
index ecd279de08b..6b32fcde535 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd5).blk	
@@ -65,7 +65,7 @@ ISBAMicroGrenadeLauncher:LA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd6).blk
index 65efd0e03a9..226b2732c2e 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Nighthawk PA(L) Mk. XXII (Sqd6).blk	
@@ -65,7 +65,7 @@ ISBAMicroGrenadeLauncher:LA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd4).blk
index 34b39bb7d52..c8c6927344a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd4).blk	
@@ -64,7 +64,7 @@ ISBAKingDavidLightGaussRifle:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd5).blk
index fd829aa0392..f84be21c9af 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd5).blk	
@@ -64,7 +64,7 @@ ISBAKingDavidLightGaussRifle:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd6).blk
index 9f84fa3d580..b549e4155be 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (A) (Sqd6).blk	
@@ -72,7 +72,7 @@ biped
 </jumpingMP>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd4).blk
index 645931d50a8..8f07902ff6e 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd4).blk	
@@ -86,7 +86,7 @@ ISBATaser:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd5).blk
index 0a8cb54816f..5dd0da1b340 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd5).blk	
@@ -90,7 +90,7 @@ ISBATaser:RA
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd6).blk
index 24ffae89035..6872cd4b48e 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (B) (Sqd6).blk	
@@ -93,7 +93,7 @@ ISBATaser:RA
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd4).blk
index 65c22dabae9..e5e3140bc9a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd4).blk	
@@ -69,7 +69,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd5).blk
index 179d89334d2..1547ff297e8 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd5).blk	
@@ -69,7 +69,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd6).blk
index b91390c2e13..1f51cee5093 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Phalanx BA  (C) (Sqd6).blk	
@@ -69,7 +69,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd4).blk
index 8b45d084c02..3e719b57611 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd4).blk	
@@ -69,7 +69,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd5).blk
index 5ea9b213b6b..41acf0e711d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd5).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd6).blk
index 548aff3a6c6..1aafc1357f0 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rogue Bear Heavy BA (Sqd6).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd4).blk
index 2f3f3524c2b..3dbe1842784 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd4).blk	
@@ -58,7 +58,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd5).blk
index 033f5ea3c02..10c6d1768b5 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd5).blk	
@@ -58,7 +58,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd6).blk
index 128cb269366..f236b441498 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Close) (Sqd6).blk	
@@ -58,7 +58,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd4).blk
index 5fcdbcacbe7..84d411c344a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd4).blk	
@@ -65,7 +65,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd5).blk
index f0a5ab0f8da..30b62ddf986 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd5).blk	
@@ -65,7 +65,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd6).blk
index bf75888e62a..e56ecb5be5c 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Sqd6).blk	
@@ -65,7 +65,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd4).blk
index cb4bb49dab8..6be43d2bf95 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd4).blk	
@@ -65,7 +65,7 @@ Mission Equipment Storage (5kg):Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd5).blk
index 9255818d5e3..7a235e36949 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd5).blk	
@@ -65,7 +65,7 @@ Mission Equipment Storage (5kg):Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd6).blk
index d0d08384470..7d4a2c6fc51 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Rottweiler BA (Upgrade) (Sqd6).blk	
@@ -65,7 +65,7 @@ Mission Equipment Storage (5kg):Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd4).blk
index d7f452b551e..2b44240aef5 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd4).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd5).blk
index 4eb395d7f6d..04009b4b26a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd5).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd6).blk
index 4f653fdc8c2..fed4c71b193 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (AI) (Sqd6).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd4).blk
index 0940ae98e09..a7ff14c435e 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd4).blk	
@@ -84,7 +84,7 @@ ISBATaser:DWP
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd5).blk
index 33581b934a2..6c9354fdb3d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd5).blk	
@@ -89,7 +89,7 @@ ISBATaser:DWP
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd6).blk
index 518e56570a7..ead589853ac 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Capture) (Sqd6).blk	
@@ -94,7 +94,7 @@ ISBATaser:DWP
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd4).blk
index 99ddc631ada..cb07adea878 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd4).blk	
@@ -63,7 +63,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd5).blk
index 0f8d21fe8b2..122d8a9f836 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd5).blk	
@@ -63,7 +63,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd6).blk
index 80584b369b4..39d5d4ea583 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Se'irim Med BA (Sqd6).blk	
@@ -63,7 +63,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd4).blk
index 620b09e275a..4b883cf93cb 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd4).blk	
@@ -87,7 +87,7 @@ ISBATaser:DWP
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd5).blk
index aecdae4f5bd..6ba329664b8 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd5).blk	
@@ -93,7 +93,7 @@ ISBATaser:DWP
 </Trooper 5 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd6).blk
index 98bb3cc40ff..6be1194a0df 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Capture) (Sqd6).blk	
@@ -100,7 +100,7 @@ ISBATaser:DWP
 </Trooper 6 Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd4).blk
index dc63aa0d83d..f9e3cd529e3 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd4).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd5).blk
index 266b8e6f2b9..2fda0aacca7 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd5).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd6).blk
index 36464eabc11..4448c6558fd 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (PPC) (Sqd6).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd4).blk
index 05ff61d37fd..e357b3f97cb 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd4).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd5).blk
index ef63d47d1b8..050b5ccb4c7 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd5).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd6).blk
index 4c6954c047c..87c1849eaa9 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Recon) (Sqd6).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd4).blk
index 69c38a98eb0..0999b121f77 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd4).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd5).blk
index a59a861926e..72af01aa9c5 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd5).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd6).blk
index 1230ce61188..43509399bd3 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sqd6).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd4).blk
index 5b938658a42..aab8f02570a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd4).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd5).blk
index 07225cded75..d03312ff2d3 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd5).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd6).blk
index 4e0045911db..9bc9b6af5ff 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Shedu Assault BA (Sup) (Sqd6).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd4).blk
index 816f941799e..15d73baf74a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd4).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd5).blk
index f1257a090de..fcbeb17a156 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd5).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd6).blk
index 427fc719b95..bce646abbbc 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (C3i) (Sqd6).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd4).blk
index 5b9b68f3a0b..c532946146d 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd4).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd5).blk
index 1664c4bf53b..36df8892453 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd5).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd6).blk
index 3d7d88a512f..580996cb3ca 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (ML) (Sqd6).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd4).blk
index eb7cdadf2bf..7167ec2c9d1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd4).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd5).blk
index 9ee1343cdf9..46a4932977c 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd5).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd6).blk
index da4ba69c827..a0e6e22cefc 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Plasma) (Sqd6).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd4).blk
index 4bda20f9e0c..965b4d3dec3 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd4).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd5).blk
index fa56efdc7fc..cebd17fc92a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd5).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd6).blk
index 64b948466d1..44fd00be5d7 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (RL) (Sqd6).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd4).blk
index 54ab1118e28..a59dca7af71 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd4).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd5).blk
index b662aaf875d..bbfbc32e6c9 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd5).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd6).blk
index 94789f5f974..9dacd4ca888 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (Sup) (Sqd6).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd4).blk
index 20f3b1171ff..c37e91d0426 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd4).blk	
@@ -74,7 +74,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd5).blk
index 4d550c6dd8c..d2a0eb746cd 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd5).blk	
@@ -74,7 +74,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd6).blk
index 163edc7a1e3..a13c002b349 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tengu Heavy BA (VSP) (Sqd6).blk	
@@ -74,7 +74,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd4).blk
index 40f733ae708..74a00f3f57a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd4).blk	
@@ -71,7 +71,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd5).blk
index 18655366655..fdab3d7b47a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd5).blk	
@@ -71,7 +71,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd6).blk
index 91ee1798e72..8eff9ee8c96 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G12 (Sqd6).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd4).blk
index b997a38fc58..f9d2d845cb9 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd4).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd5).blk
index f844c23515e..c33d080514b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd5).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd6).blk
index 5dfa90e42f2..00f94ef41e7 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [David] (Sqd6).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd4).blk
index 95af0607046..c337759966b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd4).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd5).blk
index 6b68d69b192..91f2018dbd5 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd5).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd6).blk
index 556d89b700c..0745ce4fe8a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [Flamer] (Sqd6).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd4).blk
index d26847b9e6e..b0dc540bf86 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd4).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd5).blk
index 4fa22ed9d2f..d45f29c3c59 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd5).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd6).blk
index 8b0f4abc6ee..256cbeb46e4 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [GL] (Sqd6).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd4).blk
index 0467ce0f9c6..8824c2fadbc 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd4).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd5).blk
index 75041be7c3b..d9082b44f1f 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd5).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd6).blk
index 17b6b21600c..0ad8ae826bb 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [MG] (Sqd6).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd4).blk
index 2d2192bd871..fb8924acff4 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd4).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd5).blk
index 21acc55ca3d..ffd8d3b5ba5 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd5).blk	
@@ -70,7 +70,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd6).blk
index 287665e4a43..5ba81bd8df1 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G13 [SL] (Sqd6).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd4).blk
index b720cebeef3..8bc672cd128 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd4).blk	
@@ -103,7 +103,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd5).blk
index e1fa34a0964..7946cf7b639 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd5).blk	
@@ -70,7 +70,7 @@ Mission Equipment Storage:Body:SIZE:210.0
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd6).blk
index 1bc5e80a33c..5a7514cd0f7 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) G14 (Sqd6).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd4).blk
index 791c43611a4..adcf5d78cd6 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd4).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Succession Wars
+TRO: 3075 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd5).blk
index 2921ed6e5df..77edd291235 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd5).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Succession Wars
+TRO: 3075 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd6).blk
index 338974cf34a..992c3e11b7b 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Tornado PA(L) P12 (Sqd6).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3075 - Succession Wars
+TRO: 3075 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd4).blk
index 5a3a6c4c537..544f72d4690 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd4).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd5).blk
index 852a32ec408..29866b71278 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd5).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd6).blk
index fb0074fe936..eb631f64491 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [MRR] (Sqd6).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd4).blk
index ff32b548fec..768257484ce 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd4).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd5).blk
index 876e5f9e929..5621d1cf75a 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd5).blk	
@@ -67,7 +67,7 @@ LegAttack
 
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd6).blk
index 9aab7a9f005..ae21f3dd5d2 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Asterion) [PPC] (Sqd6).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd4).blk
index 3dbe915c77b..b6ac9b888ec 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd4).blk	
@@ -69,7 +69,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd5).blk
index 63a101700a7..92c8edc1152 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd5).blk	
@@ -69,7 +69,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd6).blk
index 52b0bcc5b5c..3ce1d9b4d67 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus RL)[LRR] (Sqd6).blk	
@@ -69,7 +69,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd4).blk
index 43ba60329dc..c9afa7c8ff8 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd4).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd5).blk
index 978c4203a22..94efaab5ca6 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd5).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd6).blk
index a611e37481b..b0ae4d749d8 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Theseus)[MRR] (Sqd6).blk	
@@ -66,7 +66,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd4).blk
index e0dfc677926..31349a85fc7 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd4).blk	
@@ -73,7 +73,7 @@ BA Mimetic:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd5).blk
index abce42ab9c6..223bbf9a068 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd5).blk	
@@ -73,7 +73,7 @@ BA Mimetic:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd6).blk
index 91854b868a3..91578944afc 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Trinity Med BA (Ying Long)(Plasma) (Sqd6).blk	
@@ -73,7 +73,7 @@ BA Mimetic:RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd4).blk
index 36cce001364..a7e92410bb0 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd4).blk	
@@ -65,7 +65,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd5).blk
index 69e84b2b15b..bb5a516eaa5 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd6).blk
index 3cdea7a30d2..ada10689e16 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (DCA) (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd4).blk
index b7db7779198..b8c592a06cd 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd4).blk	
@@ -65,7 +65,7 @@ ISBAJumpBooster:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd5).blk
index a8cb2b881aa..62aa73b1ec7 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd5).blk	
@@ -65,7 +65,7 @@ ISBAJumpBooster:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd6).blk
index b78db376df1..5505955f793 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Nova) (Sqd6).blk	
@@ -65,7 +65,7 @@ ISBAJumpBooster:Body
 </Squad Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd4).blk
index c124ee0b37d..b495c5f52b6 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd4).blk	
@@ -65,7 +65,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd5).blk
index cd80bbf8b13..8f8208b97d9 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd5).blk	
@@ -65,7 +65,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd6).blk
index 28bb6f53f2c..2b3d071e0b2 100644
--- a/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3075/Void Med BA (Sqd6).blk	
@@ -65,7 +65,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd4).blk
index 26a0672adf4..52752bd5b07 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd4).blk	
@@ -64,7 +64,7 @@ ISBARemoteSensorDispenser:Body
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd5).blk
index 1d7515efa21..0907f693f40 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd5).blk	
@@ -65,7 +65,7 @@ ISBARemoteSensorDispenser:Body
 
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd6).blk
index 5f58baac3b0..938ef002f6c 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit (Recon)(Sqd6).blk	
@@ -64,7 +64,7 @@ ISBARemoteSensorDispenser:Body
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd4).blk
index efed5f81c08..07293a6fe2b 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd4).blk	
@@ -67,7 +67,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd5).blk
index bcd96935fe5..68ba48aed08 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd5).blk	
@@ -67,7 +67,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd6).blk
index f57c499cb38..3f748adee28 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Angerona Scout Suit(Sqd6).blk	
@@ -68,7 +68,7 @@ IS BA Stealth (Improved):RA
 
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd4).blk
index 076fb380a70..bb60038440a 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd4).blk	
@@ -78,7 +78,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd5).blk
index e00c8b2919a..faffce860a7 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd5).blk	
@@ -78,7 +78,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd6).blk
index c6266f595ac..1425ebe24e8 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Fire) (Sqd6).blk	
@@ -78,7 +78,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd4).blk
index 710955776e0..243972cc927 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd4).blk	
@@ -75,7 +75,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd5).blk
index 3326aa0d9ab..1144a246b9b 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd5).blk	
@@ -75,7 +75,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd6).blk
index c47c583241a..d4b570c0fbb 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ironhold Assault BA (Sqd6).blk	
@@ -75,7 +75,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd4).blk
index 082fde3f964..5510d5a92b0 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd4).blk	
@@ -81,7 +81,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd5).blk
index 58b33be5b6e..c79d5f07c84 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd5).blk	
@@ -81,7 +81,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd6).blk
index 6483d2f2676..8f375252e9a 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (AI) (Sqd6).blk	
@@ -81,7 +81,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd4).blk
index 71e0e488e91..2e437112f4f 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd4).blk	
@@ -81,7 +81,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd5).blk
index 8e175730b5c..8c7965e72a7 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd5).blk	
@@ -81,7 +81,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd6).blk
index 4357f26eecd..b4877214ffd 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Kopis Assault BA (Sqd6).blk	
@@ -81,7 +81,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd4).blk
index fa96c425830..afd6561bf9c 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd4).blk	
@@ -71,7 +71,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd5).blk
index ea7e8db2f96..2783766093e 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd5).blk	
@@ -71,7 +71,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd6).blk
index 827abff2195..ef6c614650d 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Ravager Assault BA (Sqd6).blk	
@@ -70,7 +70,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd4).blk
index 0958f234238..a1ea6afc2f4 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd4).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd5).blk
index 990fc2d84c2..6da08189883 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd5).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd6).blk
index a625b14018a..7ed43777709 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [APG] (Sqd6).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd4).blk
index fb9481eaee5..8993d65b1b7 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd4).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd5).blk
index 6c8ddba482a..4cf1deb7e56 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd5).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd6).blk
index 3fbf34aa7a0..501164dfadc 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [ER Laser] (Sqd6).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd4).blk
index 6d7b54f17c2..ffaca4c9893 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd4).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd5).blk
index 17b49cdddc9..9660df0cefa 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd5).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd6).blk
index 6881942133a..512995cbded 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Thunderbird BA [Pulse] (Sqd6).blk	
@@ -63,7 +63,7 @@ BAHeavyBattleClawVibro:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd4).blk
index a1629833d91..7b16bbc0397 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd4).blk	
@@ -75,7 +75,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd5).blk
index 948657cfda7..31373ecf0fe 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd5).blk	
@@ -75,7 +75,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd6).blk
index bdcad6e877e..7b4e31f6217 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/Cutting Edge/Warg Assault BA (Sqd6).blk	
@@ -75,7 +75,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd4).blk
index 551dee44a2d..4a0eb1f39a8 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd4).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:Body
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd5).blk
index 0341968571a..dc16968a82f 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd5).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:Body
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd6).blk
index 910af879d36..d1f756ab10f 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Afreet Med BA (Interdictor)(Sqd6).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:Body
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd4).blk
index cdc185663eb..8f29e5c6382 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd4).blk	
@@ -64,7 +64,7 @@ BASearchlight:LA
 
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd5).blk
index 1c4b70a9dfd..081c919e9e7 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd5).blk	
@@ -63,7 +63,7 @@ BASearchlight:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd6).blk
index 65192d565da..d607adbb3a6 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Clan Med BA (Rache)(Sqd6).blk	
@@ -63,7 +63,7 @@ BASearchlight:LA
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd4).blk
index 545ca44f71e..6c82a682c83 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd4).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:Body
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd5).blk
index 79ef58b875b..a387241992f 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd5).blk	
@@ -79,7 +79,7 @@ Clan BA Fire Resistant:Body
 </Trooper 5 Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd6).blk
index ed9c4aea367..871e1a66ae7 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [APG] (Sqd6).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:Body
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd4).blk
index 9e0f8058d84..cbe5e3bfe3c 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd4).blk	
@@ -72,7 +72,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd5).blk
index 028ebca0a6f..8c01680cec0 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd5).blk	
@@ -72,7 +72,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd6).blk
index 83c20fe0a83..58a825e7204 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Flamer] (Sqd6).blk	
@@ -72,7 +72,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd4).blk
index 33d01e6ccef..d0fd92e3068 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd4).blk	
@@ -72,7 +72,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd5).blk
index 15913eb5ff3..b8b5967c180 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd5).blk	
@@ -72,7 +72,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd6).blk
index aa84557f314..d5fb53afd24 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Fire) [Pulse] (Sqd6).blk	
@@ -72,7 +72,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd4).blk
index d2cbc456bfc..d173d7556cb 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd4).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Succession Wars
+TRO: 3085 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd5).blk
index c737cf6a69a..dac0bb1af0a 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd5).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Succession Wars
+TRO: 3085 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd6).blk
index 0b6ec42bda6..90eac427cc2 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Flamer] (Sqd6).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Succession Wars
+TRO: 3085 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd4).blk
index b94b28a0c19..60c4f378afa 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd4).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Succession Wars
+TRO: 3085 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd5).blk
index 5c3e2c3ef04..bdb2e81aa0d 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd5).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Succession Wars
+TRO: 3085 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd6).blk
index 4bcb07f08d6..b62046014fc 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [MG] (Sqd6).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Succession Wars
+TRO: 3085 - Succession Wars
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd4).blk
index 5901e5ee8d1..4c1c37f5cd9 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd4).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd5).blk
index 3bf5d301396..1cdc4354e96 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd5).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd6).blk
index 9360341c7e2..02a3014960c 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Elemental BA (Space) [Pulse] (Sqd6).blk	
@@ -71,7 +71,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd4).blk
index e2072b0328d..46d2061077b 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd4).blk	
@@ -66,7 +66,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd5).blk
index 4c73a34b954..ab07373ac5b 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd5).blk	
@@ -68,7 +68,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd6).blk
index 5bfa9d51dae..c0537833826 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [King David] (Sqd6).blk	
@@ -68,7 +68,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma]  (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma]  (Sqd6).blk
index a6d2e683a4f..ea4f332617d 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma]  (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma]  (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma] (Sqd4).blk
index e3f223d86dd..49aa7a54b8e 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma] (Sqd4).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma] (Sqd5).blk
index 00495911db7..f6cba2630d4 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Fa Shih BA (Sup) [Plasma] (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd4).blk
index be106e5ba98..cc2bb8dc270 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd4).blk	
@@ -67,7 +67,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd5).blk
index 327b839da88..aefa26cd5f6 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd5).blk	
@@ -67,7 +67,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd6).blk
index 53d45bd8bf7..ce050703430 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gnome BA (LRM) (Sqd6).blk	
@@ -67,7 +67,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd4).blk
index 3401261870b..77947013a47 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd4).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:RA
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd5).blk
index 65f1b46f972..c8d4b55099b 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd5).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:RA
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd6).blk
index 2d2efb1cbf2..e304be92cd0 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Golem AA (Sup)(Sqd6).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:RA
 </Point Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd4).blk
index 8159e9e306b..7e5f06b4337 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd4).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd5).blk
index 1c5922d948e..e644ee1d94e 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd5).blk	
@@ -118,7 +118,7 @@ From this forum post. https://bg.battletech.com/forums/fan-articles/battle-armor
 </notes>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd6).blk
index fcba9f474f8..a112f6a8d33 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Gray Death Heavy Suit (Sqd6).blk	
@@ -121,7 +121,7 @@ From this forum post. https://bg.battletech.com/forums/fan-articles/battle-armor
 </notes>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd4).blk
index bc1f5142ade..fe0d2cd234b 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd4).blk	
@@ -77,7 +77,7 @@ IS BA Stealth:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd5).blk
index b89d1115b76..523444315a9 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Stealth:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd6).blk
index f678bc841df..6d905a18323 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Infiltrator Mk II BA (Mag) (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Stealth:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd4).blk
index 4d27dcc86ee..dc867d45ca2 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd4).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd5).blk
index ce74adde395..08d0d2c52c7 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd5).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd6).blk
index 6b2257022e0..74bc7222fb0 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Kage Light BA (Space) (Sqd6).blk	
@@ -70,7 +70,7 @@ Jump
 </motion_type>
 
 <source>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd4).blk
index 6c4592b1699..04e68c8cb41 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd4).blk	
@@ -79,7 +79,7 @@ LegAttack
 </Trooper 4 Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd5).blk
index a7c3bbf120c..b42d44f402e 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd5).blk	
@@ -67,7 +67,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd6).blk
index 4e4b5256b9b..c5d80c50a56 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Longinus BA (Mag) (Sqd6).blk	
@@ -85,7 +85,7 @@ LegAttack
 </Trooper 6 Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (BH (Sqd1).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (BH (Sqd1).blk
index c6802e714b1..8496a68f8b3 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (BH (Sqd1).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (BH (Sqd1).blk	
@@ -75,7 +75,7 @@ IS BA Stealth:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075/RS 3085 Unabridged ONN - Star League
+TRO: 3075 Unabridged ONN - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (BH 3055) (Sqd1).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (BH 3055) (Sqd1).blk
index c9e54809269..06a55daaa24 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (BH 3055) (Sqd1).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (BH 3055) (Sqd1).blk	
@@ -59,7 +59,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3075/RS 3085 Unabridged ONN - Succession Wars
+TRO: 3075/RS 3085 Unabridged ONN - Succession Wars
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd4).blk
index d3f2a9be17d..0613e10c472 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd4).blk	
@@ -75,7 +75,7 @@ IS BA Stealth:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3075/RS 3085 Unabridged ONN - Star League
+TRO: 3075 Unabridged ONN - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd5).blk
index fefd51e4394..55080310a03 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd5).blk	
@@ -63,7 +63,7 @@ IS BA Stealth:LA
 </Squad Equipment>
 
 <source>
-TRO 3075/RS 3085 Unabridged ONN - Star League
+TRO: 3075 Unabridged ONN - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd6).blk
index c67134acbc6..e5e14e53765 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Nighthawk PA(L) Mk. XXX (Sqd6).blk	
@@ -63,7 +63,7 @@ IS BA Stealth:LA
 </Squad Equipment>
 
 <source>
-TRO 3075/RS 3085 Unabridged ONN - Star League
+TRO: 3075 Unabridged ONN - Star League
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd4).blk
index 1120598ae1a..bad039c281b 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd4).blk	
@@ -64,7 +64,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd5).blk
index ad821c9b630..8b5f525aa84 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd5).blk	
@@ -64,7 +64,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd6).blk
index 856c48bfa1c..64a1ed55a82 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Raiden BA (AI) (Sqd6).blk	
@@ -64,7 +64,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd4).blk
index 7ac08ee0e08..b5a6a100289 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd4).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd5).blk
index 4006d955b4c..c1869871f9c 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd5).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd6).blk
index 6736a0a149a..8cfb9c7a56a 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Rottweiler BA (Firedrake) (Sqd6).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd4).blk
index 4e4526dfd37..d041396301f 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd4).blk	
@@ -62,7 +62,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd5).blk
index df9e8a0d94d..4d089cf1ffe 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd5).blk	
@@ -62,7 +62,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd6).blk
index 3c6f8b82e5a..89f34a2a8f3 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Sloth BA (Interdictor) (Sqd6).blk	
@@ -62,7 +62,7 @@ Leg
 </motion_type>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd4).blk
index d1921a2dce7..cdf43e6ec80 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd4).blk	
@@ -72,7 +72,7 @@ BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd5).blk
index c45e5dd4888..6b8d62a5e30 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd5).blk	
@@ -72,7 +72,7 @@ BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd6).blk
index 18734b1e3e5..fcbef6814dd 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[MRR] (Sqd6).blk	
@@ -72,7 +72,7 @@ BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd4).blk
index 8063758a7fa..df06dad1d26 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd4).blk	
@@ -72,7 +72,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd5).blk
index a09cff2da7e..b8e59979ad7 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd5).blk	
@@ -72,7 +72,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd6).blk
index 90cb0f79ba7..268fbbfba16 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Asterion Upgrade)[PPC] (Sqd6).blk	
@@ -72,7 +72,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd4).blk
index e0d48f8c2b3..475107cb805 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd4).blk	
@@ -67,7 +67,7 @@ ISBAMicroGrenadeLauncher:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd5).blk
index a840d8ec937..b9f7c9dd3b5 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd5).blk	
@@ -67,7 +67,7 @@ ISBAMicroGrenadeLauncher:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd6).blk
index a5f5f06d16e..6d58be2af62 100644
--- a/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3085u/ONN/Trinity Med BA (Theseus Sup) Killshot (Sqd6).blk	
@@ -67,7 +67,7 @@ ISBAMicroGrenadeLauncher:LA
 </Squad Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd4).blk
index ea477dac8ec..c03de6294f5 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd4).blk	
@@ -61,7 +61,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd5).blk
index 16c44e83d88..238c4f3db17 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd5).blk	
@@ -76,7 +76,7 @@ Clan BA Reactive:Body
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd6).blk
index 140851e6eee..229782fa4aa 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (ER Pulse) (Sqd6).blk	
@@ -61,7 +61,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd4).blk
index 6de7db713e6..bacb98a032c 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd4).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd5).blk
index c95b6d57614..1149fa02aa8 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd5).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd6).blk
index ff403d81c52..f635e7d6a25 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Flamer) (Sqd6).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd4).blk
index 53eb9f0f341..692575d8d09 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd4).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd5).blk
index f3774fe3d3d..032d9564bb9 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd5).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd6).blk
index 524b27343fb..11241a3db38 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Heavy Mortar) (Sqd6).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd4).blk
index 7fd64a16c14..e94c577baa1 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd4).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd5).blk
index d2d710db3ef..1bc090e9487 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd5).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd6).blk
index a25c3ed95d6..d8ae29733ed 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (LBX) (Sqd6).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd4).blk
index a90167ed150..0df91f284aa 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd4).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd5).blk
index 467fe19e950..f5c03f27f51 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd5).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd6).blk
index 744a303243e..0498f542f8b 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Black Wolf BA (Plasma) (Sqd6).blk	
@@ -53,7 +53,7 @@ Clan BA Reactive:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Dark Ages
+TRO: 3145 The Clans - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd4).blk
index 621a0dc3b2c..4f2f09d8932 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd4).blk	
@@ -71,7 +71,7 @@ CLBearhunter Superheavy AC:Body
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd5).blk
index c80a473d960..e56737aa32f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd5).blk	
@@ -71,7 +71,7 @@ CLBearhunter Superheavy AC:Body
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd6).blk
index 420f2911b89..a6db54943dc 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (HK) (Sqd6).blk	
@@ -56,7 +56,7 @@ CLBearhunter Superheavy AC:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd4).blk
index 58bdb4e4c96..40bf5edd325 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd4).blk	
@@ -48,7 +48,7 @@ CLBAMG:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd5).blk
index 78c5f6aa087..8564576c1e6 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd5).blk	
@@ -48,7 +48,7 @@ CLBAMG:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd6).blk
index c1fce916eb5..f966c0feaac 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sqd6).blk	
@@ -48,7 +48,7 @@ CLBAMG:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd4).blk
index f7a6ebec960..174c4f183b7 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd4).blk	
@@ -48,7 +48,7 @@ CLBALightTAG:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd5).blk
index 757537986b1..826ce498509 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd5).blk	
@@ -48,7 +48,7 @@ CLBALightTAG:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd6).blk
index fd21ff641b7..c0cac87563c 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Buraq Fast BA (Sup) (Sqd6).blk	
@@ -48,7 +48,7 @@ CLBALightTAG:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd4).blk
index 03318d38191..e6a9763c2f0 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd4).blk	
@@ -66,7 +66,7 @@ BASearchlight:Body
 
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd5)).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd5)).blk
index af706e49551..2bcce3a3a2d 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd5)).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd5)).blk	
@@ -64,7 +64,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd6).blk
index 76c68f53729..458051c10c1 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (ECM) (Sqd6).blk	
@@ -64,7 +64,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd4).blk
index 9eeb5ca0d43..176d997687a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd4).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd5).blk
index 484d26864e3..922c5443fee 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd5).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd6).blk
index 33b6ce135a3..68a3a475b85 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (Imp Sensors) (Sqd6).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd4).blk
index 204cddcb412..9fe75fea0a5 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd4).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd5).blk
index b2bd3121e84..08622d35cab 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd5).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd6).blk
index b058b061cf0..bdf36052706 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (LMG) (Sqd6).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd4).blk
index 222995f0c4d..c6c3770d058 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd4).blk	
@@ -53,7 +53,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd5).blk
index 6560bbdf6d4..d5328dff40d 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd5).blk	
@@ -53,7 +53,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd6).blk
index 8973d9eed87..2536f6884d4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (SRM) (Sqd6).blk	
@@ -53,7 +53,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd4).blk
index 3a31646e33d..0f8d8827b71 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd4).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd5).blk
index d756c3a290a..cfa4cb6bc9b 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd5).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd6).blk
index a74d1970abf..44a12ebfba4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Constable Pacification Suit (TAG) (Sqd6).blk	
@@ -52,7 +52,7 @@ BASearchlight:Body
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd4).blk
index a6c5fb8ba88..eb6098ed7ed 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd4).blk	
@@ -49,7 +49,7 @@ ISBAFiredrakeIncendiaryNeedler:RA
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd5).blk
index cf64ce059aa..979eca45bcb 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd5).blk	
@@ -49,7 +49,7 @@ ISBAFiredrakeIncendiaryNeedler:RA
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd6).blk
index e09f57c7b6d..76a7a8c65e3 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (AI) (Sqd6).blk	
@@ -49,7 +49,7 @@ ISBAFiredrakeIncendiaryNeedler:RA
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd4).blk
index c4d0590408f..cc322cf4b14 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd4).blk	
@@ -63,7 +63,7 @@ Clan BA Stealth (Basic):RA
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd5).blk
index cfca3bfab9c..3b390063820 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd5).blk	
@@ -63,7 +63,7 @@ Clan BA Stealth (Basic):RA
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd6).blk
index 3cd316ce2ab..d0e7ab2748a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Clans/Wraith BA (Sqd6).blk	
@@ -63,7 +63,7 @@ Clan BA Stealth (Basic):RA
 </Point Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd4).blk
index 74f2a3ebdfe..0f482be36ab 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd4).blk	
@@ -72,7 +72,7 @@ IS BA Stealth (Basic):Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd5).blk
index 9fc892bee2d..6481af4a7ca 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd5).blk	
@@ -60,7 +60,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd6).blk
index ad70c189f6c..306adfb6f99 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Sqd6).blk	
@@ -60,7 +60,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd4).blk
index 923348b5d50..d204f4b30ef 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd4).blk	
@@ -75,7 +75,7 @@ IS BA Reflective:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Federated Suns - Dark Ages
+TRO: 3145 Federated Suns - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd5).blk
index c8267a2af5e..6dc5b133061 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd5).blk	
@@ -63,7 +63,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Dark Ages
+TRO: 3145 Federated Suns - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd6).blk
index 81681af8a83..d6dd1fb21c3 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Fusilier BA (Upgraded) (Sqd6).blk	
@@ -63,7 +63,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Dark Ages
+TRO: 3145 Federated Suns - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd4).blk
index 343500b038e..a0e18881171 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd4).blk	
@@ -49,7 +49,7 @@ InfantryAssaultRifle:RA:APM
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd5).blk
index 55d000b393d..06c3dad6eb3 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd5).blk	
@@ -49,7 +49,7 @@ InfantryAssaultRifle:RA:APM
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd6).blk
index 195be9f51a0..fde2e212776 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/PAB-28 Sniper Suit (Sqd6).blk	
@@ -49,7 +49,7 @@ InfantryAssaultRifle:RA:APM
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd4).blk
index 86f5d3755e8..1e338489523 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd4).blk	
@@ -67,7 +67,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd5).blk
index 6c7c0da30bf..cf1b64e166f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd5).blk	
@@ -74,7 +74,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd6).blk
index 012e1c6edfb..1921d0f250b 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Davion/Sea Fox Amphibious Armor (Sqd6).blk	
@@ -67,7 +67,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd4).blk
index 1b63c38b8f7..392e196a2d2 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd4).blk	
@@ -66,7 +66,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd5).blk
index 13283f9507c..61296a3048f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd5).blk	
@@ -66,7 +66,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd6).blk
index 16d00e63261..9e6103ae044 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Kishi Ceremonial Armor (Sqd6).blk	
@@ -66,7 +66,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd4).blk
index c6588f0d830..d6fa974c558 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd4).blk	
@@ -78,7 +78,7 @@ Clan BA Fire Resistant:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd5).blk
index 4209e43d7f0..55f865e9e3e 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd5).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd6).blk
index 9f21cf15613..0e295221a41 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA Bearhunter (Sqd6).blk	
@@ -66,7 +66,7 @@ Clan BA Fire Resistant:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd4).blk
index 81c957a9768..315ae12ac95 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd4).blk	
@@ -85,7 +85,7 @@ CLBAMedium Recoilless Rifle:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd5).blk
index 98ca41c9a38..b0964bdfb76 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd5).blk	
@@ -73,7 +73,7 @@ CLBAMedium Recoilless Rifle:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd6).blk
index 4ff3e9070b7..17b8e001d55 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd6).blk	
@@ -73,7 +73,7 @@ CLBAMedium Recoilless Rifle:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd4).blk
index 214ca81211f..0784b880bd7 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd4).blk	
@@ -73,7 +73,7 @@ BA Fire Resistant:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd5).blk
index bf107714add..c52a4219445 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd5).blk	
@@ -73,7 +73,7 @@ BA Fire Resistant:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd6).blk
index 47c544c2c9d..d7c24e22f7b 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd6).blk	
@@ -73,7 +73,7 @@ BA Fire Resistant:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd4).blk
index b4b4b490146..0d8523d8f86 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd4).blk	
@@ -85,7 +85,7 @@ BA-Compact Narc Ammo:RA:Shots4#
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd5).blk
index 2bc9cd87f1c..9c1b435f369 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd5).blk	
@@ -90,7 +90,7 @@ BA-Compact Narc Ammo:RA:Shots4#
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd6).blk
index bee03a02801..23eb378f692 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA [Narc] (Sqd6).blk	
@@ -95,7 +95,7 @@ BA-Compact Narc Ammo:RA:Shots4#
 </Trooper 6 Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd4).blk
index fd8d5000c9a..1da58057d05 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd4).blk	
@@ -62,7 +62,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd5).blk
index 52797f31b4e..171d799fea7 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd5).blk	
@@ -62,7 +62,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd6).blk
index bdc3ef526c2..98bd2af286a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (C3) (Sqd6).blk	
@@ -62,7 +62,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd4).blk
index c236a4e8c49..3e95f5469a6 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd4).blk	
@@ -62,7 +62,7 @@ IS BA Reflective:LA
 
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd5).blk
index a9a3a782166..1e6f060c3e3 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd5).blk	
@@ -61,7 +61,7 @@ IS BA Reflective:LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd6).blk
index d8c0fd7af0b..53562744a05 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Kurita/Zou Heavy BA (Sqd6).blk	
@@ -61,7 +61,7 @@ IS BA Reflective:LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd4).blk
index 335b11b7539..2cf96971b2c 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd4).blk	
@@ -51,7 +51,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd5).blk
index c05f036ca89..70dedc41e31 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd5).blk	
@@ -51,7 +51,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd6).blk
index 551e70c774f..2b2e3194159 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA MRR (Sqd6).blk	
@@ -51,7 +51,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd4).blk
index 25ef6eb3bbf..86870c08df3 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd4).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd5).blk
index 2e7145423ef..21b775970be 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd5).blk	
@@ -63,7 +63,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd6).blk
index d9065c443a6..be2b7b34317 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Amazon BA PPC (Sqd6).blk	
@@ -75,7 +75,7 @@ IS BA Advanced:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd4).blk
index e17b5e52b40..baaeebb44b6 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd4).blk	
@@ -56,7 +56,7 @@ BADavidLightGaussRifle:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd5).blk
index 8db67e3eab7..82d98907bee 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd5).blk	
@@ -56,7 +56,7 @@ BADavidLightGaussRifle:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd6).blk
index fec288264bf..f0534558c73 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA David (Sqd6).blk	
@@ -56,7 +56,7 @@ BADavidLightGaussRifle:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd4).blk
index 252a276041f..18c151e2d0c 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd4).blk	
@@ -55,7 +55,7 @@ ECM Suite (Light):TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd5).blk
index 037e979ef4e..b85a0433c50 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd5).blk	
@@ -55,7 +55,7 @@ ECM Suite (Light):TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd6).blk
index 65a9d252a6f..426e3ec5b07 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Interdictor (Sqd6).blk	
@@ -55,7 +55,7 @@ ECM Suite (Light):TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd4).blk
index 91af6841383..51ae7948760 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd4).blk	
@@ -56,7 +56,7 @@ CLBAMG:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd5).blk
index 7094d9a022a..61ae0b3f5ff 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd5).blk	
@@ -56,7 +56,7 @@ CLBAMG:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd6).blk
index 8189a3ee672..b9a54849126 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MG (Sqd6).blk	
@@ -56,7 +56,7 @@ CLBAMG:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd4).blk
index 2ba8096caf4..08e08118705 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd4).blk	
@@ -54,7 +54,7 @@ IS MRM 5 Ammo:TU:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd5).blk
index 70e092e6ef4..611601918c4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd5).blk	
@@ -54,7 +54,7 @@ IS MRM 5 Ammo:TU:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd6).blk
index 8fec41af6f0..0a06892e13f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA MRM (Sqd6).blk	
@@ -54,7 +54,7 @@ IS MRM 5 Ammo:TU:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd4).blk
index 97eac2cc81e..87ab0d34612 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd4).blk	
@@ -62,7 +62,7 @@ BAMineLauncher:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd5).blk
index 430c5be304d..9c9ab4fb2d4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd5).blk	
@@ -62,7 +62,7 @@ BAMineLauncher:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd6).blk
index fc2eee4f0b0..b819c3c74b8 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA Pop Up Mine (Sqd6).blk	
@@ -62,7 +62,7 @@ BAMineLauncher:TU
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd4).blk
index 466615528ba..698fe68960e 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd4).blk	
@@ -54,7 +54,7 @@ BA-SRM4 Ammo:TU:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd5).blk
index 0304ed0dcfb..c71a263fb81 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd5).blk	
@@ -54,7 +54,7 @@ BA-SRM4 Ammo:TU:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd6).blk
index c9c74a234de..e23c85c15a4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Liao/Shen Long BA SRM (Sqd6).blk	
@@ -54,7 +54,7 @@ BA-SRM4 Ammo:TU:Shots4#
 </Squad Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd4).blk
index 8c0229bd684..9911d914014 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd4).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd5).blk
index 1d2e9cc8f87..e5f3de1d056 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd5).blk	
@@ -83,7 +83,7 @@ LegAttack
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd6).blk
index fdd826cc959..81438c2e23d 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (David LGR) (Sqd6).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd4).blk
index 22e599f5ae4..01164f7d0b4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd4).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd5).blk
index 71a7a1497dc..a79ef9e8bb8 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd5).blk	
@@ -83,7 +83,7 @@ LegAttack
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd6).blk
index ad58988413e..3d4ce472120 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (FireDrake) (Sqd6).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd4).blk
index db5437af76f..63be0aae16f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd4).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd5).blk
index c5cc59f1b6a..066df2e29d8 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd5).blk	
@@ -83,7 +83,7 @@ LegAttack
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd6).blk
index e386839701f..4fe10090683 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (ImpSensors) (Sqd6).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd4).blk
index 856f8e7b1f8..ab2c8bd40ac 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd4).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd5).blk
index d64200fc0af..45e1add4977 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd5).blk	
@@ -83,7 +83,7 @@ LegAttack
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd6).blk
index e88d00451e8..aada5d4218a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (Light TAG) (Sqd6).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd4).blk
index 89b354fd4de..383ff44fa4f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd4).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd5).blk
index 51ccafb4b89..67cbabe8c0a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd5).blk	
@@ -83,7 +83,7 @@ LegAttack
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd6).blk
index 2a5721bec1f..d309aed843d 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Leonidas BA (MG) (Sqd6).blk	
@@ -49,7 +49,7 @@ ISBAAngelECM:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA  (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA  (Sqd5).blk
index 30ea626bb02..c875aa5d2c5 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA  (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA  (Sqd5).blk	
@@ -59,7 +59,7 @@ BA-SRM2 Ammo:Body:Shots1#
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA  (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA  (Sqd6).blk
index a9da3b1bd08..b88dc080ae2 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA  (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA  (Sqd6).blk	
@@ -59,7 +59,7 @@ BA-SRM2 Ammo:Body:Shots1#
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor)  (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor)  (Sqd5).blk
index 2866fca298e..cc7dc1ccef6 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor)  (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor)  (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Mimetic:LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor)  (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor)  (Sqd6).blk
index e6086c91b90..1f127c7f40a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor)  (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor)  (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Mimetic:LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor) (Sqd4).blk
index 480ff2885e5..b07dae5d3af 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Interdictor) (Sqd4).blk	
@@ -77,7 +77,7 @@ IS BA Mimetic:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Sqd4).blk
index c03108efc47..dc7b22cf1b7 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Ogre BA (Sqd4).blk	
@@ -71,7 +71,7 @@ BA-SRM2 Ammo:Body:Shots1#
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd4).blk
index 2d210e67870..231f0fe3083 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd4).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd5).blk
index 3e8068ffd1b..265f5915f07 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd5).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd6).blk
index 52749c2892b..767be2c3188 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA A (Sqd6).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd4).blk
index 0f1a03a2a47..6986081e2b1 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd4).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd5).blk
index b51fac931ae..db3a325d42e 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd5).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd6).blk
index 66663489560..9ca5ddf4b8e 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA B (Sqd6).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd4).blk
index 9e862be21b6..14f72a21685 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd4).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd5).blk
index 51187179cc9..7c925fa42ac 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd5).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd6).blk
index c770b0129bc..f3c36bb831f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Marik/Xiphos Assault BA C (Sqd6).blk	
@@ -47,7 +47,7 @@ BABasicManipulator:RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd4).blk
index e36477a64d9..4632a183a3e 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd4).blk	
@@ -53,7 +53,7 @@ BA-Magnetic Clamp:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd5).blk
index f6ad0c40a98..cff2b2ec8d1 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd5).blk	
@@ -53,7 +53,7 @@ BA-Magnetic Clamp:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd6).blk
index b95ccf70792..69ac6847156 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Merc/Marauder BA (Sqd6).blk	
@@ -53,7 +53,7 @@ BA-Magnetic Clamp:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd4).blk
index dbb40cc40ca..496a4b7885f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd4).blk	
@@ -65,7 +65,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd5).blk
index 624b592419d..0359857f8a4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Stealth (Improved):LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd6).blk
index 1c5eb1c0d24..2740b372ffb 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Merc/Spectre Stealth BA (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd4).blk
index 0ea889d9598..6775692c04f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd4).blk	
@@ -67,7 +67,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Dark Age
+RS3145 NTNU - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd5).blk
index 8226156926c..775962e2863 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd5).blk	
@@ -67,7 +67,7 @@ IS BA Advanced:Body
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Dark Age
+RS3145 NTNU - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd6).blk
index 81ab3024232..f8d44df1afe 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Gray Death SA (Harjel) (Sqd6).blk	
@@ -68,7 +68,7 @@ IS BA Advanced:Body
 
 
 <source>
-RS3145 NT NU - Dark Age
+RS3145 NTNU - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd4).blk
index 52dc6838f72..eb84c26f5e9 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd4).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Late Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd5).blk
index d402f71b27a..6aacb6b4fe8 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd5).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Late Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd6).blk
index b7f69b58c62..27678abb9ee 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK C3 HRR] (Sqd6).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Late Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd4).blk
index b43b7a391db..cd841b97f4f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd4).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Late Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd5).blk
index 7b9a631bf11..09bccad0dd0 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd5).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Late Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd6).blk
index 3292a3dea2b..cdf7025bea1 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [HK SVSP Magshot] (Sqd6).blk	
@@ -68,7 +68,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Late Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd4).blk
index b701ca1c341..ccb9c05bd6c 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd4).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Early Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd5).blk
index f32c58fecc8..ef4d9157d64 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd5).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Early Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd6).blk
index df0d9f49bd3..adf71ed063a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Grenadier BA [Heavy Flamer] (Sqd6).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-RS 3145 NT NU - Dark Age
+RS 3145 NTNU - Early Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd4).blk
index bead6d73ddb..2d8c030aa7a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd4).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd5).blk
index 9785a8eea7e..336a36251a4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd5).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd6).blk
index 35c244dd4a4..9a18dbc0e0f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Infiltrator Mk. II BA (Marine) (Sqd6).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd4).blk
index 4a6bc3c4c60..052efc76c66 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd4).blk	
@@ -62,7 +62,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-RS 3145 NT NU - Early Republic
+RS 3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd5).blk
index e262e6da097..9e9ac081b92 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd5).blk	
@@ -62,7 +62,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-RS 3145 NT NU - Early Republic
+RS 3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd6).blk
index 6cf806f96d4..b402ef59700 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ironhold Assault BA (Anti-Tank) (Sqd6).blk	
@@ -62,7 +62,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-RS 3145 NT NU - Early Republic
+RS 3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd4).blk
index 0f961a16ce1..a3d233eb483 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd4).blk	
@@ -71,7 +71,7 @@ BA Harjel not coded. Unit included for completeness
 </history>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd5).blk
index 1740f2c3a95..ddf75552c48 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd5).blk	
@@ -71,7 +71,7 @@ BA Harjel not coded. Unit included for completeness
 </history>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd6).blk
index b9bb24540f9..3157b2734bc 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Kobold BA IIC (Sqd6).blk	
@@ -71,7 +71,7 @@ BA Harjel not coded. Unit included for completeness
 </history>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd4).blk
index 72825acec70..2c4cab167d2 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd4).blk	
@@ -62,7 +62,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Dark Ages
+RS3145 NTNU - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd5).blk
index d53662c100b..1e32ed78534 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd5).blk	
@@ -102,7 +102,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-RS3145 NT NU - Dark Ages
+RS3145 NTNU - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd6).blk
index 50004204ced..880d08353a2 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Phalanx BA  (D) (Sqd6).blk	
@@ -62,7 +62,7 @@ IS BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Dark Ages
+RS3145 NTNU - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd4).blk
index 283bb463aff..c5512c609fc 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd4).blk	
@@ -65,7 +65,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd5).blk
index eb21328d43d..862301bc458 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd6).blk
index 60de3f00cd6..15f0ae18a2b 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (Flamer) (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Reflective:Body
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd4).blk
index fb57d60c065..494616ab747 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd4).blk	
@@ -65,7 +65,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd5).blk
index 0840cd74be9..06ba9eb8045 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd5).blk	
@@ -65,7 +65,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd6).blk
index c632791f702..e41966ef3a6 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Raiden BA II (HMG) (Sqd6).blk	
@@ -65,7 +65,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd4).blk
index 1138eedb9fb..986905b9eab 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd4).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd5).blk
index f50cd586b61..f5fea1ccb85 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd5).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd6).blk
index 53bf914a722..e72c3001d2f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Ravager Assault BA (LRM) (Sqd6).blk	
@@ -62,7 +62,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd4).blk
index 4c0adb0a884..57d2a6259f2 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd4).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd5).blk
index f1ad650f5a6..adb71674596 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd5).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd6).blk
index 093f6950061..76b9726b8c1 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Rogue Bear Heavy BA (Upgrade)(Sqd6).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <armor_tech>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd4).blk
index cc3595b104d..c3310359a3d 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd4).blk	
@@ -60,7 +60,7 @@ ISBAKingDavidLightGaussRifle:Body
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd5).blk
index c6f72ae2d8b..9b1a8877191 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd5).blk	
@@ -60,7 +60,7 @@ ISBAKingDavidLightGaussRifle:Body
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd6).blk
index ad1a09a215e..c7af90d7f7f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Sloth BA (Huntsman) (Sqd6).blk	
@@ -60,7 +60,7 @@ ISBAKingDavidLightGaussRifle:Body
 </Squad Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd4).blk
index 9a4d7379edc..7e78c26b20d 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd4).blk	
@@ -115,7 +115,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd5).blk
index 61ee74dd802..994453fda5a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd5).blk	
@@ -70,7 +70,7 @@ Clan BA Laser Reflective (Reflec/Glazed):Body
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd6).blk
index 1df3f01e495..46edecdd085 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [ER] (Sqd6).blk	
@@ -70,7 +70,7 @@ Clan BA Laser Reflective (Reflec/Glazed):Body
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd4).blk
index 07b83c1c57e..4bfbfaf4f41 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd4).blk	
@@ -70,7 +70,7 @@ Clan BA Laser Reflective (Reflec/Glazed):Body
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd5).blk
index 3780af97ace..fae3552a2cd 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd5).blk	
@@ -70,7 +70,7 @@ Clan BA Laser Reflective (Reflec/Glazed):Body
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd6).blk
index 40405f998f9..a5ec6420d09 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [LBX] (Sqd6).blk	
@@ -70,7 +70,7 @@ Clan BA Laser Reflective (Reflec/Glazed):Body
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd4).blk
index 1a7f0fe2962..c3e0a0a0bd1 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd4).blk	
@@ -70,7 +70,7 @@ Clan BA Laser Reflective (Reflec/Glazed):Body
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd5).blk
index 08451215e89..54365b2e692 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd5).blk	
@@ -70,7 +70,7 @@ Clan BA Laser Reflective (Reflec/Glazed):Body
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd6).blk
index 1d9dc2ad3ef..691ce9ea25f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Thunderbird BA (Upgrade) [Pulse] (Sqd6).blk	
@@ -70,7 +70,7 @@ Clan BA Laser Reflective (Reflec/Glazed):Body
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Early Republic
+RS3145 NTNU - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd4).blk
index a08a7f8d8ee..5561c59d6bc 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd4).blk	
@@ -66,7 +66,7 @@ Clan BA Reactive:LA
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd5).blk
index f71da2b9ea4..c13405daaa0 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd5).blk	
@@ -66,7 +66,7 @@ Clan BA Reactive:LA
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd6).blk
index 8e75ba71543..42d341e0d8a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/NTNU RS/Warg Assault BA (Reactive)(Sqd6).blk	
@@ -66,7 +66,7 @@ Clan BA Reactive:LA
 </Point Equipment>
 
 <source>
-RS3145 NT NU - Late Republic
+RS3145 NTNU - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd4).blk
index 46b6ee6cbf1..8e23478a8b6 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd4).blk	
@@ -86,7 +86,7 @@ IS BA Reactive (Blazer):Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd5).blk
index 2f2221d564b..520bfd0d4a2 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd5).blk	
@@ -74,7 +74,7 @@ IS BA Reactive (Blazer):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd6).blk
index caf455c79a1..d6b58ea20d3 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Centaur BA (Sqd6).blk	
@@ -74,7 +74,7 @@ IS BA Reactive (Blazer):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd4).blk
index 8ad47abd797..a2856e31c8b 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd4).blk	
@@ -74,7 +74,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd5).blk
index 57b3e2ddba6..af943ee61d2 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd5).blk	
@@ -74,7 +74,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd6).blk
index da7bf6ab1e4..ac659957585 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (David LGR) (Sqd6).blk	
@@ -74,7 +74,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd4).blk
index c8894710078..c3344f2e88e 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd4).blk	
@@ -74,7 +74,7 @@ IS BA Reactive (Blazer):LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd5).blk
index 1d56df3a5fa..323c22013f4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd5).blk	
@@ -74,7 +74,7 @@ IS BA Reactive (Blazer):LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd6).blk
index d3cda3f9a9d..7e57440bcec 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (GL) (Sqd6).blk	
@@ -74,7 +74,7 @@ IS BA Reactive (Blazer):LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd4).blk
index a78caad8fd5..dbd3ef2f591 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd4).blk	
@@ -55,7 +55,7 @@ IS BA Reactive:LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd5).blk
index 804d8d4f67c..fa3e20d181b 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd5).blk	
@@ -55,7 +55,7 @@ IS BA Reactive:LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd6).blk
index 9f6427d5d6c..8f93a5053f2 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Quirinus BA (MG) (Sqd6).blk	
@@ -55,7 +55,7 @@ IS BA Reactive:LA
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd4).blk
index a36741cf438..bd6c1f171e8 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd4).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd5).blk
index 3511fdc8d26..b82f98d792f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd5).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd6).blk
index 64f38c2ea30..77aa5914ee4 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (Flamer) (Sqd6).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd4).blk
index f5f4bd7b3ef..5f994403480 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd4).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd5).blk
index b101156330a..783bd367df1 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd5).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd6).blk
index ecdfe10d394..9414fe23903 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (HMG) (Sqd6).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd4).blk
index 49fa473770f..b27aa90aecb 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd4).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd5).blk
index 10c52eeb7bc..e734277e1c9 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd5).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd6).blk
index cd5c3e211c1..d78a453e3c0 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (LRR) (Sqd6).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd4).blk
index 140f3427f3f..2fba409aac8 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd4).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd5).blk
index e1549991ccb..f9cdfa9f81c 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd5).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd6).blk
index aa0a7959529..82ee4df8f54 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Simian BA (SL) (Sqd6).blk	
@@ -48,7 +48,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd4).blk
index 5aaacb4929d..138ffe76e67 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd4).blk	
@@ -65,7 +65,7 @@ IS BA Mimetic:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd5).blk
index de80d254d16..ce40e600175 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Mimetic:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd6).blk
index ea5aca3b52e..c1b32868d95 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Republic/Taranis BA (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Mimetic:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd4).blk
index aa64c677e34..2868b12fc46 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd4).blk	
@@ -61,7 +61,7 @@ Clan BA Stealth (Improved):Body
 </Point Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Dark Ages
+TRO: 3145 Lyran Commonwealth - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd5).blk
index cdf64bc4208..e36be48d3be 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd5).blk	
@@ -62,7 +62,7 @@ Clan BA Stealth (Improved):Body
 
 
 <source>
-TRO 3145 Lyran Commonwealth - Dark Ages
+TRO: 3145 Lyran Commonwealth - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd6).blk
index afb692dd6e8..e52c6041690 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Cuchulainn SA (Sqd6).blk	
@@ -61,7 +61,7 @@ Clan BA Stealth (Improved):Body
 </Point Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Dark Ages
+TRO: 3145 Lyran Commonwealth - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd4).blk
index 2ce90945472..9e23feba077 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd4).blk	
@@ -73,7 +73,7 @@ BA Advanced:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd5).blk
index 174669aa39d..227e6c31f4c 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd5).blk	
@@ -61,7 +61,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd6).blk
index 6e5ca85a073..8903c5a8015 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (AI) (Sqd6).blk	
@@ -61,7 +61,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd4).blk
index 54b91be5444..a86e897ef11 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd4).blk	
@@ -73,7 +73,7 @@ BA Advanced:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd5).blk
index 786470d43d3..f5d381b8335 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd5).blk	
@@ -61,7 +61,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd6).blk
index f4ef923c6ca..f3c74582842 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (LRM) (Sqd6).blk	
@@ -61,7 +61,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd4).blk
index 98ad4cf5d16..5d0208990ed 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd4).blk	
@@ -70,7 +70,7 @@ BA Advanced:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd5).blk
index 307371cad3a..6ecf87dce6f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd5).blk	
@@ -58,7 +58,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd6).blk
index ef0b5847182..a57fb9df67f 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (ML) (Sqd6).blk	
@@ -58,7 +58,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd4).blk
index ed21f3f224a..fa5746d8037 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd4).blk	
@@ -71,7 +71,7 @@ BA Advanced:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd5).blk
index d1f9dc99dd6..311c461776a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd5).blk	
@@ -59,7 +59,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd6).blk
index a9e2dd65a97..6d4c0cab3ae 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (MRR) (Sqd6).blk	
@@ -59,7 +59,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd4).blk
index 59a9d61f620..2d1c9d3093d 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd4).blk	
@@ -72,7 +72,7 @@ BA Advanced:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd5).blk
index b9f7b6e6eff..512ef229c31 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd5).blk	
@@ -60,7 +60,7 @@ BA Advanced:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd6).blk
index e66dd18a439..698be317836 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/Fenrir II Assault BA (SRM) (Sqd6).blk	
@@ -61,7 +61,7 @@ BA Advanced:Body
 
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd4).blk
index de8c4c8f566..b9940fb0058 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd4).blk	
@@ -76,7 +76,7 @@ IS BA Stealth (Basic):Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd5).blk
index f23b3ff282c..d6aa24e6d44 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd5).blk	
@@ -64,7 +64,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd6).blk
index 9e6f5a57e61..11bf5f65122 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Firedrake) (Sqd6).blk	
@@ -76,7 +76,7 @@ IS BA Stealth (Basic):Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd4).blk
index a0a748f1fc7..0cf24885e71 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd4).blk	
@@ -52,7 +52,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd5).blk
index cd935ea283b..92d5d3023d5 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd5).blk	
@@ -52,7 +52,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd6).blk
index 03366b8b324..78eaac87318 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (ISensors) (Sqd6).blk	
@@ -52,7 +52,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd4).blk
index 6f07a7af483..afc75167a2d 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd4).blk	
@@ -52,7 +52,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd5).blk
index 2aa4162d762..a4448553cb7 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd5).blk	
@@ -52,7 +52,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd6).blk
index 568498d34f8..e3c2ce5f17a 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Light TAG) (Sqd6).blk	
@@ -52,7 +52,7 @@ IS BA Stealth (Basic):Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd4).blk
index 4e221684b85..f0ba4f34921 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd4).blk	
@@ -80,7 +80,7 @@ Mine
 </Trooper 4 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd5).blk
index 6d94313a8f8..20cd14ec667 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd5).blk	
@@ -85,7 +85,7 @@ Mine
 </Trooper 5 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd6).blk
index a265aa2ced6..f9639b709c6 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Mine) (Sqd6).blk	
@@ -90,7 +90,7 @@ Mine
 </Trooper 6 Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd4).blk
index 4cbdad4a554..4dfac44bce0 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd4).blk	
@@ -64,7 +64,7 @@ ISBARemoteSensorDispenser:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd5).blk
index 67fcb17b82f..7e3c95fb530 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd5).blk	
@@ -64,7 +64,7 @@ ISBARemoteSensorDispenser:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd6).blk
index 9ec8575abde..eae69e7d7c7 100644
--- a/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3145/Steiner/GD Infiltrator Suit (Remote Sensors) (Sqd6).blk	
@@ -64,7 +64,7 @@ ISBARemoteSensorDispenser:Body
 </Squad Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[Flamer] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[Flamer] (Sqd4).blk
index 37f06d38947..cf1048d503e 100644
--- a/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[Flamer] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[Flamer] (Sqd4).blk	
@@ -103,7 +103,7 @@ New Avalon,Talcott
 </primaryFactory>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[MRR] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[MRR] (Sqd4).blk
index 2f944326a7b..2996e4bbe64 100644
--- a/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[MRR] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[MRR] (Sqd4).blk	
@@ -107,7 +107,7 @@ New Avalon,Talcott
 </primaryFactory>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[PPC] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[PPC] (Sqd4).blk
index dad4a53988d..4c5e5d70bea 100644
--- a/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[PPC] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[PPC] (Sqd4).blk	
@@ -107,7 +107,7 @@ New Avalon,Talcott
 </primaryFactory>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[SRM] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[SRM] (Sqd4).blk
index 2869b22f38e..b455ec7cdef 100644
--- a/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[SRM] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/Cavalier II BA[SRM] (Sqd4).blk	
@@ -108,7 +108,7 @@ New Avalon,Talcott
 </primaryFactory>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd4).blk
index 6f4ce6fc89b..c2450305d9a 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd4).blk	
@@ -79,7 +79,7 @@ ISBASRM2OS:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO Dark Age - Dark Age
+TRO: Dark Age - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd5).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd5).blk
index ed0eee9ae91..22881870ee6 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd5).blk	
@@ -78,7 +78,7 @@ ISBASRM2OS:Body
 </Trooper 5 Equipment>
 
 <source>
-TRO Dark Age - Dark Age
+TRO: Dark Age - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd6).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd6).blk
index 7eb9fe97c4a..04eae409bac 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [LRR](Sqd6).blk	
@@ -81,7 +81,7 @@ ISBASRM2OS:Body
 </Trooper 6 Equipment>
 
 <source>
-TRO Dark Age - Dark Age
+TRO: Dark Age - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](Sqd5).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](Sqd5).blk
index 3597eac76da..de7be889815 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](Sqd5).blk	
@@ -78,7 +78,7 @@ ISBASmallLaser:RA
 </Trooper 5 Equipment>
 
 <source>
-TRO Dark Age - Dark Age
+TRO: Dark Age - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](Sqd6).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](Sqd6).blk
index 9a69af82b80..1a5126df677 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](Sqd6).blk	
@@ -81,7 +81,7 @@ ISBASmallLaser:RA
 </Trooper 6 Equipment>
 
 <source>
-TRO Dark Age - Dark Age
+TRO: Dark Age - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](sqd4).blk
index f4eae5c8495..99935bf7052 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Baka) [SL](sqd4).blk	
@@ -79,7 +79,7 @@ ISBASmallLaser:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Dark Age - Dark Age
+TRO: Dark Age - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd4).blk
index e31d15996e4..98976893e2c 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd4).blk	
@@ -80,7 +80,7 @@ ISBAMineDispenser:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd5).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd5).blk
index f89b23688f6..6d73013c11a 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd5).blk	
@@ -79,7 +79,7 @@ ISBAMineDispenser:Body
 </Trooper 5 Equipment>
 
 <source>
-Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd6).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd6).blk
index 7d6903bd747..303583e79d4 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [David](Sqd6).blk	
@@ -82,7 +82,7 @@ ISBAMineDispenser:Body
 </Trooper 6 Equipment>
 
 <source>
-Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd4).blk
index f586adba370..df41662d54f 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd4).blk	
@@ -80,7 +80,7 @@ CLBAMG:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd5).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd5).blk
index aa6bbf00617..ef28f4be116 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd5).blk	
@@ -79,7 +79,7 @@ CLBAMG:RA
 </Trooper 5 Equipment>
 
 <source>
-Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd6).blk b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd6).blk
index 051138f7c65..6514de3f319 100644
--- a/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/IS Standard BA (Fa Sure) [MG](Sqd6).blk	
@@ -82,7 +82,7 @@ CLBAMG:RA
 </Trooper 6 Equipment>
 
 <source>
-Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd4).blk
index d9e82c8d54b..ee39027d86c 100644
--- a/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd4).blk	
@@ -82,7 +82,7 @@ BA-SRM4 Ammo:Body:Shots1#
 </Trooper 4 Equipment>
 
 <source>
-Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd5).blk
index d87ab1e9030..7f3c1db566c 100644
--- a/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd5).blk	
@@ -81,7 +81,7 @@ BA-SRM4 Ammo:Body:Shots1#
 </Trooper 5 Equipment>
 
 <source>
-Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd6).blk
index 356ce225072..788b75bd80e 100644
--- a/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/3150/Kanazuchi Assault BA (Support)(Sqd6).blk	
@@ -84,7 +84,7 @@ BA-SRM4 Ammo:Body:Shots1#
 </Trooper 6 Equipment>
 
 <source>
-Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd4).blk
index 10a8d9926d0..48ebead0497 100644
--- a/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd4).blk	
@@ -64,7 +64,7 @@ BA-SRM2 Ammo:Body:Shots2#
 </Point Equipment>
 
 <source>
-TRO Golden Century - Early Succession War
+TRO: Golden Century - Early Succession War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd5).blk
index 340e4057088..37aa77970bb 100644
--- a/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd5).blk	
@@ -64,7 +64,7 @@ BA-SRM2 Ammo:Body:Shots2#
 </Point Equipment>
 
 <source>
-TRO Golden Century - Early Succession War
+TRO: Golden Century - Early Succession War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd6).blk
index 3223f220605..854e9ba9563 100644
--- a/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/Golden Century/Rhino BA (Sqd6).blk	
@@ -64,7 +64,7 @@ BA-SRM2 Ammo:Body:Shots2#
 </Point Equipment>
 
 <source>
-TRO Golden Century - Early Succession War
+TRO: Golden Century - Early Succession War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd4).blk b/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd4).blk
index 30870d7ad83..2dc2363547a 100644
--- a/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd4).blk	
@@ -75,7 +75,7 @@ Hades Industrial Complex
 </primaryFactory>
 
 <source>
-TRO Golden Century - Early Succession War
+TRO: Golden Century - Early Succession War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd5).blk b/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd5).blk
index 70096f88236..75b4961da2c 100644
--- a/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd5).blk	
@@ -71,7 +71,7 @@ Hades Industrial Complex
 </primaryFactory>
 
 <source>
-TRO Golden Century - Early Succession War
+TRO: Golden Century - Early Succession War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd6).blk b/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd6).blk
index 20c2a3c73e2..8271dfc915d 100644
--- a/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/Golden Century/Water Elemental Mining Suit (Sqd6).blk	
@@ -71,7 +71,7 @@ Hades Industrial Complex
 </primaryFactory>
 
 <source>
-TRO Golden Century - Early Succession War
+TRO: Golden Century - Early Succession War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Jihad FR/Machina Domini Interface Armor.blk b/megamek/data/mechfiles/battlearmor/Jihad FR/Machina Domini Interface Armor.blk
index 8e0c12822d3..568974ecf6a 100644
--- a/megamek/data/mechfiles/battlearmor/Jihad FR/Machina Domini Interface Armor.blk	
+++ b/megamek/data/mechfiles/battlearmor/Jihad FR/Machina Domini Interface Armor.blk	
@@ -61,7 +61,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-J:Final Reckoning - Jihad
+Jihad:Final Reckoning - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd4).blk
index de134ca6b27..306f99560d1 100644
--- a/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd4).blk	
@@ -94,7 +94,7 @@ Independence
 </primaryFactory>
 
 <source>
-OTP:Fronc Reaches - Early Republic
+OTP: Fronc Reaches - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd5).blk
index cac23c28785..85b6b2c8c61 100644
--- a/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd5).blk	
@@ -93,7 +93,7 @@ Independence
 </primaryFactory>
 
 <source>
-OTP:Fronc Reaches - Early Republic
+OTP: Fronc Reaches - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd6).blk
index c69567e8df8..6bce1a38b2b 100644
--- a/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/OTP/Fronc Reaches/TinStar BA (Sqd6).blk	
@@ -96,7 +96,7 @@ Independence
 </primaryFactory>
 
 <source>
-OTP:Fronc Reaches - Early Republic
+OTP: Fronc Reaches - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd4).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd4).blk
index 5e5a8fdd86e..0119132a82d 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd4).blk	
@@ -62,7 +62,7 @@ LegAttack
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd5).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd5).blk
index 51192a35c73..6ca114fcbee 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd5).blk	
@@ -62,7 +62,7 @@ LegAttack
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd6).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd6).blk
index c64be311c29..d7c981cdd74 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Elemental II BA Standard (Sqd6).blk	
@@ -62,7 +62,7 @@ LegAttack
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd4).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd4).blk
index 3918c8ce394..9c64742796f 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd4).blk	
@@ -72,7 +72,7 @@ BABattleClawVibro:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd5).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd5).blk
index 935c0740c30..ee9bd79b21d 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd5).blk	
@@ -60,7 +60,7 @@ BABattleClawVibro:LA
 </Squad Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd6).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd6).blk
index 8a2163ef322..fe66b04e7cd 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gladiator-S Exo (Sqd6).blk	
@@ -60,7 +60,7 @@ BABattleClawVibro:LA
 </Squad Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd4).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd4).blk
index 5b65b8cf4f0..b2b03caabfa 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd4).blk	
@@ -72,7 +72,7 @@ Leg
 </motion_type>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd5).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd5).blk
index 682cb7c998f..e38def10baf 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd5).blk	
@@ -72,7 +72,7 @@ Leg
 </motion_type>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd6).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd6).blk
index c9a53f366d7..cae7cdb19d5 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Gray Death SA Production (Sqd6).blk	
@@ -72,7 +72,7 @@ Leg
 </motion_type>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <overview>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd4).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd4).blk
index 93b3fd8b628..d0221003993 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd4).blk	
@@ -78,7 +78,7 @@ IS BA Mimetic:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd5).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd5).blk
index d65bccbd215..1a37d26b0b8 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd5).blk	
@@ -78,7 +78,7 @@ IS BA Mimetic:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd6).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd6).blk
index 3e7f7afbeb1..34def13e5a8 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Hauberk BA Commando (Sqd6).blk	
@@ -66,7 +66,7 @@ IS BA Mimetic:Body
 </Squad Equipment>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd4).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd4).blk
index 58cb82d8f75..5ac14300370 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd4).blk	
@@ -65,7 +65,7 @@ Clan BA Stealth (Basic):RA
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd5).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd5).blk
index 8be9845c445..50ed5d32b6d 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd5).blk	
@@ -65,7 +65,7 @@ Clan BA Stealth (Basic):RA
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd6).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd6).blk
index d577a9a1bb6..cec99414095 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Rogue Bear Heavy BA Hybrid (Sqd6).blk	
@@ -65,7 +65,7 @@ Clan BA Stealth (Basic):RA
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd4).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd4).blk
index f7f5e84358d..4d4182ee12c 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd4).blk	
@@ -62,7 +62,7 @@ Infantry Auto Rifle:APM
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd5).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd5).blk
index e4eac6366b0..f70c6068b70 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd5).blk	
@@ -62,7 +62,7 @@ Infantry Auto Rifle:APM
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd6).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd6).blk
index 27be3e63e5b..f79467b8419 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Sylph BA Enhanced (Sqd6).blk	
@@ -62,7 +62,7 @@ Infantry Auto Rifle:APM
 </Point Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd4).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd4).blk
index 54b8b86c8ba..c1bf1c70ee3 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd4).blk	
@@ -66,7 +66,7 @@ InfantryAssaultRifle:LA:APM
 </Squad Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd5).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd5).blk
index ec5ba78d31c..902bff2b881 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd5).blk	
@@ -66,7 +66,7 @@ InfantryAssaultRifle:LA:APM
 </Squad Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd6).blk b/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd6).blk
index 3e33530ea77..9380310b683 100644
--- a/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/ProtoTypes/Void Med BA Minelayer (Sqd6).blk	
@@ -66,7 +66,7 @@ InfantryAssaultRifle:LA:APM
 </Squad Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd4).blk
index da737503b4f..63b8f069151 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd4).blk	
@@ -93,7 +93,7 @@ Independence
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #28 -
+Rec Guide:ilClan #28 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd5).blk
index 78406435eac..73a94b540e7 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd5).blk	
@@ -96,7 +96,7 @@ Independence
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #28 -
+Rec Guide:ilClan #28 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd6).blk
index 8355c51ce39..f2eaf855ea1 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 28/TinStar BattleArmor (Original)(Sqd6).blk	
@@ -99,7 +99,7 @@ Independence
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #28 -
+Rec Guide:ilClan #28 - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd4).blk
index bc844946016..d478c84a17c 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd4).blk	
@@ -86,7 +86,7 @@ New Valencia
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #29 -
+Rec Guide:ilClan #29 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd5).blk
index 878d9b9d3a6..8361f9b243b 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd5).blk	
@@ -89,7 +89,7 @@ New Valencia
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #29 -
+Rec Guide:ilClan #29 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd6).blk
index daba6fbe7da..63a9c26748f 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Advanced)(Sqd6).blk	
@@ -92,7 +92,7 @@ New Valencia
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #29 -
+Rec Guide:ilClan #29 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd4).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd4).blk
index 61d3c17c786..1c7f747d2ed 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd4).blk	
@@ -91,7 +91,7 @@ New Valencia
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #29 -
+Rec Guide:ilClan #29 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd5).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd5).blk
index aacb66d86b0..8376a2ad672 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd5).blk	
@@ -94,7 +94,7 @@ New Valencia
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #29 -
+Rec Guide:ilClan #29 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd6).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd6).blk
index b48eba021c8..82fcf2c5abd 100644
--- a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 29/Dragoon Battle Armor (Sqd6).blk	
@@ -97,7 +97,7 @@ New Valencia
 </primaryFactory>
 
 <source>
-Rec Guide:ilClan #29 -
+Rec Guide:ilClan #29 - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd4).blk
index aba98d1efd2..4620cfc78fa 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd4).blk	
@@ -68,7 +68,7 @@ ISBAExtendedLifeSupport:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd5).blk
index 9ea3444cf23..0497e34c1dc 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd5).blk	
@@ -56,7 +56,7 @@ ISBAExtendedLifeSupport:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd6).blk
index 3b4acc61fe8..118c7d8f8f4 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Ailette Zero-G Engineering Exo (Sqd6).blk	
@@ -56,7 +56,7 @@ ISBAExtendedLifeSupport:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG]  (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG]  (Sqd5).blk
index 182893a6af9..114e9f0d246 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG]  (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG]  (Sqd5).blk	
@@ -60,7 +60,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG] (Sqd4).blk
index 8fd7b948abd..23c4081295c 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG] (Sqd4).blk	
@@ -72,7 +72,7 @@ LegAttack
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG] (Sqd6).blk
index 00ef094e301..ed2289d9846 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [AG] (Sqd6).blk	
@@ -60,7 +60,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID]  (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID]  (Sqd5).blk
index cb5c8b30a95..d9b3bfaebef 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID]  (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID]  (Sqd5).blk	
@@ -56,7 +56,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID] (Sqd4).blk
index 75f104b8194..0427ff93799 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID] (Sqd4).blk	
@@ -68,7 +68,7 @@ BAIndustrialDrill:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID] (Sqd6).blk
index 62088ddd0ee..f478bb40fff 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gladiator Exo [BC ID] (Sqd6).blk	
@@ -56,7 +56,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd4).blk
index 0ffc4220fde..49be305cfd6 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd4).blk	
@@ -76,7 +76,7 @@ IS BA Advanced:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd5).blk
index 45b08a4c19d..aabf1cec5ce 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd5).blk	
@@ -76,7 +76,7 @@ IS BA Advanced:LA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd6).blk
index 0b2b9fe4fc3..c67dae6b6ff 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo 'Falcata' (Sqd6).blk	
@@ -64,7 +64,7 @@ IS BA Advanced:LA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd4).blk
index d232086aadb..4f312a9a141 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd4).blk	
@@ -68,7 +68,7 @@ BASearchlight:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd5).blk
index 917194fd254..89636d42fb0 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd5).blk	
@@ -68,7 +68,7 @@ BASearchlight:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd6).blk
index d2b2241eade..54fca31a2d9 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Gorilla Exo PEX-2B (Sqd6).blk	
@@ -56,7 +56,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd4).blk
index 75ba636de7f..fa4a1fb3636 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd4).blk	
@@ -59,7 +59,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd5).blk
index 9bf0dbe3aca..f668ed6d57e 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd5).blk	
@@ -59,7 +59,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd6).blk
index 39a7d8b0699..4c09c84f528 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [AG] (Sqd6).blk	
@@ -59,7 +59,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd4).blk
index bc74969ae25..3bfcae0f530 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd4).blk	
@@ -71,7 +71,7 @@ BABasicManipulator:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd5).blk
index f531cfd6482..3427882161d 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd5).blk	
@@ -71,7 +71,7 @@ BABasicManipulator:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd6).blk
index 949efe7180b..0f812421ff5 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [BM] (Sqd6).blk	
@@ -71,7 +71,7 @@ BABasicManipulator:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd4).blk
index 5b72ed255da..048a59ce3a1 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd4).blk	
@@ -71,7 +71,7 @@ BACargoLifter:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd5).blk
index 7c1509eb322..946a15c661b 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd5).blk	
@@ -71,7 +71,7 @@ BACargoLifter:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd6).blk
index 79d427f533f..43f7c8f5b58 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [CL] (Sqd6).blk	
@@ -71,7 +71,7 @@ BACargoLifter:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd4).blk
index c7aedf57549..a90df458b2a 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd4).blk	
@@ -71,7 +71,7 @@ BAIndustrialDrill:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd5).blk
index 3a7b0eeaa4b..b4ffffaa3d9 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd5).blk	
@@ -71,7 +71,7 @@ BAIndustrialDrill:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd6).blk
index 7583f07728a..0168966e78b 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [ID] (Sqd6).blk	
@@ -59,7 +59,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd4).blk
index 004096ac3cd..ede4361537c 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd4).blk	
@@ -71,7 +71,7 @@ BABasicManipulatorMineClearance:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd5).blk
index 4316431539d..8dd0e6065ec 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd5).blk	
@@ -59,7 +59,7 @@ BABasicManipulatorMineClearance:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd6).blk
index 3995b7cbbd2..760d99158d6 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [MC] (Sqd6).blk	
@@ -59,7 +59,7 @@ BABasicManipulatorMineClearance:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd4).blk
index 63b51b1a1e4..40d041fd693 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd4).blk	
@@ -71,7 +71,7 @@ BASalvageArm:RA
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd5).blk
index f3cf08be508..235c33b4dae 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd5).blk	
@@ -59,7 +59,7 @@ BASalvageArm:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd6).blk
index e085fc02b0c..b6b5437dd95 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Groundhog Exo CEX-205 [SA] (Sqd6).blk	
@@ -59,7 +59,7 @@ BASalvageArm:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd4).blk
index 395d7f91011..d702ee336df 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd4).blk	
@@ -56,7 +56,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd5).blk
index c98be929611..9624557b631 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd5).blk	
@@ -56,7 +56,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd6).blk
index 916342bd80d..aba1defcb83 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/HeavyHauler Exo (Sqd6).blk	
@@ -56,7 +56,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd4).blk
index b7af008f727..8a80e817f19 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd4).blk	
@@ -58,7 +58,7 @@ ISImprovedSensors:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd5).blk
index b0d04f14954..edca1ecfd18 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd5).blk	
@@ -58,7 +58,7 @@ ISImprovedSensors:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd6).blk
index 98ee21e9fa8..2225bb6dbbe 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Krise PA(L) (Sqd6).blk	
@@ -58,7 +58,7 @@ ISImprovedSensors:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd4).blk
index b86dd2e71d3..a1dd5c24e15 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd4).blk	
@@ -55,7 +55,7 @@ BACuttingTorch:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd5).blk
index d5a434334c9..5baa8bbef5d 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd5).blk	
@@ -55,7 +55,7 @@ BACuttingTorch:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd6).blk
index 20713f95252..b529c052006 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/PowerLoader Exo P-5000 (Sqd6).blk	
@@ -55,7 +55,7 @@ BACuttingTorch:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd4).blk
index 6439efe4c63..c79db803b5a 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd4).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd5).blk
index 5f8efdb577c..abf3a12a77b 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd5).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd6).blk
index 0dc01cfee28..74033b0252f 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Interdictor) (Sqd6).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd4).blk
index 5b147d69ef8..1a1b48f6307 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd4).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd5).blk
index a3c77617306..2bc60250e14 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd5).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd6).blk
index 8cc4157e3af..156b1244769 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Scout) (Sqd6).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd4).blk
index fb968265dfc..779f59a2319 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd4).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd5).blk
index 8538bfccaae..5165949ca81 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd5).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd6).blk
index 0cf564c4a77..2565686c717 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Spotter) (Sqd6).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd4).blk
index cd0c5381443..bcd0199a32a 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd4).blk	
@@ -60,7 +60,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd5).blk
index 5711c19c555..932da2db567 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd5).blk	
@@ -60,7 +60,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd6).blk
index c003d2c92dc..454e25f147c 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sqd6).blk	
@@ -60,7 +60,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd4).blk
index 1de6154660f..c8599418694 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd4).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd5).blk
index 0ee15500fe7..c78f16f5967 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd5).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd6).blk
index d18bc1332f6..8838fee71c8 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Resgate PA(L) (Sup) (Sqd6).blk	
@@ -64,7 +64,7 @@ Clan BA Fire Resistant:LA
 </Point Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd4).blk
index 6b70591567a..6a00af44792 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd4).blk	
@@ -56,7 +56,7 @@ BABasicManipulatorMineClearance:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd5).blk
index b43db251a5a..325aa1a541c 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd5).blk	
@@ -56,7 +56,7 @@ BABasicManipulatorMineClearance:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd6).blk
index 16036613d29..fdcc06fe9ae 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Mine Clearance] (Sqd6).blk	
@@ -56,7 +56,7 @@ BABasicManipulatorMineClearance:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd4).blk
index efece47c678..ee6c7d77002 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd4).blk	
@@ -56,7 +56,7 @@ BASalvageArm:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd5).blk
index 0102e46bfe3..7898e74c451 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd5).blk	
@@ -56,7 +56,7 @@ BASalvageArm:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd6).blk
index 285576badad..e2a42d08d40 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Salrilla Exo [Salvage Arm] (Sqd6).blk	
@@ -56,7 +56,7 @@ BASalvageArm:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd4).blk
index e7c4df0f437..69d4cdcf7bd 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd4).blk	
@@ -59,7 +59,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd5).blk
index 57074176a04..50fd507474d 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd5).blk	
@@ -59,7 +59,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd6).blk
index fd343225499..f8563764803 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) II (Sqd6).blk	
@@ -59,7 +59,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd4).blk
index b5cc3c27655..8de5f045956 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd4).blk	
@@ -60,7 +60,7 @@ ISBAMediumRecoillessRifle:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd5).blk
index aa7d77184b1..11f4f0f3d36 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd5).blk	
@@ -60,7 +60,7 @@ ISBAMediumRecoillessRifle:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd6).blk
index 3d442053e9b..15b7ee491d9 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothdavid PA(L) III (Sqd6).blk	
@@ -60,7 +60,7 @@ ISBAMediumRecoillessRifle:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd4).blk
index f8a899cd893..b80f5c53d1d 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd4).blk	
@@ -72,7 +72,7 @@ BASearchlight:Body
 </Trooper 4 Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd5).blk
index e6a0f81966f..f93c4a47734 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd5).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd6).blk
index 21d1d6cbd43..63187270da4 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Smoothgoliath PA(L) II (Sqd6).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd4).blk
index c884b0dc949..14b859d3001 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd4).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd5).blk
index bf81567163c..b34f123182a 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd5).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd6).blk
index 2eff925420f..d4110368aac 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [AG] (Sqd6).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd4).blk
index 6958ca70bcb..3082a71aec1 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd4).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd5).blk
index 4f13af06638..14a32bf9b12 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd5).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd6).blk
index dc65de86434..d2971d3a827 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo I [ID] (Sqd6).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd4).blk
index 40a4e6f68a6..2e5654c903a 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd4).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd5).blk
index a367f092961..efffe0c5b0b 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd5).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd6).blk
index 2cf5327c2d0..2ba7a544c86 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [AG] (Sqd6).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd4).blk
index 71163615816..f8dbd6e2588 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd4).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd5).blk
index 2a359402c7c..14d18232668 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd5).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd6).blk
index a443a176d47..a022bf229b4 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo II [ID] (Sqd6).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd4).blk
index 816a1f1c305..0cfa6f0bb2b 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd4).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd5).blk
index c30b8ba95e8..fd4f2a6d91f 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd5).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd6).blk
index e9e0818e4e1..59a36faf679 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [AG] (Sqd6).blk	
@@ -60,7 +60,7 @@ BASearchlight:Body
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd4).blk
index 443c537b279..465c37fd28f 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd4).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd5).blk
index c75c786dd49..1649db07b7c 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd5).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd6).blk
index 7745ab03652..37bb2c2b782 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo III [ID] (Sqd6).blk	
@@ -60,7 +60,7 @@ BAIndustrialDrill:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd4).blk
index 3bf7f51f728..9b2dd0b024d 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd4).blk	
@@ -61,7 +61,7 @@ ISBAGrenadeLauncher:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd5).blk
index 444ffc094ee..f7c2532aaa7 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd5).blk	
@@ -61,7 +61,7 @@ ISBAGrenadeLauncher:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd6).blk
index 87bfd757ea3..6cf558e9216 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-GL] (Sqd6).blk	
@@ -61,7 +61,7 @@ ISBAGrenadeLauncher:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd4).blk
index 6d2525d47d4..4a8261f6a71 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd4).blk	
@@ -61,7 +61,7 @@ ISBALightMachineGun:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd5).blk
index 878b2168b9b..9d4b14b0ec1 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd5).blk	
@@ -61,7 +61,7 @@ ISBALightMachineGun:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd6).blk
index 72cc4bd34ef..675648e0ad2 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [AG-LMG] (Sqd6).blk	
@@ -61,7 +61,7 @@ ISBALightMachineGun:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd4).blk
index df87cdd121f..c62ef74223a 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd4).blk	
@@ -61,7 +61,7 @@ ISBAGrenadeLauncher:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd5).blk
index 31ba3739ff0..3e8b2e74a67 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd5).blk	
@@ -61,7 +61,7 @@ ISBAGrenadeLauncher:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd6).blk
index 0adc87267b6..087feee3463 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-GL] (Sqd6).blk	
@@ -61,7 +61,7 @@ ISBAGrenadeLauncher:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd4).blk
index 2c666e5257e..d0ddaf45f6e 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd4).blk	
@@ -61,7 +61,7 @@ ISBALightMachineGun:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd5).blk
index 40d3072af87..7d1c5ddd98c 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd5).blk	
@@ -61,7 +61,7 @@ ISBALightMachineGun:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd6).blk
index 41e2eebdfcf..f32ba04f3a0 100644
--- a/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/TRO VA/Tunnel Rat Mining Exo IV [BC-LMG] (Sqd6).blk	
@@ -61,7 +61,7 @@ ISBALightMachineGun:RA
 </Squad Equipment>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd4).blk
index ed607f8a038..a2d7c8b277f 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd4).blk	
@@ -60,7 +60,7 @@ BABattleClaw:RA
 </Point Equipment>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd5).blk
index 0083f7a077a..11df0532279 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd5).blk	
@@ -60,7 +60,7 @@ BABattleClaw:RA
 </Point Equipment>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd6).blk
index 31f3d3d6ca2..d5c16f34e17 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Elemental II BA X (Sqd6).blk	
@@ -60,7 +60,7 @@ BABattleClaw:RA
 </Point Equipment>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd4).blk
index 9da7282c138..964ae76847e 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd4).blk	
@@ -69,7 +69,7 @@ Mixed (Clan Chassis)
 </year>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <motion_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd5).blk
index 225e2f0167f..d156cb95fbe 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd5).blk	
@@ -70,7 +70,7 @@ Mixed (Clan Chassis)
 </year>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <motion_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd6).blk
index 4540bdc7573..93044f50779 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Rogue Bear Heavy BA HR (Sqd6).blk	
@@ -69,7 +69,7 @@ Mixed (Clan Chassis)
 </year>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <motion_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd4).blk
index d07faa02926..767b079edb7 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd4).blk	
@@ -60,7 +60,7 @@ Clan Level 3
 Leg
 </motion_type>
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd5).blk
index 8241932ce85..d52311f12a7 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd5).blk	
@@ -60,7 +60,7 @@ Clan Level 3
 Leg
 </motion_type>
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd6).blk
index ababec1000f..a5a9023e1a4 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Clans/Sylph XR (Sqd6).blk	
@@ -64,7 +64,7 @@ Leg
 </motion_type>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd4).blk
index 9df172c7cf8..3967892aa9a 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd4).blk	
@@ -63,7 +63,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-XTRO ComStar - Civil War
+XTR: ComStar - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd5).blk
index 39f32a7da6d..245fa450cf9 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd5).blk	
@@ -63,7 +63,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-XTRO ComStar - Civil War
+XTR: ComStar - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd6).blk
index b538be9b359..338d352cc8a 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Hurricane PA (L) P17 (Sqd6).blk	
@@ -63,7 +63,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-XTRO ComStar - Civil War
+XTR: ComStar - Civil War
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd4).blk
index 4dd6dd49b22..b818b7aa170 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd4).blk	
@@ -75,7 +75,7 @@ IS BA Stealth (Basic):LA
 </Trooper 4 Equipment>
 
 <source>
-XTRO ComStar - Jihad
+XTR: ComStar - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd5).blk
index 0f2e02f251e..daba5e77e91 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd5).blk	
@@ -78,7 +78,7 @@ IS BA Stealth (Basic):LA
 </Trooper 5 Equipment>
 
 <source>
-XTRO ComStar - Jihad
+XTR: ComStar - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd6).blk
index b07423af6fb..a9627aefb99 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Comstar/Kobold X-C3 (Sqd6).blk	
@@ -81,7 +81,7 @@ IS BA Stealth (Basic):LA
 </Trooper 6 Equipment>
 
 <source>
-XTRO ComStar - Jihad
+XTR: ComStar - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd4).blk
index 6394084efe7..2883fe4e0f8 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd4).blk	
@@ -68,7 +68,7 @@ IS BA Mimetic:LA
 </Squad Equipment>
 
 <source>
-XTRO Davion
+XTR: Davion - Jihad
 </source>
 
 <chassis>
@@ -126,11 +126,3 @@ TARGETING:Unknown
 
 <notes>
 </notes>
-
-
-
-
-(Sqd3)
-(Sqd4)
-(Sqd5)
-(Sqd6)
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd5).blk
index 9161814712b..477ae1a8fed 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd5).blk	
@@ -68,7 +68,7 @@ IS BA Mimetic:LA
 </Squad Equipment>
 
 <source>
-XTRO Davion
+XTR: Davion - Jihad
 </source>
 
 <chassis>
@@ -126,11 +126,3 @@ TARGETING:Unknown
 
 <notes>
 </notes>
-
-
-
-
-(Sqd3)
-(Sqd4)
-(Sqd5)
-(Sqd6)
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd6).blk
index a5783eb30a0..a7c51755ba4 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Hauberk BA U15 (Sqd6).blk	
@@ -68,7 +68,7 @@ IS BA Mimetic:LA
 </Squad Equipment>
 
 <source>
-XTRO Davion
+XTR: Davion - Jihad
 </source>
 
 <chassis>
@@ -126,11 +126,3 @@ TARGETING:Unknown
 
 <notes>
 </notes>
-
-
-
-
-(Sqd3)
-(Sqd4)
-(Sqd5)
-(Sqd6)
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd4).blk
index cfae449f712..346e3a2b901 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd4).blk	
@@ -81,7 +81,7 @@ IS BA Mimetic:RA
 </Trooper 4 Equipment>
 
 <source>
-XTRO Davion - Jihad
+XTR: Davion - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd5).blk
index aa990ac11fe..bc45d705ac4 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd5).blk	
@@ -69,7 +69,7 @@ IS BA Mimetic:RA
 </Squad Equipment>
 
 <source>
-XTRO Davion - Jihad
+XTR: Davion - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd6).blk
index f267aa81d95..3b9f8e4f14b 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Davion/Infiltrator Mk. II BA Coral Intent (Sqd6).blk	
@@ -69,7 +69,7 @@ IS BA Mimetic:RA
 </Squad Equipment>
 
 <source>
-XTRO Davion - Jihad
+XTR: Davion - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd4).blk
index ab66c6fa648..95b3de8fb06 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd4).blk	
@@ -73,7 +73,7 @@ Infantry Auto Rifle:APM
 </Trooper 4 Equipment>
 
 <source>
-XTR Gladiators
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd5).blk
index 22bcb942d6b..e2e01ea612a 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd5).blk	
@@ -61,7 +61,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-XTR Gladiators
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd6).blk
index 13d975f327d..adacf8c3f47 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gladiator Exo The Spider (Sqd6).blk	
@@ -61,7 +61,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-XTR Gladiators
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd4).blk
index da671cce37b..422014e2370 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd4).blk	
@@ -118,7 +118,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd5).blk
index dc6235133f6..e2988068b86 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd5).blk	
@@ -121,7 +121,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd6).blk
index 6edaadfc741..ded4323938b 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Gray Death Scout Suit The Willow Wisps (Sqd6).blk	
@@ -124,7 +124,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd4).blk
index ad6550ace40..8c1e62aaa63 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd4).blk	
@@ -78,7 +78,7 @@ IS BA Advanced:RA
 </Trooper 4 Equipment>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd5).blk
index 42d12b8b7ab..067f398e2ab 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd5).blk	
@@ -66,7 +66,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd6).blk
index 5c883b394ba..ab1a9aadd84 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/IS Standard BA [Hive] (Sqd6).blk	
@@ -66,7 +66,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd4).blk
index f52595e0868..99954d55497 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd4).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd5).blk
index 6a4ac21f75e..92e71fd7b9d 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd5).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd6).blk
index 38c821bb382..8f2567fb35e 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Gladiator/Kanazuchi Assault BA Cyclops (Sqd6).blk	
@@ -65,7 +65,7 @@ IS BA Advanced:RA
 </Squad Equipment>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd4).blk
index c030dc2c708..5f5047a5544 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd4).blk	
@@ -79,7 +79,7 @@ IS BA Mimetic:Body
 </Trooper 4 Equipment>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd5).blk
index ca3ec36c5ef..9c3cb04b299 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd5).blk	
@@ -82,7 +82,7 @@ IS BA Mimetic:Body
 </Trooper 5 Equipment>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd6).blk
index 5f6387b7878..35e5715ec0e 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Kage Light BA C (Sqd6).blk	
@@ -85,7 +85,7 @@ IS BA Mimetic:Body
 </Trooper 6 Equipment>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd4).blk
index 6ba08ac2bdb..b753ce223eb 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd4).blk	
@@ -65,7 +65,7 @@ Clan BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd5).blk
index 5bd0df5a9f8..2aef6a303c9 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd5).blk	
@@ -65,7 +65,7 @@ Clan BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd6).blk
index f6d51dbead8..b34fbd095f6 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Kurita/Void Med BA Caltrop (Sqd6).blk	
@@ -65,7 +65,7 @@ Clan BA Stealth (Improved):RA
 </Squad Equipment>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd4).blk
index 642d1b5adf8..1ab18e9c7a0 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd4).blk	
@@ -73,7 +73,7 @@ ISBAMineDispenser:Body
 </Trooper 4 Equipment>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd5).blk
index 591322cd09b..fc114f5e51d 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd5).blk	
@@ -77,7 +77,7 @@ ISBAMineDispenser:Body
 </Trooper 5 Equipment>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd6).blk
index 9afef0bb748..af6b064994c 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Fa Shih BA 2 [MG] (Sqd6).blk	
@@ -82,7 +82,7 @@ ISBAMineDispenser:Body
 
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd4).blk
index d737ea5ab2e..5b0d702624d 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd4).blk	
@@ -74,7 +74,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd5).blk
index 7976c9161e7..490d97a6fc7 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd5).blk	
@@ -74,7 +74,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd6).blk
index 3a541ec4eec..8ad5405946c 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Liao/Trinity Med BA (Ying Long BC3)[David] (Sqd6).blk	
@@ -74,7 +74,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd4).blk
index 20d042fb344..15c7b368538 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd4).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd5).blk
index f4075c2abea..9a516b0a428 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd5).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd6).blk
index 100ff02c4c7..a732a9846fa 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [David] (Sqd6).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd4).blk
index a8310eb4f42..45be63c60d3 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd4).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd5).blk
index 9c33094a026..85e26a1bbe9 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd5).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd6).blk
index 70156034881..850e2e00ced 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Marik/Longinus BA Hacked [MG] (Sqd6).blk	
@@ -73,7 +73,7 @@ Jump
 </motion_type>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd4).blk
index c5db395ab03..b8256337eeb 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd4).blk	
@@ -66,7 +66,7 @@ ISBAFlamer:RA
 </Squad Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd5).blk
index 3678017a11c..5147e9136e3 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd5).blk	
@@ -66,7 +66,7 @@ ISBAFlamer:RA
 </Squad Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd6).blk
index 3a098fa98b0..1b6fe5d77f4 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer Flamer (Sqd6).blk	
@@ -66,7 +66,7 @@ ISBAFlamer:RA
 </Squad Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd4).blk
index 1929c2e64bb..93b760b2a36 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd4).blk	
@@ -66,7 +66,7 @@ ISBAMG:RA
 </Squad Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd5).blk
index 0d54600560c..0258c02033e 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd5).blk	
@@ -66,7 +66,7 @@ ISBAMG:RA
 </Squad Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd6).blk
index 71a5aaa3063..3fd508a5f57 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer MG (Sqd6).blk	
@@ -84,7 +84,7 @@ ISBAMG:RA
 </Trooper 6 Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd4).blk
index eaea9e0d45f..933c2ec59b3 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd4).blk	
@@ -66,7 +66,7 @@ ISBASmallLaser:RA
 </Squad Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd5).blk
index 916095b63d1..e2057aea99f 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd5).blk	
@@ -66,7 +66,7 @@ ISBASmallLaser:RA
 </Squad Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd6).blk
index c1d47b1406e..fbdf306025f 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Djinn BA (Reflec) Terrorizer SL (Sqd6).blk	
@@ -66,7 +66,7 @@ ISBASmallLaser:RA
 </Squad Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Groundhog Exo Master Thief (Sqd1).blk b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Groundhog Exo Master Thief (Sqd1).blk
index afdb72416be..f4cde5d0a08 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Groundhog Exo Master Thief (Sqd1).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Most Wanted/Groundhog Exo Master Thief (Sqd1).blk	
@@ -72,7 +72,7 @@ Mission Equipment Storage (20 kg):Body
 </Trooper 1 Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd4).blk
index d3c2268cf1c..18c600f242f 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd4).blk	
@@ -59,7 +59,7 @@ InfantryAssaultRifle:RA:APM
 </Squad Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd5).blk
index 2d0c0b36e6a..06ca97b6fc7 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd5).blk	
@@ -59,7 +59,7 @@ InfantryAssaultRifle:RA:APM
 </Squad Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd6).blk
index 96f799347a4..a7e4a3f3bc1 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Periphery/Ailette Rescue PA(L)(Sqd6).blk	
@@ -59,7 +59,7 @@ InfantryAssaultRifle:RA:APM
 </Squad Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd4).blk
index a3489584bdc..d359f0b23bd 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd4).blk	
@@ -58,7 +58,7 @@ CLBAAPGaussRifle:LA
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd5).blk
index 244f0e6c98c..b0bbb0b5e7e 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd5).blk	
@@ -58,7 +58,7 @@ CLBAAPGaussRifle:LA
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd6).blk
index 0584554d343..e2909e19b0f 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra APG (Sqd6).blk	
@@ -58,7 +58,7 @@ CLBAAPGaussRifle:LA
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd4).blk
index 7b244a8e448..fb8081d3630 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd4).blk	
@@ -76,7 +76,7 @@ LegAttack
 </Trooper 6 Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd5).blk
index 87086d0e82d..8dee10214a7 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd5).blk	
@@ -58,7 +58,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd6).blk
index 159b62bb93c..4be26bc33e2 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra ER Small (Sqd6).blk	
@@ -76,7 +76,7 @@ LegAttack
 </Trooper 6 Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd4).blk
index 9ead1f2f438..288dae2ab1e 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd4).blk	
@@ -58,7 +58,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd5).blk
index 55e83f48caf..fc1c767c663 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd5).blk	
@@ -58,7 +58,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd6).blk
index a7ae4f31f2d..24172585b4f 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra MRR (Sqd6).blk	
@@ -58,7 +58,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd4).blk
index 6438c1ce364..d94cf88058a 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd4).blk	
@@ -58,7 +58,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd5).blk
index e59ae7d0352..284bd5a59ee 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd5).blk	
@@ -58,7 +58,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd6).blk
index 3195103e008..84faabde508 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Purifier BA Terra SPulse (Sqd6).blk	
@@ -58,7 +58,7 @@ LegAttack
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd4).blk
index a465e272e05..ac83a293465 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd4).blk	
@@ -65,7 +65,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd5).blk
index 9d14cd6ce91..4bd02a03113 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd5).blk	
@@ -65,7 +65,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd6).blk
index b3eed5f833e..55bfe9ae506 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Phantoms/Tornado PA(L) G17 (Sqd6).blk	
@@ -65,7 +65,7 @@ Infantry Auto Rifle:APM
 </Squad Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd4).blk
index 5210680bc64..b7d7a3f290e 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd4).blk	
@@ -112,7 +112,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd5).blk
index 38a623dcdb4..001cd51a4e0 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd5).blk	
@@ -115,7 +115,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd6).blk
index 7bceb09a8fe..dd22790a58a 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic I/Surat Solahma Suit (Grey Death) (Sqd6).blk	
@@ -118,7 +118,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd4).blk
index 8137d7f4c65..69e3bee797b 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd4).blk	
@@ -73,7 +73,7 @@ ISDetachableWeaponPack:RA
 </Point Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd5).blk
index 802ca160c2f..c2b0ae56409 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd5).blk	
@@ -73,7 +73,7 @@ ISDetachableWeaponPack:RA
 </Point Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd6).blk
index cf6e32fa45b..ef16e749f86 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Thunderbird II BA (Sqd6).blk	
@@ -74,7 +74,7 @@ ISDetachableWeaponPack:RA
 
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd4).blk
index ac7a4719934..d878bded109 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd4).blk	
@@ -62,7 +62,7 @@ BattleArmorC3:TU
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd5).blk
index 27decd55cf7..d4b5dd0ae1d 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd5).blk	
@@ -62,7 +62,7 @@ BattleArmorC3:TU
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd6).blk
index 4b4f98c786d..9a8c440c8b3 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (C3) (Sqd6).blk	
@@ -62,7 +62,7 @@ BattleArmorC3:TU
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd4).blk
index 541b2841c18..eee890d2d49 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd4).blk	
@@ -62,7 +62,7 @@ BACL Ammo LRM-4:TU:Shots3#
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd5).blk
index 80fedd026c7..d8c17802dd4 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd5).blk	
@@ -62,7 +62,7 @@ BACL Ammo LRM-4:TU:Shots3#
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd6).blk
index 83b8cc32012..a6f1e5ee5ee 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (LRM) (Sqd6).blk	
@@ -62,7 +62,7 @@ BACL Ammo LRM-4:TU:Shots3#
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd4).blk
index ff459fee925..a955c072682 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd4).blk	
@@ -61,7 +61,7 @@ BA-SRM6 Ammo:TU:Shots3#
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd5).blk
index 3b45dfab9e8..bd28a4b3f20 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd5).blk	
@@ -61,7 +61,7 @@ BA-SRM6 Ammo:TU:Shots3#
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd6).blk
index d3042ddaa77..d0169e35fe7 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (SRM) (Sqd6).blk	
@@ -61,7 +61,7 @@ BA-SRM6 Ammo:TU:Shots3#
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd4).blk
index 35598f4827b..e22030ca841 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd4).blk	
@@ -62,7 +62,7 @@ ISDetachableWeaponPack:Body
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd5).blk
index 26db118f57e..3cd39d5a448 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd5).blk	
@@ -62,7 +62,7 @@ ISDetachableWeaponPack:Body
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd6).blk
index 875c24b1ddd..763eaf7936a 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic II/Tortoise II (aSRM) (Sqd6).blk	
@@ -62,7 +62,7 @@ ISDetachableWeaponPack:Body
 </Squad Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd4).blk
index e9d52dc3417..02e85142082 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd4).blk	
@@ -109,7 +109,7 @@ Devil's Rock
 </primaryFactory>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd5).blk
index 5997ec702c7..311b95e25db 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd5).blk	
@@ -112,7 +112,7 @@ Devil's Rock
 </primaryFactory>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd6).blk
index 57e433cea26..7866837c1c2 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Aegis Point Defense Suit (Sqd6).blk	
@@ -115,7 +115,7 @@ Devil's Rock
 </primaryFactory>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Clan Interface Armor (Sqd1).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Clan Interface Armor (Sqd1).blk
index 61e42c99811..f5113ca9364 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Clan Interface Armor (Sqd1).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Clan Interface Armor (Sqd1).blk	
@@ -73,7 +73,7 @@ Mission Equipment Storage (20 kg):Body
 </Trooper 1 Equipment>
 
 <source>
-XTRO Republic III - Early Republic
+XTR: Republic III - Early Republic
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd4).blk
index 0673e270622..afa81535622 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd4).blk	
@@ -113,7 +113,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd5).blk
index 94915b7a252..9de9b0949e9 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd5).blk	
@@ -61,7 +61,7 @@ BA-SRM4 Ammo:Body:Shots4#
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd6).blk
index dd1262c8076..524d914e0d0 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA A (Sqd6).blk	
@@ -61,7 +61,7 @@ BA-SRM4 Ammo:Body:Shots4#
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd4).blk
index 001a19bb3d6..9d636f401ef 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd4).blk	
@@ -60,7 +60,7 @@ BACL Ammo LRM-4:Body:Shots4#
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd5).blk
index 30453a70f3d..2c8bfe50b3d 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd5).blk	
@@ -60,7 +60,7 @@ BACL Ammo LRM-4:Body:Shots4#
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd6).blk
index 332f51f43b5..80a27a469fa 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA B (Sqd6).blk	
@@ -60,7 +60,7 @@ BACL Ammo LRM-4:Body:Shots4#
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd4).blk
index 92385586246..3dac35e49a5 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd4).blk	
@@ -58,7 +58,7 @@ ISBAMediumLaser:Body
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd5).blk
index 39e17e27e17..183ed42cd57 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd5).blk	
@@ -58,7 +58,7 @@ ISBAMediumLaser:Body
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd6).blk
index f5fb532d0b9..fed0c6e0be7 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA C (Sqd6).blk	
@@ -58,7 +58,7 @@ ISBAMediumLaser:Body
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd4).blk
index fa1867624d8..baccdb84eba 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd4).blk	
@@ -73,7 +73,7 @@ Clan BA Stealth:RA
 </Trooper 4 Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd5).blk
index 492a228f591..32eefbdfd6b 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd5).blk	
@@ -61,7 +61,7 @@ Clan BA Stealth:RA
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd6).blk
index 24a92cb286d..8418a475293 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Republic III/Grenadier II BA D (Sqd6).blk	
@@ -61,7 +61,7 @@ Clan BA Stealth:RA
 </Squad Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Gnome BA 'Dwarf_.blk b/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Gnome BA 'Dwarf_.blk
index 700c35541d5..14fb2eb70ef 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Gnome BA 'Dwarf_.blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Gnome BA 'Dwarf_.blk	
@@ -109,7 +109,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTRO Royal Fantasy - Dark Age
+XTR: Royal Fantasy - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Sylph BA 'TinkerBelle'.blk b/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Sylph BA 'TinkerBelle'.blk
index d2b34e3f969..2c87823ead5 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Sylph BA 'TinkerBelle'.blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Sylph BA 'TinkerBelle'.blk	
@@ -108,7 +108,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTRO Royal Fantasy - Dark Age
+XTR: Royal Fantasy - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Undine BA 'Sebastian'.blk b/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Undine BA 'Sebastian'.blk
index 3919146000c..13910e3076d 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Undine BA 'Sebastian'.blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Royal Fantasy/Undine BA 'Sebastian'.blk	
@@ -69,7 +69,7 @@ Should be SRT1 but not coded in the MM at this time.
 </notes>
 
 <source>
-XTRO Royal Fantasy - Dark Age
+XTR: Royal Fantasy - Dark Age
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd4).blk
index 98a818998ff..a30695478ea 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd4).blk	
@@ -68,7 +68,7 @@ BACL Ammo LRM-5:Body:Shots2#
 </Trooper 4 Equipment>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd5).blk
index c233bfd2697..6abaeb4d3f9 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd5).blk	
@@ -68,7 +68,7 @@ BACL Ammo LRM-5:Body:Shots2#
 </Trooper 4 Equipment>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd6).blk
index 8e69388e74b..dde7faed58e 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Fenrir BA Longshot (Sqd6).blk	
@@ -56,7 +56,7 @@ BACL Ammo LRM-5:Body:Shots2#
 </Squad Equipment>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd4).blk b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd4).blk
index bc4e17bfed8..12792807ac0 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd4).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd4).blk	
@@ -115,7 +115,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <chassis>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd5).blk b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd5).blk
index 87302ca9ad1..19c841e8f8a 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd5).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd5).blk	
@@ -66,7 +66,7 @@ Leg
 </motion_type>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd6).blk b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd6).blk
index 527cddd2ba8..f22134add9f 100644
--- a/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd6).blk	
+++ b/megamek/data/mechfiles/battlearmor/XTRs/Steiner/Gray Death SA Prototype (Sqd6).blk	
@@ -67,7 +67,7 @@ Leg
 </motion_type>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <armor_type>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Boeing Jump Bomber.blk b/megamek/data/mechfiles/convfighter/3039u/Boeing Jump Bomber.blk
index fc5bb6734f5..b1ccb3ef0c1 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Boeing Jump Bomber.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Boeing Jump Bomber.blk	
@@ -97,7 +97,7 @@ Aerodyne
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Boomerang Spotter Plane.blk b/megamek/data/mechfiles/convfighter/3039u/Boomerang Spotter Plane.blk
index 9a89e5a36c6..1aefb17f9c2 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Boomerang Spotter Plane.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Boomerang Spotter Plane.blk	
@@ -115,7 +115,7 @@ STOLChassisMod
 </armor_tech_rating>
 
 <source>
-TRO 3039 - Early Succession War
+TRO: 3039 - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter B.blk b/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter B.blk
index a82a1b01695..d793677c02e 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter B.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter B.blk	
@@ -98,7 +98,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter C.blk b/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter C.blk
index 9dbc0c03683..f7a8233450e 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter C.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter C.blk	
@@ -99,7 +99,7 @@ IS Streak SRM 4 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter D.blk b/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter D.blk
index 102406b7356..0ae9d87ebfd 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter D.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter D.blk	
@@ -99,7 +99,7 @@ IS MRM 10 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter.blk b/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter.blk
index f5c4348d1f0..d98b226877a 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Guardian Fighter.blk	
@@ -99,7 +99,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Bat Hawk.blk b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Bat Hawk.blk
index b95112ed7c5..838b86e0314 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Bat Hawk.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Bat Hawk.blk	
@@ -97,7 +97,7 @@ IS Ammo SRM-2
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Inseki II.blk b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Inseki II.blk
index bffc8c499f7..1843fa7db1d 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Inseki II.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Inseki II.blk	
@@ -100,7 +100,7 @@ IS Machine Gun Ammo - Half
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Inseki.blk b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Inseki.blk
index 555ef20be48..314c2a71710 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Inseki.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Inseki.blk	
@@ -99,7 +99,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor-G.blk b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor-G.blk
index affcfd463cf..740a7438231 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor-G.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor-G.blk	
@@ -99,7 +99,7 @@ IS Streak SRM 4 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor-U.blk b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor-U.blk
index 945c2479d7e..e223718b3b4 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor-U.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor-U.blk	
@@ -100,7 +100,7 @@ IS Ultra AC/10 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor.blk b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor.blk
index e09f413736a..4c9b4bc203b 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Heavy Strike Fighter Meteor.blk	
@@ -99,7 +99,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Andurien.blk b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Andurien.blk
index 418c4d1ab3b..9761a93ecf2 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Andurien.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Andurien.blk	
@@ -96,7 +96,7 @@ ISERSmallLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Angel (Upgrade).blk b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Angel (Upgrade).blk
index 62c85aafc4a..fe5e6586419 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Angel (Upgrade).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Angel (Upgrade).blk	
@@ -95,7 +95,7 @@ IS Streak SRM 2 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Angel.blk b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Angel.blk
index bd59ded3326..1d9b99572d4 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Angel.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Angel.blk	
@@ -95,7 +95,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Comet.blk b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Comet.blk
index 45e4162e103..4070b9812b9 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Comet.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Comet.blk	
@@ -95,7 +95,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl II.blk b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl II.blk
index 4a3a7ea78ec..ad441749af6 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl II.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl II.blk	
@@ -96,7 +96,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl III.blk b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl III.blk
index 717a4c087b2..16e6cae7491 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl III.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl III.blk	
@@ -95,7 +95,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl.blk b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl.blk
index 896bc141e74..8cf1012b970 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Owl.blk	
@@ -95,7 +95,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Suzume (Sparrow).blk b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Suzume (Sparrow).blk
index 6eab618ecb1..494af894806 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Suzume (Sparrow).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Light Strike Fighter Suzume (Sparrow).blk	
@@ -95,7 +95,7 @@ IS Ammo LRM-5
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Mechbuster (LB-X).blk b/megamek/data/mechfiles/convfighter/3039u/Mechbuster (LB-X).blk
index 28172078cbf..044bfa42f64 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Mechbuster (LB-X).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Mechbuster (LB-X).blk	
@@ -95,7 +95,7 @@ IS LB 20-X Cluster Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Mechbuster (Laser).blk b/megamek/data/mechfiles/convfighter/3039u/Mechbuster (Laser).blk
index e511864944b..ea7c39f521f 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Mechbuster (Laser).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Mechbuster (Laser).blk	
@@ -96,7 +96,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Mechbuster (SRM).blk b/megamek/data/mechfiles/convfighter/3039u/Mechbuster (SRM).blk
index 43559cc2d09..faf8ce5be6e 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Mechbuster (SRM).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Mechbuster (SRM).blk	
@@ -98,7 +98,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Mechbuster.blk b/megamek/data/mechfiles/convfighter/3039u/Mechbuster.blk
index fd0baa122b4..94b020e5f93 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Mechbuster.blk
+++ b/megamek/data/mechfiles/convfighter/3039u/Mechbuster.blk
@@ -95,7 +95,7 @@ IS Ammo AC/20
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Crane).blk b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Crane).blk
index 2c311dc16e6..1b4f2ab9133 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Crane).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Crane).blk	
@@ -97,7 +97,7 @@ IS Ammo LRM-5
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Defender II).blk b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Defender II).blk
index 0baf736821e..6bd3d0181f6 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Defender II).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Defender II).blk	
@@ -98,7 +98,7 @@ IS Ammo LRM-5 Artemis-capable
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Defender).blk b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Defender).blk
index ea9da28276e..f25a84ae6e7 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Defender).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Defender).blk	
@@ -98,7 +98,7 @@ IS Ammo LRM-5
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Kaiseradler).blk b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Kaiseradler).blk
index 6ab82d7db24..02fcc9e8d17 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Kaiseradler).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Kaiseradler).blk	
@@ -103,7 +103,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Steinadler).blk b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Steinadler).blk
index 87c84ca8b1a..1a7a1d1bb2f 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Steinadler).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Medium Strike Fighter (Steinadler).blk	
@@ -98,7 +98,7 @@ IS Ammo LRM-5
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Planetlifter Air Transport (SuperPelican - Waddle).blk b/megamek/data/mechfiles/convfighter/3039u/Planetlifter Air Transport (SuperPelican - Waddle).blk
index 3cbc6ef56cb..57be3e5fec3 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Planetlifter Air Transport (SuperPelican - Waddle).blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Planetlifter Air Transport (SuperPelican - Waddle).blk	
@@ -101,7 +101,7 @@ IS Ammo AC/5
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3039u/Planetlifter Air Transport.blk b/megamek/data/mechfiles/convfighter/3039u/Planetlifter Air Transport.blk
index 5776124a259..6a0f6e02b91 100644
--- a/megamek/data/mechfiles/convfighter/3039u/Planetlifter Air Transport.blk	
+++ b/megamek/data/mechfiles/convfighter/3039u/Planetlifter Air Transport.blk	
@@ -98,7 +98,7 @@ cargobay:20.5:1:1
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3075U/Stork Light Refueling Craft (Original).blk b/megamek/data/mechfiles/convfighter/3075U/Stork Light Refueling Craft (Original).blk
index e43900a5244..fe9e5f327e3 100644
--- a/megamek/data/mechfiles/convfighter/3075U/Stork Light Refueling Craft (Original).blk	
+++ b/megamek/data/mechfiles/convfighter/3075U/Stork Light Refueling Craft (Original).blk	
@@ -108,7 +108,7 @@ IS Ammo SRM-4
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3075U/Stork Light Refueling Craft (Standard ).blk b/megamek/data/mechfiles/convfighter/3075U/Stork Light Refueling Craft (Standard ).blk
index d29a55fcf9a..74a5ec8372e 100644
--- a/megamek/data/mechfiles/convfighter/3075U/Stork Light Refueling Craft (Standard ).blk	
+++ b/megamek/data/mechfiles/convfighter/3075U/Stork Light Refueling Craft (Standard ).blk	
@@ -115,7 +115,7 @@ ISAMS Ammo
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/3145/Liao/Saroyan Jump Bomber.blk b/megamek/data/mechfiles/convfighter/3145/Liao/Saroyan Jump Bomber.blk
index b429e10c17a..6b42b7bfd65 100644
--- a/megamek/data/mechfiles/convfighter/3145/Liao/Saroyan Jump Bomber.blk	
+++ b/megamek/data/mechfiles/convfighter/3145/Liao/Saroyan Jump Bomber.blk	
@@ -111,7 +111,7 @@ ISGuardianECMSuite
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/ProtoTypes/Bullet Suicide Drone.blk b/megamek/data/mechfiles/convfighter/ProtoTypes/Bullet Suicide Drone.blk
index 1a838210329..a225e368d79 100644
--- a/megamek/data/mechfiles/convfighter/ProtoTypes/Bullet Suicide Drone.blk	
+++ b/megamek/data/mechfiles/convfighter/ProtoTypes/Bullet Suicide Drone.blk	
@@ -97,7 +97,7 @@ IS Ammo SRM-2
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/ProtoTypes/Drake Medium Stealth Fighter.blk b/megamek/data/mechfiles/convfighter/ProtoTypes/Drake Medium Stealth Fighter.blk
index d72738ce1b0..08351a5d4e6 100644
--- a/megamek/data/mechfiles/convfighter/ProtoTypes/Drake Medium Stealth Fighter.blk	
+++ b/megamek/data/mechfiles/convfighter/ProtoTypes/Drake Medium Stealth Fighter.blk	
@@ -111,7 +111,7 @@ IS Ammo MML-3 SRM
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/ProtoTypes/Planetlifter Tactical Support.blk b/megamek/data/mechfiles/convfighter/ProtoTypes/Planetlifter Tactical Support.blk
index 249fcc0f5a1..1b2a7b28a40 100644
--- a/megamek/data/mechfiles/convfighter/ProtoTypes/Planetlifter Tactical Support.blk	
+++ b/megamek/data/mechfiles/convfighter/ProtoTypes/Planetlifter Tactical Support.blk	
@@ -110,7 +110,7 @@ ISArrowIVAmmo
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/ProtoTypes/Seabuster Strike Fighter (Production).blk b/megamek/data/mechfiles/convfighter/ProtoTypes/Seabuster Strike Fighter (Production).blk
index 0c022aced65..17fc0b00f09 100644
--- a/megamek/data/mechfiles/convfighter/ProtoTypes/Seabuster Strike Fighter (Production).blk	
+++ b/megamek/data/mechfiles/convfighter/ProtoTypes/Seabuster Strike Fighter (Production).blk	
@@ -110,7 +110,7 @@ IS Ultra AC/20 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Avanti Aerospace Airliner.blk b/megamek/data/mechfiles/convfighter/TRO VAr/Avanti Aerospace Airliner.blk
index 785422ec0c8..8f7453f4c0f 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Avanti Aerospace Airliner.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Avanti Aerospace Airliner.blk	
@@ -120,7 +120,7 @@ Lifeboat (Maritime)
 </structural_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Succession Wars
+TRO: Vehicle Annex (r) - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Chariot High-Speed Medevac (Standard).blk b/megamek/data/mechfiles/convfighter/TRO VAr/Chariot High-Speed Medevac.blk
similarity index 96%
rename from megamek/data/mechfiles/convfighter/TRO VAr/Chariot High-Speed Medevac (Standard).blk
rename to megamek/data/mechfiles/convfighter/TRO VAr/Chariot High-Speed Medevac.blk
index c50f3166f8a..4ccb188fcf1 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Chariot High-Speed Medevac (Standard).blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Chariot High-Speed Medevac.blk	
@@ -116,7 +116,7 @@ Based on Fluff.
 </notes>
 
 <source>
-TRO Vehicle Annex (r) - Succession Wars
+TRO: Vehicle Annex (r) - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Delta Air Cruiser.blk b/megamek/data/mechfiles/convfighter/TRO VAr/Delta Air Cruiser.blk
index 9d52436a242..a04de432549 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Delta Air Cruiser.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Delta Air Cruiser.blk	
@@ -120,7 +120,7 @@ Lifeboat (Maritime)
 </structural_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Succession Wars
+TRO: Vehicle Annex (r) - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Federated-Boeing Longhaul.blk b/megamek/data/mechfiles/convfighter/TRO VAr/Federated-Boeing Longhaul.blk
index 6fd13d8d135..4257347fc11 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Federated-Boeing Longhaul.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Federated-Boeing Longhaul.blk	
@@ -105,7 +105,7 @@ FieldKitchen
 </structural_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Jetta Coruna 4X.blk b/megamek/data/mechfiles/convfighter/TRO VAr/Jetta Coruna 4X.blk
index d85c79c9506..8654f56d8a0 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Jetta Coruna 4X.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Jetta Coruna 4X.blk	
@@ -104,7 +104,7 @@ Environmental Sealing
 </structural_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Jihad
+TRO: Vehicle Annex (r) - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/King Karnov Transport KC-6.blk b/megamek/data/mechfiles/convfighter/TRO VAr/King Karnov Transport KC-6.blk
index f11e604c30e..33c8ab315a3 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/King Karnov Transport KC-6.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/King Karnov Transport KC-6.blk	
@@ -120,7 +120,7 @@ Based on fluff
 </notes>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/King Karnov Transport.blk b/megamek/data/mechfiles/convfighter/TRO VAr/King Karnov Transport.blk
index df34b6b6e18..5cd8920b576 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/King Karnov Transport.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/King Karnov Transport.blk	
@@ -117,7 +117,7 @@ VSTOLChassisMod
 </armor_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Clan Invasion
+TRO: Vehicle Annex (r) - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Mosquito Radar Plane IX (Standard).blk b/megamek/data/mechfiles/convfighter/TRO VAr/Mosquito Radar Plane IX.blk
similarity index 97%
rename from megamek/data/mechfiles/convfighter/TRO VAr/Mosquito Radar Plane IX (Standard).blk
rename to megamek/data/mechfiles/convfighter/TRO VAr/Mosquito Radar Plane IX.blk
index 89ac0b2c1cc..c85e2f08b4e 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Mosquito Radar Plane IX (Standard).blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Mosquito Radar Plane IX.blk	
@@ -115,7 +115,7 @@ Communications Equipment (2 ton)
 </structural_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Civil War
+TRO: Vehicle Annex (r) - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Protector High-Speed Medevac.blk b/megamek/data/mechfiles/convfighter/TRO VAr/Protector High-Speed Medevac.blk
index 9d64966d81a..78a169bfef9 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Protector High-Speed Medevac.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Protector High-Speed Medevac.blk	
@@ -113,7 +113,7 @@ Paramedic Equipment
 </structural_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Succession Wars
+TRO: Vehicle Annex (r) - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/S 2772 Airplane.blk b/megamek/data/mechfiles/convfighter/TRO VAr/S 2772 Airplane.blk
index 9cbe4c09628..913583e9a16 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/S 2772 Airplane.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/S 2772 Airplane.blk	
@@ -104,7 +104,7 @@ troopspace:1.5
 </structural_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Age of War
+TRO: Vehicle Annex (r) - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Torrent Heavy Bomber (Original).blk b/megamek/data/mechfiles/convfighter/TRO VAr/Torrent Heavy Bomber (Original).blk
index 74d5ab679e8..d89b73aa9fe 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Torrent Heavy Bomber (Original).blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Torrent Heavy Bomber (Original).blk	
@@ -164,7 +164,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO Vehicle Annex (r) - Star League
+TRO: Vehicle Annex (r) - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Torrent Heavy Bomber.blk b/megamek/data/mechfiles/convfighter/TRO VAr/Torrent Heavy Bomber.blk
index 8e8320132cc..fdf7e1dcba3 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Torrent Heavy Bomber.blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Torrent Heavy Bomber.blk	
@@ -167,7 +167,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO Vehicle Annex (r) - Star League
+TRO: Vehicle Annex (r) - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/TRO VAr/Zanadu Air Bus (Standard).blk b/megamek/data/mechfiles/convfighter/TRO VAr/Zanadu Air Bus.blk
similarity index 96%
rename from megamek/data/mechfiles/convfighter/TRO VAr/Zanadu Air Bus (Standard).blk
rename to megamek/data/mechfiles/convfighter/TRO VAr/Zanadu Air Bus.blk
index d56bf81e0a4..db65c87c337 100644
--- a/megamek/data/mechfiles/convfighter/TRO VAr/Zanadu Air Bus (Standard).blk	
+++ b/megamek/data/mechfiles/convfighter/TRO VAr/Zanadu Air Bus.blk	
@@ -104,7 +104,7 @@ FieldKitchen
 </structural_tech_rating>
 
 <source>
-TRO Vehicle Annex (r) - Succession Wars
+TRO: Vehicle Annex (r) - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Boondocks/Drake Medium Strike Fighter.blk b/megamek/data/mechfiles/convfighter/XTRs/Boondocks/Drake Medium Strike Fighter.blk
index 46b67541db2..439d14d5b0c 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Boondocks/Drake Medium Strike Fighter.blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Boondocks/Drake Medium Strike Fighter.blk	
@@ -113,7 +113,7 @@ IS Ammo MML-3 SRM
 </Fuselage Equipment>
 
 <source>
-XTRO Boondocks - Jihad
+XTR: Boondocks - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Corporations/Planetlifter Support Aircraft.blk b/megamek/data/mechfiles/convfighter/XTRs/Corporations/Planetlifter Support Aircraft.blk
index 6ef42ce5113..ba3b6947b4d 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Corporations/Planetlifter Support Aircraft.blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Corporations/Planetlifter Support Aircraft.blk	
@@ -144,7 +144,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-XTR Corps - Jihad
+XTR: Corporations - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Periphery/SeaBuster Strike Fighter (Early).blk b/megamek/data/mechfiles/convfighter/XTRs/Periphery/SeaBuster Strike Fighter (Early).blk
index ec328763cb5..74c7c807537 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Periphery/SeaBuster Strike Fighter (Early).blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Periphery/SeaBuster Strike Fighter (Early).blk	
@@ -104,7 +104,7 @@ ISImprovedHeavyGauss Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Primitives I/Hurricane Conventional Fighter.blk b/megamek/data/mechfiles/convfighter/XTRs/Primitives I/Hurricane Conventional Fighter.blk
index a351f0b9b23..b8b0ff3e142 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Primitives I/Hurricane Conventional Fighter.blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Primitives I/Hurricane Conventional Fighter.blk	
@@ -107,7 +107,7 @@ External Stores Hardpoint
 </structural_tech_rating>
 
 <source>
-XTRO Primitives I - Age of War
+XTR: Primitives I - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Primitives III/Vendetta Medium Fighter.blk b/megamek/data/mechfiles/convfighter/XTRs/Primitives III/Vendetta Medium Fighter.blk
index c03115325f6..e9f6649e011 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Primitives III/Vendetta Medium Fighter.blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Primitives III/Vendetta Medium Fighter.blk	
@@ -126,7 +126,7 @@ External Stores Hardpoint
 </armor_tech_rating>
 
 <source>
-XTRO Prim III - Age of War
+XTR: Primitives III -Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Primitives IV/Mustang Fighter.blk b/megamek/data/mechfiles/convfighter/XTRs/Primitives IV/Mustang Fighter.blk
index 0078d1ca787..b54a49a6c69 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Primitives IV/Mustang Fighter.blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Primitives IV/Mustang Fighter.blk	
@@ -111,7 +111,7 @@ IS Ammo AC/10 Primitive
 </structural_tech_rating>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Primitives V/Colt Medium Fighter (LRM).blk b/megamek/data/mechfiles/convfighter/XTRs/Primitives V/Colt Medium Fighter (LRM).blk
index 0a55f216794..31a148f9616 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Primitives V/Colt Medium Fighter (LRM).blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Primitives V/Colt Medium Fighter (LRM).blk	
@@ -117,7 +117,7 @@ IS Ammo LRM-5
 </armor_tech_rating>
 
 <source>
-XTRO Primitives V - Age of War
+XTR: Primitives V - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Primitives V/Colt Medium Fighter (SRM).blk b/megamek/data/mechfiles/convfighter/XTRs/Primitives V/Colt Medium Fighter (SRM).blk
index f6a04227056..6ba76cb4427 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Primitives V/Colt Medium Fighter (SRM).blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Primitives V/Colt Medium Fighter (SRM).blk	
@@ -117,7 +117,7 @@ IS Ammo SRM-4
 </armor_tech_rating>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/convfighter/XTRs/Succession Wars/Tsuru VIP Aircraft.blk b/megamek/data/mechfiles/convfighter/XTRs/Succession Wars/Tsuru VIP Aircraft.blk
index 00144ab5843..685db7ffa99 100644
--- a/megamek/data/mechfiles/convfighter/XTRs/Succession Wars/Tsuru VIP Aircraft.blk	
+++ b/megamek/data/mechfiles/convfighter/XTRs/Succession Wars/Tsuru VIP Aircraft.blk	
@@ -111,7 +111,7 @@ Communications Equipment (3 ton)
 </structural_tech_rating>
 
 <source>
-XTRO Succession Wars - Succession Wars
+XTR: Succession Wars - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/HBHK/Gaajian System Patrol Boat (2485).blk b/megamek/data/mechfiles/dropships/HBHK/Gaajian System Patrol Boat (2485).blk
index fed551996ec..5061f964831 100644
--- a/megamek/data/mechfiles/dropships/HBHK/Gaajian System Patrol Boat (2485).blk	
+++ b/megamek/data/mechfiles/dropships/HBHK/Gaajian System Patrol Boat (2485).blk	
@@ -136,7 +136,7 @@ ISHighResImager
 </structural_integrity>
 
 <source>
-HB:HK - Age of War
+HB:House Kurita - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/HBHK/Hoshiryokou (Standard).blk b/megamek/data/mechfiles/dropships/HBHK/Hoshiryokou.blk
similarity index 100%
rename from megamek/data/mechfiles/dropships/HBHK/Hoshiryokou (Standard).blk
rename to megamek/data/mechfiles/dropships/HBHK/Hoshiryokou.blk
diff --git a/megamek/data/mechfiles/dropships/HBMPS/Aqueduct Liquid Carrier (Standard).blk b/megamek/data/mechfiles/dropships/HBMPS/Aqueduct Liquid Carrier.blk
similarity index 100%
rename from megamek/data/mechfiles/dropships/HBMPS/Aqueduct Liquid Carrier (Standard).blk
rename to megamek/data/mechfiles/dropships/HBMPS/Aqueduct Liquid Carrier.blk
diff --git a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Cargo).blk b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Cargo).blk
index 50f58f3674f..3c7fdcc74b8 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Cargo).blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Cargo).blk	
@@ -231,7 +231,7 @@ Graham IV, New Earth, Terra
 </primaryFactory>
 
 <source>
-H:Liberation of Terra II - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Carrier).blk b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Carrier).blk
index ec4bea11baa..94711f47546 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Carrier).blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Carrier).blk	
@@ -234,7 +234,7 @@ Graham IV, New Earth, Terra
 </primaryFactory>
 
 <source>
-H:Liberation of Terra II - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Troop Transport).blk b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Troop Transport).blk
index d6e37912f7b..c683424995e 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Troop Transport).blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (2756 Troop Transport).blk	
@@ -235,7 +235,7 @@ Graham IV, New Earth, Terra
 </primaryFactory>
 
 <source>
-H:Liberation of Terra II - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (BattleMech Carrier).blk b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (BattleMech Carrier).blk
index 4587b4cf795..f46c6fc44e7 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (BattleMech Carrier).blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Lee (BattleMech Carrier).blk	
@@ -254,7 +254,7 @@ Transport
 </height>
 
 <source>
-H:Liberation of Terra II - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/M3 Drone CASPAR.blk b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/M3 Drone CASPAR.blk
index 2b297e4323f..baccebd1169 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/M3 Drone CASPAR.blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/M3 Drone CASPAR.blk	
@@ -224,7 +224,7 @@ SDS Drone
 </height>
 
 <source>
-H:Liberation of Terra I - Star League
+Historical:Liberation of Terra I - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Model 96C 'Howdah' .blk b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Model 96C 'Howdah' .blk
index 06f028692c3..5c638b270a6 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Model 96C 'Howdah' .blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Model 96C 'Howdah' .blk	
@@ -199,7 +199,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <notes>
-Unit overweight per TRO entry. Dropped Cargo to make it legal.
+Unit overweight per TRO: entry. Dropped Cargo to make it legal.
 </notes>
 
 <use>
@@ -219,7 +219,7 @@ Tug/ SDS Controller
 </height>
 
 <source>
-H:Liberation of Terra I - Star League
+Historical:Liberation of Terra I - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Pueblo (2673).blk b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Pueblo (2673).blk
index bd67734c40e..ec796590e7d 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Pueblo (2673).blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Liberation of Terra I and II/Pueblo (2673).blk	
@@ -190,7 +190,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <notes>
-Overweight per the TRO, dropped cargo to make it legal. Needs 6 officers not 2 and 16 crew not 6. .
+Overweight per the TRO:, dropped cargo to make it legal. Needs 6 officers not 2 and 16 crew not 6. .
 </notes>
 
 <use>
@@ -210,7 +210,7 @@ Surveillance
 </height>
 
 <source>
-H:Liberation of Terra II - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Historicals/Reunification War/Jumbo (Standard).blk b/megamek/data/mechfiles/dropships/Historicals/Reunification War/Jumbo.blk
similarity index 97%
rename from megamek/data/mechfiles/dropships/Historicals/Reunification War/Jumbo (Standard).blk
rename to megamek/data/mechfiles/dropships/Historicals/Reunification War/Jumbo.blk
index c9a46d1f33b..fc00cecf5cc 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Reunification War/Jumbo (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Reunification War/Jumbo.blk	
@@ -125,7 +125,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-H:Reunification War - Age of War
+Historical:Reunification War - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Historicals/Wars of the Republic Era/Polaris (Standard).blk b/megamek/data/mechfiles/dropships/Historicals/Wars of the Republic Era/Polaris.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/Historicals/Wars of the Republic Era/Polaris (Standard).blk
rename to megamek/data/mechfiles/dropships/Historicals/Wars of the Republic Era/Polaris.blk
index d8712a370bc..575d75668b6 100644
--- a/megamek/data/mechfiles/dropships/Historicals/Wars of the Republic Era/Polaris (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/Historicals/Wars of the Republic Era/Polaris.blk	
@@ -199,7 +199,7 @@ CLAMS Ammo:72
 </structural_integrity>
 
 <source>
-H:Wars of the Republic Era - Early Republic
+Historical:Wars of the Republic Era - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/JHS - Terra/Cockatrice Monitor Platform (Drone).blk b/megamek/data/mechfiles/dropships/JHS - Terra/Cockatrice Monitor Platform (Drone).blk
index 472a3ab9105..ff971abcfe4 100644
--- a/megamek/data/mechfiles/dropships/JHS - Terra/Cockatrice Monitor Platform (Drone).blk	
+++ b/megamek/data/mechfiles/dropships/JHS - Terra/Cockatrice Monitor Platform (Drone).blk	
@@ -140,7 +140,7 @@ Weapons:
 </notes>
 
 <source>
-Jihad Hot Spots: Terra - Civil War
+Jihad Hot Spots:Terra - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/JHS - Terra/Dragau Assault Interceptor (CASPAR II Drone).blk b/megamek/data/mechfiles/dropships/JHS - Terra/Dragau Assault Interceptor (CASPAR II Drone).blk
index 0a59b1c31c6..1f6ddc4663a 100644
--- a/megamek/data/mechfiles/dropships/JHS - Terra/Dragau Assault Interceptor (CASPAR II Drone).blk	
+++ b/megamek/data/mechfiles/dropships/JHS - Terra/Dragau Assault Interceptor (CASPAR II Drone).blk	
@@ -150,7 +150,7 @@ Piloting 5).
 </notes>
 
 <source>
-Jihad Hot Spots: Terra - Civil War
+Jihad Hot Spots:Terra - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/JHS - Terra/Tiamat Pocket Warship (CASPAR II Drone).blk b/megamek/data/mechfiles/dropships/JHS - Terra/Tiamat Pocket Warship (CASPAR II Drone).blk
index 53245fe0de4..f8e151e1764 100644
--- a/megamek/data/mechfiles/dropships/JHS - Terra/Tiamat Pocket Warship (CASPAR II Drone).blk	
+++ b/megamek/data/mechfiles/dropships/JHS - Terra/Tiamat Pocket Warship (CASPAR II Drone).blk	
@@ -247,7 +247,7 @@ Piloting 5).
 </notes>
 
 <source>
-Jihad Hot Spots: Terra - Jihad
+Jihad Hot Spots:Terra - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Jihad Secrets - Blake Documents/Danais (Standard).blk b/megamek/data/mechfiles/dropships/Jihad Secrets - Blake Documents/Danais.blk
similarity index 100%
rename from megamek/data/mechfiles/dropships/Jihad Secrets - Blake Documents/Danais (Standard).blk
rename to megamek/data/mechfiles/dropships/Jihad Secrets - Blake Documents/Danais.blk
diff --git a/megamek/data/mechfiles/dropships/Other/Lion (3052) (WD).blk b/megamek/data/mechfiles/dropships/Other/Lion (3052) (WD).blk
index 88d1361fab9..55b05ac4e64 100644
--- a/megamek/data/mechfiles/dropships/Other/Lion (3052) (WD).blk	
+++ b/megamek/data/mechfiles/dropships/Other/Lion (3052) (WD).blk	
@@ -300,7 +300,7 @@ Troop Carrier
 </height>
 
 <source>
-TRO 3057r - Clan Invasion
+TRO: 3057r - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/Other/Rose (Bara no Ryu) (Hive).blk b/megamek/data/mechfiles/dropships/Other/Rose (Bara no Ryu) (Hive).blk
index f098a98d8d3..b2c9e60506c 100644
--- a/megamek/data/mechfiles/dropships/Other/Rose (Bara no Ryu) (Hive).blk	
+++ b/megamek/data/mechfiles/dropships/Other/Rose (Bara no Ryu) (Hive).blk	
@@ -189,7 +189,7 @@ Cargo Carrier
 </height>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/ProtoTypes/Clan/Outpost (Defender).blk b/megamek/data/mechfiles/dropships/ProtoTypes/Clan/Outpost (Defender).blk
index 52c45702245..aba450f180b 100644
--- a/megamek/data/mechfiles/dropships/ProtoTypes/Clan/Outpost (Defender).blk	
+++ b/megamek/data/mechfiles/dropships/ProtoTypes/Clan/Outpost (Defender).blk	
@@ -172,7 +172,7 @@ CLLaserAntiMissileSystem
 </structural_integrity>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/ProtoTypes/Clan/Titan (Monitor).blk b/megamek/data/mechfiles/dropships/ProtoTypes/Clan/Titan (Monitor).blk
index f814b68be1a..d898355c3fd 100644
--- a/megamek/data/mechfiles/dropships/ProtoTypes/Clan/Titan (Monitor).blk	
+++ b/megamek/data/mechfiles/dropships/ProtoTypes/Clan/Titan (Monitor).blk	
@@ -148,7 +148,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/ProtoTypes/IS/Claymore V3.blk b/megamek/data/mechfiles/dropships/ProtoTypes/IS/Claymore V3.blk
index 0a80f24e717..47c60fde90a 100644
--- a/megamek/data/mechfiles/dropships/ProtoTypes/IS/Claymore V3.blk	
+++ b/megamek/data/mechfiles/dropships/ProtoTypes/IS/Claymore V3.blk	
@@ -134,7 +134,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/ProtoTypes/IS/Lung Wang P2.blk b/megamek/data/mechfiles/dropships/ProtoTypes/IS/Lung Wang P2.blk
index 1e79fcbf273..35064a246d1 100644
--- a/megamek/data/mechfiles/dropships/ProtoTypes/IS/Lung Wang P2.blk	
+++ b/megamek/data/mechfiles/dropships/ProtoTypes/IS/Lung Wang P2.blk	
@@ -141,7 +141,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/ProtoTypes/IS/Merlin R1.blk b/megamek/data/mechfiles/dropships/ProtoTypes/IS/Merlin R1.blk
index 426b269ba43..528caba22a6 100644
--- a/megamek/data/mechfiles/dropships/ProtoTypes/IS/Merlin R1.blk	
+++ b/megamek/data/mechfiles/dropships/ProtoTypes/IS/Merlin R1.blk	
@@ -131,7 +131,7 @@ ISLaserAntiMissileSystem
 </structural_integrity>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/ProtoTypes/IS/Vengeance DC.blk b/megamek/data/mechfiles/dropships/ProtoTypes/IS/Vengeance DC.blk
index d7dceb96759..61fbc1699c5 100644
--- a/megamek/data/mechfiles/dropships/ProtoTypes/IS/Vengeance DC.blk	
+++ b/megamek/data/mechfiles/dropships/ProtoTypes/IS/Vengeance DC.blk	
@@ -183,7 +183,7 @@ ISSmallNavalCommScannerSuite
 </structural_integrity>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Behemoth C (2848).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Behemoth C (2848).blk
index 422e2c3b4dd..c051729788d 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Behemoth C (2848).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Behemoth C (2848).blk	
@@ -116,7 +116,7 @@ CLERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Behemoth C (Arcship).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Behemoth C (Arcship).blk
index 43e056e2fcb..529993bc115 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Behemoth C (Arcship).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Behemoth C (Arcship).blk	
@@ -114,7 +114,7 @@ CLERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Broadsword (2979).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Broadsword (2979).blk
index 4018d64d7ca..8fc2b45ade8 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Broadsword (2979).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Broadsword (2979).blk	
@@ -137,7 +137,7 @@ Clan Streak SRM 6 Ammo:60
 </structural_integrity>
 
 <source>
-TRO 3057R - Late Succession War - Lostech
+TRO: 3057R - Late Succession War - Lostech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Carrier (2882).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Carrier (2882).blk
index 531bc2da3d8..fe1001cdac8 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Carrier (2882).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Carrier (2882).blk	
@@ -181,7 +181,7 @@ Clan Ultra AC/20 Ammo:50
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Confederate C (3048).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Confederate C (3048).blk
index 1a7f4aa2f80..09a4f656d79 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Confederate C (3048).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Confederate C (3048).blk	
@@ -134,7 +134,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057U - Late Succession War - Renaissance
+TRO: 3057U - Late Succession War - Renaissance
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Lion (2835).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Lion (2835).blk
index 8e5c114c91a..b687ecd3ab3 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Lion (2835).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Lion (2835).blk	
@@ -201,7 +201,7 @@ CLAMS Ammo:96
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Lion (3005) (WD).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Lion (3005) (WD).blk
index 6f42ade63f8..bbd7956ce34 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Lion (3005) (WD).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Lion (3005) (WD).blk	
@@ -204,7 +204,7 @@ ISAMS Ammo:96
 </structural_integrity>
 
 <source>
-TRO 3057R - Late Succession War - Lostech
+TRO: 3057R - Late Succession War - Lostech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Miraborg (3053).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Miraborg (3053).blk
index 55f2d2976f5..e0197664a88 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Miraborg (3053).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Miraborg (3053).blk	
@@ -176,7 +176,7 @@ CLMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Mule C (2842).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Mule C (2842).blk
index a667bd3aa6a..ecd23fac288 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Mule C (2842).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Mule C (2842).blk	
@@ -165,3 +165,7 @@ CLERMediumLaser
 <escape_pod>
 2
 </escape_pod>
+
+<source>
+TRO: 3057r - Early Succession War
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Noruff (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Noruff (3056).blk
index b885d73b9b2..6d0a03e7e7e 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Noruff (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Noruff (3056).blk	
@@ -169,7 +169,7 @@ Clan Streak SRM 6 Ammo:15
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Overlord C (2818) (Tank).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Overlord C (2818) (Tank).blk
index db3da0a8a15..cd38cbf83e3 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Overlord C (2818) (Tank).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Overlord C (2818) (Tank).blk	
@@ -158,7 +158,7 @@ CLERPPC
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Overlord C (2818).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Overlord C (2818).blk
index 96eaf5b16e1..c4273c22cd4 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Overlord C (2818).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Overlord C (2818).blk	
@@ -155,7 +155,7 @@ CLERPPC
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Sassanid (2875).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Sassanid (2875).blk
index 262fa009249..c2f25e43259 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Sassanid (2875).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Sassanid (2875).blk	
@@ -167,7 +167,7 @@ CLMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Titan (2953).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Titan (2953).blk
index ea2636dba64..b3425f7bf6a 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Titan (2953).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Titan (2953).blk	
@@ -162,7 +162,7 @@ ISSmallNavalCommScannerSuite
 </structural_integrity>
 
 <source>
-TRO 3057R - Late Succession War - Lostech
+TRO: 3057R - Late Succession War - Lostech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2829) (Tank).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2829) (Tank).blk
index c40d2613ace..49c4c147b4b 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2829) (Tank).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2829) (Tank).blk	
@@ -143,7 +143,7 @@ CLMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2829).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2829).blk
index 8151e02cd47..7040241d94b 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2829).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2829).blk	
@@ -142,7 +142,7 @@ CLMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2840) (Cargo).blk b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2840) (Cargo).blk
index a474823d53d..0b95bfc45ae 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2840) (Cargo).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/Clan/Union C (2840) (Cargo).blk	
@@ -141,7 +141,7 @@ CLMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2582).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2582).blk
index 1a8d8b5ed55..3196094411a 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2582).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2582).blk	
@@ -154,7 +154,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2721).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2721).blk
index 7074b8541a1..4a5e6cc860c 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2721).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2721).blk	
@@ -203,3 +203,7 @@ ISMediumPulseLaser
 <escape_pod>
 4
 </escape_pod>
+
+<source>
+TRO: 3057r - Star League
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2721b).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2721b).blk
index d431e36ccad..be643fb5ccc 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2721b).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (2721b).blk	
@@ -162,7 +162,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (3055).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (3055).blk
index 41e0a8e1f15..99f15fc5494 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (3055).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Achilles (3055).blk	
@@ -159,7 +159,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Avenger (2816).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Avenger (2816).blk
index 7f11de9fdff..f849edc0456 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Avenger (2816).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Avenger (2816).blk	
@@ -135,7 +135,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Avenger (3048).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Avenger (3048).blk
index ad8ba4f93d7..c5a07fd5024 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Avenger (3048).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Avenger (3048).blk	
@@ -135,7 +135,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Late Succession War - Renaissance
+TRO: 3057R - Late Succession War - Renaissance
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Behemoth (2658).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Behemoth (2658).blk
index b063027be4c..ca00a07926e 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Behemoth (2658).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Behemoth (2658).blk	
@@ -120,7 +120,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Behemoth (2782).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Behemoth (2782).blk
index 04fbc2ed0e3..27a0e12286c 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Behemoth (2782).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Behemoth (2782).blk	
@@ -120,7 +120,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2708).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2708).blk
index 27b7f0db15b..045b23ebd2c 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2708).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2708).blk	
@@ -113,7 +113,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2709).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2709).blk
index d5dd0a6f4dc..e29a9bafa77 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2709).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2709).blk	
@@ -115,7 +115,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2792).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2792).blk
index ffdf2f0d9ee..485eda3e3e2 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2792).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Buccaneer (2792).blk	
@@ -116,7 +116,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Cargo King (2790).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Cargo King (2790).blk
index aab9e67c7dc..9df135a953a 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Cargo King (2790).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Cargo King (2790).blk	
@@ -136,7 +136,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Cargomaster (2790).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Cargomaster (2790).blk
index c08c76184d8..20f07c18f01 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Cargomaster (2790).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Cargomaster (2790).blk	
@@ -143,7 +143,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Claymore (3054).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Claymore (3054).blk
index 503768cfb4d..ed1e4456909 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Claymore (3054).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Claymore (3054).blk	
@@ -141,7 +141,7 @@ IS LB 10-X Cluster Ammo:10
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (2801).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (2801).blk
index da78e8ecddb..18b0e463314 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (2801).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (2801).blk	
@@ -127,7 +127,7 @@ MASH Core Component
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk
index 09e0aca047f..e2c1420740e 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk	
@@ -135,7 +135,7 @@ MASH Operation Theater
 </structural_integrity>
 
 <source>
-TRO 3057R - Late Succession War - Renaissance
+TRO: 3057R - Late Succession War - Renaissance
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3054).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3054).blk
index 87acc285ca0..5199f54daa4 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3054).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3054).blk	
@@ -128,7 +128,7 @@ MASH Core Component
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3079).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3079).blk
index 2943435a290..c0938aca474 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3079).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Condor (3079).blk	
@@ -127,7 +127,7 @@ MASH Core Component
 </structural_integrity>
 
 <source>
-TRO 3057R - Jihad
+TRO: 3057R - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Confederate (2602).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Confederate (2602).blk
index 59ba9b9f084..99312cbc98b 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Confederate (2602).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Confederate (2602).blk	
@@ -138,7 +138,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Confederate (2602)Mech.blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Confederate (2602)Mech.blk
index ed975ab4156..ed6ff4462f4 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Confederate (2602)Mech.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Confederate (2602)Mech.blk	
@@ -138,7 +138,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Excalibur (2786).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Excalibur (2786).blk
index b7fce9b4dd8..502731d19f8 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Excalibur (2786).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Excalibur (2786).blk	
@@ -130,7 +130,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Excalibur (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Excalibur (3056).blk
index f3e10b12cd0..9b33cc36cfa 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Excalibur (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Excalibur (3056).blk	
@@ -136,7 +136,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Fortress (2613).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Fortress (2613).blk
index 27d5ad46a46..a2e514bc41b 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Fortress (2613).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Fortress (2613).blk	
@@ -168,7 +168,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Fortress (3058).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Fortress (3058).blk
index 0e57a4178af..a1f9b9921af 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Fortress (3058).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Fortress (3058).blk	
@@ -174,7 +174,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Fury (2638).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Fury (2638).blk
index 54d0f6aa2d1..5fd1151059e 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Fury (2638).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Fury (2638).blk	
@@ -118,7 +118,7 @@ IS Ammo AC/10:20
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Fury (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Fury (3056).blk
index 2e97c36f723..8ba3916b01e 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Fury (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Fury (3056).blk	
@@ -122,7 +122,7 @@ IS Ammo AC/10:20
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (2531).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (2531).blk
index a3294f7901a..a82f90c843d 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (2531).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (2531).blk	
@@ -124,7 +124,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (3055).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (3055).blk
index ac87c976488..cbd90f88208 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (3055).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (3055).blk	
@@ -128,7 +128,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (Heavy Vehicle).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (Heavy Vehicle).blk
index b0978056861..21d628d6b9b 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (Heavy Vehicle).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Gazelle (Heavy Vehicle).blk	
@@ -124,7 +124,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Succession Wars
+TRO: 3057R - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Hamilcar (3054).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Hamilcar (3054).blk
index aae26c43ed0..6203107bac4 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Hamilcar (3054).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Hamilcar (3054).blk	
@@ -138,7 +138,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Hamilcar (3084).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Hamilcar (3084).blk
index 4ef56d88297..0763cb38f33 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Hamilcar (3084).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Hamilcar (3084).blk	
@@ -234,3 +234,6 @@ Space Assault Ship
 4
 </escape_pod>
 
+<source>
+TRO: 3057r - Early Republic
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Hannibal (3055).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Hannibal (3055).blk
index ca04177a1c7..ea2541e7e72 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Hannibal (3055).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Hannibal (3055).blk	
@@ -165,7 +165,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Hercules (3053).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Hercules (3053).blk
index aa0855dc163..085cd54b20f 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Hercules (3053).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Hercules (3053).blk	
@@ -148,7 +148,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Intruder (2655).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Intruder (2655).blk
index e1b5af06785..ff3058016f1 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Intruder (2655).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Intruder (2655).blk	
@@ -155,7 +155,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Intruder (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Intruder (3056).blk
index 7b3ba91e898..bb0fe839106 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Intruder (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Intruder (3056).blk	
@@ -159,7 +159,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Kuan Ti (3055).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Kuan Ti (3055).blk
index 0ed5de9374a..244e216c0ce 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Kuan Ti (3055).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Kuan Ti (3055).blk	
@@ -166,7 +166,7 @@ ISAMS Ammo:24
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard (2537).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard (2537).blk
index d8670f4b56b..ae21784c160 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard (2537).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard (2537).blk	
@@ -124,7 +124,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard (3056).blk
index 66105d3ca82..5e21e1a863b 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard (3056).blk	
@@ -127,7 +127,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard CV (2581).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard CV (2581).blk
index 9a0478c6afb..433c769487d 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard CV (2581).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard CV (2581).blk	
@@ -125,7 +125,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard CV (3054).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard CV (3054).blk
index 304cdcd7757..b70e78deb72 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard CV (3054).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Leopard CV (3054).blk	
@@ -128,7 +128,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Lion (2595).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Lion (2595).blk
index d3ed0b3c790..6c3bc544bd5 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Lion (2595).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Lion (2595).blk	
@@ -167,7 +167,7 @@ IS Ammo SRM-6:60
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Lung Wang (3055).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Lung Wang (3055).blk
index fd6737cbb45..b8090ad780a 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Lung Wang (3055).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Lung Wang (3055).blk	
@@ -154,7 +154,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Mammoth (2658).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Mammoth (2658).blk
index 29029ad2383..40898d8dc53 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Mammoth (2658).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Mammoth (2658).blk	
@@ -116,7 +116,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Model 97 'Octopus' (3051).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Model 97 'Octopus' (3051).blk
index 87dc8230254..620040e822f 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Model 97 'Octopus' (3051).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Model 97 'Octopus' (3051).blk	
@@ -141,7 +141,7 @@ ISNavalTugAdaptor
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Monarch (2759).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Monarch (2759).blk
index d7bf83287dc..24765bbba4e 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Monarch (2759).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Monarch (2759).blk	
@@ -102,7 +102,7 @@ cargobay:1119.0:1:4
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Mule 'Q-Ship'.blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Mule 'Q-Ship'.blk
index e726d4db2e3..1097c3c7e15 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Mule 'Q-Ship'.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Mule 'Q-Ship'.blk	
@@ -139,7 +139,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Mule (2737).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Mule (2737).blk
index fc246d6a4ec..2167bc8e4ed 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Mule (2737).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Mule (2737).blk	
@@ -123,7 +123,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Nagumo (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Nagumo (3056).blk
index b1c43f5ddbc..40b10339018 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Nagumo (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Nagumo (3056).blk	
@@ -155,7 +155,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Okinawa (3055).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Okinawa (3055).blk
index d1d7b39d5a9..c502603180a 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Okinawa (3055).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Okinawa (3055).blk	
@@ -151,7 +151,7 @@ IS Streak SRM 2 Ammo:100
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Okinawa (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Okinawa (3056).blk
index 7e6242d65e0..67443b20cb8 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Okinawa (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Okinawa (3056).blk	
@@ -151,7 +151,7 @@ IS Streak SRM 2 Ammo:100
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2762).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2762).blk
index e49edbe89c0..1635ddfadcd 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2762).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2762).blk	
@@ -147,7 +147,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2762b).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2762b).blk
index d6a0d52b262..d92afbedb33 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2762b).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2762b).blk	
@@ -151,7 +151,7 @@ ISERPPC
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2775) (Combined Arms).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2775) (Combined Arms).blk
index 02b5f960067..e68c22b7163 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2775) (Combined Arms).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2775) (Combined Arms).blk	
@@ -148,7 +148,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2809) (Klondike).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2809) (Klondike).blk
index 86d1821af71..a8929939452 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2809) (Klondike).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2809) (Klondike).blk	
@@ -146,7 +146,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2817) (Command).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2817) (Command).blk
index 67eb8e42993..1f8050add8b 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2817) (Command).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (2817) (Command).blk	
@@ -149,7 +149,7 @@ Communications Equipment (15 ton)
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (3056).blk
index bdbb94edcce..d57deb6f34e 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Overlord (3056).blk	
@@ -143,7 +143,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Rose (Bara no Ryu) (3054).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Rose (Bara no Ryu) (3054).blk
index 85e648e686a..94a58d2611b 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Rose (Bara no Ryu) (3054).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Rose (Bara no Ryu) (3054).blk	
@@ -138,7 +138,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (2815).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (2815).blk
index 7fd43950799..269d992286f 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (2815).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (2815).blk	
@@ -119,7 +119,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (2815M).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (2815M).blk
index c8516ca481f..c00b11f3ca7 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (2815M).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (2815M).blk	
@@ -123,7 +123,7 @@ MASH Core Component
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (3054).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (3054).blk
index 5c72628df41..418ff5027a7 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (3054).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Seeker (3054).blk	
@@ -122,7 +122,7 @@ MASH Core Component
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Titan (2647).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Titan (2647).blk
index b36d8a927f8..45a1f7aeb1e 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Titan (2647).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Titan (2647).blk	
@@ -203,3 +203,7 @@ Medium Laser
 <escape_pod>
 4
 </escape_pod>
+
+<source>
+TRO: 3057r - Star League
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Titan (2647b).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Titan (2647b).blk
index b05f7d68bcd..36d171d6e89 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Titan (2647b).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Titan (2647b).blk	
@@ -161,7 +161,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (2593).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (2593).blk
index 37cdf7e0489..124229b157a 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (2593).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (2593).blk	
@@ -130,7 +130,7 @@ IS Ammo LRM-10:12
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (2593b).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (2593b).blk
index 8436cd6e6ae..3feac3ec3e3 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (2593b).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (2593b).blk	
@@ -131,7 +131,7 @@ IS Ammo LRM-10:12
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (3057).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (3057).blk
index e72d765b36b..badfed89d15 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (3057).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Triumph (3057).blk	
@@ -134,7 +134,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708) (Cargo).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708) (Cargo).blk
index a58d416612c..e83b3fa0752 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708) (Cargo).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708) (Cargo).blk	
@@ -185,7 +185,7 @@ ENGINE:Star League V250
 </height>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708).blk
index 6fb621fa765..07912213b21 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708).blk	
@@ -187,7 +187,7 @@ ENGINE:Star League V250
 </height>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708b).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708b).blk
index bd5c84e0bc2..0893c0e383f 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708b).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2708b).blk	
@@ -142,7 +142,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2709).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2709).blk
index c97922ea1a9..49b6d480f97 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2709).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2709).blk	
@@ -143,7 +143,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2710).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2710).blk
index d41ad168ee3..33d954b9957 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2710).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (2710).blk	
@@ -143,7 +143,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (3055).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (3055).blk
index 500f4a6cec6..eb65f374e8f 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (3055).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Union (3055).blk	
@@ -146,7 +146,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Vengeance (2682).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Vengeance (2682).blk
index 640fa61606e..d6729f655cc 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Vengeance (2682).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Vengeance (2682).blk	
@@ -142,7 +142,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3057R/IS/Vengeance (3056).blk b/megamek/data/mechfiles/dropships/TRO3057R/IS/Vengeance (3056).blk
index a292d63d6c6..173f6707010 100644
--- a/megamek/data/mechfiles/dropships/TRO3057R/IS/Vengeance (3056).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3057R/IS/Vengeance (3056).blk	
@@ -145,7 +145,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/Clan/Arcadia (3066).blk b/megamek/data/mechfiles/dropships/TRO3067/Clan/Arcadia (3066).blk
index 2ce2cd85014..00ef43ea2e5 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/Clan/Arcadia (3066).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/Clan/Arcadia (3066).blk	
@@ -161,7 +161,7 @@ Clan Streak SRM 6 Ammo:45
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/Clan/Arcadia (3080).blk b/megamek/data/mechfiles/dropships/TRO3067/Clan/Arcadia (3080).blk
index aef016320af..371dd25b8e8 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/Clan/Arcadia (3080).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/Clan/Arcadia (3080).blk	
@@ -158,7 +158,7 @@ Clan Ammo ATM-9:14
 </structural_integrity>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/Clan/Mercer (3065).blk b/megamek/data/mechfiles/dropships/TRO3067/Clan/Mercer (3065).blk
index 4362e80b978..8d16b18bf0b 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/Clan/Mercer (3065).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/Clan/Mercer (3065).blk	
@@ -182,7 +182,7 @@ CLArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/Clan/Outpost (3063).blk b/megamek/data/mechfiles/dropships/TRO3067/Clan/Outpost (3063).blk
index dfbec5494c9..105c2bf63f0 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/Clan/Outpost (3063).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/Clan/Outpost (3063).blk	
@@ -190,7 +190,7 @@ Clan Streak SRM 6 Ammo:75
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/Clan/Outpost (3070).blk b/megamek/data/mechfiles/dropships/TRO3067/Clan/Outpost (3070).blk
index c94fef42883..a5817e8f6ec 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/Clan/Outpost (3070).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/Clan/Outpost (3070).blk	
@@ -180,7 +180,7 @@ CLAMS Ammo:72
 </structural_integrity>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Assault Triumph (3062).blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Assault Triumph (3062).blk
index def61021eca..1790d554141 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Assault Triumph (3062).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Assault Triumph (3062).blk	
@@ -151,7 +151,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Assault Triumph (3082).blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Assault Triumph (3082).blk
index be4afa770a9..61db23366e9 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Assault Triumph (3082).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Assault Triumph (3082).blk	
@@ -158,7 +158,7 @@ ISLaserAntiMissileSystem
 </structural_integrity>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Conquistador (3063).blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Conquistador (3063).blk
index 97e0dd67278..233e7e19471 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Conquistador (3063).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Conquistador (3063).blk	
@@ -262,7 +262,7 @@ ISAMS Ammo:168
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Conquistador (Avalon One).blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Conquistador (Avalon One).blk
index 360a83c350b..ae82f83961f 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Conquistador (Avalon One).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Conquistador (Avalon One).blk	
@@ -266,7 +266,7 @@ ISSmallNavalCommScannerSuite
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Merlin (3063).blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Merlin (3063).blk
index 96d0b2c6f23..db57b25a3c1 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Merlin (3063).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Merlin (3063).blk	
@@ -138,7 +138,7 @@ ISERPPC
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Nekohono'o (Standard).blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Nekohono'o.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3067/IS/Nekohono'o (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3067/IS/Nekohono'o.blk
index 47f65894103..5ed71090b66 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Nekohono'o (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Nekohono'o.blk
@@ -192,7 +192,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Overlord A3.blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Overlord A3.blk
index 1a329adac27..29c27e176b2 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Overlord A3.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Overlord A3.blk	
@@ -192,7 +192,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3067 - Clan Invasion
+TRO: 3067 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Overlord A3A.blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Overlord A3A.blk
index 321e0215196..a44441bb3bd 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Overlord A3A.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Overlord A3A.blk	
@@ -192,7 +192,7 @@ Ammo Screen:10
 </structural_integrity>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Union-X (3065).blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Union-X (3065).blk
index d79284de7e1..444d01f8025 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Union-X (3065).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Union-X (3065).blk	
@@ -159,7 +159,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3067/IS/Union-X (3071).blk b/megamek/data/mechfiles/dropships/TRO3067/IS/Union-X (3071).blk
index b94d8201f6f..7076751e1f4 100644
--- a/megamek/data/mechfiles/dropships/TRO3067/IS/Union-X (3071).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3067/IS/Union-X (3071).blk	
@@ -160,7 +160,7 @@ Heavy PPC
 </structural_integrity>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus Mk I.blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus Mk I.blk
index 9b6808cac9b..afe89cc6013 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus Mk I.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus Mk I.blk	
@@ -169,7 +169,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus (Standard).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus.blk
index e22c960165b..085a7a21ab4 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Colossus.blk	
@@ -218,7 +218,7 @@ Assault DropShip
 </height>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator (Command).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator (Command).blk
index b252657c5e3..b27db692011 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator (Command).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator (Command).blk	
@@ -151,7 +151,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator (Standard).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator.blk
index 47264220aea..4afdc5cdae9 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Dictator.blk	
@@ -151,7 +151,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee (Cargo).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee (Cargo).blk
index fce80dc8c98..6cd7931e71a 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee (Cargo).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee (Cargo).blk	
@@ -101,7 +101,7 @@ crewquarters:35.0:0
 </structural_integrity>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee (Standard).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee.blk
index 8fc41d26be2..53a73bc64c8 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Manatee.blk	
@@ -123,7 +123,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant' Mk I.blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant' Mk I.blk
index a69ed0780b4..45718962462 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant' Mk I.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant' Mk I.blk	
@@ -170,7 +170,7 @@ ISNavalTugAdaptor
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant' (Standard).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant'.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant' (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant'.blk
index 245843abdf6..1f72d634ea9 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant' (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Model 96 'Elephant'.blk	
@@ -170,7 +170,7 @@ ISNavalTugAdaptor
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Mule (Star League Pocket Warship).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Mule (Star League Pocket Warship).blk
index dd08ebbd4bc..40d859d575d 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Mule (Star League Pocket Warship).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Mule (Star League Pocket Warship).blk	
@@ -139,7 +139,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon 'Pocket Warship'.blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon 'Pocket Warship'.blk
index b4125feab87..aff0ad60dd8 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon 'Pocket Warship'.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon 'Pocket Warship'.blk	
@@ -143,7 +143,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon (2751).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon (2751).blk
index c7d837be8b1..5f851e7c3fd 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon (2751).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon (2751).blk	
@@ -161,7 +161,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon Mk I.blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon Mk I.blk
index d7fe6d5a0ef..f47ddf9044e 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon Mk I.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon Mk I.blk	
@@ -153,7 +153,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon (Standard).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon.blk
index a41bf04cfe8..4059397f4b8 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Pentagon.blk	
@@ -163,7 +163,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vampire (Standard).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vampire.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3075/Age of War/Vampire (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3075/Age of War/Vampire.blk
index cfdf5ed5225..80a8ebfac57 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vampire (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vampire.blk	
@@ -118,7 +118,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (2312).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (2312).blk
index 0b20dc7671e..98c2c8154ac 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (2312).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (2312).blk	
@@ -129,7 +129,7 @@ IS Ammo LRM-5:72
 </structural_integrity>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (2405).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (2405).blk
index 8116c37ef00..61acd8bdf3e 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (2405).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (2405).blk	
@@ -129,7 +129,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (Cargo).blk b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (Cargo).blk
index 29d8eabacd5..a61ccf2fc6f 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (Cargo).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Age of War/Vulture (Cargo).blk	
@@ -127,7 +127,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (BA).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (BA).blk
index 65ce576abf3..cee066ebace 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (BA).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (BA).blk	
@@ -125,7 +125,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (CV).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (CV).blk
index 232f702598f..c12fc6c73f2 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (CV).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (CV).blk	
@@ -123,7 +123,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Cargo).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Cargo).blk
index ce943f6d625..c67c7da531c 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Cargo).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Cargo).blk	
@@ -123,7 +123,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Combined Arms).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Combined Arms).blk
index 747b050dd7b..57c6d2da161 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Combined Arms).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Combined Arms).blk	
@@ -125,7 +125,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Gunship).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Gunship).blk
index 6eca9fa813d..141f6739256 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Gunship).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Gunship).blk	
@@ -151,7 +151,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Tanker).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Tanker).blk
index 06cba4e9239..df968271747 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Tanker).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Tanker).blk	
@@ -123,7 +123,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Vehicle).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Vehicle).blk
index 6283b8d7073..9daca4ce705 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Vehicle).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Vehicle).blk	
@@ -123,7 +123,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Standard).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora.blk
index e4c404b496b..83e37a703ae 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Aurora.blk	
@@ -123,7 +123,7 @@ ISLargePulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Excalibur 'Pocket Warship'.blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Excalibur 'Pocket Warship'.blk
index 3cd05e817d5..efbb23b9417 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Excalibur 'Pocket Warship'.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Excalibur 'Pocket Warship'.blk	
@@ -191,7 +191,7 @@ Ammo Screen:20
 </structural_integrity>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Leopard 'Pocket Warship'.blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Leopard 'Pocket Warship'.blk
index 9e5d9d06d13..7bada23bc08 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Leopard 'Pocket Warship'.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Leopard 'Pocket Warship'.blk	
@@ -130,7 +130,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Mule 'Pocket Warship'.blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Mule 'Pocket Warship'.blk
index fa4fff7765b..301eae7d06f 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Mule 'Pocket Warship'.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Mule 'Pocket Warship'.blk	
@@ -139,7 +139,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Mule (Armored Pocket Warship).blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Mule (Armored Pocket Warship).blk
index 03776e5cd54..cd7ea7cb92a 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Mule (Armored Pocket Warship).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Mule (Armored Pocket Warship).blk	
@@ -137,7 +137,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Union 'Pocket Warship'.blk b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Union 'Pocket Warship'.blk
index cc7209db887..6d2022685e6 100644
--- a/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Union 'Pocket Warship'.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3075/Cutting Edge/Union 'Pocket Warship'.blk	
@@ -157,7 +157,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Aesir Assault Dropship (Standard).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Aesir Assault Dropship.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Aesir Assault Dropship (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Aesir Assault Dropship.blk
index c81fa20b7a8..2bafa5f167a 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Aesir Assault Dropship (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Aesir Assault Dropship.blk	
@@ -226,7 +226,7 @@ ISSmallNavalCommScannerSuite
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Isegrim Assault DropShip (Standard).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Isegrim Assault DropShip.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Isegrim Assault DropShip (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Isegrim Assault DropShip.blk
index 841d1f74398..ea14b1e40a7 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Isegrim Assault DropShip (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Isegrim Assault DropShip.blk	
@@ -176,7 +176,7 @@ Clan Ammo ATM-12 HE:30
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Vanir Assault Dropship (Standard).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Vanir Assault Dropship.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Vanir Assault Dropship (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Vanir Assault Dropship.blk
index ad16e7fc5c0..2b0e5978da5 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Vanir Assault Dropship (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/Clan/Vanir Assault Dropship.blk	
@@ -293,7 +293,7 @@ Assault DropShip
 </height>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (Refit).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (Refit).blk
index 7a3dd77aa19..83c549221e5 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (Refit).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (Refit).blk	
@@ -190,7 +190,7 @@ ISAMS Ammo:72
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (SCC).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (SCC).blk
index 25df3caa913..0d88a19026b 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (SCC).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (SCC).blk	
@@ -190,7 +190,7 @@ ISAMS Ammo:72
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (Standard).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship.blk
index 7a8f959be37..836c57e4f17 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Arondight Pocket Warship.blk	
@@ -190,7 +190,7 @@ ISAMS Ammo:72
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (SCC).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (SCC).blk
index 8de1acc72ad..1f5833745e8 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (SCC).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (SCC).blk	
@@ -193,7 +193,7 @@ IS Ammo MML-9 SRM Artemis-capable:66
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (Sub-Capital).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (Sub-Capital).blk
index ba18a906225..b2eb7c82618 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (Sub-Capital).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (Sub-Capital).blk	
@@ -151,7 +151,7 @@ ISAMS Ammo:24
 </structural_integrity>
 
 <source>
-JHS 3076 - Jihad
+Jihad Hot Spots:3076 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (Standard).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship.blk
index 42fb8fd0e53..639698342b7 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Interdictor Pocket Warship.blk	
@@ -182,7 +182,7 @@ ISAMS Ammo:24
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Taihou Assault Dropship (Standard).blk b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Taihou Assault Dropship.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Taihou Assault Dropship (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Taihou Assault Dropship.blk
index 13d8ae1e8fe..26ac581ccc1 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Taihou Assault Dropship (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Cutting Edge/IS/Taihou Assault Dropship.blk	
@@ -214,7 +214,7 @@ Assault DropShip
 </height>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/ONN/Nekohono'o (SCL).blk b/megamek/data/mechfiles/dropships/TRO3085/ONN/Nekohono'o (SCL).blk
index 696d2ce834a..a1ad208de59 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/ONN/Nekohono'o (SCL).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/ONN/Nekohono'o (SCL).blk	
@@ -204,7 +204,7 @@ ISNC3
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Supplemental/Dragau II Assault Interceptor (Standard).blk b/megamek/data/mechfiles/dropships/TRO3085/Supplemental/Dragau II Assault Interceptor.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3085/Supplemental/Dragau II Assault Interceptor (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3085/Supplemental/Dragau II Assault Interceptor.blk
index 2d784107081..64b372fb6da 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Supplemental/Dragau II Assault Interceptor (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Supplemental/Dragau II Assault Interceptor.blk	
@@ -146,17 +146,13 @@ ISAMS Ammo:72
 </structural_integrity>
 
 <source>
-TRO 3085S - Jihad
+TRO: 3085S - Jihad
 </source>
 
 <tonnage>
 2500.0
 </tonnage>
 
-<bv>
-14254
-</bv>
-
 <designtype>
 1
 </designtype>
diff --git a/megamek/data/mechfiles/dropships/TRO3085/Supplemental/Tiamat Pocket Warship (Standard).blk b/megamek/data/mechfiles/dropships/TRO3085/Supplemental/Tiamat Pocket Warship.blk
similarity index 99%
rename from megamek/data/mechfiles/dropships/TRO3085/Supplemental/Tiamat Pocket Warship (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3085/Supplemental/Tiamat Pocket Warship.blk
index 2abd58c4b3d..f1410274d1b 100644
--- a/megamek/data/mechfiles/dropships/TRO3085/Supplemental/Tiamat Pocket Warship (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3085/Supplemental/Tiamat Pocket Warship.blk	
@@ -282,7 +282,7 @@ Pocket WarShip
 </height>
 
 <source>
-Jihad Hot Spots: Terra - Jihad
+Jihad Hot Spots:Terra - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3145/Marik/Gorgon Carrier (Standard).blk b/megamek/data/mechfiles/dropships/TRO3145/Marik/Gorgon Carrier.blk
similarity index 97%
rename from megamek/data/mechfiles/dropships/TRO3145/Marik/Gorgon Carrier (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3145/Marik/Gorgon Carrier.blk
index 01011004b41..8349199302a 100644
--- a/megamek/data/mechfiles/dropships/TRO3145/Marik/Gorgon Carrier (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3145/Marik/Gorgon Carrier.blk	
@@ -141,7 +141,7 @@ ISAMS Ammo:72
 </structural_integrity>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3145/Marik/Seleucus Infantry Transport (Standard).blk b/megamek/data/mechfiles/dropships/TRO3145/Marik/Seleucus Infantry Transport.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3145/Marik/Seleucus Infantry Transport (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3145/Marik/Seleucus Infantry Transport.blk
index 41b818dea74..2ba7068379d 100644
--- a/megamek/data/mechfiles/dropships/TRO3145/Marik/Seleucus Infantry Transport (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3145/Marik/Seleucus Infantry Transport.blk	
@@ -160,7 +160,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3145/Merc/Nagasawa (Standard).blk b/megamek/data/mechfiles/dropships/TRO3145/Merc/Nagasawa.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3145/Merc/Nagasawa (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3145/Merc/Nagasawa.blk
index 801b1440ea3..cc4f2534c0e 100644
--- a/megamek/data/mechfiles/dropships/TRO3145/Merc/Nagasawa (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3145/Merc/Nagasawa.blk
@@ -157,7 +157,7 @@ CLLaserAntiMissileSystem
 </structural_integrity>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3145/Republic/Duat Military Transport (Standard).blk b/megamek/data/mechfiles/dropships/TRO3145/Republic/Duat Military Transport.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3145/Republic/Duat Military Transport (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3145/Republic/Duat Military Transport.blk
index 8ae0775cf07..72e77e5b4fe 100644
--- a/megamek/data/mechfiles/dropships/TRO3145/Republic/Duat Military Transport (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3145/Republic/Duat Military Transport.blk	
@@ -208,7 +208,7 @@ ISDroneExtra
 </structural_integrity>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3145/Steiner/Trutzburg (Standard).blk b/megamek/data/mechfiles/dropships/TRO3145/Steiner/Trutzburg.blk
similarity index 98%
rename from megamek/data/mechfiles/dropships/TRO3145/Steiner/Trutzburg (Standard).blk
rename to megamek/data/mechfiles/dropships/TRO3145/Steiner/Trutzburg.blk
index bbdf7631696..8658df06bee 100644
--- a/megamek/data/mechfiles/dropships/TRO3145/Steiner/Trutzburg (Standard).blk	
+++ b/megamek/data/mechfiles/dropships/TRO3145/Steiner/Trutzburg.blk
@@ -184,7 +184,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/TRO3150/Castrum Pocket WarShip.blk b/megamek/data/mechfiles/dropships/TRO3150/Castrum Pocket WarShip.blk
index b49c99cbdd0..35b754ef8fb 100644
--- a/megamek/data/mechfiles/dropships/TRO3150/Castrum Pocket WarShip.blk	
+++ b/megamek/data/mechfiles/dropships/TRO3150/Castrum Pocket WarShip.blk	
@@ -251,7 +251,7 @@ ISNC3
 </structural_integrity>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Davion/Conquistador Blockade Runner.blk b/megamek/data/mechfiles/dropships/XTRs/Davion/Conquistador Blockade Runner.blk
index acd127d763d..43149baaf44 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Davion/Conquistador Blockade Runner.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Davion/Conquistador Blockade Runner.blk	
@@ -242,7 +242,7 @@ ISLaserAntiMissileSystem
 </structural_integrity>
 
 <source>
-XTRO Davion - Jihad
+XTR: Davion - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Kurita/Nekohonoo HQ.blk b/megamek/data/mechfiles/dropships/XTRs/Kurita/Nekohonoo HQ.blk
index e1189377898..71288692b31 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Kurita/Nekohonoo HQ.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Kurita/Nekohonoo HQ.blk	
@@ -202,7 +202,7 @@ ISLargeNavalCommScannerSuite
 </structural_integrity>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Liao/Lung Wang Predator.blk b/megamek/data/mechfiles/dropships/XTRs/Liao/Lung Wang Predator.blk
index f101e3129aa..21a88f609a2 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Liao/Lung Wang Predator.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Liao/Lung Wang Predator.blk	
@@ -141,7 +141,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Marik/Merlin Ngake.blk b/megamek/data/mechfiles/dropships/XTRs/Marik/Merlin Ngake.blk
index c548f6bc03e..1a04c1d1683 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Marik/Merlin Ngake.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Marik/Merlin Ngake.blk	
@@ -135,7 +135,7 @@ ISLaserAntiMissileSystem
 </structural_integrity>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Periphery/Vengeance Pocket Warship Prototype.blk b/megamek/data/mechfiles/dropships/XTRs/Periphery/Vengeance Pocket Warship Prototype.blk
index d3ea37fb40c..789c8d39dad 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Periphery/Vengeance Pocket Warship Prototype.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Periphery/Vengeance Pocket Warship Prototype.blk	
@@ -183,7 +183,7 @@ ISSmallNavalCommScannerSuite
 </structural_integrity>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Phantoms/Vampire II.blk b/megamek/data/mechfiles/dropships/XTRs/Phantoms/Vampire II.blk
index 67ce808aed6..3feb5bcb6b7 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Phantoms/Vampire II.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Phantoms/Vampire II.blk	
@@ -119,7 +119,7 @@ Communications Equipment (8 ton)
 </structural_integrity>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Pirates/Leopard PA.blk b/megamek/data/mechfiles/dropships/XTRs/Pirates/Leopard PA.blk
index 64ce800e7db..53df39537e5 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Pirates/Leopard PA.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Pirates/Leopard PA.blk	
@@ -145,7 +145,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-XTRO Pirates - Jihad
+XTR: Pirates - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives II/Black Eagle Dropship.blk b/megamek/data/mechfiles/dropships/XTRs/Primitives II/Black Eagle Dropship.blk
index 5ff2680901d..7e9e2874179 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives II/Black Eagle Dropship.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives II/Black Eagle Dropship.blk	
@@ -173,7 +173,7 @@ We've reduced the cargo space to make the unit valid.
 </height>
 
 <source>
-TRO Primitives II - Age of War
+TRO: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship (Armored Carrier).blk b/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship (Armored Carrier).blk
index c450c2154f2..272ab031df1 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship (Armored Carrier).blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship (Armored Carrier).blk	
@@ -189,7 +189,7 @@ Combat Transport
 </height>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship (Mech Carrier).blk b/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship (Mech Carrier).blk
index c32100e19cf..60ecd938b32 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship (Mech Carrier).blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship (Mech Carrier).blk	
@@ -188,7 +188,7 @@ TARGETING:Unknown
 </height>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship.blk b/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship.blk
index ef9aa22ee71..77c9c83dd81 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives III/Czar Dropship.blk	
@@ -188,7 +188,7 @@ Combat Transport
 </height>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives IV/DroST IIa (2445).blk b/megamek/data/mechfiles/dropships/XTRs/Primitives IV/DroST IIa (2445).blk
index 9d32d890572..9b2ecfba8ea 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives IV/DroST IIa (2445).blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives IV/DroST IIa (2445).blk	
@@ -124,7 +124,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives IV/DroST IIa (2470).blk b/megamek/data/mechfiles/dropships/XTRs/Primitives IV/DroST IIa (2470).blk
index e7ddb007d02..8f29922d9c4 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives IV/DroST IIa (2470).blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives IV/DroST IIa (2470).blk	
@@ -121,7 +121,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives IV/Drost IIb (2445).blk b/megamek/data/mechfiles/dropships/XTRs/Primitives IV/Drost IIb (2445).blk
index 621cfc7bbb6..500a19e351c 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives IV/Drost IIb (2445).blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives IV/Drost IIb (2445).blk	
@@ -202,7 +202,7 @@ Cargo Transport
 </height>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives IV/Drost IIb (2470).blk b/megamek/data/mechfiles/dropships/XTRs/Primitives IV/Drost IIb (2470).blk
index ed5c0fb3b6a..5ff4070eb4d 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives IV/Drost IIb (2470).blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives IV/Drost IIb (2470).blk	
@@ -159,7 +159,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Primitives V/Saturn Patrol Ship.blk b/megamek/data/mechfiles/dropships/XTRs/Primitives V/Saturn Patrol Ship.blk
index 3be1f196408..59d24b84024 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Primitives V/Saturn Patrol Ship.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Primitives V/Saturn Patrol Ship.blk	
@@ -147,7 +147,7 @@ IS Ammo MG - Full:200
 </structural_integrity>
 
 <source>
-XTRO Primitives V - Age of War
+XTR: Primitives V - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/dropships/XTRs/Steiner/Claymore Interceptor.blk b/megamek/data/mechfiles/dropships/XTRs/Steiner/Claymore Interceptor.blk
index e7a12e7b3cb..3da3985ba62 100644
--- a/megamek/data/mechfiles/dropships/XTRs/Steiner/Claymore Interceptor.blk	
+++ b/megamek/data/mechfiles/dropships/XTRs/Steiner/Claymore Interceptor.blk	
@@ -134,7 +134,7 @@ CLERMediumLaser
 </structural_integrity>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Era Digests/Age of War/Firebird FR-1.blk b/megamek/data/mechfiles/fighters/Era Digests/Age of War/Firebird FR-1.blk
index 0c7ab1e77fb..20c9c786a8c 100644
--- a/megamek/data/mechfiles/fighters/Era Digests/Age of War/Firebird FR-1.blk	
+++ b/megamek/data/mechfiles/fighters/Era Digests/Age of War/Firebird FR-1.blk	
@@ -107,7 +107,7 @@ IS Ammo LRM-10
 </Fuselage Equipment>
 
 <source>
-ED: Age of War - Age of War
+Era Digest:Age of War - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/FR 2765/Liao/Thrush TR-5.blk b/megamek/data/mechfiles/fighters/FR 2765/Liao/Thrush TR-5.blk
index 511089dc8c4..9188e783308 100644
--- a/megamek/data/mechfiles/fighters/FR 2765/Liao/Thrush TR-5.blk	
+++ b/megamek/data/mechfiles/fighters/FR 2765/Liao/Thrush TR-5.blk	
@@ -104,7 +104,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-Field Report 2765 Liao - Age of War
+Field Report 2765 CCAF - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/FR 2765/Liao/Transit TR-9.blk b/megamek/data/mechfiles/fighters/FR 2765/Liao/Transit TR-9.blk
index 8b3fa196e1a..e286d694317 100644
--- a/megamek/data/mechfiles/fighters/FR 2765/Liao/Transit TR-9.blk	
+++ b/megamek/data/mechfiles/fighters/FR 2765/Liao/Transit TR-9.blk	
@@ -109,7 +109,7 @@ IS Ammo AC/20
 </Fuselage Equipment>
 
 <source>
-Field Report 2765 Liao - Age of War
+Field Report 2765 CCAF - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Chippewa IIC 2.blk b/megamek/data/mechfiles/fighters/Golden Century/Chippewa IIC 2.blk
index 59c69257ccb..d0564b35ca4 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Chippewa IIC 2.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Chippewa IIC 2.blk	
@@ -123,9 +123,6 @@ Clan Ammo LRM-15 (Clan) Artemis-capable
 Clan Ammo SRM-6 (Clan) Artemis-capable
 </Fuselage Equipment>
 
-<source>
-Succession Wars
-</source>
 
 <tonnage>
 90.0
@@ -160,7 +157,7 @@ TARGETING:Rander TAS
 </systemManufacturers>
 
 <source>
-TR:Golden Century - Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Chippewa IIC.blk b/megamek/data/mechfiles/fighters/Golden Century/Chippewa IIC.blk
index ea5d55ddf30..3cb756842e3 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Chippewa IIC.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Chippewa IIC.blk	
@@ -123,9 +123,7 @@ Clan Ammo LRM-15 (Clan) Artemis-capable
 Clan Streak SRM 4 Ammo
 </Fuselage Equipment>
 
-<source>
-Succession Wars
-</source>
+
 
 <tonnage>
 90.0
@@ -160,7 +158,7 @@ TARGETING:Rander TAS
 </systemManufacturers>
 
 <source>
-TR:Golden Century - Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Goth A.blk b/megamek/data/mechfiles/fighters/Golden Century/Goth A.blk
index bc4afd3d53e..995d8428b88 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Goth A.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Goth A.blk	
@@ -118,7 +118,7 @@ Clan Ammo SRM-6:OMNI
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Goth B.blk b/megamek/data/mechfiles/fighters/Golden Century/Goth B.blk
index aa0dafbd4f4..8c5b05eaff7 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Goth B.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Goth B.blk	
@@ -114,7 +114,7 @@ CLERLargeLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Goth C.blk b/megamek/data/mechfiles/fighters/Golden Century/Goth C.blk
index 178188f4bc0..479100ede60 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Goth C.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Goth C.blk	
@@ -118,7 +118,7 @@ CLRotaryAC5 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Goth D.blk b/megamek/data/mechfiles/fighters/Golden Century/Goth D.blk
index 8d7f8121ac6..e37fc19b964 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Goth D.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Goth D.blk	
@@ -120,7 +120,7 @@ Coolant Pod:OMNI
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Goth Prime.blk b/megamek/data/mechfiles/fighters/Golden Century/Goth Prime.blk
index 5d585d79c20..eb7cf7df7d8 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Goth Prime.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Goth Prime.blk	
@@ -122,7 +122,7 @@ Clan Ammo LRM-15 (Clan) Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Ironsides IRN-SD1b-EC.blk b/megamek/data/mechfiles/fighters/Golden Century/Ironsides IRN-SD1b-EC.blk
index 4771495db0e..cb3785b89d1 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Ironsides IRN-SD1b-EC.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Ironsides IRN-SD1b-EC.blk	
@@ -112,7 +112,7 @@ Ironsides EC: Following Klondike, Star Adder scientists began mass producing pro
 </history>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Issedone A.blk b/megamek/data/mechfiles/fighters/Golden Century/Issedone A.blk
index 432fc215dc6..f6051b7bbc3 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Issedone A.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Issedone A.blk	
@@ -106,7 +106,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO Golden Century
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Issedone B.blk b/megamek/data/mechfiles/fighters/Golden Century/Issedone B.blk
index 51585cddce9..c0e84139899 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Issedone B.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Issedone B.blk	
@@ -108,7 +108,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO Golden Century
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Issedone C.blk b/megamek/data/mechfiles/fighters/Golden Century/Issedone C.blk
index 08926b733fb..f752821e294 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Issedone C.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Issedone C.blk	
@@ -113,7 +113,7 @@ CLECMSuite:OMNI
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Issedone D.blk b/megamek/data/mechfiles/fighters/Golden Century/Issedone D.blk
index 154875af537..c9aa6c480bc 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Issedone D.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Issedone D.blk	
@@ -109,7 +109,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Issedone Prime.blk b/megamek/data/mechfiles/fighters/Golden Century/Issedone Prime.blk
index b4885b00186..b5d1360adf8 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Issedone Prime.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Issedone Prime.blk	
@@ -103,7 +103,7 @@ CLERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Kublai E.blk b/megamek/data/mechfiles/fighters/Golden Century/Kublai E.blk
index 43530bf8d3c..4acb09bbea1 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Kublai E.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Kublai E.blk	
@@ -116,7 +116,7 @@ IS Ultra AC/10 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Kublai F.blk b/megamek/data/mechfiles/fighters/Golden Century/Kublai F.blk
index e08f1bf9719..abeb7c2d0a2 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Kublai F.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Kublai F.blk	
@@ -110,7 +110,7 @@ ISAngelECMSuite:OMNI
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Kublai G.blk b/megamek/data/mechfiles/fighters/Golden Century/Kublai G.blk
index b115b251e1e..029801f5ac7 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Kublai G.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Kublai G.blk	
@@ -112,7 +112,7 @@ IS MRM 30 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Ogotai A.blk b/megamek/data/mechfiles/fighters/Golden Century/Ogotai A.blk
index b3d17cc1915..1089d37f892 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Ogotai A.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Ogotai A.blk	
@@ -109,7 +109,7 @@ Clan Ammo SRM-6 (Clan) Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Ogotai B.blk b/megamek/data/mechfiles/fighters/Golden Century/Ogotai B.blk
index d10fee47bed..1702adb0d68 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Ogotai B.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Ogotai B.blk	
@@ -108,7 +108,7 @@ Clan Ammo LRM-20:OMNI
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Ogotai Prime.blk b/megamek/data/mechfiles/fighters/Golden Century/Ogotai Prime.blk
index ac3eb1735a5..612cf70c05b 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Ogotai Prime.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Ogotai Prime.blk	
@@ -102,7 +102,7 @@ Clan Ammo LRM-10:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO Golden Century
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Pella.blk b/megamek/data/mechfiles/fighters/Golden Century/Pella.blk
index 5f3b0686fe3..368d5b821ef 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Pella.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Pella.blk	
@@ -106,7 +106,7 @@ Clan LB 5-X Cluster Ammo
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Qasar A.blk b/megamek/data/mechfiles/fighters/Golden Century/Qasar A.blk
index 02215e2547c..d2c87407e56 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Qasar A.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Qasar A.blk	
@@ -102,7 +102,7 @@ CLERLargeLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Qasar B.blk b/megamek/data/mechfiles/fighters/Golden Century/Qasar B.blk
index 7ad07f403f2..ebe20f94c58 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Qasar B.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Qasar B.blk	
@@ -105,7 +105,7 @@ Clan Streak SRM 6 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Qasar C.blk b/megamek/data/mechfiles/fighters/Golden Century/Qasar C.blk
index 3beb7eeaf0b..110217b0749 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Qasar C.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Qasar C.blk	
@@ -104,7 +104,7 @@ CLRotaryAC5 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Qasar D.blk b/megamek/data/mechfiles/fighters/Golden Century/Qasar D.blk
index 06900897006..2aaa2980894 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Qasar D.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Qasar D.blk	
@@ -108,7 +108,7 @@ Clan Ammo ATM-9:OMNI
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: Golden Century - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Qasar Prime.blk b/megamek/data/mechfiles/fighters/Golden Century/Qasar Prime.blk
index 6603fd74979..95e4d54bb69 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Qasar Prime.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Qasar Prime.blk	
@@ -101,7 +101,7 @@ CLERMediumLaser:OMNI
 </Aft Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Rapier RPR-100b-EC.blk b/megamek/data/mechfiles/fighters/Golden Century/Rapier RPR-100b-EC.blk
index bb98711f989..6fa1ec626ca 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Rapier RPR-100b-EC.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Rapier RPR-100b-EC.blk	
@@ -114,7 +114,7 @@ CLCASE
 </history>
 
 <source>
-Succession War
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
@@ -134,7 +134,7 @@ Clan Wolverine replaced the Large Pulse Lasers with Clan-spec versions and the m
 </deployment>
 
 <history>
-Bauer's unexpected decision to enter the military aerospace market in 2590 was a complete surprise to everyone, since it was better-known for making remote-controlled aerospace models than the real deal. However, their decision was based upon a new invention from one of their researchers, the veteran Dr. Lionel Rajan III, who developed a revolutionary neurocontrol device. This device used overlapping wave signals to produce a three-dimensional image of what the toy was "seeing" in the operator's mind. The SLDF was impressed with this revolutionary targeting and tracking system, especially since the Reunification War still raged with no end in sight, and gave the toy company a chance. A number of different prototypes, including a heavy Land-Air 'Mech, were rejected but it was the Rapier which won Bauer Enterprises its contract, with full production beginning in 2595. Besides its revolutionary Bauer Scope 130Y, the craft boasted good maneuverability and protection compared to craft of similar mass, sporting twelve tons of Philter Mech myomer-weave armor plating. It was widely deployed throughout the SLDF, with less advanced versions lacking the Scope 130Y used by the Lyran Commonwealth. Though the factory on Tharkad was never attacked during the Succession Wars, the Rapier still suffered from the loss of technological knowledge during that period, with downgraded versions of the fighter produced throughout the Inner Sphere. Only ComStar and the Word of Blake are known to still field Star League-quality Rapiers. Bauer Enterprises was poised to begin production of new models of the Rapier when a Blakist assault in late 3067 destroyed the Tharkad factory, though enough of the facility apparently survived to roll out a few of the new variant.
+Bauer's unexpected decision to enter the military aerospace market in 2590 was a complete surprise to everyone, since it was better-known for making remote-controlled aerospace models than the real deal. However, their decision was based upon a new invention from one of their researchers, the veteran Dr. Lionel Rajan III, who developed a revolutionary neurocontrol device. This device used overlapping wave signals to produce a three-dimensional image of what the toy was "seeing" in the operator's mind. The SLDF was impressed with this revolutionary targeting and tracking system, especially since the Reunification War still raged with no end in sight, and gave the toy company a chance. A number of different prototypes, including a heavy Land-Air 'Mech, were rejected but it was the Rapier which won Bauer Enterprises its contract, with full production beginning in 2595. Besides its revolutionary Bauer Scope 130Y, the craft boasted good maneuverability and protection compared to craft of similar mass, sporting twelve tons of Philter Mech myomer-weave armor plating. It was widely deployed throughout the SLDF, with less advanced versions lacking the Scope 130Y used by the Lyran Commonwealth. Though the factory on Tharkad was never attacked during the TRO: Golden Century - Early Succession War, the Rapier still suffered from the loss of technological knowledge during that period, with downgraded versions of the fighter produced throughout the Inner Sphere. Only ComStar and the Word of Blake are known to still field Star League-quality Rapiers. Bauer Enterprises was poised to begin production of new models of the Rapier when a Blakist assault in late 3067 destroyed the Tharkad factory, though enough of the facility apparently survived to roll out a few of the new variant.
 </history>
 
 <manufacturer>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Sabre SB-27b-EC.blk b/megamek/data/mechfiles/fighters/Golden Century/Sabre SB-27b-EC.blk
index 1f869d2cd52..41902aa1253 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Sabre SB-27b-EC.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Sabre SB-27b-EC.blk	
@@ -109,7 +109,7 @@ Cloud Cobra technicians modified the Clan’s remaining stock of Royal Sabres wi
 </history>
 
 <source>
-TRO Golden Century - Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Golden Century/Tomahawk THK-63-EC.blk b/megamek/data/mechfiles/fighters/Golden Century/Tomahawk THK-63-EC.blk
index 48132cbc59e..9dd24aab255 100644
--- a/megamek/data/mechfiles/fighters/Golden Century/Tomahawk THK-63-EC.blk	
+++ b/megamek/data/mechfiles/fighters/Golden Century/Tomahawk THK-63-EC.blk	
@@ -112,7 +112,7 @@ Very popular with early clan pilots, technicians swapped the twin large lasers f
 </history>
 
 <source>
-Succession War
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Hist LofT/Voidseeker Mk 39-004 Interceptor.blk b/megamek/data/mechfiles/fighters/Hist LofT/Voidseeker Mk 39-004 Interceptor.blk
index 9ac5af7c4f1..adab0408863 100644
--- a/megamek/data/mechfiles/fighters/Hist LofT/Voidseeker Mk 39-004 Interceptor.blk	
+++ b/megamek/data/mechfiles/fighters/Hist LofT/Voidseeker Mk 39-004 Interceptor.blk	
@@ -120,7 +120,7 @@ Designed to work in conjunction with the much larger M-5 Caspar SDS drone warshi
 </deployment>
 
 <history>
-he Voidseeker replaced the Mark 30 BlackWasp drone fighter and it can be speculated that, like the BlackWasp, the Mark 39 could be launched from the Caspar drones or carrier satellites. The Mark 39 is noted for having superior resistance to electronic warfare gear, compared to its predecessor. The most notable feature about the Mark 39 is that their sophisticated battle computers are capable of coordinating attacks with other Mark 39 and M-5 units by forming a decentralized computer network, which allows the drones to collectively make tactical decisions. The advantages include preventing overcommitting drones against a single target, and the impossibility of neutralizing the defenders by taking out any central command unit. The Mark 39 drones could also be slaved to a human controller. After the initial Voidseeker design was created and deemed successful, engineers created two versions: The MK 39-004 Interceptor and the MK 39-007 Striker. The Mark 39 family was very successful and deployed in vast numbers (by the thousands) in areas that did not warrant the deployment of M-5 Caspars, such as deep space naval installations like Camelot Command and planetary systems of minor value. Most of the Mark 39 systems had been destroyed, deactivated or otherwise neutralized by the end of the Second Succession War but some can still found in active service. Like landmines, the Mark 39 drones maintain a passive listening mode and respond to all ships that fail to provide a correct IFF transponder code.
+The Voidseeker replaced the Mark 30 BlackWasp drone fighter and it can be speculated that, like the BlackWasp, the Mark 39 could be launched from the Caspar drones or carrier satellites. The Mark 39 is noted for having superior resistance to electronic warfare gear, compared to its predecessor. The most notable feature about the Mark 39 is that their sophisticated battle computers are capable of coordinating attacks with other Mark 39 and M-5 units by forming a decentralized computer network, which allows the drones to collectively make tactical decisions. The advantages include preventing overcommitting drones against a single target, and the impossibility of neutralizing the defenders by taking out any central command unit. The Mark 39 drones could also be slaved to a human controller. After the initial Voidseeker design was created and deemed successful, engineers created two versions: The MK 39-004 Interceptor and the MK 39-007 Striker. The Mark 39 family was very successful and deployed in vast numbers (by the thousands) in areas that did not warrant the deployment of M-5 Caspars, such as deep space naval installations like Camelot Command and planetary systems of minor value. Most of the Mark 39 systems had been destroyed, deactivated or otherwise neutralized by the end of the Second Succession War but some can still found in active service. Like landmines, the Mark 39 drones maintain a passive listening mode and respond to all ships that fail to provide a correct IFF transponder code.
 </history>
 
 <manufacturer>
@@ -136,7 +136,7 @@ Adding 4 points of armor 1 to each wing, 2 to the aft. Also reduced fuel by 1 to
 </notes>
 
 <source>
-Hist: LofT Vol 1 - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Hist LofT/Voidseeker Mk 39-007 Striker.blk b/megamek/data/mechfiles/fighters/Hist LofT/Voidseeker Mk 39-007 Striker.blk
index efe3c5776de..75ee9471c16 100644
--- a/megamek/data/mechfiles/fighters/Hist LofT/Voidseeker Mk 39-007 Striker.blk	
+++ b/megamek/data/mechfiles/fighters/Hist LofT/Voidseeker Mk 39-007 Striker.blk	
@@ -123,7 +123,7 @@ Designed to work in conjunction with the much larger M-5 Caspar SDS drone warshi
 </deployment>
 
 <history>
-he Voidseeker replaced the Mark 30 BlackWasp drone fighter and it can be speculated that, like the BlackWasp, the Mark 39 could be launched from the Caspar drones or carrier satellites. The Mark 39 is noted for having superior resistance to electronic warfare gear, compared to its predecessor. The most notable feature about the Mark 39 is that their sophisticated battle computers are capable of coordinating attacks with other Mark 39 and M-5 units by forming a decentralized computer network, which allows the drones to collectively make tactical decisions. The advantages include preventing overcommitting drones against a single target, and the impossibility of neutralizing the defenders by taking out any central command unit. The Mark 39 drones could also be slaved to a human controller. After the initial Voidseeker design was created and deemed successful, engineers created two versions: The MK 39-004 Interceptor and the MK 39-007 Striker. The Mark 39 family was very successful and deployed in vast numbers (by the thousands) in areas that did not warrant the deployment of M-5 Caspars, such as deep space naval installations like Camelot Command and planetary systems of minor value. Most of the Mark 39 systems had been destroyed, deactivated or otherwise neutralized by the end of the Second Succession War but some can still found in active service. Like landmines, the Mark 39 drones maintain a passive listening mode and respond to all ships that fail to provide a correct IFF transponder code.
+The Voidseeker replaced the Mark 30 BlackWasp drone fighter and it can be speculated that, like the BlackWasp, the Mark 39 could be launched from the Caspar drones or carrier satellites. The Mark 39 is noted for having superior resistance to electronic warfare gear, compared to its predecessor. The most notable feature about the Mark 39 is that their sophisticated battle computers are capable of coordinating attacks with other Mark 39 and M-5 units by forming a decentralized computer network, which allows the drones to collectively make tactical decisions. The advantages include preventing overcommitting drones against a single target, and the impossibility of neutralizing the defenders by taking out any central command unit. The Mark 39 drones could also be slaved to a human controller. After the initial Voidseeker design was created and deemed successful, engineers created two versions: The MK 39-004 Interceptor and the MK 39-007 Striker. The Mark 39 family was very successful and deployed in vast numbers (by the thousands) in areas that did not warrant the deployment of M-5 Caspars, such as deep space naval installations like Camelot Command and planetary systems of minor value. Most of the Mark 39 systems had been destroyed, deactivated or otherwise neutralized by the end of the Second Succession War but some can still found in active service. Like landmines, the Mark 39 drones maintain a passive listening mode and respond to all ships that fail to provide a correct IFF transponder code.
 </history>
 
 <manufacturer>
@@ -139,7 +139,7 @@ Added 1 point to aft armor. Reduced fuel by .5 tons.
 </notes>
 
 <source>
-Hist: LofT Vol 1 - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Hist Reunification War/MM-1 Dragonfly.blk b/megamek/data/mechfiles/fighters/Hist Reunification War/MM-1 Dragonfly.blk
index f0738684c41..9ccc812b3fc 100644
--- a/megamek/data/mechfiles/fighters/Hist Reunification War/MM-1 Dragonfly.blk	
+++ b/megamek/data/mechfiles/fighters/Hist Reunification War/MM-1 Dragonfly.blk	
@@ -100,7 +100,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-H:Reunification War - Age of War
+Historical:Reunification War - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/JHS Terra/Aeshna Heavy Drone Fighter.blk b/megamek/data/mechfiles/fighters/JHS Terra/Aeshna Heavy Drone Fighter.blk
index fec922ed1d6..0787560deac 100644
--- a/megamek/data/mechfiles/fighters/JHS Terra/Aeshna Heavy Drone Fighter.blk	
+++ b/megamek/data/mechfiles/fighters/JHS Terra/Aeshna Heavy Drone Fighter.blk	
@@ -116,7 +116,7 @@ Aerospace Smart Robotic Control System (Improved) gives the Aeshna a Piloting Sk
 </notes>
 
 <source>
-JHS:Terra - Jihad
+Jihad Hot Spots:Terra - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/JHS Terra/Scarab Medium Drone Fighter.blk b/megamek/data/mechfiles/fighters/JHS Terra/Scarab Medium Drone Fighter.blk
index 94b5b0e2119..e3de829c3d7 100644
--- a/megamek/data/mechfiles/fighters/JHS Terra/Scarab Medium Drone Fighter.blk	
+++ b/megamek/data/mechfiles/fighters/JHS Terra/Scarab Medium Drone Fighter.blk	
@@ -107,7 +107,7 @@ ImprovedSmartRoboticControlSystem
 </Fuselage Equipment>
 
 <source>
-JHS Terra - Jihad
+Jihad Hot Spots:Terra - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/JHS Terra/Tabanid Light Drone Fighter.blk b/megamek/data/mechfiles/fighters/JHS Terra/Tabanid Light Drone Fighter.blk
index 3fd3aa196e0..561e7ff5af6 100644
--- a/megamek/data/mechfiles/fighters/JHS Terra/Tabanid Light Drone Fighter.blk	
+++ b/megamek/data/mechfiles/fighters/JHS Terra/Tabanid Light Drone Fighter.blk	
@@ -104,7 +104,7 @@ ImprovedSmartRoboticControlSystem
 </Fuselage Equipment>
 
 <source>
-JHS Terra - Jihad
+Jihad Hot Spots:Terra - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Chippewa CHP-W5b.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Chippewa CHP-W5b.blk
index de27b6d903d..02fc9aac515 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Chippewa CHP-W5b.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Chippewa CHP-W5b.blk	
@@ -117,7 +117,7 @@ IS Ammo LRM-15 Artemis-capable
 </Fuselage Equipment>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Corsair CSR-V12b.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Corsair CSR-V12b.blk
index f12e4c81bc5..4f6787aae8d 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Corsair CSR-V12b.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Corsair CSR-V12b.blk	
@@ -140,7 +140,7 @@ TARGETING:Ranker TA800
 </systemManufacturers>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Eagle EGL-R6b.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Eagle EGL-R6b.blk
index 6ef0f1f18a4..25aedb7fa13 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Eagle EGL-R6b.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Eagle EGL-R6b.blk	
@@ -110,7 +110,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Hellcat II HCT-213C.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Hellcat II HCT-213C.blk
index 69306c4c689..c1169621055 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Hellcat II HCT-213C.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Hellcat II HCT-213C.blk	
@@ -107,7 +107,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Lightning LTN-G15b.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Lightning LTN-G15b.blk
index 5495cf22d29..ad8001149d3 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Lightning LTN-G15b.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Lightning LTN-G15b.blk	
@@ -110,7 +110,7 @@ IS Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Sabre SB-27b.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Sabre SB-27b.blk
index 2734cfc1ebb..483ed82efb8 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Sabre SB-27b.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Sabre SB-27b.blk	
@@ -107,7 +107,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Stuka STU-K5b.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Stuka STU-K5b.blk
index 27b020681a1..773714609ca 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Stuka STU-K5b.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Stuka STU-K5b.blk	
@@ -112,7 +112,7 @@ IS Ammo AC/20
 </Fuselage Equipment>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
@@ -156,7 +156,7 @@ This variant is unique to the MUL as it has the ER PPCs. But I've adjusted the d
 </notes>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Stuka STU-K5b2.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Stuka STU-K5b2.blk
index 9ea71b2ac32..fd21209a722 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Stuka STU-K5b2.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Stuka STU-K5b2.blk	
@@ -148,7 +148,7 @@ This variant is unique to the MUL as it has the ER PPCs. But I've adjusted the d
 </notes>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Thunderbird TRB-D36b.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Thunderbird TRB-D36b.blk
index d90f8d71782..60030bff6f3 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Thunderbird TRB-D36b.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Thunderbird TRB-D36b.blk	
@@ -116,7 +116,7 @@ IS Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Operation Klondike/Zero ZRO-116b.blk b/megamek/data/mechfiles/fighters/Operation Klondike/Zero ZRO-116b.blk
index f96347560d8..83cb0e28a5b 100644
--- a/megamek/data/mechfiles/fighters/Operation Klondike/Zero ZRO-116b.blk	
+++ b/megamek/data/mechfiles/fighters/Operation Klondike/Zero ZRO-116b.blk	
@@ -105,7 +105,7 @@ ISMediumPulseLaser
 </Fuselage Equipment>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Cheetah OF-17A-R.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Cheetah OF-17A-R.blk
index 37b0ec7cf4d..9379a6e5a1f 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Cheetah OF-17A-R.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Cheetah OF-17A-R.blk	
@@ -108,7 +108,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Corax C.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Corax C.blk
index 26ed945b648..7f4174bd197 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Corax C.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Corax C.blk	
@@ -107,7 +107,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Corsair CSR-12D.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Corsair CSR-12D.blk
index 51b88419202..dd858a1b3d1 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Corsair CSR-12D.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Corsair CSR-12D.blk	
@@ -138,7 +138,7 @@ TARGETING:Ranker TA1000
 </systemManufacturers>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Hydaspes 3.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Hydaspes 3.blk
index 6c825b08db4..42e4f4d8d61 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Hydaspes 3.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Hydaspes 3.blk	
@@ -121,7 +121,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Lucifer III  LCR-3.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Lucifer III  LCR-3.blk
index 4b338afc0d0..6a56e8e7351 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Lucifer III  LCR-3.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Lucifer III  LCR-3.blk	
@@ -109,7 +109,7 @@ IS Ammo Extended LRM-10
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Persepolis.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Persepolis.blk
index 162314ef891..78fe514a027 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Persepolis.blk
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Persepolis.blk
@@ -142,7 +142,7 @@ TARGETING:Omicron XX
 </systemManufacturers>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Rapier RPR-300S.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Rapier RPR-300S.blk
index ebb25fdfebf..10fcf8298a1 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Rapier RPR-300S.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Rapier RPR-300S.blk	
@@ -145,7 +145,7 @@ TARGETING:Bauer-Scope 130Z
 </systemManufacturers>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Sabre SB-31D.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Sabre SB-31D.blk
index 2824e14473e..d1cd50842e8 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Sabre SB-31D.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Sabre SB-31D.blk	
@@ -107,7 +107,7 @@ ISLaserAntiMissileSystem
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Suzaku SU-14.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Suzaku SU-14.blk
index 50634eeef8e..fcbc1df78fc 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Suzaku SU-14.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Suzaku SU-14.blk	
@@ -141,7 +141,7 @@ TARGETING:Chichester ASR30
 </systemManufacturers>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Transit TR-13G.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Transit TR-13G.blk
index c13921d204a..7b444a9d2d9 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Transit TR-13G.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Transit TR-13G.blk	
@@ -109,7 +109,7 @@ ISLongTomCannonAmmo
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Tyre 3.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Tyre 3.blk
index a4ec56e2e75..08f47831b7f 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Tyre 3.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Tyre 3.blk	
@@ -114,7 +114,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Umbra RF-1.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Umbra RF-1.blk
index 594c3f4cc77..ff5ecf2694a 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Umbra RF-1.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Umbra RF-1.blk	
@@ -105,7 +105,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Wildkatze WKT-1S.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Wildkatze WKT-1S.blk
index f7f96510ba8..100e9fc2356 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Wildkatze WKT-1S.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Wildkatze WKT-1S.blk	
@@ -107,7 +107,7 @@ IS Ammo MML-5 LRM
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/ProtoTypes/Wildkatze WKT-2S.blk b/megamek/data/mechfiles/fighters/ProtoTypes/Wildkatze WKT-2S.blk
index 2f3a97d1df4..0c03ba96c0a 100644
--- a/megamek/data/mechfiles/fighters/ProtoTypes/Wildkatze WKT-2S.blk	
+++ b/megamek/data/mechfiles/fighters/ProtoTypes/Wildkatze WKT-2S.blk	
@@ -111,7 +111,7 @@ ISAMS Ammo
 </Fuselage Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/Somerset Strikers/Banshee BSE-X2.blk b/megamek/data/mechfiles/fighters/Somerset Strikers/Banshee BSE-X2.blk
index 3529c1c118a..04b8b7de0cc 100644
--- a/megamek/data/mechfiles/fighters/Somerset Strikers/Banshee BSE-X2.blk	
+++ b/megamek/data/mechfiles/fighters/Somerset Strikers/Banshee BSE-X2.blk	
@@ -95,7 +95,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-Somerset Stikers
+Somerset Strikers - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-10.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-10.blk
index bd6163e922f..8f6403dd8b7 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-10.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-10.blk	
@@ -96,7 +96,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-R.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-R.blk
index 0670f623742..862ecf970b0 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-R.blk	
@@ -94,7 +94,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-RR.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-RR.blk
index 56597368cd1..6f00505bd34 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-RR.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11-RR.blk	
@@ -96,7 +96,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11.blk
index c1cb9540f9c..3bd90214da1 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-11.blk	
@@ -104,7 +104,7 @@ ISMediumPulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-12-S.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-12-S.blk
index a66288b9732..d9b646d69d5 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-12-S.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-12-S.blk	
@@ -96,7 +96,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-13.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-13.blk
index d11e41f5525..b270928dd6a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-13.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-13.blk	
@@ -106,7 +106,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-14-S.blk b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-14-S.blk
index 51edac16430..191d739e6da 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-14-S.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Cheetah F-14-S.blk	
@@ -97,7 +97,7 @@ IS Streak SRM 2 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W10.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W10.blk
index 79aa6b5474a..4a2b235e10b 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W10.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W10.blk	
@@ -107,7 +107,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
@@ -143,7 +143,7 @@ TARGETING:Rander TAS
 </systemManufacturers>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W5.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W5.blk
index b8e34190078..148f392ae32 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W5.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W5.blk	
@@ -109,7 +109,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
@@ -145,7 +145,7 @@ TARGETING:Rander TAS
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7.blk
index 6c90b234cae..09c6b3566f0 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7.blk	
@@ -117,7 +117,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
@@ -153,7 +153,7 @@ TARGETING:Rander TAS
 </systemManufacturers>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7T.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7T.blk
index 707474766c0..92e0f72be0e 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7T.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W7T.blk	
@@ -150,7 +150,7 @@ TARGETING:Rander TAS
 </systemManufacturers>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W8.blk b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W8.blk
index f36345162e9..1f9f4e3432e 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W8.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Chippewa CHP-W8.blk	
@@ -118,7 +118,7 @@ IS Ammo MML-7 SRM Artemis-capable
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
@@ -154,7 +154,7 @@ TARGETING:Rander TAS
 </systemManufacturers>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12.blk
index 449b58ec223..d4f5ee65a12 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12.blk	
@@ -101,7 +101,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12M Regulus.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12M Regulus.blk
index a152d91fdf6..2ca75b1a120 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12M Regulus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V12M Regulus.blk	
@@ -100,7 +100,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession War
+TRO: 3039 - Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V14.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V14.blk
index a52c574ed79..b3c65dcf311 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V14.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V14.blk	
@@ -101,7 +101,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V18.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V18.blk
index 19142d0dd63..046fef9d0e6 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V18.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V18.blk	
@@ -109,7 +109,7 @@ ISERSmallLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V20.blk b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V20.blk
index b6e10f4979b..cf782448cc2 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V20.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Corsair CSR-V20.blk	
@@ -97,7 +97,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk
index 96a3ef33894..0a60654688a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk	
@@ -104,7 +104,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk
index 868937f87d7..74d3062e125 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk	
@@ -113,7 +113,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk
index 6a7c4ea80da..3d8707349fd 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk	
@@ -106,7 +106,7 @@ IS Ammo LRM-20
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk
index 8c6591d1d2c..5bb89d92a4b 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk	
@@ -111,7 +111,7 @@ IS Streak SRM 2 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk
index b52718e7193..3253a58c9c1 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk	
@@ -100,7 +100,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100.blk
index 58919ba9fd4..e3d65fc7ae1 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100.blk	
@@ -107,7 +107,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100a.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100a.blk
index 3d18326543e..f91504b0819 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100a.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100a.blk	
@@ -107,7 +107,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100b.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100b.blk
index 502ba625dad..798d66de953 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100b.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-100b.blk	
@@ -103,7 +103,7 @@ IS Ammo AC/5
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700.blk
index 90cd2017822..c73f889f3d0 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700.blk	
@@ -108,7 +108,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700a.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700a.blk
index 7d98e9d50e4..d46c4663202 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700a.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700a.blk	
@@ -113,7 +113,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700b.blk b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700b.blk
index c072a76977e..ca0baf487b6 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700b.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Riever F-700b.blk	
@@ -119,7 +119,7 @@ IS Streak SRM 6 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-3.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-3.blk
index 3bd4f00b7f3..5001ca1f954 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-3.blk	
@@ -98,7 +98,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4.blk
index 7b3eb74a88f..df402d3ab55 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4.blk	
@@ -108,7 +108,7 @@ IS Ammo SRM-4 Artemis-capable
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4C.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4C.blk
index c6047ea77cd..082e8b92f90 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4C.blk	
@@ -109,7 +109,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4X.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4X.blk
index 9eef4ec2aa6..a3803c7400a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4X.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-4X.blk	
@@ -104,7 +104,7 @@ ISMediumPulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-7.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-7.blk
index 443df0bf72d..e1baa2e8ec0 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-7.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-7.blk	
@@ -99,7 +99,7 @@ IS MRM 10 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-8.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-8.blk
index 41b14a37c13..0f6373368f7 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sai S-8.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sai S-8.blk	
@@ -107,7 +107,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-25.blk b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-25.blk
index af48adf5f13..8cb896c027d 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-25.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-25.blk	
@@ -103,7 +103,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-26.blk b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-26.blk
index 35d31288c00..82ea42f0ebb 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-26.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-26.blk	
@@ -111,7 +111,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-27.blk b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-27.blk
index e0c86bf9700..30c4ab7cc26 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-27.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Samurai SL-27.blk	
@@ -114,7 +114,7 @@ ISPlasmaRifleAmmo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-21.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-21.blk
index 7d887c2e5d6..1e8bb474d9a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-21.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-21.blk	
@@ -94,7 +94,7 @@ Large Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z1.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z1.blk
index 4b6eee94b82..756af551c34 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z1.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z1.blk	
@@ -94,7 +94,7 @@ Large Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2.blk
index 212af7b25f7..145c44f45b2 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2.blk	
@@ -98,7 +98,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2A.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2A.blk
index 437be6a422a..9fc6f5b93fe 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2A.blk	
@@ -106,7 +106,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2B.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2B.blk
index f2c8df3ec5c..f892212bb5a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z2B.blk	
@@ -105,7 +105,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3.blk
index 58ed30e0980..8299bb80e1e 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3.blk	
@@ -95,7 +95,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3A.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3A.blk
index 4d15076c1d9..a652df53b59 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z3A.blk	
@@ -103,7 +103,7 @@ ISMediumPulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z4.blk b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z4.blk
index 91797f428af..ddd99d120f0 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z4.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Seydlitz SYD-Z4.blk	
@@ -102,7 +102,7 @@ ISERLargeLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17.blk b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17.blk
index ce3e88f6b90..1c4da78eb6a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17.blk	
@@ -101,7 +101,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17AC.blk b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17AC.blk
index 2b0287c194a..921ce3398f4 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17AC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17AC.blk	
@@ -101,7 +101,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17R.blk b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17R.blk
index 9f0bd40ccec..1035b28ce7c 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-17R.blk	
@@ -101,7 +101,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-18.blk b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-18.blk
index 454257eacbb..5543733180a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-18.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Shilone SL-18.blk	
@@ -112,7 +112,7 @@ IS Ammo MML-7 SRM
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21.blk
index 425bc2a49b2..6ac1d6f91ba 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21.blk	
@@ -97,7 +97,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21L.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21L.blk
index 795ccebc464..21770c3a103 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21L.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-21L.blk	
@@ -97,7 +97,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-22.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-22.blk
index b0702344a13..a9695ff38e2 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-22.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sholagar SL-22.blk	
@@ -106,7 +106,7 @@ IS Ammo MML-7 SRM
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15.blk
index 5f193c2cee8..5ee58f9839a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15.blk	
@@ -102,7 +102,7 @@ IS Ammo AC/10
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15A.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15A.blk
index f887fd5a44b..40401f8f388 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15A.blk	
@@ -105,7 +105,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15B.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15B.blk
index ef69ee81c61..ed3c4dd4759 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15B.blk	
@@ -105,7 +105,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15C.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15C.blk
index 840343eaae0..70004b58664 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15C.blk	
@@ -105,7 +105,7 @@ IS Ammo LRM-15
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15K.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15K.blk
index f87601be58e..404d5a7ed80 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15K.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15K.blk	
@@ -103,7 +103,7 @@ IS LB 10-X Cluster Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15R.blk b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15R.blk
index 538aba3c1a3..5aca1f5d05f 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Slayer SL-15R.blk	
@@ -103,7 +103,7 @@ IS LB 10-X Cluster Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-6D.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-6D.blk
index 0a7f6890acd..5f0e790cf1c 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-6D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-6D.blk	
@@ -105,7 +105,7 @@ ISSmallPulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-7D.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-7D.blk
index a584f8d25e0..e8b4b7abc18 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-7D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-7D.blk	
@@ -105,7 +105,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-8H.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-8H.blk
index 808ac81d010..64d14b4f0c0 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-8H.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-8H.blk	
@@ -96,7 +96,7 @@ IS Ammo SRM-2
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5.blk
index e861677d993..bfbc5757334 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5.blk	
@@ -97,7 +97,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5K.blk b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5K.blk
index 8785cdf864c..559c27bde4a 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5K.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Sparrowhawk SPR-H5K.blk	
@@ -99,7 +99,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90.blk
index 09f6ae2d710..f5f1818e3bc 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90.blk	
@@ -98,7 +98,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90S.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90S.blk
index ead746309fa..5f706c39360 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90S.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-90S.blk	
@@ -99,7 +99,7 @@ IS Ammo AC/5
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-92.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-92.blk
index 0636c366cd2..c03fef78d2d 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-92.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-92.blk	
@@ -98,7 +98,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-94.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-94.blk
index 7739d5892c9..3abe6beb7ab 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-94.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-94.blk	
@@ -100,7 +100,7 @@ IS Ammo LRM-10
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-95.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-95.blk
index 586ca47bb87..f66e9848a94 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-95.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stingray F-95.blk	
@@ -104,7 +104,7 @@ ISERLargeLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D6.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D6.blk
index 8553540d902..db862322509 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D6.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D6.blk	
@@ -112,7 +112,7 @@ IS Ammo LRM-20
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
@@ -156,7 +156,7 @@ This variant is unique to the MUL as it has the ER PPCs. But I've adjusted the d
 </notes>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D7.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D7.blk
index a0be829fc58..f2de0c51126 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D7.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-D7.blk	
@@ -120,7 +120,7 @@ ISRotaryAC5 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
@@ -164,7 +164,7 @@ This variant is unique to the MUL as it has the ER PPCs. But I've adjusted the d
 </notes>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K10.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K10.blk
index 26eb7130b2e..fb5f5b34ef8 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K10.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K10.blk	
@@ -106,7 +106,7 @@ IS Ammo LRM-20
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
@@ -150,7 +150,7 @@ This variant is unique to the MUL as it has the ER PPCs. But I've adjusted the d
 </notes>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K15.blk
index e4dc154fdd7..8033063b9b6 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K15.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K15.blk	
@@ -111,7 +111,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
@@ -155,7 +155,7 @@ This variant is unique to the MUL as it has the ER PPCs. But I've adjusted the d
 </notes>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K5.blk b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K5.blk
index d562cc48c7d..8d4fdaf2536 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K5.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Stuka STU-K5.blk	
@@ -105,7 +105,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
@@ -148,7 +148,7 @@ This variant is unique to the MUL as it has the ER PPCs. But I've adjusted the d
 </notes>
 
 <source>
-H:Operation Klondyke - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7.blk b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7.blk
index d845f03b2ee..d4f2f4b387c 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7.blk	
@@ -96,7 +96,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7p.blk b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7p.blk
index 33f9c8645ec..988b6f73852 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7p.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-7p.blk	
@@ -95,7 +95,7 @@ ISMediumPulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-8.blk b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-8.blk
index b61bbc84f16..eab874cc6c8 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-8.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Thrush TR-8.blk	
@@ -96,7 +96,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13.blk
index e0ac0542bf8..b3e2a7b636c 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13.blk	
@@ -100,7 +100,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13A.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13A.blk
index 6170af321ff..2355383f0a5 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-13A.blk	
@@ -100,7 +100,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-14 AC.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-14 AC.blk
index b09dea655ce..d954f1b92c7 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-14 AC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-14 AC.blk	
@@ -100,7 +100,7 @@ IS Ammo AC/20
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-15.blk
index d36bf1d81c5..d5c1d280efc 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-15.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-15.blk	
@@ -108,7 +108,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Jihad
+TRO: 3039 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-16.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-16.blk
index 01bf809488b..7eeaf4fe1ce 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-16.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Transgressor TR-16.blk	
@@ -110,7 +110,7 @@ IS Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-10.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-10.blk
index 8f57e1b296e..faf5fe8d6db 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-10.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-10.blk	
@@ -100,7 +100,7 @@ IS Ammo AC/20
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-11.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-11.blk
index dee8ea156ac..4778d7c008d 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-11.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-11.blk	
@@ -101,7 +101,7 @@ variant that removes the four lasers; instead, the cockpit is widened to make ro
 </notes>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-12.blk b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-12.blk
index 28d741613d0..245282f2e5b 100644
--- a/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-12.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3039u/Transit TR-12.blk	
@@ -102,7 +102,7 @@ IS LB 20-X Cluster Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/Clan/Swift C.blk b/megamek/data/mechfiles/fighters/TRO3050U/Clan/Swift C.blk
index 927f2998420..a9a284eb2cc 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/Clan/Swift C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/Clan/Swift C.blk	
@@ -103,7 +103,7 @@ CLERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Succession Wars
+TRO: 3050u - Succession Wars
 </source>
 
 <tonnage>
@@ -139,5 +139,5 @@ TARGETING:PhantomTrac 55
 </systemManufacturers>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/Clan/Tomahawk C.blk b/megamek/data/mechfiles/fighters/TRO3050U/Clan/Tomahawk C.blk
index 521de94feda..f7f521ea9ec 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/Clan/Tomahawk C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/Clan/Tomahawk C.blk	
@@ -104,7 +104,7 @@ CLERLargeLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Succession Wars
+TRO: 3050u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/Clan/Tomahawk CH.blk b/megamek/data/mechfiles/fighters/TRO3050U/Clan/Tomahawk CH.blk
index f26b591407d..a257c2b70e1 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/Clan/Tomahawk CH.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/Clan/Tomahawk CH.blk	
@@ -104,7 +104,7 @@ CLHeavyLargeLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Civil War
+TRO: 3050u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-443.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-443.blk
index 9cc80ad6b2a..abceb76cd9a 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-443.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-443.blk	
@@ -113,7 +113,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star league
+TRO: 3050u - Star league
 </source>
 
 <tonnage>
@@ -153,7 +153,7 @@ TARGETING:Antron 7
 </systemManufacturers>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-643.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-643.blk
index 100e3870db6..8af34af2efc 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-643.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-643.blk	
@@ -104,7 +104,7 @@ IS MRM 40 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Civil War
+TRO: 3050u - Civil War
 </source>
 
 <tonnage>
@@ -144,7 +144,7 @@ TARGETING:Antron 7
 </systemManufacturers>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-MD.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-MD.blk
index 570f26a2ac7..70259a0a1aa 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-MD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-MD.blk	
@@ -103,7 +103,7 @@ IS MRM 40 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Clan Invasion
+TRO: 3050u - Clan Invasion
 </source>
 
 <tonnage>
@@ -143,7 +143,7 @@ TARGETING:Antron 7
 </systemManufacturers>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-X.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-X.blk
index 5ef96069c36..e7c829f8cac 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-X.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ahab AHB-X.blk	
@@ -141,7 +141,7 @@ TARGETING:Antron 7
 </systemManufacturers>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-100.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-100.blk
index 734c0dd0a7f..f21dd2f6942 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-100.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-100.blk	
@@ -112,7 +112,7 @@ IS Ammo SRM-4
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-300.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-300.blk
index 5ba8c1d3577..c05991ddfd2 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-300.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-300.blk	
@@ -111,7 +111,7 @@ IS Ammo LRM-15
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-400.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-400.blk
index 48a59ad1994..2bad09ccfbf 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-400.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-400.blk	
@@ -103,7 +103,7 @@ IS Ammo LRM-15
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Succession Wars
+TRO: 3050u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-500.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-500.blk
index 22778b3ff24..997418f88d9 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-500.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-500.blk	
@@ -111,7 +111,7 @@ IS Ammo LRM-15
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-600.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-600.blk
index 7720c33e729..796aef335d9 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-600.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Gotha GTHA-600.blk	
@@ -114,7 +114,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HD.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HD.blk
index 6178074d41f..3c823f9e4f9 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HD.blk	
@@ -105,7 +105,7 @@ IS Ammo AC/20
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Age of War
+TRO: 3050u - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HE.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HE.blk
index 5df7eb9491a..21c3dea1b87 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HE.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HE.blk	
@@ -103,7 +103,7 @@ PPC
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HF.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HF.blk
index 3afe46ccbab..f082aac755a 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HF.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HF.blk	
@@ -106,7 +106,7 @@ IS LB 10-X Cluster Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Jihad
+TRO: 3050u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HG.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HG.blk
index 826a477668b..ac6c215005c 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HG.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Hammerhead HMR-HG.blk	
@@ -132,7 +132,7 @@ TARGETING:BANDAR 9
 </systemManufacturers>
 
 <source>
-TRO 3050u - Jihad
+TRO: 3050u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT212.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT212.blk
index c77b5b51d2a..55b0a552abe 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT212.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT212.blk	
@@ -105,7 +105,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT213B.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT213B.blk
index 62f25c06870..15696ec1ead 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT213B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT213B.blk	
@@ -105,7 +105,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT214.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT214.blk
index 65074d4a6c7..f6e54567c5b 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT214.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT214.blk	
@@ -106,7 +106,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT215.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT215.blk
index c4a7ec86ee5..b8dd4601fa3 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT215.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/HellcatII HCT215.blk	
@@ -109,7 +109,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Jihad
+TRO: 3050u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD1.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD1.blk
index 74ba74f8990..6188a4123db 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD1.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD1.blk	
@@ -103,7 +103,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD2.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD2.blk
index c5f3819896f..0bf7f35f5f5 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD2.blk	
@@ -103,7 +103,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD3.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD3.blk
index fef8e79ddf8..956cabc35e2 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Ironsides IRN-SD3.blk	
@@ -105,7 +105,7 @@ IS MRM 10 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Jihad
+TRO: 3050u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-100.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-100.blk
index c75a9ecde10..e14dc8bbad6 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-100.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-100.blk	
@@ -100,7 +100,7 @@ IS Ammo LRM-10
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-101.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-101.blk
index cc0ee94fa41..71b5277b2ac 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-101.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-101.blk	
@@ -100,7 +100,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-102.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-102.blk
index 750e640d6e9..0733d713335 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-102.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-102.blk	
@@ -100,7 +100,7 @@ IS Ammo LRM-10
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Succession Wars
+TRO: 3050u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-200.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-200.blk
index 153639af9a4..3f79f4410c6 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-200.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-200.blk	
@@ -108,7 +108,7 @@ IS Ammo LRM-10
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-300.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-300.blk
index 81cadbd9537..72e8adb5609 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-300.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rapier RPR-300.blk	
@@ -108,7 +108,7 @@ ISHeavyGauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Jihad
+TRO: 3050u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133E.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133E.blk
index 67c98cf8645..a3b50ca29e0 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133E.blk	
@@ -107,7 +107,7 @@ IS Ammo LRM-15
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133F.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133F.blk
index 383fc94d2c1..edafdee6722 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133F.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133F.blk	
@@ -111,7 +111,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133L.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133L.blk
index 6b41c44cd7c..3aec597b44f 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133L.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133L.blk	
@@ -105,7 +105,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133LP.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133LP.blk
index da6bd1e8260..0d98fbbc885 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133LP.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133LP.blk	
@@ -105,7 +105,7 @@ ISMediumPulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Clan Invasion
+TRO: 3050u - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133P.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133P.blk
index facff75bfdf..a931d7a826e 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133P.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Rogue RGU-133P.blk	
@@ -105,7 +105,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Succession Wars
+TRO: 3050u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-502.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-502.blk
index 270b43bc76a..9e0dd9be70e 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-502.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-502.blk	
@@ -96,7 +96,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-503.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-503.blk
index 3b1aee2be6a..e1ef15c125f 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-503.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-503.blk	
@@ -104,7 +104,7 @@ ISMediumPulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-504.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-504.blk
index 7797d0b2519..a24f168bca3 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-504.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Spad SPD-504.blk	
@@ -104,7 +104,7 @@ ISERSmallLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Jihad
+TRO: 3050u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Swift SWF-606.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Swift SWF-606.blk
index 9f49f90d45b..1d9c28b2cea 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Swift SWF-606.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Swift SWF-606.blk	
@@ -131,7 +131,7 @@ TARGETING:PhantomTrac 55
 </systemManufacturers>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Swift SWF-606R.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Swift SWF-606R.blk
index 44cc432ed47..eb7517dcb36 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Swift SWF-606R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Swift SWF-606R.blk	
@@ -134,5 +134,5 @@ TARGETING:PhantomTrac 55
 </systemManufacturers>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-33.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-33.blk
index fb4794d69dc..9747df1c758 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-33.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-33.blk	
@@ -96,7 +96,7 @@ Large Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-43.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-43.blk
index da6c642b4b8..041f584e4f8 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-43.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-43.blk	
@@ -104,7 +104,7 @@ Large Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-53.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-53.blk
index b692c30830c..b6030c9041e 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-53.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-53.blk	
@@ -107,7 +107,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-63.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-63.blk
index 3bf9b4aaf28..daa9c7856da 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-63.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-63.blk	
@@ -104,7 +104,7 @@ Large Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-63CS.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-63CS.blk
index 640bb6ed78a..326d1d40288 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-63CS.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Tomahawk THK-63CS.blk	
@@ -104,7 +104,7 @@ ISERLargeLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Jihad
+TRO: 3050u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3T.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3T.blk
index 399c8fb84a9..333741ee470 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3T.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3T.blk	
@@ -105,7 +105,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3U.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3U.blk
index eb163ad5eb1..521f6f3d2a2 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3U.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3U.blk	
@@ -97,7 +97,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Succession Wars
+TRO: 3050u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3V.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3V.blk
index 526600849d5..35110985625 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3V.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Trident TRN-3V.blk	
@@ -105,7 +105,7 @@ ISERSmallLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Jihad
+TRO: 3050u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Zero ZRO-114.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Zero ZRO-114.blk
index 0aabb3fbd99..5e5bfe689bf 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Zero ZRO-114.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Zero ZRO-114.blk	
@@ -97,7 +97,7 @@ IS Ammo LRM-10
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3050U/IS/Zero ZRO-115.blk b/megamek/data/mechfiles/fighters/TRO3050U/IS/Zero ZRO-115.blk
index 4494c4db9fa..08e127f627a 100644
--- a/megamek/data/mechfiles/fighters/TRO3050U/IS/Zero ZRO-115.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3050U/IS/Zero ZRO-115.blk	
@@ -98,7 +98,7 @@ IS Streak SRM 2 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Clan Invasion
+TRO: 3050u - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Avar A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Avar A.blk
index 9ccb1075347..acc8a0bd9b8 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Avar A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Avar A.blk	
@@ -115,7 +115,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Avar B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Avar B.blk
index 63c8c4aab84..a5741647828 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Avar B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Avar B.blk	
@@ -109,7 +109,7 @@ CLERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Avar C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Avar C.blk
index fa28ad68540..6cda52d77a3 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Avar C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Avar C.blk	
@@ -117,7 +117,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Avar D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Avar D.blk
index e507b37521a..f26055f34dc 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Avar D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Avar D.blk	
@@ -112,7 +112,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Avar E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Avar E.blk
index f0c8aeaf95d..6e177044617 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Avar E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Avar E.blk	
@@ -115,7 +115,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Avar Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Avar Prime.blk
index 54c3606f62c..77b8539a014 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Avar Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Avar Prime.blk	
@@ -112,7 +112,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir A.blk
index cb8deac4188..df1f63271be 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir A.blk	
@@ -109,7 +109,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir B.blk
index b3ab4eeafd5..aeeeeff461d 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir B.blk	
@@ -111,7 +111,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir C.blk
index 3757003eb2c..ffdf9d1a2f6 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir C.blk	
@@ -107,7 +107,7 @@ CLERLargeLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir D.blk
index 2c2e9fc8880..9ff64f4fc24 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir D.blk	
@@ -107,7 +107,7 @@ CLHeavySmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir E.blk
index d6b79236bc6..e339d196cf8 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir E.blk	
@@ -117,7 +117,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir Prime.blk
index d7c50ad7594..4bba1c910bf 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Bashkir Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Bashkir Prime.blk	
@@ -111,7 +111,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Batu A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Batu A.blk
index f00273312ef..b8ef818b29f 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Batu A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Batu A.blk	
@@ -119,7 +119,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Batu B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Batu B.blk
index 0ba606c2557..4a4401c5fd2 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Batu B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Batu B.blk	
@@ -114,7 +114,7 @@ CLERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Batu C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Batu C.blk
index c186c08ea93..baf4e1f5f18 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Batu C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Batu C.blk	
@@ -115,7 +115,7 @@ Clan Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Batu D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Batu D.blk
index ab825ca9b7d..5a2a8db1654 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Batu D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Batu D.blk	
@@ -113,7 +113,7 @@ CLERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Batu E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Batu E.blk
index 013275d51d0..8026458e97e 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Batu E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Batu E.blk	
@@ -114,7 +114,7 @@ Clan Ultra AC/20 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Batu Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Batu Prime.blk
index f91e915eba1..bbcca7a16ac 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Batu Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Batu Prime.blk	
@@ -116,7 +116,7 @@ CLERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai A.blk
index 41d81e3d770..7dfff847f06 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai A.blk	
@@ -121,7 +121,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai B.blk
index 439a3e4a508..dee0d10d85f 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai B.blk	
@@ -116,7 +116,7 @@ Clan Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai C.blk
index 006852c72a7..3974f719976 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai C.blk	
@@ -117,7 +117,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai D.blk
index 41453e69849..95a3809ee41 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai D.blk	
@@ -117,7 +117,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai E.blk
index 8a8657ce9c3..64f51979c5b 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai E.blk	
@@ -120,7 +120,7 @@ Hyper-Assault Gauss Rifle/20 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai Prime.blk
index ecb9879b2c2..1e602076743 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai Prime.blk	
@@ -118,7 +118,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai X.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai X.blk
index 92d84cc7eec..3dbe1186af7 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jagatai X.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jagatai X.blk	
@@ -130,7 +130,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz A.blk
index eca8f014119..c313b916da3 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz A.blk	
@@ -116,7 +116,7 @@ CLERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz B.blk
index 3e3c3414f95..52b0e6db6ea 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz B.blk	
@@ -122,7 +122,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz C.blk
index 5e7a438cb3e..cccef025ce2 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz C.blk	
@@ -121,7 +121,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz D.blk
index 3ba16de0750..5bcd7c26d96 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz D.blk	
@@ -125,7 +125,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz E.blk
index 890422a3cfd..692b2563f37 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz E.blk	
@@ -121,7 +121,7 @@ CLStreakSRM2 (IOS):OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz Prime.blk
index 2c8d8f9d275..6fcd3ac7d15 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz Prime.blk	
@@ -121,7 +121,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession War
+TRO: 3055u - Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz X.blk b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz X.blk
index ae8745d738d..d480d723dfc 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Jengiz X.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Jengiz X.blk	
@@ -124,7 +124,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz A.blk
index 6030b96e4c2..06aed11b2d0 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz A.blk	
@@ -114,7 +114,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz B.blk
index 75cae20be8b..6b0bb78ea4b 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz B.blk	
@@ -117,7 +117,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz C.blk
index 15c49fc6a22..123b8563b2e 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz C.blk	
@@ -109,7 +109,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz D.blk
index f5fac777f1b..11ca27980e2 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz D.blk	
@@ -123,7 +123,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz E.blk
index ce575b3b41f..9621bacabb2 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz E.blk	
@@ -116,7 +116,7 @@ Hyper-Assault Gauss Rifle/40 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz Prime.blk
index 39ef79fb8d0..e52db0ea980 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Kirghiz Prime.blk	
@@ -116,7 +116,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai A.blk
index 2cce0fcf2f0..027484f8fff 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai A.blk	
@@ -119,7 +119,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai B.blk
index 57e5464c22e..f85365bc6d5 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai B.blk	
@@ -124,7 +124,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai C.blk
index 1cb67f7067b..07bfb06cece 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai C.blk	
@@ -120,7 +120,7 @@ CLERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai D.blk
index db98cb1a8ef..92223bf3357 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai D.blk	
@@ -118,7 +118,7 @@ CLERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai E.blk
index 8d1b26134e8..8f4dcabb4fc 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai E.blk	
@@ -120,7 +120,7 @@ Hyper-Assault Gauss Rifle/40 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai Prime.blk
index 4623352b996..3c757db1797 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai Prime.blk	
@@ -119,7 +119,7 @@ Clan Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai X.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai X.blk
index 4a2d4f7815f..8f745f6db7b 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sabutai X.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sabutai X.blk	
@@ -127,7 +127,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Scytha A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Scytha A.blk
index cc1b64585f8..2cc996cfcf1 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Scytha A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Scytha A.blk	
@@ -128,7 +128,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
@@ -164,7 +164,7 @@ TARGETING:TTS Model 3
 </systemManufacturers>
 
 <notes>
-This unit is intentially build per the TRO which makees in 2 tons overweight.
+This unit is intentially build per the TRO: which makees in 2 tons overweight.
 </notes>
 
 
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Scytha B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Scytha B.blk
index 033860f9ce3..049a645db61 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Scytha B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Scytha B.blk	
@@ -116,7 +116,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Scytha C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Scytha C.blk
index 83c66a0ef93..7e40052fb1b 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Scytha C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Scytha C.blk	
@@ -116,7 +116,7 @@ Clan Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Scytha D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Scytha D.blk
index c9eaf4f1df8..6fb75f11ec1 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Scytha D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Scytha D.blk	
@@ -122,7 +122,7 @@ Clan Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Scytha E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Scytha E.blk
index 2e2f9d42351..ad674c470b0 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Scytha E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Scytha E.blk	
@@ -121,7 +121,7 @@ Hyper-Assault Gauss Rifle/30 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Scytha Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Scytha Prime.blk
index adcd9b0a241..7107e650296 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Scytha Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Scytha Prime.blk	
@@ -121,7 +121,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Scytha X.blk b/megamek/data/mechfiles/fighters/TRO3055U/Scytha X.blk
index b5b7f2ba3d9..3b1a786973b 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Scytha X.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Scytha X.blk	
@@ -130,7 +130,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sulla A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sulla A.blk
index d786b0fbf64..2d91222612b 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sulla A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sulla A.blk	
@@ -115,7 +115,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sulla B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sulla B.blk
index 156046f9d0f..fbeed3ec7d6 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sulla B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sulla B.blk	
@@ -113,7 +113,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sulla C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sulla C.blk
index 1c3edf799b7..8306e063383 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sulla C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sulla C.blk	
@@ -109,7 +109,7 @@ CLERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sulla D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sulla D.blk
index ac9e48ae81f..1b2c2729d64 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sulla D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sulla D.blk	
@@ -114,7 +114,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sulla E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sulla E.blk
index 0459eab262e..09180359bbb 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sulla E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sulla E.blk	
@@ -113,7 +113,7 @@ CLPlasmaCannonAmmo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Sulla Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Sulla Prime.blk
index 2f97eb25c97..df5119c8841 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Sulla Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Sulla Prime.blk	
@@ -109,7 +109,7 @@ CLERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Turk A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Turk A.blk
index dafa9e066f6..e9f021e8954 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Turk A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Turk A.blk	
@@ -116,7 +116,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Turk B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Turk B.blk
index 15141814031..3651ccfd28a 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Turk B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Turk B.blk	
@@ -112,7 +112,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Turk C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Turk C.blk
index 40b30b8a898..84156e6fae0 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Turk C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Turk C.blk	
@@ -116,7 +116,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Turk D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Turk D.blk
index bdd046f18d1..63aa1cb7f2b 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Turk D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Turk D.blk	
@@ -115,7 +115,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Turk E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Turk E.blk
index f51a3606139..e46ebdaaf71 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Turk E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Turk E.blk	
@@ -123,7 +123,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Turk Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Turk Prime.blk
index 2ec666fab92..8d6a696a568 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Turk Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Turk Prime.blk	
@@ -113,7 +113,7 @@ CLERLargeLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Vandal A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Vandal A.blk
index 408e3548c27..7e50dee1583 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Vandal A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Vandal A.blk	
@@ -108,7 +108,7 @@ CLERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Vandal B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Vandal B.blk
index 14506669807..6e340726843 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Vandal B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Vandal B.blk	
@@ -111,7 +111,7 @@ CLERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Vandal C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Vandal C.blk
index acf9cefeb76..8b41819c755 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Vandal C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Vandal C.blk	
@@ -108,7 +108,7 @@ CLERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Vandal D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Vandal D.blk
index f7f8f87f424..efaa8b3d6e9 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Vandal D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Vandal D.blk	
@@ -108,7 +108,7 @@ CLHeavyMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Vandal E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Vandal E.blk
index b4794122159..04f93c0b918 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Vandal E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Vandal E.blk	
@@ -112,7 +112,7 @@ RemoteSensorDispenser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Vandal Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Vandal Prime.blk
index aec6627db26..e4a1cf41011 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Vandal Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Vandal Prime.blk	
@@ -108,7 +108,7 @@ CLActiveProbe:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth A.blk b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth A.blk
index 1e6baf6980a..f09b8249d17 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth A.blk	
@@ -119,7 +119,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth B.blk b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth B.blk
index 9a080275d04..b9869650798 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth B.blk	
@@ -110,7 +110,7 @@ CLMediumPulseLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth C.blk b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth C.blk
index d390aff2545..1e6d684e06a 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth C.blk	
@@ -114,7 +114,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth D.blk b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth D.blk
index 68cb1c09a4e..25b369463ee 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth D.blk	
@@ -114,7 +114,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Civil War
+TRO: 3055u - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth E.blk b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth E.blk
index 08df760b5d9..be4e2c152f1 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth E.blk	
@@ -117,7 +117,7 @@ Hyper-Assault Gauss Rifle/30 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Jihad
+TRO: 3055u - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth Prime.blk b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth Prime.blk
index 8bb0f0b6e6c..b350ac63215 100644
--- a/megamek/data/mechfiles/fighters/TRO3055U/Visigoth Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3055U/Visigoth Prime.blk	
@@ -121,7 +121,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3055u - Succession Wars
+TRO: 3055u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Ammon 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Ammon 2.blk
index 412f4082190..c9ae7ccab2e 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Ammon 2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Ammon 2.blk	
@@ -108,7 +108,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 2.blk
index 73803fa4479..fa10c594a45 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 2.blk	
@@ -97,7 +97,7 @@ CLERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Succession Wars
+TRO: 3067 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 3.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 3.blk
index 69da5f0cc8e..49bd9874b69 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 3.blk	
@@ -95,7 +95,7 @@ CLERLargeLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Succession Wars
+TRO: 3067 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 4.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 4.blk
index 77f84ca393a..bfb3c9babc5 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 4.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Chaeronea 4.blk	
@@ -97,7 +97,7 @@ CLTargeting Computer
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Hydaspes 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Hydaspes 2.blk
index 3944ef7ab40..8789b341876 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Hydaspes 2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Hydaspes 2.blk	
@@ -117,7 +117,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 2.blk
index 50801c6fd1e..a8bce59d295 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 2.blk	
@@ -110,7 +110,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 3.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 3.blk
index 20452a5813b..c7baf45dc45 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Issus 3.blk	
@@ -106,7 +106,7 @@ CLERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 2.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 2.blk
index 80221d05e3b..4e6fa76b45e 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 2.blk	
@@ -111,7 +111,7 @@ Clan Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 3.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 3.blk
index 51a48a2841a..651fe666462 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes 3.blk	
@@ -111,7 +111,7 @@ Hyper-Assault Gauss Rifle/40 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes.blk
index 0e5bbd48262..63649be4247 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/Clan Aerospace/Xerxes.blk	
@@ -110,7 +110,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Succession Wars
+TRO: 3067 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OD.blk
index 37c601d9e68..bba55fbc6fd 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OD.blk	
@@ -102,7 +102,7 @@ IS Ammo LRM-10:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OR.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OR.blk
index 793a26bfd5e..4c22dffe291 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OR.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Corax CRX-OR.blk	
@@ -104,7 +104,7 @@ Clan Streak SRM 4 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1C.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1C.blk
index 65872b93374..85660e11704 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1C.blk	
@@ -115,7 +115,7 @@ ISMediumPulseLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1D.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1D.blk
index 7c1d71962c6..db62cca050e 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Dagger DARO-1D.blk	
@@ -118,7 +118,7 @@ ISGuardianECMSuite:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Defiance DFC-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Defiance DFC-OD.blk
index c782dc916a7..482e9f23e0d 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Defiance DFC-OD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Defiance DFC-OD.blk	
@@ -101,7 +101,7 @@ IS Ammo Thunderbolt-10:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Eisensturm EST-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Eisensturm EST-OD.blk
index 00ff683d17c..87321e397f9 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Eisensturm EST-OD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Eisensturm EST-OD.blk	
@@ -125,7 +125,7 @@ IS Ammo MML-7 LRM Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OD.blk
index 68b208151b8..e1739666213 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OD.blk	
@@ -117,7 +117,7 @@ ISERMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OR.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OR.blk
index a63b8b99852..2cf4dce7e93 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OR.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Huscarl HSCL-1-OR.blk	
@@ -115,7 +115,7 @@ Clan Ammo LRM-20 (Clan) Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Lancer LX-3.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Lancer LX-3.blk
index 485051767fd..548ed1e4dd5 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Lancer LX-3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Lancer LX-3.blk	
@@ -96,7 +96,7 @@ ISLargeVSPLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Shiva SHV-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Shiva SHV-OD.blk
index 8c2ce301e3f..3f8efa490c0 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Shiva SHV-OD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Shiva SHV-OD.blk	
@@ -115,7 +115,7 @@ IS Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OD.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OD.blk
index f163499a78d..47ee35db40f 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OD.blk	
@@ -116,7 +116,7 @@ IS Ammo MML-9 SRM:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OE.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OE.blk
index a50922cc4a7..5275184cedc 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OE.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Tatsu MIK-OE.blk	
@@ -114,7 +114,7 @@ ISPlasmaRifleAmmo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Troika CMT-6T.blk b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Troika CMT-6T.blk
index 40a7eefaf81..8c50e4dd09b 100644
--- a/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Troika CMT-6T.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067 Unabridged/IS Aerospace/Troika CMT-6T.blk	
@@ -115,7 +115,7 @@ ISCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/Clan/Ammon.blk b/megamek/data/mechfiles/fighters/TRO3067/Clan/Ammon.blk
index f57d21e54a5..5649dad8c5b 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/Clan/Ammon.blk
+++ b/megamek/data/mechfiles/fighters/TRO3067/Clan/Ammon.blk
@@ -101,7 +101,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/Clan/Chaeronea.blk b/megamek/data/mechfiles/fighters/TRO3067/Clan/Chaeronea.blk
index 144ac5c01d7..20c9e426bd7 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/Clan/Chaeronea.blk
+++ b/megamek/data/mechfiles/fighters/TRO3067/Clan/Chaeronea.blk
@@ -94,7 +94,7 @@ CLERPPC
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Succession Wars
+TRO: 3067 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/Clan/Hydaspes.blk b/megamek/data/mechfiles/fighters/TRO3067/Clan/Hydaspes.blk
index a8133bebce1..9e0ebf2719a 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/Clan/Hydaspes.blk
+++ b/megamek/data/mechfiles/fighters/TRO3067/Clan/Hydaspes.blk
@@ -122,7 +122,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Succession Wars
+TRO: 3067 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/Clan/Issus.blk b/megamek/data/mechfiles/fighters/TRO3067/Clan/Issus.blk
index d63124c1e27..60a8cfa7c1a 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/Clan/Issus.blk
+++ b/megamek/data/mechfiles/fighters/TRO3067/Clan/Issus.blk
@@ -109,7 +109,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Succession Wars
+TRO: 3067 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/Clan/Tyre 2.blk b/megamek/data/mechfiles/fighters/TRO3067/Clan/Tyre 2.blk
index 6b5ec4cb7b8..53cb8a32c1c 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/Clan/Tyre 2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/Clan/Tyre 2.blk	
@@ -104,7 +104,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Succession Wars
+TRO: 3067 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/Clan/Tyre.blk b/megamek/data/mechfiles/fighters/TRO3067/Clan/Tyre.blk
index e38943e7fa4..e1fa5f2e027 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/Clan/Tyre.blk
+++ b/megamek/data/mechfiles/fighters/TRO3067/Clan/Tyre.blk
@@ -106,7 +106,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Succession Wars
+TRO: 3067 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-O.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-O.blk
index 754896c585d..181522fb8a8 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-O.blk	
@@ -100,7 +100,7 @@ Medium Laser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OA.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OA.blk
index 881456b588c..f3620cc3a60 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OA.blk	
@@ -103,7 +103,7 @@ IS Ammo SRM-6:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OB.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OB.blk
index 4bdebfff0c3..0b27ba464c1 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OB.blk	
@@ -105,7 +105,7 @@ Small Laser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OC.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OC.blk
index 985cbe14005..7980d03c48b 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Corax CRX-OC.blk	
@@ -100,7 +100,7 @@ IS MRM 20 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1.blk
index c9d86deda5e..9a67235d049 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1.blk	
@@ -117,7 +117,7 @@ ISRotaryAC5 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1A.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1A.blk
index 70fea6ab347..8511f532900 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1A.blk	
@@ -114,7 +114,7 @@ Large Laser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1B.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1B.blk
index 982ff731af4..b6268a8c697 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Dagger DARO-1B.blk	
@@ -114,7 +114,7 @@ IS LB 10-X Cluster Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-O.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-O.blk
index 5fb30ff9548..83fd0ac9235 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-O.blk	
@@ -108,7 +108,7 @@ IS Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OA.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OA.blk
index 11a58cdbb82..c3dcd3415ef 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OA.blk	
@@ -107,7 +107,7 @@ IS Ammo SRM-2:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OB.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OB.blk
index a28276a4874..4c914960381 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OB.blk	
@@ -103,7 +103,7 @@ IS LB 10-X Cluster Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OC.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OC.blk
index 6bec9220bbb..7e5d46865c9 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Defiance DFC-OC.blk	
@@ -108,7 +108,7 @@ ISSmallPulseLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-O.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-O.blk
index 28fd27b643a..f498bfc8cfa 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-O.blk	
@@ -115,7 +115,7 @@ IS Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OA.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OA.blk
index 4a3358a42bc..10960b9e361 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OA.blk	
@@ -117,7 +117,7 @@ ISHeavyGauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OB.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OB.blk
index 35d17c63f7a..31add6c13d6 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OB.blk	
@@ -119,7 +119,7 @@ IS Ammo LRM-15 Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OC.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OC.blk
index 9440f1ed6b2..ec0975c114a 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-OC.blk	
@@ -126,7 +126,7 @@ IS Ammo SRM-6 Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-R3.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-R3.blk
index 5f20284e709..3afece83132 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-R3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Eisensturm EST-R3.blk	
@@ -111,7 +111,7 @@ IS Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-O.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-O.blk
index d296ed454bd..6643a1e0a11 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-O.blk	
@@ -108,7 +108,7 @@ IS LB 10-X Cluster Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OA.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OA.blk
index 856cbb41a74..56b9b91d1b2 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OA.blk	
@@ -112,7 +112,7 @@ IS Ammo SRM-4:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OB.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OB.blk
index 57ccb0c6730..3e7ba3ff188 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OB.blk	
@@ -113,7 +113,7 @@ IS Ammo LRM-20 Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OC.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OC.blk
index 0f2a5e4464f..aeaf0033b34 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Huscarl HSCL-1-OC.blk	
@@ -113,7 +113,7 @@ IS Ultra AC/20 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Lancer LX-2.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Lancer LX-2.blk
index 52cdfb19cf0..9742bc54cc0 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Lancer LX-2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Lancer LX-2.blk	
@@ -98,7 +98,7 @@ IS Ammo LRM-10 Artemis-capable
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Lancer LX-2A.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Lancer LX-2A.blk
index 818174deaec..08e6fe49dd3 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Lancer LX-2A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Lancer LX-2A.blk	
@@ -96,7 +96,7 @@ ISLargePulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Oni ON-1.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Oni ON-1.blk
index fa0a9a3784f..1f922c28dd8 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Oni ON-1.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Oni ON-1.blk	
@@ -107,7 +107,7 @@ IS MRM 30 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Oni ON-2.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Oni ON-2.blk
index c4f2a7175cd..1965fc09881 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Oni ON-2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Oni ON-2.blk	
@@ -112,7 +112,7 @@ IS MRM 40 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-O.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-O.blk
index 1d81620716c..a0a6bae72e5 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-O.blk	
@@ -120,7 +120,7 @@ IS Ammo SRM-6:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Clan Invasion
+TRO: 3067 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OA.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OA.blk
index 653eb2ebc05..aade066f2f1 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OA.blk	
@@ -118,7 +118,7 @@ IS Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Clan Invasion
+TRO: 3067 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OB.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OB.blk
index 18d6857d31c..4c4fc30a15e 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OB.blk	
@@ -122,7 +122,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Clan Invasion
+TRO: 3067 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OC.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OC.blk
index 9dae388e855..34a7bd8ab96 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Shiva SHV-OC.blk	
@@ -124,7 +124,7 @@ IS Light Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Clan Invasion
+TRO: 3067 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-O.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-O.blk
index 86fe2cd90fd..464fcb34087 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-O.blk	
@@ -113,7 +113,7 @@ IS MRM 30 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OA.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OA.blk
index cf48c6de6b3..028650cf9ec 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OA.blk	
@@ -111,7 +111,7 @@ ISMediumPulseLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OB.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OB.blk
index d54c0ecd1da..4effb2a1234 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OB.blk	
@@ -118,7 +118,7 @@ IS Ammo LRM-15 Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OC.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OC.blk
index 54859ff0215..79917b5c543 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Tatsu MIK-OC.blk	
@@ -109,7 +109,7 @@ IS MRM 40 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Troika CMT-3T.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Troika CMT-3T.blk
index e45c5f2a6c9..5e171937adb 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Troika CMT-3T.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Troika CMT-3T.blk	
@@ -110,7 +110,7 @@ ISCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3067/IS/Troika CMT-4U.blk b/megamek/data/mechfiles/fighters/TRO3067/IS/Troika CMT-4U.blk
index 06aab1bf7c9..3ba47236f66 100644
--- a/megamek/data/mechfiles/fighters/TRO3067/IS/Troika CMT-4U.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3067/IS/Troika CMT-4U.blk	
@@ -114,7 +114,7 @@ RL15
 </Fuselage Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-1A.blk b/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-1A.blk
index fd0e3917b53..68f9df53099 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-1A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-1A.blk	
@@ -104,7 +104,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-1D.blk b/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-1D.blk
index 590b838598c..a19687caa64 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-1D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-1D.blk	
@@ -96,7 +96,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-2D.blk b/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-2D.blk
index da2f6c850f2..3bec2a9ea12 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-2D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-2D.blk	
@@ -98,7 +98,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Succession Wars
+TRO: 3075 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-3S.blk b/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-3S.blk
index e4935c88c25..52d1b4b98b6 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-3S.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Centurion CNT-3S.blk	
@@ -104,7 +104,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Deathstalker F-77.blk b/megamek/data/mechfiles/fighters/TRO3075/Deathstalker F-77.blk
index eead26b27aa..1ed5feefd80 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Deathstalker F-77.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Deathstalker F-77.blk	
@@ -101,7 +101,7 @@ IS Ammo AC/10
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Deathstalker F-77A.blk b/megamek/data/mechfiles/fighters/TRO3075/Deathstalker F-77A.blk
index 9a5f366e151..a555cdfb094 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Deathstalker F-77A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Deathstalker F-77A.blk	
@@ -103,7 +103,7 @@ IS Ultra AC/10 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R1.blk b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R1.blk
index 0f02a9b9bdf..537d2d3dcf2 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R1.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R1.blk	
@@ -108,7 +108,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R10.blk b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R10.blk
index 543d47ccbe7..5110d47307e 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R10.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R10.blk	
@@ -104,7 +104,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Succession Wars
+TRO: 3075 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R11.blk b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R11.blk
index 88341fca000..c744b864133 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R11.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R11.blk	
@@ -99,7 +99,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R4.blk b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R4.blk
index e60e0b07766..2c654d97233 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R4.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R4.blk	
@@ -108,7 +108,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R6.blk b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R6.blk
index 30d6558515e..96321d4324e 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R6.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R6.blk	
@@ -100,7 +100,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R9.blk b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R9.blk
index 5cecc5b305a..ffb4e29c9d3 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R9.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Eagle EGL-R9.blk	
@@ -99,7 +99,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213.blk b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213.blk
index af284ee2982..30e85167266 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213.blk	
@@ -101,7 +101,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213D.blk b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213D.blk
index c4af5947e81..aed9127a9bf 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213D.blk	
@@ -136,7 +136,7 @@ TARGETING:Telecron M75
 </systemManufacturers>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213R.blk b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213R.blk
index 5d534030a22..ed642a064c3 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213R.blk	
@@ -100,7 +100,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213S.blk b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213S.blk
index 54b7e9cab95..b2e79c9ec40 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213S.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-213S.blk	
@@ -132,7 +132,7 @@ TARGETING:Telecron M75
 </systemManufacturers>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-313.blk b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-313.blk
index 5d43efe14b7..9d9d4afd6df 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-313.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Hellcat HCT-313.blk	
@@ -109,7 +109,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G14.blk b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G14.blk
index dfc34828240..bad2753eb86 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G14.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G14.blk	
@@ -108,7 +108,7 @@ IS Ammo AC/10
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G15.blk b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G15.blk
index 0d7bd7373ea..2a867780bb6 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G15.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G15.blk	
@@ -100,7 +100,7 @@ IS Ammo AC/20
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16D.blk b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16D.blk
index 2977fe20af3..80140b21093 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16D.blk	
@@ -112,7 +112,7 @@ ISRotaryAC2 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16L.blk b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16L.blk
index bef543f4f95..53a4159be9c 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16L.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16L.blk	
@@ -108,7 +108,7 @@ IS Ultra AC/20 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16O.blk b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16O.blk
index 3cd09cc176d..1eefaaf47a7 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16O.blk	
@@ -112,7 +112,7 @@ IS LB 20-X Cluster Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16S.blk b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16S.blk
index cc6a9fbb027..61c470ca187 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16S.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16S.blk	
@@ -105,7 +105,7 @@ ISHeavyGauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16T.blk b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16T.blk
index 51d7a22f937..37636c36d7b 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16T.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Lightning LTN-G16T.blk	
@@ -110,7 +110,7 @@ IS Ammo AC/20
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Royals/Ahab AHB-443b.blk b/megamek/data/mechfiles/fighters/TRO3075/Royals/Ahab AHB-443b.blk
index cf37cca6894..16e82f95be0 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Royals/Ahab AHB-443b.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Royals/Ahab AHB-443b.blk	
@@ -121,7 +121,7 @@ IS Ammo SRM-6
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
@@ -161,7 +161,7 @@ TARGETING:Antron 7
 </systemManufacturers>
 
 <source>
-TRO 3050u - Star League
+TRO: 3050u - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Royals/Gotha GTHA-500b.blk b/megamek/data/mechfiles/fighters/TRO3075/Royals/Gotha GTHA-500b.blk
index 38551aaff84..379983f0b37 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Royals/Gotha GTHA-500b.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Royals/Gotha GTHA-500b.blk	
@@ -113,7 +113,7 @@ IS Ammo LRM-15 Artemis-capable
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Royals/Hammerhead HMR-HDb.blk b/megamek/data/mechfiles/fighters/TRO3075/Royals/Hammerhead HMR-HDb.blk
index 65d0008ab89..6ce4cbdc2df 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Royals/Hammerhead HMR-HDb.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Royals/Hammerhead HMR-HDb.blk	
@@ -104,7 +104,7 @@ IS Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Royals/Ironsides IRN-SD1b.blk b/megamek/data/mechfiles/fighters/TRO3075/Royals/Ironsides IRN-SD1b.blk
index 0b85a9b38ad..d84a8ef55b8 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Royals/Ironsides IRN-SD1b.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Royals/Ironsides IRN-SD1b.blk	
@@ -105,7 +105,7 @@ ISCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Royals/Rapier RPR-100b.blk b/megamek/data/mechfiles/fighters/TRO3075/Royals/Rapier RPR-100b.blk
index 33170b99a81..1d3cf05da58 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Royals/Rapier RPR-100b.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Royals/Rapier RPR-100b.blk	
@@ -105,7 +105,7 @@ ISCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Royals/Rogue RGU-133Eb.blk b/megamek/data/mechfiles/fighters/TRO3075/Royals/Rogue RGU-133Eb.blk
index 987d453bfa7..8209741b855 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Royals/Rogue RGU-133Eb.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Royals/Rogue RGU-133Eb.blk	
@@ -109,7 +109,7 @@ IS Ammo LRM-15 Artemis-capable
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Royals/Tomahawk THK-63b.blk b/megamek/data/mechfiles/fighters/TRO3075/Royals/Tomahawk THK-63b.blk
index dd93e4025fe..a367b374ab3 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Royals/Tomahawk THK-63b.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Royals/Tomahawk THK-63b.blk	
@@ -104,7 +104,7 @@ Large Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Royals/Trident TRN-3Tb.blk b/megamek/data/mechfiles/fighters/TRO3075/Royals/Trident TRN-3Tb.blk
index 1925bf90f2d..fe197aa4e38 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Royals/Trident TRN-3Tb.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Royals/Trident TRN-3Tb.blk	
@@ -105,7 +105,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3050u - Succession Wars
+TRO: 3050u - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-26.blk b/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-26.blk
index 75b91d6df62..c58b6cd5a16 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-26.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-26.blk	
@@ -104,7 +104,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-27.blk b/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-27.blk
index 520acca92ff..f1f0f1c8942 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-27.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-27.blk	
@@ -96,7 +96,7 @@ Medium Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-28.blk b/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-28.blk
index 98bee59bbdd..c713ee20dc9 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-28.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-28.blk	
@@ -136,7 +136,7 @@ TARGETING:Ki-II TTS
 </systemManufacturers>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-29.blk b/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-29.blk
index 0c6d294b721..dbbb875eee1 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-29.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Sabre SB-29.blk	
@@ -104,7 +104,7 @@ ISERMediumLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-O Invictus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-O Invictus.blk
index 6f284a0c1dc..23ce2d110db 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-O Invictus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-O Invictus.blk	
@@ -122,7 +122,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OA Dominus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OA Dominus.blk
index 8e0783a9ed2..1f0434eee9e 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OA Dominus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OA Dominus.blk	
@@ -124,7 +124,7 @@ IS Ammo MML-9 LRM Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OB Infernus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OB Infernus.blk
index bc9fe544282..94adeec3e63 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OB Infernus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OB Infernus.blk	
@@ -116,7 +116,7 @@ ISMediumVSPLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OC Comminus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OC Comminus.blk
index e656759a21d..54f69222a32 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OC Comminus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OC Comminus.blk	
@@ -121,7 +121,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OD Luminos.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OD Luminos.blk
index 51dfa816b33..28877cb2d5c 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OD Luminos.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OD Luminos.blk	
@@ -114,7 +114,7 @@ ISLargePulseLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OE Eminus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OE Eminus.blk
index 6461c4cffbc..3664bfa21f3 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OE Eminus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Rusalka S-RSL-OE Eminus.blk	
@@ -118,7 +118,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-O Invictus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-O Invictus.blk
index d68e3d159c1..c654f6f1823 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-O Invictus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-O Invictus.blk	
@@ -109,7 +109,7 @@ ISGuardianECMSuite:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OA Dominus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OA Dominus.blk
index bbd7071485e..3e52e57c0f9 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OA Dominus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OA Dominus.blk	
@@ -118,7 +118,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OB Infernus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OB Infernus.blk
index 9c6d3dfc4f3..d15df337d58 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OB Infernus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OB Infernus.blk	
@@ -113,7 +113,7 @@ ISERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OC Comminus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OC Comminus.blk
index 6836c605b79..2a9fe02fa20 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OC Comminus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OC Comminus.blk	
@@ -117,7 +117,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OD Luminos.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OD Luminos.blk
index 1471e07af8a..b1e7686b72e 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OD Luminos.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OD Luminos.blk	
@@ -110,7 +110,7 @@ ISERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OE Eminus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OE Eminus.blk
index c34abf8faa3..f655cf5eade 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OE Eminus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Shade S-HA-OE Eminus.blk	
@@ -110,7 +110,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-O Invictus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-O Invictus.blk
index 5136dd6b3f4..2acea7caafc 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-O Invictus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-O Invictus.blk	
@@ -119,7 +119,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OA Dominus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OA Dominus.blk
index be4fff3a69f..db01390a041 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OA Dominus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OA Dominus.blk	
@@ -118,7 +118,7 @@ ISRotaryAC5 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OB Infernus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OB Infernus.blk
index 712c409700d..dccafe1716d 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OB Infernus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OB Infernus.blk	
@@ -117,7 +117,7 @@ ISERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OC Comminus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OC Comminus.blk
index cfc1fb30303..af46c2b6b3f 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OC Comminus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OC Comminus.blk	
@@ -126,7 +126,7 @@ IS Streak SRM 6 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OD Luminos.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OD Luminos.blk
index e61af075f4f..e0f34e9a902 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OD Luminos.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OD Luminos.blk	
@@ -118,7 +118,7 @@ ISERSmallLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OE Eminus.blk b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OE Eminus.blk
index 98fd7662486..e73a4d905ac 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OE Eminus.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Spectrals/Striga S-STR-OE Eminus.blk	
@@ -116,7 +116,7 @@ ISCASE:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Starfire SF-1X.blk b/megamek/data/mechfiles/fighters/TRO3075/Starfire SF-1X.blk
index d409da2997e..96d297ab6c9 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Starfire SF-1X.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Starfire SF-1X.blk	
@@ -108,7 +108,7 @@ IS Ultra AC/5 Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Succession Wars I - Succession Wars
+XTR: Succession Wars - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D36.blk b/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D36.blk
index df7d87b0bb4..84682270742 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D36.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D36.blk	
@@ -107,7 +107,7 @@ IS Ammo LRM-20
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D46.blk b/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D46.blk
index 7d6cac892b0..4114bcfa455 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D46.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D46.blk	
@@ -136,7 +136,7 @@ TARGETING:N&D Longreach
 </systemManufacturers>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D50.blk b/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D50.blk
index d265c4e84d5..b96c9ee224c 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D50.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D50.blk	
@@ -112,7 +112,7 @@ IS Ammo AC/10
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D56.blk b/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D56.blk
index 692d29d7b02..28f84b36f83 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D56.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Thunderbird TRB-D56.blk	
@@ -145,7 +145,7 @@ TARGETING:N&D Longreach
 </systemManufacturers>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-2A.blk b/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-2A.blk
index e7b30c5fcce..695347a92cc 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-2A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-2A.blk	
@@ -136,3 +136,7 @@ ARMOR:Lexington Lite Standard
 COMMUNICATIONS:CBM COMSET 3
 TARGETING:CBM TRAK-2
 </systemManufacturers>
+
+<source>
+TRO: 3075 - Age of War
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-3A.blk b/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-3A.blk
index d8bb0c599d4..b0d4bfce7bc 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-3A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-3A.blk	
@@ -128,3 +128,7 @@ ARMOR:Lexington Lite Standard
 COMMUNICATIONS:CBM COMSET 3
 TARGETING:CBM TRAK-2
 </systemManufacturers>
+
+<source>
+TRO: 3075 - Age of War 
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-3M.blk b/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-3M.blk
index e5d67917bdb..4de2245df6c 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-3M.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-3M.blk	
@@ -104,7 +104,7 @@ IS Ammo LRM-20
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-5H.blk b/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-5H.blk
index e8318902d79..ea7e1b19b61 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-5H.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Typhoon TFN-5H.blk	
@@ -144,3 +144,7 @@ ARMOR:Lexington Lite Ferro-Aluminum
 COMMUNICATIONS:CBM COMSET 3
 TARGETING:CBM TRAK-2
 </systemManufacturers>
+
+<source>
+TRO: 3075 - Jihad
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-5N.blk b/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-5N.blk
index b41e0bc1f47..9022c319697 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-5N.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-5N.blk	
@@ -102,7 +102,7 @@ IS Ammo AC/10
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-6N.blk b/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-6N.blk
index a986a2a8953..725b13b285a 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-6N.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-6N.blk	
@@ -104,7 +104,7 @@ IS Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-8N.blk b/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-8N.blk
index e653d16d3b3..bb142aaf927 100644
--- a/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-8N.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3075/Vulcan VLC-8N.blk	
@@ -112,7 +112,7 @@ IS Light Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Mengqin MNG-8L.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Mengqin MNG-8L.blk
index 269ae0867e6..4e3217af3e8 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Mengqin MNG-8L.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Mengqin MNG-8L.blk	
@@ -122,7 +122,7 @@ IS Ammo LRM-15
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1S.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1S.blk
index 8eefc7d4471..50751c11a0f 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1S.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1S.blk	
@@ -118,7 +118,7 @@ IS Ammo MML-7 LRM Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SA.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SA.blk
index a50c4b552be..6fb2b11460a 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SA.blk	
@@ -116,7 +116,7 @@ ISPlasmaRifleAmmo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SB.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SB.blk
index 90028e7368b..9d9dec76476 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SB.blk	
@@ -115,7 +115,7 @@ IS Ammo MML-5 LRM:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SC.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SC.blk
index bb64c820ad1..3211b55a492 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SC.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SC.blk	
@@ -118,7 +118,7 @@ ISMediumPulseLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SD.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SD.blk
index 4d5c23075db..bc5eb5b83c6 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SD.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Morgenstern MR-1SD.blk	
@@ -124,7 +124,7 @@ IS Ammo MML-7 SRM Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth A.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth A.blk
index 03eabd3e39a..aecb0704e70 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth A.blk	
@@ -120,7 +120,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth B.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth B.blk
index 1f4da90810d..ca907905cc7 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth B.blk	
@@ -124,7 +124,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth C.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth C.blk
index 6a3c03fdcbb..eaa78e30ed6 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth C.blk	
@@ -130,7 +130,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth Prime.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth Prime.blk
index f7b055923ee..520b1440286 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Ostrogoth Prime.blk	
@@ -128,7 +128,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-L3.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-L3.blk
index 1bf60a6cbdb..b6fe70df318 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-L3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-L3.blk	
@@ -102,7 +102,7 @@ ISERLargeLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-R3.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-R3.blk
index 447eef80730..677ed5be0ef 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-R3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-R3.blk	
@@ -110,7 +110,7 @@ ISSmallPulseLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-Y3.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-Y3.blk
index db91ac75eba..185fca072e0 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-Y3.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Poignard PGD-Y3.blk	
@@ -108,7 +108,7 @@ IS Ammo LAC/5
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-2R.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-2R.blk
index ede25d6fd2e..9894f32cc05 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-2R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-2R.blk	
@@ -108,7 +108,7 @@ IS Ammo MML-7 LRM
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-3R.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-3R.blk
index 9a76489fd99..0932aad8bbe 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-3R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Sagittarii SGT-3R.blk	
@@ -107,7 +107,7 @@ IS Ammo MML-5 SRM
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun A.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun A.blk
index 3ddd37c0537..e165c99c7ff 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun A.blk	
@@ -122,7 +122,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun B.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun B.blk
index 0394c6fad66..580b92ccf1c 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun B.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun B.blk	
@@ -112,7 +112,7 @@ Hyper-Assault Gauss Rifle/40 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun C.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun C.blk
index b86cb0617ec..252c76b1f91 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun C.blk	
@@ -118,7 +118,7 @@ CLHeavyMediumLaser:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun Prime.blk b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun Prime.blk
index a392068b1ff..abd38a40a3d 100644
--- a/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun Prime.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3085u/Cutting Edge/Wusun Prime.blk	
@@ -122,7 +122,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01D.blk b/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01D.blk
index 72190f1a742..e100dea91c2 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01D.blk	
@@ -111,7 +111,7 @@ IS Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <tonnage>
@@ -147,5 +147,5 @@ TARGETING:Rander TA1000 with Beagle Active Probe
 </systemManufacturers>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01E.blk b/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01E.blk
index 9ee464b5dcf..25fbe5b0986 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01E.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Davion/Cutlass CUT-01E.blk	
@@ -137,7 +137,7 @@ TARGETING:Rander TA1000 with Beagle Active Probe
 </systemManufacturers>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Davion/Rondel RDL-01C.blk b/megamek/data/mechfiles/fighters/TRO3145/Davion/Rondel RDL-01C.blk
index 9364f192013..db29b0a01cc 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Davion/Rondel RDL-01C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Davion/Rondel RDL-01C.blk	
@@ -111,7 +111,7 @@ ISRotaryAC5 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Kurita/Koroshiya KOS-1A.blk b/megamek/data/mechfiles/fighters/TRO3145/Kurita/Koroshiya KOS-1A.blk
index c3bde3fe78d..e5fe40212d8 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Kurita/Koroshiya KOS-1A.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Kurita/Koroshiya KOS-1A.blk	
@@ -108,7 +108,7 @@ IS MRM 40 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Liao/Yun Y-2.blk b/megamek/data/mechfiles/fighters/TRO3145/Liao/Yun Y-2.blk
index 0387fbcc016..94bd4190de1 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Liao/Yun Y-2.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Liao/Yun Y-2.blk	
@@ -110,7 +110,7 @@ IS Streak SRM 6 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Marik/Aquila AQA-1M.blk b/megamek/data/mechfiles/fighters/TRO3145/Marik/Aquila AQA-1M.blk
index dddce52db17..e472ee2251b 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Marik/Aquila AQA-1M.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Marik/Aquila AQA-1M.blk	
@@ -108,7 +108,7 @@ IS Light Gauss Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Marik/Picaroon CSR-F100.blk b/megamek/data/mechfiles/fighters/TRO3145/Marik/Picaroon CSR-F100.blk
index a82a79089f9..4181cc0b446 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Marik/Picaroon CSR-F100.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Marik/Picaroon CSR-F100.blk	
@@ -102,7 +102,7 @@ Heavy PPC
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Marik/Shikra SKR-4M.blk b/megamek/data/mechfiles/fighters/TRO3145/Marik/Shikra SKR-4M.blk
index 77974968e94..3704db118ba 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Marik/Shikra SKR-4M.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Marik/Shikra SKR-4M.blk	
@@ -116,7 +116,7 @@ Clan Ultra AC/10 Ammo
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Jengiz F.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Jengiz F.blk
index 6afdea713c7..480658e5e7b 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Jengiz F.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Jengiz F.blk	
@@ -118,7 +118,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Morgenstern MR-1SE.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Morgenstern MR-1SE.blk
index 62db57ed3ed..7a07852021e 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Morgenstern MR-1SE.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Morgenstern MR-1SE.blk	
@@ -114,7 +114,7 @@ IS Ammo LRM-15 Artemis-capable:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Ostrogoth D.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Ostrogoth D.blk
index a841347e614..b57c8f1cca2 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Ostrogoth D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Ostrogoth D.blk	
@@ -121,7 +121,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sagittarii SGT-4R.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sagittarii SGT-4R.blk
index a47ba3486fd..f9dfefd8eb9 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sagittarii SGT-4R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sagittarii SGT-4R.blk	
@@ -109,7 +109,7 @@ IS Ammo MML-5 SRM
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Scytha F.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Scytha F.blk
index ad2f12d557f..d7c81304221 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Scytha F.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Scytha F.blk	
@@ -124,7 +124,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Seydlitz C.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Seydlitz C.blk
index de9acafb3d5..154da5c4a4e 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Seydlitz C.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Seydlitz C.blk	
@@ -104,7 +104,7 @@ Clan Reflective
 </Fuselage Equipment>
 
 <source>
-Dark Age
+TRO: 3145 - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sparrowhawk SPR-7Dr.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sparrowhawk SPR-7Dr.blk
index 8a14fe05fb2..381909ad64c 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sparrowhawk SPR-7Dr.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sparrowhawk SPR-7Dr.blk	
@@ -105,7 +105,7 @@ ISERSmallLaser
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Stingray F-96R.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Stingray F-96R.blk
index b182664ff67..b6f9ea8cebf 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Stingray F-96R.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Stingray F-96R.blk	
@@ -104,7 +104,7 @@ Large Re-engineered Laser
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sulla F.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sulla F.blk
index 88df1b8617e..dd88a418ab0 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sulla F.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Sulla F.blk	
@@ -114,7 +114,7 @@ WatchdogECMSuite:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Tatsu MIK-OF.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Tatsu MIK-OF.blk
index bf94150bdd5..bb832871f66 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Tatsu MIK-OF.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Tatsu MIK-OF.blk	
@@ -109,7 +109,7 @@ IS Ammo MML-7 SRM:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Troika CMT-7T.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Troika CMT-7T.blk
index 827e65218df..a5406e2e0ca 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Troika CMT-7T.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Troika CMT-7T.blk	
@@ -109,7 +109,7 @@ IS Ammo LRM-20
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Wusun D.blk b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Wusun D.blk
index 1210bc5e38a..2fac909df16 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/NTNU/Wusun D.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/NTNU/Wusun D.blk	
@@ -112,7 +112,7 @@ Clan Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 NTNU - Late Republic
+TRO: 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-O.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-O.blk
index 6bf56c4bda6..20be1410b5f 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-O.blk	
@@ -115,7 +115,7 @@ ISImprovedHeavyGauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OA.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OA.blk
index 8f3d107e513..c96edacf452 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OA.blk	
@@ -119,7 +119,7 @@ IS Gauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OB.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OB.blk
index e8105df3cc0..cf51de5fa65 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Republic/Schrack SCK-OB.blk	
@@ -115,7 +115,7 @@ ISRotaryAC5 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-O.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-O.blk
index 746001ec32c..fef8f97b883 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-O.blk	
@@ -117,7 +117,7 @@ ISRotaryAC5 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OA.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OA.blk
index a421e286de9..408929396d0 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OA.blk	
@@ -121,7 +121,7 @@ IS MRM 40 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OB.blk b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OB.blk
index 3c432ad57e0..05d536b80b2 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Republic/Simurgh SMG-OB.blk	
@@ -114,7 +114,7 @@ ISImprovedHeavyGauss Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-O.blk b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-O.blk
index 4dc945bf760..17b35152741 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-O.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-O.blk	
@@ -111,7 +111,7 @@ IS Streak SRM 4 Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Early Republic
+TRO: 3145 Lyran Commonwealth - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OA.blk b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OA.blk
index c98e37af6ee..ccffbab727f 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OA.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OA.blk	
@@ -108,7 +108,7 @@ ISTargeting Computer:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Early Republic
+TRO: 3145 Lyran Commonwealth - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OB.blk b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OB.blk
index fbe35d7c46a..b9de1f4cc66 100644
--- a/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OB.blk	
+++ b/megamek/data/mechfiles/fighters/TRO3145/Steiner/Sternensturm STM-OB.blk	
@@ -116,7 +116,7 @@ ISAMS Ammo:OMNI
 </Fuselage Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Early Republic
+TRO: 3145 Lyran Commonwealth - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Boondocks/Sangihe Shrike-Thrush Nanook.blk b/megamek/data/mechfiles/fighters/XTRs/Boondocks/Sangihe Shrike-Thrush Nanook.blk
index 03cfed8497c..b124d3df2ea 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Boondocks/Sangihe Shrike-Thrush Nanook.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Boondocks/Sangihe Shrike-Thrush Nanook.blk	
@@ -142,7 +142,7 @@ Small Laser
 </Fuselage Equipment>
 
 <source>
-XTRO Boondocks - Jihad
+XTR: Boondocks - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Boondoggles/Cheetah II F-12A.blk b/megamek/data/mechfiles/fighters/XTRs/Boondoggles/Cheetah II F-12A.blk
index c5809cf036f..60ae0cc6987 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Boondoggles/Cheetah II F-12A.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Boondoggles/Cheetah II F-12A.blk	
@@ -101,7 +101,7 @@ Amity
 </primaryFactory>
 
 <source>
-XTR Boondoggles - Succesion Wars
+XTR: Boondoggles - Late Succession War - Renaissance
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Clans/Ammon-XR.blk b/megamek/data/mechfiles/fighters/XTRs/Clans/Ammon-XR.blk
index 9c1c05b5a09..193e6ec4ff3 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Clans/Ammon-XR.blk
+++ b/megamek/data/mechfiles/fighters/XTRs/Clans/Ammon-XR.blk
@@ -103,7 +103,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Clans/Scytha-XR.blk b/megamek/data/mechfiles/fighters/XTRs/Clans/Scytha-XR.blk
index 023b2351a5c..6fed625b102 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Clans/Scytha-XR.blk
+++ b/megamek/data/mechfiles/fighters/XTRs/Clans/Scytha-XR.blk
@@ -113,7 +113,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Comstar/Ironsides CX-19.blk b/megamek/data/mechfiles/fighters/XTRs/Comstar/Ironsides CX-19.blk
index 6631b358924..a9eb8003f29 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Comstar/Ironsides CX-19.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Comstar/Ironsides CX-19.blk	
@@ -115,7 +115,7 @@ Clan Streak SRM 6 Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO ComStar - Jihad
+XTR: ComStar - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Comstar/Tomahawk CX-11.blk b/megamek/data/mechfiles/fighters/XTRs/Comstar/Tomahawk CX-11.blk
index 4376d740bc6..49891682ef5 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Comstar/Tomahawk CX-11.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Comstar/Tomahawk CX-11.blk	
@@ -106,7 +106,7 @@ ISLaserInsulator
 </Fuselage Equipment>
 
 <source>
-XTRO ComStar - Jihad
+XTR: ComStar - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Comstar/Zero ZRO-CX-3.blk b/megamek/data/mechfiles/fighters/XTRs/Comstar/Zero ZRO-CX-3.blk
index 2ba64b8359f..417831e7e96 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Comstar/Zero ZRO-CX-3.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Comstar/Zero ZRO-CX-3.blk	
@@ -97,7 +97,7 @@ ISEnhancedLRM5 Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO ComStar - Jihad
+XTR: ComStar - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Corporations/Sabre Defense Special.blk b/megamek/data/mechfiles/fighters/XTRs/Corporations/Sabre Defense Special.blk
index 8a647d83340..f98f5321588 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Corporations/Sabre Defense Special.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Corporations/Sabre Defense Special.blk	
@@ -99,7 +99,7 @@ ISLaserAntiMissileSystem
 </Fuselage Equipment>
 
 <source>
-XTRO Corporation - Jihad
+XTR: Corporation - Jihad
 </source>
 
 <tonnage>
@@ -139,7 +139,7 @@ TARGETING:Ki-II TTS
 </systemManufacturers>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Corporations/Sholagar SL-27X.blk b/megamek/data/mechfiles/fighters/XTRs/Corporations/Sholagar SL-27X.blk
index c1b12300041..1524138a893 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Corporations/Sholagar SL-27X.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Corporations/Sholagar SL-27X.blk	
@@ -98,7 +98,7 @@ Light PPC
 </Fuselage Equipment>
 
 <source>
-XTRO Corporation - Jihad
+XTR: Corporation - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Davion/Corsair CSR-X12 Rigid Night.blk b/megamek/data/mechfiles/fighters/XTRs/Davion/Corsair CSR-X12 Rigid Night.blk
index ade9a5a207f..c4fcbd7249f 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Davion/Corsair CSR-X12 Rigid Night.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Davion/Corsair CSR-X12 Rigid Night.blk	
@@ -101,7 +101,7 @@ CLSmallPulseLaser
 </Fuselage Equipment>
 
 <source>
-XTRO Davion - Jihad
+XTR: Davion - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Davion/Dagger DAR4-XP.blk b/megamek/data/mechfiles/fighters/XTRs/Davion/Dagger DAR4-XP.blk
index 384f06f3c28..b2ceb81b199 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Davion/Dagger DAR4-XP.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Davion/Dagger DAR4-XP.blk	
@@ -104,7 +104,7 @@ ISMediumVSPLaser
 </Fuselage Equipment>
 
 <source>
-XTRO Davion - Jihad
+XTR: Davion - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Gunslingers/Hellcat II HCT-213BC (Herman).blk b/megamek/data/mechfiles/fighters/XTRs/Gunslingers/Hellcat II HCT-213BC (Herman).blk
index d6ad2579f43..ce8692a6ff8 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Gunslingers/Hellcat II HCT-213BC (Herman).blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Gunslingers/Hellcat II HCT-213BC (Herman).blk	
@@ -105,7 +105,7 @@ ISSpaceMineDispenser
 </Fuselage Equipment>
 
 <source>
-XTRO Gunslingers - Star League
+XTR: Gunslingers - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Gunslingers/Swift SWF-606 (Aaron).blk b/megamek/data/mechfiles/fighters/XTRs/Gunslingers/Swift SWF-606 (Aaron).blk
index 5ab02c531ea..c996f18adbe 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Gunslingers/Swift SWF-606 (Aaron).blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Gunslingers/Swift SWF-606 (Aaron).blk	
@@ -139,5 +139,5 @@ TARGETING:PhantomTrac 55
 </systemManufacturers>
 
 <source>
-XTRO Gunslingers - Star League
+XTR: Gunslingers - Star League
 </source>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Kurita/Oni ON-2X.blk b/megamek/data/mechfiles/fighters/XTRs/Kurita/Oni ON-2X.blk
index 7ca39cbd82e..a2593a94f15 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Kurita/Oni ON-2X.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Kurita/Oni ON-2X.blk	
@@ -113,7 +113,7 @@ IS MRM 30 Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Kurita/Shilone Sl-17X.blk b/megamek/data/mechfiles/fighters/XTRs/Kurita/Shilone Sl-17X.blk
index 0e5d3dc0d20..47472e3a9dd 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Kurita/Shilone Sl-17X.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Kurita/Shilone Sl-17X.blk	
@@ -110,7 +110,7 @@ ISImprovedHeavyGauss Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Liao/Transit TR-13 Glare.blk b/megamek/data/mechfiles/fighters/XTRs/Liao/Transit TR-13 Glare.blk
index eff6c9abb95..240ee6f767a 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Liao/Transit TR-13 Glare.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Liao/Transit TR-13 Glare.blk	
@@ -109,7 +109,7 @@ ISImprovedHeavyGauss Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Liao/Troika CMT-3TV (Viktor).blk b/megamek/data/mechfiles/fighters/XTRs/Liao/Troika CMT-3TV (Viktor).blk
index 660f553e526..3866712057b 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Liao/Troika CMT-3TV (Viktor).blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Liao/Troika CMT-3TV (Viktor).blk	
@@ -109,7 +109,7 @@ Clan Streak LRM 20 Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Marik/Cheetah OF-17.blk b/megamek/data/mechfiles/fighters/XTRs/Marik/Cheetah OF-17.blk
index 52c6cf46e08..ea76990b628 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Marik/Cheetah OF-17.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Marik/Cheetah OF-17.blk	
@@ -105,7 +105,7 @@ IS Vehicular Stealth
 </Fuselage Equipment>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Marik/Shiva SHV-S.blk b/megamek/data/mechfiles/fighters/XTRs/Marik/Shiva SHV-S.blk
index 8519963c2b7..24ebd6b8f86 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Marik/Shiva SHV-S.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Marik/Shiva SHV-S.blk	
@@ -111,7 +111,7 @@ ISImprovedHeavyGauss Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Lucifer LCF-X30.blk b/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Lucifer LCF-X30.blk
index 099b3f11e5f..03c307251f2 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Lucifer LCF-X30.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Lucifer LCF-X30.blk	
@@ -107,7 +107,7 @@ IS Ammo Extended LRM-10
 </Fuselage Equipment>
 
 <source>
-XTRO Mercenaries - Jihad
+XTR: Mercenaries - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Seydlitz SYD-45X Starling.blk b/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Seydlitz SYD-45X Starling.blk
index aa830f6f8fb..44316be29fd 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Seydlitz SYD-45X Starling.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Seydlitz SYD-45X Starling.blk	
@@ -103,7 +103,7 @@ ISChaffPod
 </Fuselage Equipment>
 
 <source>
-XTRO Mercenaries - Jihad
+XTR: Mercenaries - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Slayer SL-CX1.blk b/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Slayer SL-CX1.blk
index 83ad7b82a66..bc466ae875a 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Slayer SL-CX1.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Slayer SL-CX1.blk	
@@ -109,7 +109,7 @@ ISRotaryAC5 Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Mercenaries - Jihad
+XTR: Mercenaries - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Periphery/Thunderbird TRB-XTS.blk b/megamek/data/mechfiles/fighters/XTRs/Periphery/Thunderbird TRB-XTS.blk
index 4fd883ca59c..a65bcaa47dc 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Periphery/Thunderbird TRB-XTS.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Periphery/Thunderbird TRB-XTS.blk	
@@ -113,7 +113,7 @@ ISRotaryAC5 Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Phantoms/Battle Taxi NL-43.blk b/megamek/data/mechfiles/fighters/XTRs/Phantoms/Battle Taxi NL-43.blk
index 3e2e646d892..7518a432d4d 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Phantoms/Battle Taxi NL-43.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Phantoms/Battle Taxi NL-43.blk	
@@ -117,7 +117,7 @@ IS Vehicular Stealth
 </Fuselage Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Phantoms/Deathstalker XF-78.blk b/megamek/data/mechfiles/fighters/XTRs/Phantoms/Deathstalker XF-78.blk
index d399bed3e50..2a6297c8298 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Phantoms/Deathstalker XF-78.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Phantoms/Deathstalker XF-78.blk	
@@ -111,7 +111,7 @@ ISImprovedHeavyGauss Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Pirates/Chippewa CHP-X-P Gladstone.blk b/megamek/data/mechfiles/fighters/XTRs/Pirates/Chippewa CHP-X-P Gladstone.blk
index c06a297fa54..9637aca386b 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Pirates/Chippewa CHP-X-P Gladstone.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Pirates/Chippewa CHP-X-P Gladstone.blk	
@@ -147,7 +147,7 @@ TARGETING:Rander TAS
 </systemManufacturers>
 
 <source>
-XTRO Pirates - Jihad
+XTR: Pirates - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Pirates/Lightning LTN-G16-P Branson.blk b/megamek/data/mechfiles/fighters/XTRs/Pirates/Lightning LTN-G16-P Branson.blk
index 581036f1386..0b884afb45c 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Pirates/Lightning LTN-G16-P Branson.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Pirates/Lightning LTN-G16-P Branson.blk	
@@ -109,7 +109,7 @@ IS Ammo HVAC/10
 </Fuselage Equipment>
 
 <source>
-XTRO Pirates - Jihad
+XTR: Pirates - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Primitives I/Vulcan VLC-3N.blk b/megamek/data/mechfiles/fighters/XTRs/Primitives I/Vulcan VLC-3N.blk
index 886176f048d..845546da042 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Primitives I/Vulcan VLC-3N.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Primitives I/Vulcan VLC-3N.blk	
@@ -109,7 +109,7 @@ IS Ammo AC/10
 </Fuselage Equipment>
 
 <source>
-XTRO Primitives I - Age of War
+XTR: Primitives I - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Primitives IV/Hammerhead HMR-HA.blk b/megamek/data/mechfiles/fighters/XTRs/Primitives IV/Hammerhead HMR-HA.blk
index 50a1336d03d..77d123ba6f6 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Primitives IV/Hammerhead HMR-HA.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Primitives IV/Hammerhead HMR-HA.blk	
@@ -103,7 +103,7 @@ Large Laser
 </Fuselage Equipment>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Primitives IV/Hammerhead HMR-HC.blk b/megamek/data/mechfiles/fighters/XTRs/Primitives IV/Hammerhead HMR-HC.blk
index a92e4c1207b..fc01736ef42 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Primitives IV/Hammerhead HMR-HC.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Primitives IV/Hammerhead HMR-HC.blk	
@@ -95,7 +95,7 @@ Large Laser
 </Fuselage Equipment>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Republic II/Persepolis 2.blk b/megamek/data/mechfiles/fighters/XTRs/Republic II/Persepolis 2.blk
index c2836c93955..cb1d6a865e3 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Republic II/Persepolis 2.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Republic II/Persepolis 2.blk	
@@ -119,7 +119,7 @@ CLCASE
 </Fuselage Equipment>
 
 <source>
-XTRO Republic II - Dark Ages
+XTR: Republic II - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/RetroTech/Malaika BAM-1A1.blk b/megamek/data/mechfiles/fighters/XTRs/RetroTech/Malaika BAM-1A1.blk
index 3e61ec95582..d9e8da92957 100644
--- a/megamek/data/mechfiles/fighters/XTRs/RetroTech/Malaika BAM-1A1.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/RetroTech/Malaika BAM-1A1.blk	
@@ -109,7 +109,7 @@ IS Ammo MML-5 SRM Artemis-capable
 </Fuselage Equipment>
 
 <source>
-XTRO RetroTech - Jihad
+XTR: RetroTech - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/RetroTech/Sparrowhawk SPR-DH.blk b/megamek/data/mechfiles/fighters/XTRs/RetroTech/Sparrowhawk SPR-DH.blk
index 67b0215e7d2..c307804b5eb 100644
--- a/megamek/data/mechfiles/fighters/XTRs/RetroTech/Sparrowhawk SPR-DH.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/RetroTech/Sparrowhawk SPR-DH.blk	
@@ -105,7 +105,7 @@ ISERSmallLaser
 </Fuselage Equipment>
 
 <source>
-XTRO RetroTech - Jihad
+XTR: RetroTech - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/RetroTech/Star Dagger S-2.blk b/megamek/data/mechfiles/fighters/XTRs/RetroTech/Star Dagger S-2.blk
index dff7b7d3832..b8789a644cd 100644
--- a/megamek/data/mechfiles/fighters/XTRs/RetroTech/Star Dagger S-2.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/RetroTech/Star Dagger S-2.blk	
@@ -107,7 +107,7 @@ IS Ammo MG - Full
 </Fuselage Equipment>
 
 <source>
-XTRO RetroTech - Jihad
+XTR: RetroTech - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Steiner/Rapier RPR-300X.blk b/megamek/data/mechfiles/fighters/XTRs/Steiner/Rapier RPR-300X.blk
index 6646b4debf4..f5bc9646228 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Steiner/Rapier RPR-300X.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Steiner/Rapier RPR-300X.blk	
@@ -113,7 +113,7 @@ IS Ammo Extended LRM-10
 </Fuselage Equipment>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Succession Wars/Starfire.blk b/megamek/data/mechfiles/fighters/XTRs/Succession Wars/Starfire.blk
index fc6d88e09c0..46bef5206c1 100644
--- a/megamek/data/mechfiles/fighters/XTRs/Succession Wars/Starfire.blk	
+++ b/megamek/data/mechfiles/fighters/XTRs/Succession Wars/Starfire.blk	
@@ -108,7 +108,7 @@ IS Ultra AC/5 Ammo
 </Fuselage Equipment>
 
 <source>
-XTRO Succession Wars - Succession Wars
+XTR: Succession Wars - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/infantry/3085/Clan/Clan Anti-Infantry Clan Jade Falcon Police.blk b/megamek/data/mechfiles/infantry/3085/Clan/Clan Anti-Infantry Clan Jade Falcon Police.blk
index 778c7435a41..025fbb69fd1 100644
--- a/megamek/data/mechfiles/infantry/3085/Clan/Clan Anti-Infantry Clan Jade Falcon Police.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Clan/Clan Anti-Infantry Clan Jade Falcon Police.blk	
@@ -44,7 +44,7 @@ Clan Level 3
 2825
 </year>
 <era>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </era>
 <motion_type>
 Wheeled
diff --git a/megamek/data/mechfiles/infantry/3085/Clan/Clan Heavy Foot Infantry Ebon Keshik Point.blk b/megamek/data/mechfiles/infantry/3085/Clan/Clan Heavy Foot Infantry Ebon Keshik Point.blk
index 329096d936e..1a18f17c089 100644
--- a/megamek/data/mechfiles/infantry/3085/Clan/Clan Heavy Foot Infantry Ebon Keshik Point.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Clan/Clan Heavy Foot Infantry Ebon Keshik Point.blk	
@@ -38,7 +38,7 @@ Clan Level 3
 2875
 </year>
 <era>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/Clan/Clan Space Marine Clan Snow Raven Space Marines.blk b/megamek/data/mechfiles/infantry/3085/Clan/Clan Space Marine Clan Snow Raven Space Marines.blk
index b92297e4871..7976202aca5 100644
--- a/megamek/data/mechfiles/infantry/3085/Clan/Clan Space Marine Clan Snow Raven Space Marines.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Clan/Clan Space Marine Clan Snow Raven Space Marines.blk	
@@ -40,7 +40,7 @@ Clan Level 3
 3015
 </year>
 <era>
-TRO 3085 - Late Succession War
+TRO: 3085 - Late Succession War
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/Clan/Motorized Infantry Dark Caste Bandits.blk b/megamek/data/mechfiles/infantry/3085/Clan/Motorized Infantry Dark Caste Bandits.blk
index 868fc064a97..4af0608f3c0 100644
--- a/megamek/data/mechfiles/infantry/3085/Clan/Motorized Infantry Dark Caste Bandits.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Clan/Motorized Infantry Dark Caste Bandits.blk	
@@ -41,7 +41,7 @@ Clan Level 2
 2830
 </year>
 <era>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </era>
 <motion_type>
 Motorized
diff --git a/megamek/data/mechfiles/infantry/3085/Comstar/Bridge-builder Engineers Take the Time III-chi Forty-eighth Division.blk b/megamek/data/mechfiles/infantry/3085/Comstar/Bridge-builder Engineers Take the Time III-chi Forty-eighth Division.blk
index f39b149520f..94a5504fac9 100644
--- a/megamek/data/mechfiles/infantry/3085/Comstar/Bridge-builder Engineers Take the Time III-chi Forty-eighth Division.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Comstar/Bridge-builder Engineers Take the Time III-chi Forty-eighth Division.blk	
@@ -60,5 +60,5 @@ Infantry bridge-building equipment not coded in MM.  Unit included for completen
 </history>
 
 <era>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </era>
diff --git a/megamek/data/mechfiles/infantry/3085/Comstar/Motorized XCT Infantry Explorer Corps Hostile Environment.blk b/megamek/data/mechfiles/infantry/3085/Comstar/Motorized XCT Infantry Explorer Corps Hostile Environment.blk
index 699e8ec8c5e..a67108b57d8 100644
--- a/megamek/data/mechfiles/infantry/3085/Comstar/Motorized XCT Infantry Explorer Corps Hostile Environment.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Comstar/Motorized XCT Infantry Explorer Corps Hostile Environment.blk	
@@ -44,7 +44,7 @@ IS Level 3
 3058				
 </year>
 <era>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </era>
 <motion_type>
 Motorized
diff --git a/megamek/data/mechfiles/infantry/3085/Comstar/Space Marine Com Guards Warship Fleet Marine.blk b/megamek/data/mechfiles/infantry/3085/Comstar/Space Marine Com Guards Warship Fleet Marine.blk
index fe07a0312c3..8c752ebebcc 100644
--- a/megamek/data/mechfiles/infantry/3085/Comstar/Space Marine Com Guards Warship Fleet Marine.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Comstar/Space Marine Com Guards Warship Fleet Marine.blk	
@@ -44,7 +44,7 @@ IS Level 3
 2900
 </year>
 <era>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/Corporations/Heavy Support Infantry Irian Technologies SWAT Team.blk b/megamek/data/mechfiles/infantry/3085/Corporations/Heavy Support Infantry Irian Technologies SWAT Team.blk
index d8df17cc856..8f9fba99698 100644
--- a/megamek/data/mechfiles/infantry/3085/Corporations/Heavy Support Infantry Irian Technologies SWAT Team.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Corporations/Heavy Support Infantry Irian Technologies SWAT Team.blk	
@@ -44,7 +44,7 @@ IS Level 3
 3063
 </year>
 <era>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </era>
 <motion_type>
 Motorized
diff --git a/megamek/data/mechfiles/infantry/3085/Corporations/Hover Assault Infantry Johnston Industries Rapid Response Force.blk b/megamek/data/mechfiles/infantry/3085/Corporations/Hover Assault Infantry Johnston Industries Rapid Response Force.blk
index 36d5145c3c9..7470486f084 100644
--- a/megamek/data/mechfiles/infantry/3085/Corporations/Hover Assault Infantry Johnston Industries Rapid Response Force.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Corporations/Hover Assault Infantry Johnston Industries Rapid Response Force.blk	
@@ -41,7 +41,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </era>
 <motion_type>
 Hover
diff --git a/megamek/data/mechfiles/infantry/3085/Corporations/Jump Support Infantry Star Corps Jump Assault Infantry.blk b/megamek/data/mechfiles/infantry/3085/Corporations/Jump Support Infantry Star Corps Jump Assault Infantry.blk
index 0127eb282a4..a2ea9bfd380 100644
--- a/megamek/data/mechfiles/infantry/3085/Corporations/Jump Support Infantry Star Corps Jump Assault Infantry.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Corporations/Jump Support Infantry Star Corps Jump Assault Infantry.blk	
@@ -41,7 +41,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </era>
 <motion_type>
 Jump
diff --git a/megamek/data/mechfiles/infantry/3085/Corporations/VTOL Infantry Hachiman Taro Enterprise Extraction Force.blk b/megamek/data/mechfiles/infantry/3085/Corporations/VTOL Infantry Hachiman Taro Enterprise Extraction Force.blk
index 0261b93d3ba..4456a536287 100644
--- a/megamek/data/mechfiles/infantry/3085/Corporations/VTOL Infantry Hachiman Taro Enterprise Extraction Force.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Corporations/VTOL Infantry Hachiman Taro Enterprise Extraction Force.blk	
@@ -40,7 +40,7 @@ VTOL
 </Field Guns Equipment>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <squad_size>
@@ -60,5 +60,5 @@ MyomerVest
 </armorKit>
 
 <era>
-TRO 3085 - Late Succession War - Renaissance
+TRO: 3085 - Late Succession War - Renaissance
 </era>
diff --git a/megamek/data/mechfiles/infantry/3085/Davion/Firefighter Twenty-fourth Hellfire Firefighting Battalion 84th Avalon LI 17th Avalon Hussars.blk b/megamek/data/mechfiles/infantry/3085/Davion/Firefighter Twenty-fourth Hellfire Firefighting Battalion 84th Avalon LI 17th Avalon Hussars.blk
index 0f897246f61..3129d377184 100644
--- a/megamek/data/mechfiles/infantry/3085/Davion/Firefighter Twenty-fourth Hellfire Firefighting Battalion 84th Avalon LI 17th Avalon Hussars.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Davion/Firefighter Twenty-fourth Hellfire Firefighting Battalion 84th Avalon LI 17th Avalon Hussars.blk	
@@ -52,5 +52,5 @@ DavionKit
 </armorKit>
 
 <source>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/infantry/3085/Davion/Frogmen Blue Water Marine Response Teams (Frogmen).blk b/megamek/data/mechfiles/infantry/3085/Davion/Frogmen Blue Water Marine Response Teams (Frogmen).blk
index 4529743f234..f772b8c53c7 100644
--- a/megamek/data/mechfiles/infantry/3085/Davion/Frogmen Blue Water Marine Response Teams (Frogmen).blk	
+++ b/megamek/data/mechfiles/infantry/3085/Davion/Frogmen Blue Water Marine Response Teams (Frogmen).blk	
@@ -40,7 +40,7 @@ Motorized SCUBA
 </Field Guns Equipment>
 
 <source>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/Davion/Mountaineer 45th Cerulean Mountain Infantry.blk b/megamek/data/mechfiles/infantry/3085/Davion/Mountaineer 45th Cerulean Mountain Infantry.blk
index 0551b6dcdb5..e5502c932f6 100644
--- a/megamek/data/mechfiles/infantry/3085/Davion/Mountaineer 45th Cerulean Mountain Infantry.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Davion/Mountaineer 45th Cerulean Mountain Infantry.blk	
@@ -68,5 +68,5 @@ DavionKit
 </armorKit>
 
 <era>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </era>
diff --git a/megamek/data/mechfiles/infantry/3085/Davion/SpecOps Paratrooper MI6 Extraction Team.blk b/megamek/data/mechfiles/infantry/3085/Davion/SpecOps Paratrooper MI6 Extraction Team.blk
index 0d2e21e28d3..6000e0bb542 100644
--- a/megamek/data/mechfiles/infantry/3085/Davion/SpecOps Paratrooper MI6 Extraction Team.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Davion/SpecOps Paratrooper MI6 Extraction Team.blk	
@@ -47,7 +47,7 @@ Leg
 </Field Guns Equipment>
 
 <source>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/FRR/Anti-Mech Jump Infantry Third Ueda Infantry.blk b/megamek/data/mechfiles/infantry/3085/FRR/Anti-Mech Jump Infantry Third Ueda Infantry.blk
index b0bee88b89c..f93bccc1336 100644
--- a/megamek/data/mechfiles/infantry/3085/FRR/Anti-Mech Jump Infantry Third Ueda Infantry.blk	
+++ b/megamek/data/mechfiles/infantry/3085/FRR/Anti-Mech Jump Infantry Third Ueda Infantry.blk	
@@ -41,7 +41,7 @@ IS Level 2
 2600
 </year>
 <era>
-TRO 3085 - Star League
+TRO: 3085 - Star League
 </era>
 <motion_type>
 Jump
diff --git a/megamek/data/mechfiles/infantry/3085/FRR/Clan Assault Infantry Ghost Bear Heavy Solahma Infantry.blk b/megamek/data/mechfiles/infantry/3085/FRR/Clan Assault Infantry Ghost Bear Heavy Solahma Infantry.blk
index a05736be8c1..8a32a754967 100644
--- a/megamek/data/mechfiles/infantry/3085/FRR/Clan Assault Infantry Ghost Bear Heavy Solahma Infantry.blk	
+++ b/megamek/data/mechfiles/infantry/3085/FRR/Clan Assault Infantry Ghost Bear Heavy Solahma Infantry.blk	
@@ -44,7 +44,7 @@ Clan Level 3
 3015
 </year>
 <source>
-TRO 3085 - Late Succession War - LosTech
+TRO: 3085 - Late Succession War - LosTech
 </source>
 <motion_type>
 Jump
diff --git a/megamek/data/mechfiles/infantry/3085/FRR/Clan Mechanized Infantry MimirWatch Counter Insurgency Point.blk b/megamek/data/mechfiles/infantry/3085/FRR/Clan Mechanized Infantry MimirWatch Counter Insurgency Point.blk
index 85e18b6a233..57acb776288 100644
--- a/megamek/data/mechfiles/infantry/3085/FRR/Clan Mechanized Infantry MimirWatch Counter Insurgency Point.blk	
+++ b/megamek/data/mechfiles/infantry/3085/FRR/Clan Mechanized Infantry MimirWatch Counter Insurgency Point.blk	
@@ -42,7 +42,7 @@ Clan Level 3
 2900
 </year>
 <source>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </source>
 <motion_type>
 Tracked
diff --git a/megamek/data/mechfiles/infantry/3085/FRR/Motorized Heavy Infantry MotstandMimir Troop.blk b/megamek/data/mechfiles/infantry/3085/FRR/Motorized Heavy Infantry MotstandMimir Troop.blk
index 091f32ada3a..b649d47b669 100644
--- a/megamek/data/mechfiles/infantry/3085/FRR/Motorized Heavy Infantry MotstandMimir Troop.blk	
+++ b/megamek/data/mechfiles/infantry/3085/FRR/Motorized Heavy Infantry MotstandMimir Troop.blk	
@@ -41,7 +41,7 @@ IS Level 2
 2500
 </year>
 <source>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </source>
 <motion_type>
 Motorized
diff --git a/megamek/data/mechfiles/infantry/3085/Hell Horses/AA Mechanized Infantry Mechanized AA Infantry.blk b/megamek/data/mechfiles/infantry/3085/Hell Horses/AA Mechanized Infantry Mechanized AA Infantry.blk
index 9c820397154..947e2cd2d98 100644
--- a/megamek/data/mechfiles/infantry/3085/Hell Horses/AA Mechanized Infantry Mechanized AA Infantry.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Hell Horses/AA Mechanized Infantry Mechanized AA Infantry.blk	
@@ -44,7 +44,7 @@ Clan Level 3
 2900
 </year>
 <source>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </source>
 <motion_type>
 Wheeled
diff --git a/megamek/data/mechfiles/infantry/3085/Hell Horses/Clan Foot Infantry Ad Hoc Point.blk b/megamek/data/mechfiles/infantry/3085/Hell Horses/Clan Foot Infantry Ad Hoc Point.blk
index 91a65969377..17b9b7cbd34 100644
--- a/megamek/data/mechfiles/infantry/3085/Hell Horses/Clan Foot Infantry Ad Hoc Point.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Hell Horses/Clan Foot Infantry Ad Hoc Point.blk	
@@ -44,7 +44,7 @@ Clan Level 3
 2825
 </year>
 <era>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/Hell Horses/Clan Heavy Jump Infantry Heavy Infantry Point.blk b/megamek/data/mechfiles/infantry/3085/Hell Horses/Clan Heavy Jump Infantry Heavy Infantry Point.blk
index 75e25415166..1f1f3a03062 100644
--- a/megamek/data/mechfiles/infantry/3085/Hell Horses/Clan Heavy Jump Infantry Heavy Infantry Point.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Hell Horses/Clan Heavy Jump Infantry Heavy Infantry Point.blk	
@@ -44,7 +44,7 @@ Clan Level 3
 3015
 </year>
 <era>
-TRO 3085 - Late Succession War - LosTech
+TRO: 3085 - Late Succession War - LosTech
 </era>
 <motion_type>
 Jump
diff --git a/megamek/data/mechfiles/infantry/3085/Hell Horses/Fast Recon Cavalry Point.blk b/megamek/data/mechfiles/infantry/3085/Hell Horses/Fast Recon Cavalry Point.blk
index a79e6a31ddf..0f1d20f1b8c 100644
--- a/megamek/data/mechfiles/infantry/3085/Hell Horses/Fast Recon Cavalry Point.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Hell Horses/Fast Recon Cavalry Point.blk	
@@ -38,7 +38,7 @@ Clan Level 3
 2825
 </year>
 <source>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </source>
 <motion_type>
 Hover
diff --git a/megamek/data/mechfiles/infantry/3085/Kurita/Ceremonial Guard Otomo Guard.blk b/megamek/data/mechfiles/infantry/3085/Kurita/Ceremonial Guard Otomo Guard.blk
index 8613031eb92..57326521781 100644
--- a/megamek/data/mechfiles/infantry/3085/Kurita/Ceremonial Guard Otomo Guard.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Kurita/Ceremonial Guard Otomo Guard.blk	
@@ -44,7 +44,7 @@ IS Level 2
 2350
 </year>
 <era>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/Kurita/Heavy Jump Infantry DEST Heavy Response Platoon.blk b/megamek/data/mechfiles/infantry/3085/Kurita/Heavy Jump Infantry DEST Heavy Response Platoon.blk
index bc21824579e..b4de0590b12 100644
--- a/megamek/data/mechfiles/infantry/3085/Kurita/Heavy Jump Infantry DEST Heavy Response Platoon.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Kurita/Heavy Jump Infantry DEST Heavy Response Platoon.blk	
@@ -44,7 +44,7 @@ IS Level 3
 2840
 </year>
 <era>
-TRO 3085 - Early Succession War
+TRO: 3085 - Early Succession War
 </era>
 <motion_type>
 Jump
diff --git a/megamek/data/mechfiles/infantry/3085/Kurita/Mechanized Field Artillery 71st Mechanized.blk b/megamek/data/mechfiles/infantry/3085/Kurita/Mechanized Field Artillery 71st Mechanized.blk
index 0e98bdaf611..2280b5c6823 100644
--- a/megamek/data/mechfiles/infantry/3085/Kurita/Mechanized Field Artillery 71st Mechanized.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Kurita/Mechanized Field Artillery 71st Mechanized.blk	
@@ -48,7 +48,7 @@ IS Level 3
 2500
 </year>
 <source>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </source>
 <motion_type>
 Wheeled
diff --git a/megamek/data/mechfiles/infantry/3085/Kurita/Recon Infantry Recon Battalion 201st Pesht Assault Team 3rd Proserpina Hussars.blk b/megamek/data/mechfiles/infantry/3085/Kurita/Recon Infantry Recon Battalion 201st Pesht Assault Team 3rd Proserpina Hussars.blk
index 17fcb374950..d9857d66964 100644
--- a/megamek/data/mechfiles/infantry/3085/Kurita/Recon Infantry Recon Battalion 201st Pesht Assault Team 3rd Proserpina Hussars.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Kurita/Recon Infantry Recon Battalion 201st Pesht Assault Team 3rd Proserpina Hussars.blk	
@@ -60,5 +60,5 @@ KuritaKit
 </specialization>
 
 <source>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </source>
diff --git a/megamek/data/mechfiles/infantry/3085/Liao/Commando CCAF Battlefield Infiltration Units.blk b/megamek/data/mechfiles/infantry/3085/Liao/Commando CCAF Battlefield Infiltration Units.blk
index 5df4fde941b..b5faf253a57 100644
--- a/megamek/data/mechfiles/infantry/3085/Liao/Commando CCAF Battlefield Infiltration Units.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Liao/Commando CCAF Battlefield Infiltration Units.blk	
@@ -60,5 +60,5 @@ ISSneakSuitCamoIRECM
 </armorKit>
 
 <source>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </source>
diff --git a/megamek/data/mechfiles/infantry/3085/Liao/Missile Artillery Infantry Kommando Special Forces.blk b/megamek/data/mechfiles/infantry/3085/Liao/Missile Artillery Infantry Kommando Special Forces.blk
index bcee54cb3f4..0c69664f1b5 100644
--- a/megamek/data/mechfiles/infantry/3085/Liao/Missile Artillery Infantry Kommando Special Forces.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Liao/Missile Artillery Infantry Kommando Special Forces.blk	
@@ -45,7 +45,7 @@ IS Level 3
 2600
 </year>
 <source>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </source>
 <motion_type>
 Wheeled
diff --git a/megamek/data/mechfiles/infantry/3085/Liao/Sniper House Dai Da Chi Snipers.blk b/megamek/data/mechfiles/infantry/3085/Liao/Sniper House Dai Da Chi Snipers.blk
index ae42c5c95a0..8c35254c7b7 100644
--- a/megamek/data/mechfiles/infantry/3085/Liao/Sniper House Dai Da Chi Snipers.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Liao/Sniper House Dai Da Chi Snipers.blk	
@@ -48,7 +48,7 @@ IS Level 3
 </year>
 
 <era>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </era>
 
 <motion_type>
diff --git a/megamek/data/mechfiles/infantry/3085/Marik/AA Jump Infantry 292nd League Regulars.blk b/megamek/data/mechfiles/infantry/3085/Marik/AA Jump Infantry 292nd League Regulars.blk
index d320b504162..d1bfe023ccb 100644
--- a/megamek/data/mechfiles/infantry/3085/Marik/AA Jump Infantry 292nd League Regulars.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Marik/AA Jump Infantry 292nd League Regulars.blk	
@@ -41,7 +41,7 @@ IS Level 2
 3060
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Jump
diff --git a/megamek/data/mechfiles/infantry/3085/Mercenary/Scout Infantry The Battle Corps - Baker Street Irregulars.blk b/megamek/data/mechfiles/infantry/3085/Mercenary/Scout Infantry The Battle Corps - Baker Street Irregulars.blk
index a010c352de2..30e1305629c 100644
--- a/megamek/data/mechfiles/infantry/3085/Mercenary/Scout Infantry The Battle Corps - Baker Street Irregulars.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Mercenary/Scout Infantry The Battle Corps - Baker Street Irregulars.blk	
@@ -35,7 +35,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/Mercenary/Submersible Mechanized Infantry Kraken Unleashed - The Mermen.blk b/megamek/data/mechfiles/infantry/3085/Mercenary/Submersible Mechanized Infantry Kraken Unleashed - The Mermen.blk
index 5532d514e86..b25d469d25b 100644
--- a/megamek/data/mechfiles/infantry/3085/Mercenary/Submersible Mechanized Infantry Kraken Unleashed - The Mermen.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Mercenary/Submersible Mechanized Infantry Kraken Unleashed - The Mermen.blk	
@@ -40,7 +40,7 @@ Submarine
 </Field Guns Equipment>
 
 <source>
-TRO 3085S
+TRO: 3085S
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/MoC/Field Medic Magistracy Medical Corp.blk b/megamek/data/mechfiles/infantry/3085/MoC/Field Medic Magistracy Medical Corp.blk
index 4849ef77a2a..10260804fb2 100644
--- a/megamek/data/mechfiles/infantry/3085/MoC/Field Medic Magistracy Medical Corp.blk	
+++ b/megamek/data/mechfiles/infantry/3085/MoC/Field Medic Magistracy Medical Corp.blk	
@@ -40,7 +40,7 @@ Leg
 </Field Guns Equipment>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/MoC/Foot Infantry Raventhir's Infantry Guard.blk b/megamek/data/mechfiles/infantry/3085/MoC/Foot Infantry Raventhir's Infantry Guard.blk
index 8b3df9575e2..37d20ac0b1a 100644
--- a/megamek/data/mechfiles/infantry/3085/MoC/Foot Infantry Raventhir's Infantry Guard.blk	
+++ b/megamek/data/mechfiles/infantry/3085/MoC/Foot Infantry Raventhir's Infantry Guard.blk	
@@ -41,7 +41,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Assassin Skaret Assassins.blk b/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Assassin Skaret Assassins.blk
index 07f5b289acb..cafb0e61bcf 100644
--- a/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Assassin Skaret Assassins.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Assassin Skaret Assassins.blk	
@@ -47,7 +47,7 @@ IS Level 3
 2800
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 leg
diff --git a/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Ceremonial Guard Caesars Royal Guard Marion Hegemony.blk b/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Ceremonial Guard Caesars Royal Guard Marion Hegemony.blk
index a8cf2a1249a..c8641725266 100644
--- a/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Ceremonial Guard Caesars Royal Guard Marion Hegemony.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Ceremonial Guard Caesars Royal Guard Marion Hegemony.blk	
@@ -40,7 +40,7 @@ Leg
 </Field Guns Equipment>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Pirate Lady Death's Pacification Squads.blk b/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Pirate Lady Death's Pacification Squads.blk
index cdfe06a5421..ce34e7f4a99 100644
--- a/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Pirate Lady Death's Pacification Squads.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Periphery Pirate/Pirate Lady Death's Pacification Squads.blk	
@@ -41,7 +41,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Motorized
diff --git a/megamek/data/mechfiles/infantry/3085/RAF/Foot Ballistic Rifle Hastati V.blk b/megamek/data/mechfiles/infantry/3085/RAF/Foot Ballistic Rifle Hastati V.blk
index a21cf6b5b8e..4531364f1f2 100644
--- a/megamek/data/mechfiles/infantry/3085/RAF/Foot Ballistic Rifle Hastati V.blk	
+++ b/megamek/data/mechfiles/infantry/3085/RAF/Foot Ballistic Rifle Hastati V.blk	
@@ -35,7 +35,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/RAF/Jump Laser Infantry Principes III 103rd Jump Battalion.blk b/megamek/data/mechfiles/infantry/3085/RAF/Jump Laser Infantry Principes III 103rd Jump Battalion.blk
index a30d3042619..34231939710 100644
--- a/megamek/data/mechfiles/infantry/3085/RAF/Jump Laser Infantry Principes III 103rd Jump Battalion.blk	
+++ b/megamek/data/mechfiles/infantry/3085/RAF/Jump Laser Infantry Principes III 103rd Jump Battalion.blk	
@@ -35,7 +35,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Jump
diff --git a/megamek/data/mechfiles/infantry/3085/RAF/Motorized MG Galatean Support Wheels.blk b/megamek/data/mechfiles/infantry/3085/RAF/Motorized MG Galatean Support Wheels.blk
index da134d03935..e2dc2db4048 100644
--- a/megamek/data/mechfiles/infantry/3085/RAF/Motorized MG Galatean Support Wheels.blk	
+++ b/megamek/data/mechfiles/infantry/3085/RAF/Motorized MG Galatean Support Wheels.blk	
@@ -41,7 +41,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Motorized
diff --git a/megamek/data/mechfiles/infantry/3085/RAF/Special Forces Stone's Trackers.blk b/megamek/data/mechfiles/infantry/3085/RAF/Special Forces Stone's Trackers.blk
index a4292fdd937..012d3771db5 100644
--- a/megamek/data/mechfiles/infantry/3085/RAF/Special Forces Stone's Trackers.blk	
+++ b/megamek/data/mechfiles/infantry/3085/RAF/Special Forces Stone's Trackers.blk	
@@ -44,7 +44,7 @@ Clan Level 4
 3082
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Jump
diff --git a/megamek/data/mechfiles/infantry/3085/Steiner/Anti-Infantry Unit Second Lyran Armored Infantry.blk b/megamek/data/mechfiles/infantry/3085/Steiner/Anti-Infantry Unit Second Lyran Armored Infantry.blk
index 7cd4918d7e5..0d74be6b32e 100644
--- a/megamek/data/mechfiles/infantry/3085/Steiner/Anti-Infantry Unit Second Lyran Armored Infantry.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Steiner/Anti-Infantry Unit Second Lyran Armored Infantry.blk	
@@ -47,7 +47,7 @@ Motorized
 </Field Guns Equipment>
 
 <source>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/Steiner/HALO Paratrooper Lyran Paratrooper Corps.blk b/megamek/data/mechfiles/infantry/3085/Steiner/HALO Paratrooper Lyran Paratrooper Corps.blk
index 399cc6edf99..9f0af03a144 100644
--- a/megamek/data/mechfiles/infantry/3085/Steiner/HALO Paratrooper Lyran Paratrooper Corps.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Steiner/HALO Paratrooper Lyran Paratrooper Corps.blk	
@@ -47,7 +47,7 @@ Leg
 </Field Guns Equipment>
 
 <source>
-TRO 3085 - Late Succession War
+TRO: 3085 - Late Succession War
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/Steiner/Heavy Infantry Heavy Urban Response Platoon.blk b/megamek/data/mechfiles/infantry/3085/Steiner/Heavy Infantry Heavy Urban Response Platoon.blk
index 1ba6fe8c8a7..662ee7d5afe 100644
--- a/megamek/data/mechfiles/infantry/3085/Steiner/Heavy Infantry Heavy Urban Response Platoon.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Steiner/Heavy Infantry Heavy Urban Response Platoon.blk	
@@ -41,7 +41,7 @@ IS Level 3
 3065
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Motorized
diff --git a/megamek/data/mechfiles/infantry/3085/Taurian/Minesweepers Thirty-fifth Cluster Support Force Red Chasseurs.blk b/megamek/data/mechfiles/infantry/3085/Taurian/Minesweepers Thirty-fifth Cluster Support Force Red Chasseurs.blk
index 532c6b8a057..40b54dc8b71 100644
--- a/megamek/data/mechfiles/infantry/3085/Taurian/Minesweepers Thirty-fifth Cluster Support Force Red Chasseurs.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Taurian/Minesweepers Thirty-fifth Cluster Support Force Red Chasseurs.blk	
@@ -40,7 +40,7 @@ Motorized
 </Field Guns Equipment>
 
 <source>
-TRO 3085 - Star League
+TRO: 3085 - Star League
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/Taurian/SRM Foot Infantry Taurian Citizens' Militia.blk b/megamek/data/mechfiles/infantry/3085/Taurian/SRM Foot Infantry Taurian Citizens' Militia.blk
index 3d660c1b97b..8a33830300a 100644
--- a/megamek/data/mechfiles/infantry/3085/Taurian/SRM Foot Infantry Taurian Citizens' Militia.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Taurian/SRM Foot Infantry Taurian Citizens' Militia.blk	
@@ -41,7 +41,7 @@ IS Level 2
 2500
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 leg
diff --git a/megamek/data/mechfiles/infantry/3085/Taurian/XCT Marine Special Asteroid Support Forces.blk b/megamek/data/mechfiles/infantry/3085/Taurian/XCT Marine Special Asteroid Support Forces.blk
index 02895d02ccc..e022919ecaa 100644
--- a/megamek/data/mechfiles/infantry/3085/Taurian/XCT Marine Special Asteroid Support Forces.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Taurian/XCT Marine Special Asteroid Support Forces.blk	
@@ -44,7 +44,7 @@ IS Level 3
 2500
 </year>
 <era>
-TRO 3085
+TRO: 3085
 </era>
 <motion_type>
 Leg
diff --git a/megamek/data/mechfiles/infantry/3085/Word of Blake/Mechanized Assault XCT Word of Blake Militia NBC.blk b/megamek/data/mechfiles/infantry/3085/Word of Blake/Mechanized Assault XCT Word of Blake Militia NBC.blk
index c9fb1ec49cb..6d8fc9ea54d 100644
--- a/megamek/data/mechfiles/infantry/3085/Word of Blake/Mechanized Assault XCT Word of Blake Militia NBC.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Word of Blake/Mechanized Assault XCT Word of Blake Militia NBC.blk	
@@ -46,7 +46,7 @@ IS Level 3
 3065
 </year>
 <era>
-TRO 3085 - Civil Wa
+TRO: 3085 - Civil Wa
 </era>
 <motion_type>
 Wheeled
diff --git a/megamek/data/mechfiles/infantry/3085/Word of Blake/Riot Police Word of Blake Protectorate Militia Pacification Unit.blk b/megamek/data/mechfiles/infantry/3085/Word of Blake/Riot Police Word of Blake Protectorate Militia Pacification Unit.blk
index f3529e33080..dd2f4c79a8b 100644
--- a/megamek/data/mechfiles/infantry/3085/Word of Blake/Riot Police Word of Blake Protectorate Militia Pacification Unit.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Word of Blake/Riot Police Word of Blake Protectorate Militia Pacification Unit.blk	
@@ -40,7 +40,7 @@ Motorized
 </Field Guns Equipment>
 
 <source>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/Word of Blake/Tau Wraith Manei Domini Recon Squad.blk b/megamek/data/mechfiles/infantry/3085/Word of Blake/Tau Wraith Manei Domini Recon Squad.blk
index 6ff7dee21b3..8035f1dde74 100644
--- a/megamek/data/mechfiles/infantry/3085/Word of Blake/Tau Wraith Manei Domini Recon Squad.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Word of Blake/Tau Wraith Manei Domini Recon Squad.blk	
@@ -40,7 +40,7 @@ Leg
 </Field Guns Equipment>
 
 <source>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/3085/Word of Blake/Tau Zombie Manei Domini Attack Squad.blk b/megamek/data/mechfiles/infantry/3085/Word of Blake/Tau Zombie Manei Domini Attack Squad.blk
index 78f82dee9a1..a8db85821fb 100644
--- a/megamek/data/mechfiles/infantry/3085/Word of Blake/Tau Zombie Manei Domini Attack Squad.blk	
+++ b/megamek/data/mechfiles/infantry/3085/Word of Blake/Tau Zombie Manei Domini Attack Squad.blk	
@@ -40,7 +40,7 @@ Leg
 </Field Guns Equipment>
 
 <source>
-TRO 3085 - Civil War
+TRO: 3085 - Civil War
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Bandit Motorized Point (Rifle).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Bandit Motorized Point (Rifle).blk
index 54d98bced99..4a5e69fecee 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Bandit Motorized Point (Rifle).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Bandit Motorized Point (Rifle).blk	
@@ -47,7 +47,7 @@ Motorized Infantry Dark Caste Bandits
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Ceremonial Platoon (Close Combat).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Ceremonial Platoon (Close Combat).blk
index 5437fb629a5..e641551a93f 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Ceremonial Platoon (Close Combat).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Ceremonial Platoon (Close Combat).blk	
@@ -48,7 +48,7 @@ Ceremonial Guard Otomo Guard
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Ceremonial Platoon (MG Heavy).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Ceremonial Platoon (MG Heavy).blk
index 044ff278ee5..85cd9b5ccc2 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Ceremonial Platoon (MG Heavy).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Ceremonial Platoon (MG Heavy).blk	
@@ -47,7 +47,7 @@ Ceremonial Guard Caesar's Royal Guard; Marion Hegemony
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (LRM Heavy).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (LRM Heavy).blk
index 30e1e49b1f8..875b716cc20 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (LRM Heavy).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (LRM Heavy).blk	
@@ -47,7 +47,7 @@ Heavy Foot LRM Infantry Stalwart Support - Heavy LRM Infantry
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser Heavy XCT).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser Heavy XCT).blk
index 427a29e5da7..36755c617c4 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser Heavy XCT).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser Heavy XCT).blk	
@@ -47,7 +47,7 @@ Xenoplanetary Infantry Eagle Corps Eyrie Defense Force
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser Marine).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser Marine).blk
index 5e651e6cacd..e4c7383fda3 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser Marine).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser Marine).blk	
@@ -47,7 +47,7 @@ Space Marine Com Guards Warship
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser TAG).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser TAG).blk
index 3d80fdd78a8..cf215fa79a4 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser TAG).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser TAG).blk	
@@ -47,7 +47,7 @@ TAG Spotter Infantry Stalwart Support - Spotter Infantry
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser XCT).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser XCT).blk
index cefb77155c6..fc43895c205 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser XCT).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Laser XCT).blk	
@@ -47,7 +47,7 @@ XCT Marine Special Asteroid Support Forces
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Light Scout).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Light Scout).blk
index 611201a3c61..f8c4bd73c28 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Light Scout).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Light Scout).blk	
@@ -47,7 +47,7 @@ Scout Infantry The Battle Corps - Baker Street Irregulars
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Light).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Light).blk
index 4427858cf9f..88933f81ace 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Light).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Light).blk	
@@ -47,7 +47,7 @@ SRM Foot Infantry Taurian Citizens' Militia
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Mountain).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Mountain).blk
index d7903e3c882..3c80576c7a7 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Mountain).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Mountain).blk	
@@ -49,7 +49,7 @@ Mountaineer 45th Cerulean Mountain Infantry, 3rd Davion Guards
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Paratrooper).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Paratrooper).blk
index e0aeaef8c78..a751293bf91 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Paratrooper).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Platoon (Rifle Paratrooper).blk	
@@ -47,7 +47,7 @@ HALO Paratrooper Lyran Paratrooper Corps
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Squad (Medic).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Squad (Medic).blk
index e44ef2f685e..dd2f8754b38 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Squad (Medic).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Squad (Medic).blk	
@@ -47,7 +47,7 @@ Field Medic Magistracy Medical Corp
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Stealth Platoon (Rifle Paratrooper).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Stealth Platoon (Rifle Paratrooper).blk
index 61afa66efcb..ec8c320a9e9 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Stealth Platoon (Rifle Paratrooper).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Stealth Platoon (Rifle Paratrooper).blk	
@@ -47,7 +47,7 @@ SpecOps Paratrooper MI6 Extraction
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Stealth Squad (Sniper Paratrooper).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Stealth Squad (Sniper Paratrooper).blk
index fb0d20ee39d..b708bd592d8 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Stealth Squad (Sniper Paratrooper).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Foot Stealth Squad (Sniper Paratrooper).blk	
@@ -47,7 +47,7 @@ Skaret Assassins JàrnFòlk
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (Anti-Mech) (Laser).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (Anti-Mech) (Laser).blk
index 79601be4b99..a86a8dbf422 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (Anti-Mech) (Laser).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (Anti-Mech) (Laser).blk	
@@ -47,7 +47,7 @@ Anti-'Mech Jump Infantry Third Ueda Infantry
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (GL).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (GL).blk
index 167958840f9..844e351912b 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (GL).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (GL).blk	
@@ -47,7 +47,7 @@ Jump Support Infantry Star Corps Jump Assault Infantry
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (Laser Heavy).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (Laser Heavy).blk
index 05cf5a8005b..d6c08872bf3 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (Laser Heavy).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Platoon (Laser Heavy).blk	
@@ -47,7 +47,7 @@ Heavy Jump Infantry Royal Gurkha Battalion
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Stealth Platoon (Laser).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Stealth Platoon (Laser).blk
index 963200445ca..1ee9917fdfc 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Stealth Platoon (Laser).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Stealth Platoon (Laser).blk	
@@ -47,7 +47,7 @@ Heavy Jump Infantry DEST Heavy Response Platoon
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Stealth Platoon (Needler Demolition).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Stealth Platoon (Needler Demolition).blk
index f1a225c08c1..91fa8f1adf4 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Stealth Platoon (Needler Demolition).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Jump Stealth Platoon (Needler Demolition).blk	
@@ -47,7 +47,7 @@ Commando Battlefield Infiltration Units
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Hover Platoon (Demolition).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Hover Platoon (Demolition).blk
index e4f5992bb19..7f56b2e4577 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Hover Platoon (Demolition).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Hover Platoon (Demolition).blk	
@@ -47,7 +47,7 @@ Recon Infantry Recon Battalion; 201st Pesht Assault Team; 3rd Proserpina Hussars
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Sub Platoon (SRM SCUBA).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Sub Platoon (SRM SCUBA).blk
index 38e0a5027f1..978567c17ea 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Sub Platoon (SRM SCUBA).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Sub Platoon (SRM SCUBA).blk	
@@ -47,7 +47,7 @@ Submersible Mechanized Infantry Kraken Unleashed - The Mermen
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Tracked Platoon (Bridging).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Tracked Platoon (Bridging).blk
index c81993bd9a7..c05387470b5 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Tracked Platoon (Bridging).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Tracked Platoon (Bridging).blk	
@@ -47,7 +47,7 @@ Bridge-builder Engineers Take the Time III-chi; Forty-eighth Division
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Wheeled Platoon (Laser XCT).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Wheeled Platoon (Laser XCT).blk
index 9bd3c130d98..83dd5d0bb0f 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Wheeled Platoon (Laser XCT).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Mechanized Wheeled Platoon (Laser XCT).blk	
@@ -47,7 +47,7 @@ Mechanized Assault XCT Word of Blake Militia NBC
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Fieldworks).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Fieldworks).blk
index aecd5777430..74733e9fa44 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Fieldworks).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Fieldworks).blk	
@@ -47,7 +47,7 @@ Combat Engineer Royal Engineers; 1st Lyran Royal Guards RCT
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Firefighters).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Firefighters).blk
index 7080c761132..f199a9fd8e7 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Firefighters).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Firefighters).blk	
@@ -47,7 +47,7 @@ Firefighter Twenty-fourth Hellfire Firefighting Battalion; 84th Avalon LI; 17th
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Gauss Heavy).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Gauss Heavy).blk
index 13bde925558..f3dd498e0fc 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Gauss Heavy).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Gauss Heavy).blk	
@@ -47,7 +47,7 @@ Heavy Support Infantry Irian Technologies SWAT Team
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Laser XCT).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Laser XCT).blk
index 8bb6442bc05..dd74d2c8fef 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Laser XCT).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Laser XCT).blk	
@@ -47,7 +47,7 @@ Motorized XCT Infantry Explorer Corps Hostile Environment
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Needler Heavy).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Needler Heavy).blk
index 8e992266d19..ca7076079ff 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Needler Heavy).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Needler Heavy).blk	
@@ -47,7 +47,7 @@ Anti-Infantry Unit Second Lyran Armored Infantry
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Nonlethal).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Nonlethal).blk
index ec60b7d9a18..d97410d3c83 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Nonlethal).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Nonlethal).blk	
@@ -47,7 +47,7 @@ Riot Police Word of Blake Protectorate Militia Pacification Unit
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Plasma Heavy).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Plasma Heavy).blk
index 6b9b9820711..d8579ee659e 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Plasma Heavy).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Platoon (Plasma Heavy).blk	
@@ -47,7 +47,7 @@ Heavy Infantry Heavy Urban Response Platoon
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Sub Platoon (Laser SCUBA).blk b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Sub Platoon (Laser SCUBA).blk
index bef54c6327c..ef97212f40c 100644
--- a/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Sub Platoon (Laser SCUBA).blk	
+++ b/megamek/data/mechfiles/infantry/TW/Generic Infantry/Motorized Sub Platoon (Laser SCUBA).blk	
@@ -47,7 +47,7 @@ Frogmen Blue Water Marine Response Teams (Frogmen)
 </overview>
 
 <source>
-TRO 3085 (Generic version)
+TRO: 3085 (Generic version)
 </source>
 
 <squad_size>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Comitatus JumpShip (2995).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Comitatus JumpShip (2995).blk
index 49d49fc15bb..d46f420542d 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Comitatus JumpShip (2995).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Comitatus JumpShip (2995).blk	
@@ -208,7 +208,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R - Late Succession War - Lostech
+TRO: 3057R - Late Succession War - Lostech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Hunter Jumpship (2832).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Hunter Jumpship (2832).blk
index e616ca77655..fe01893e868 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Hunter Jumpship (2832).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Hunter Jumpship (2832).blk	
@@ -129,7 +129,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Hunter Jumpship (2948) (LF).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Hunter Jumpship (2948) (LF).blk
index ddf7b46b119..f08a7bbc180 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Hunter Jumpship (2948) (LF).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Hunter Jumpship (2948) (LF).blk	
@@ -129,7 +129,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057U - Late Succession War - Lostech
+TRO: 3057U - Late Succession War - Lostech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Invader Jumpship (2850).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Invader Jumpship (2850).blk
index c6609322b68..651addc2d6b 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Invader Jumpship (2850).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Invader Jumpship (2850).blk	
@@ -117,7 +117,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Merchant Jumpship (2901).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Merchant Jumpship (2901).blk
index 88e1e3ad9dd..1c0fb120d03 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Merchant Jumpship (2901).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Merchant Jumpship (2901).blk	
@@ -114,7 +114,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R - Late Succession War - Lostech
+TRO: 3057R - Late Succession War - Lostech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Monolith Jumpship (2839).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Monolith Jumpship (2839).blk
index 064dab2ec53..18c3b9ec6e6 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Monolith Jumpship (2839).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Monolith Jumpship (2839).blk	
@@ -121,7 +121,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Odyssey Jumpship (2887).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Odyssey Jumpship (2887).blk
index 08d408a8734..00b432cb2f8 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Odyssey Jumpship (2887).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Odyssey Jumpship (2887).blk	
@@ -151,7 +151,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Scout JumpShip (2895).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Scout JumpShip (2895).blk
index e05ddc8f6b9..e0616c35f42 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Scout JumpShip (2895).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Scout JumpShip (2895).blk	
@@ -113,7 +113,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R -
+TRO: 3057R -
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/Clan/Star Lord JumpShip (2841).blk b/megamek/data/mechfiles/jumpships/3057R/Clan/Star Lord JumpShip (2841).blk
index 54b4c49af09..e3693422f42 100644
--- a/megamek/data/mechfiles/jumpships/3057R/Clan/Star Lord JumpShip (2841).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/Clan/Star Lord JumpShip (2841).blk	
@@ -118,7 +118,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Chimeisho JumpShip (3056).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Chimeisho JumpShip (3056).blk
index 56cd045bd58..6121bca490a 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Chimeisho JumpShip (3056).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Chimeisho JumpShip (3056).blk	
@@ -121,7 +121,7 @@ ISERLargeLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631 LF).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631 LF).blk
index 7682a983f93..64f16cc5a9e 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631 LF).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631 LF).blk	
@@ -114,7 +114,7 @@ steeragequarters:100.0:0
 </structural_integrity>
 
 <source>
-TRO 3057U - Star League
+TRO: 3057U - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631 PPC).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631 PPC).blk
index c6be465d46a..c152158a3de 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631 PPC).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631 PPC).blk	
@@ -116,7 +116,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631).blk
index eb05cd6318f..a71f028a11c 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Invader Jumpship (2631).blk	
@@ -116,7 +116,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk
index e61fb00dd3a..1341d0e90cd 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk	
@@ -148,7 +148,7 @@ ISMobileHPG
 </structural_integrity>
 
 <source>
-TRO 3057R - Late Succession War - Lostech
+TRO: 3057R - Late Succession War - Lostech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2503).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2503).blk
index 7b670243f87..a2ee20cccd1 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2503).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2503).blk	
@@ -113,7 +113,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2602).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2602).blk
index a92917f961e..1501c7ab98b 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2602).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2602).blk	
@@ -109,7 +109,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-TRO 3057U -
+TRO: 3057U - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2602P).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2602P).blk
index cc9f26f92d0..f32c2f8bfa9 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2602P).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Merchant Jumpship (2602P).blk	
@@ -110,7 +110,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-TRO 3057U - Star League
+TRO: 3057U - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Monolith Jumpship (2776).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Monolith Jumpship (2776).blk
index 576fa3fbfb3..646835b4093 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Monolith Jumpship (2776).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Monolith Jumpship (2776).blk	
@@ -120,7 +120,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Quetzalcoatl-Scout JumpShip (Standard).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Quetzalcoatl-Scout JumpShip.blk
similarity index 97%
rename from megamek/data/mechfiles/jumpships/3057R/IS/Quetzalcoatl-Scout JumpShip (Standard).blk
rename to megamek/data/mechfiles/jumpships/3057R/IS/Quetzalcoatl-Scout JumpShip.blk
index 5d3f8d4a33d..f14f0254367 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Quetzalcoatl-Scout JumpShip (Standard).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Quetzalcoatl-Scout JumpShip.blk	
@@ -110,7 +110,7 @@ cargobay:437.5:1:2
 </structural_integrity>
 
 <source>
-TRO 3026 - Early Succession Wars
+TRO: 3026 - Early Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Scout JumpShip (2712).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Scout JumpShip (2712).blk
index d38c19bdda7..12f68b6eece 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Scout JumpShip (2712).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Scout JumpShip (2712).blk	
@@ -112,7 +112,7 @@ cargobay:519.5:1:5
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Star Lord JumpShip (2590 LF).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Star Lord JumpShip (2590 LF).blk
index c3e931b1fe8..eeb147c4f19 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Star Lord JumpShip (2590 LF).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Star Lord JumpShip (2590 LF).blk	
@@ -114,7 +114,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-TRO 3057U - Star League
+TRO: 3057U - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Star Lord JumpShip (2590).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Star Lord JumpShip (2590).blk
index 194e0b78be2..c305cf3d431 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Star Lord JumpShip (2590).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Star Lord JumpShip (2590).blk	
@@ -118,7 +118,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (2754).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (2754).blk
index f5e4b685de6..895df0bee13 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (2754).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (2754).blk	
@@ -140,7 +140,7 @@ ISAMS Ammo:24
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (2755) (LF).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (2755) (LF).blk
index 5037b0d7a90..40042ba35fc 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (2755) (LF).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (2755) (LF).blk	
@@ -139,7 +139,7 @@ ISAMS Ammo:24
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (3071).blk b/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (3071).blk
index d83aa6a4bee..450afed69f7 100644
--- a/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (3071).blk	
+++ b/megamek/data/mechfiles/jumpships/3057R/IS/Tramp JumpShip (3071).blk	
@@ -144,7 +144,7 @@ ISAMS Ammo:24
 </structural_integrity>
 
 <source>
-TRO 3057R - Jihad
+TRO: 3057R - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3075/Explorer JumpShip (HPG).blk b/megamek/data/mechfiles/jumpships/3075/Explorer JumpShip (HPG).blk
index 7b481a5eb17..5a9e44de752 100644
--- a/megamek/data/mechfiles/jumpships/3075/Explorer JumpShip (HPG).blk	
+++ b/megamek/data/mechfiles/jumpships/3075/Explorer JumpShip (HPG).blk	
@@ -111,7 +111,7 @@ cargobay:149.0:1:5
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/3075/Explorer JumpShip.blk b/megamek/data/mechfiles/jumpships/3075/Explorer JumpShip.blk
index 183961b30ac..c37ade7cdf2 100644
--- a/megamek/data/mechfiles/jumpships/3075/Explorer JumpShip.blk	
+++ b/megamek/data/mechfiles/jumpships/3075/Explorer JumpShip.blk	
@@ -111,7 +111,7 @@ cargobay:275.0:1:5
 </structural_integrity>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/XTRs/Primitives I/Aquilla JumpShip Transport.blk b/megamek/data/mechfiles/jumpships/XTRs/Primitives I/Aquilla JumpShip Transport.blk
index 0d7a6842150..e43b8e126ea 100644
--- a/megamek/data/mechfiles/jumpships/XTRs/Primitives I/Aquilla JumpShip Transport.blk	
+++ b/megamek/data/mechfiles/jumpships/XTRs/Primitives I/Aquilla JumpShip Transport.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Aquilla Transport Jumpship
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 3713
@@ -122,6 +122,50 @@ cargobay:10100.0:1:7
 10
 </structural_integrity>
 
+<capabilities>
+The Aquilla-class vessel, developed during the period known as The Exodus, served as a crucial interstellar transport for humanity's colonization efforts. Operating primarily in the core systems around Terra, it transported low bulk/high value cargo and carried large numbers of passengers to colonize new star systems. The vessel relied on its fusion reactor and internal fuel bunkers to charge its primitive drive core, as the more advanced technologies of the modern JumpShips were not yet developed. Additionally, the Aquilla-class was occasionally repurposed as a naval auxiliary, taking part in activities such as mining jump points and engaging in combat during conflicts like the Outer Reaches Rebellion and the Reunification War.
+</capabilities>
+
+<overview>
+The Kearny-Fuchida Drive revolutionized space travel for humanity, leading to a mass exodus from Terra in search of freedom, adventure, and opportunity. In response to the demand for interstellar transports, the Aquilla-class vessel was developed by Boeing Interstellar. However, during its time, the manipulation of the KF-field was still in its early stages, limiting the jump range to a maximum of fifteen light-years. Unlike the modern JumpShips, the Aquilla relied on powerful drive systems and internal fuel bunkers, lacking the DropShip/JumpShip combination and Jump Sails that would be developed later. Despite these limitations, the Aquilla-class played a crucial role in mankind's colonization efforts and served as a naval auxiliary during conflicts such as the Outer Reaches Rebellion and the Reunification War. However, the introduction of the more efficient JumpShip/DropShip combination eventually rendered the aging Aquilla-class obsolete.
+</overview>
+
+<history>
+The Aquilla-class vessels played a significant role in humanity's colonization of the stars, with Samantha Calderon leading a flotilla of converted Aquilla-class transports into uncharted space and ultimately establishing the Taurian Concordat. These vessels were also employed by the Periphery states during the Reunification War, with up-gunned versions being used as armed merchants to compensate for the lack of a strong war fleet. However, as the more advanced and cost-effective JumpShip/DropShip combination emerged, the aging Aquilla-class became obsolete and was phased out.
+</history>
+
+<manufacturer>
+Boeing Interestellar
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Transport
+</use>
+
+<length>
+305 m
+</length>
+
+<width>
+53 m
+</width>
+
+<height>
+45 m
+</height>
+
 <source>
 IO - Age of War
 </source>
@@ -142,6 +186,10 @@ IO - Age of War
 0
 </sail>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 107
 </crew>
@@ -173,3 +221,4 @@ IO - Age of War
 <escape_pod>
 20
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/jumpships/XTRs/Primitives III/Liberty Jumpship.blk b/megamek/data/mechfiles/jumpships/XTRs/Primitives III/Liberty Jumpship.blk
index 79c02864437..1f45f47c8e5 100644
--- a/megamek/data/mechfiles/jumpships/XTRs/Primitives III/Liberty Jumpship.blk	
+++ b/megamek/data/mechfiles/jumpships/XTRs/Primitives III/Liberty Jumpship.blk	
@@ -116,7 +116,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/jumpships/XTRs/Primitives V/Levianthan Jumpship.blk b/megamek/data/mechfiles/jumpships/XTRs/Primitives V/Levianthan Jumpship.blk
index 132bbe9a2b1..3fbdad5d388 100644
--- a/megamek/data/mechfiles/jumpships/XTRs/Primitives V/Levianthan Jumpship.blk	
+++ b/megamek/data/mechfiles/jumpships/XTRs/Primitives V/Levianthan Jumpship.blk	
@@ -119,7 +119,7 @@ dockingcollar
 </structural_integrity>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/mechs/3039u/Archer ARC-2K.mtf b/megamek/data/mechfiles/mechs/3039u/Archer ARC-2K.mtf
index c31097238db..b4f8d0501f1 100644
--- a/megamek/data/mechfiles/mechs/3039u/Archer ARC-2K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Archer ARC-2K.mtf	
@@ -6,7 +6,7 @@ mul id:73
 Config:Biped
 TechBase:Inner Sphere
 Era:2856
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Archer ARC-2R.mtf b/megamek/data/mechfiles/mechs/3039u/Archer ARC-2R.mtf
index 2e464192ebf..0be23e14b09 100644
--- a/megamek/data/mechfiles/mechs/3039u/Archer ARC-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Archer ARC-2R.mtf	
@@ -5,7 +5,7 @@ mul id:74
 Config:Biped
 techbase:Inner Sphere
 era:2474
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Archer ARC-2S.mtf b/megamek/data/mechfiles/mechs/3039u/Archer ARC-2S.mtf
index 1cfd04dcb5d..a362d810d0b 100644
--- a/megamek/data/mechfiles/mechs/3039u/Archer ARC-2S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Archer ARC-2S.mtf	
@@ -6,7 +6,7 @@ mul id:76
 Config:Biped
 TechBase:Inner Sphere
 Era:2915
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Archer ARC-2W.mtf b/megamek/data/mechfiles/mechs/3039u/Archer ARC-2W.mtf
index d5b787fda29..391ddd63bdb 100644
--- a/megamek/data/mechfiles/mechs/3039u/Archer ARC-2W.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Archer ARC-2W.mtf	
@@ -6,7 +6,7 @@ mul id:77
 Config:Biped
 TechBase:Inner Sphere
 Era:3010
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Assassin ASN-101.mtf b/megamek/data/mechfiles/mechs/3039u/Assassin ASN-101.mtf
index b1ce71f6dfd..67e3d0f3351 100644
--- a/megamek/data/mechfiles/mechs/3039u/Assassin ASN-101.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Assassin ASN-101.mtf	
@@ -6,7 +6,7 @@ mul id:126
 Config:Biped
 TechBase:Inner Sphere
 Era:3024
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Assassin ASN-21.mtf b/megamek/data/mechfiles/mechs/3039u/Assassin ASN-21.mtf
index ccba172315c..ba687080737 100644
--- a/megamek/data/mechfiles/mechs/3039u/Assassin ASN-21.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Assassin ASN-21.mtf	
@@ -5,7 +5,7 @@ mul id:127
 Config:Biped
 techbase:Inner Sphere
 era:2676
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Atlas AS7-D-DC.mtf b/megamek/data/mechfiles/mechs/3039u/Atlas AS7-D-DC.mtf
index 3aad8df3a5c..884ee7490d5 100644
--- a/megamek/data/mechfiles/mechs/3039u/Atlas AS7-D-DC.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Atlas AS7-D-DC.mtf	
@@ -6,7 +6,7 @@ mul id:142
 Config:Biped
 TechBase:Inner Sphere
 Era:2776
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:3
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3039u/Atlas AS7-D.mtf b/megamek/data/mechfiles/mechs/3039u/Atlas AS7-D.mtf
index cb6ae69428b..3b0f677b79a 100644
--- a/megamek/data/mechfiles/mechs/3039u/Atlas AS7-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Atlas AS7-D.mtf	
@@ -6,7 +6,7 @@ mul id:140
 Config:Biped
 techbase:Inner Sphere
 era:2755
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3039u/Atlas AS7-RS.mtf b/megamek/data/mechfiles/mechs/3039u/Atlas AS7-RS.mtf
index 277a1aeff8a..765a21f3bb3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Atlas AS7-RS.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Atlas AS7-RS.mtf	
@@ -6,7 +6,7 @@ mul id:147
 Config:Biped
 TechBase:Inner Sphere
 Era:2892
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8Q.mtf b/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8Q.mtf
index 110b151b8ee..8f50e101246 100644
--- a/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8Q.mtf	
@@ -5,7 +5,7 @@ mul id:174
 Config:Biped
 techbase:Inner Sphere
 era:2665
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8R.mtf b/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8R.mtf
index 7a4afc61b35..4e26e752dac 100644
--- a/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8R.mtf	
@@ -6,7 +6,7 @@ mul id:175
 Config:Biped
 TechBase:Inner Sphere
 Era:2683
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8T.mtf b/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8T.mtf
index e630a2b50b6..783b161d2a5 100644
--- a/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8T.mtf	
@@ -6,7 +6,7 @@ mul id:176
 Config:Biped
 TechBase:Inner Sphere
 Era:2815
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8V.mtf b/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8V.mtf
index 2ac0c1056b7..9c35aef5bf0 100644
--- a/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8V.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Awesome AWS-8V.mtf	
@@ -6,7 +6,7 @@ mul id:177
 Config:Biped
 TechBase:Inner Sphere
 Era:2980
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3E.mtf b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3E.mtf
index 901d2e80f13..6f12cf5793c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3E.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3E.mtf	
@@ -6,7 +6,7 @@ mul id:240
 Config:Biped
 TechBase:Inner Sphere
 Era:2475
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3M.mtf b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3M.mtf
index d4925f86c50..8e52a92fe33 100644
--- a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3M.mtf	
@@ -6,7 +6,7 @@ mul id:241
 Config:Biped
 TechBase:Inner Sphere
 Era:2579
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3MC.mtf b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3MC.mtf
index a95912520be..0adb9d2d58f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3MC.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3MC.mtf	
@@ -6,7 +6,7 @@ mul id:242
 Config:Biped
 TechBase:Inner Sphere
 Era:3037
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3Q.mtf b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3Q.mtf
index e1984050a61..04204d17849 100644
--- a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3Q.mtf	
@@ -6,7 +6,7 @@ mul id:244
 Config:Biped
 TechBase:Inner Sphere
 Era:2915
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3S Reinesblatt.mtf b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3S Reinesblatt.mtf
index 90810cdceef..63eca9a0e69 100644
--- a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3S Reinesblatt.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3S Reinesblatt.mtf	
@@ -6,7 +6,7 @@ mul id:246
 Config:Biped
 TechBase:Inner Sphere
 Era:3029
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3S.mtf b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3S.mtf
index ca2add620e3..2c26cdfccec 100644
--- a/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Banshee BNC-3S.mtf	
@@ -6,7 +6,7 @@ mul id:245
 Config:Biped
 TechBase:Inner Sphere
 Era:3026
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1D.mtf b/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1D.mtf
index e53786f4fe0..7d39a55ad7e 100644
--- a/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1D.mtf	
@@ -6,7 +6,7 @@ mul id:282
 Config:Biped
 TechBase:Inner Sphere
 Era:2867
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1G-DC.mtf b/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1G-DC.mtf
index 0046be84da7..9470640838d 100644
--- a/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1G-DC.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1G-DC.mtf	
@@ -6,7 +6,7 @@ mul id:288
 Config:Biped
 TechBase:Inner Sphere
 Era:2633
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:3
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1G.mtf b/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1G.mtf
index 212c592c0c5..811d555ec04 100644
--- a/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1G.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1G.mtf	
@@ -6,7 +6,7 @@ mul id:283
 Config:Biped
 techbase:Inner Sphere
 era:2633
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1S.mtf b/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1S.mtf
index 927a40c8d4b..6860c9f1a8f 100644
--- a/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/BattleMaster BLR-1S.mtf	
@@ -6,7 +6,7 @@ mul id:289
 Config:Biped
 techbase:Inner Sphere
 era:3025
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/Black Knight BL-7-KNT-L.mtf b/megamek/data/mechfiles/mechs/3039u/Black Knight BL-7-KNT-L.mtf
index ba10f7649de..6f6f51b6218 100644
--- a/megamek/data/mechfiles/mechs/3039u/Black Knight BL-7-KNT-L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Black Knight BL-7-KNT-L.mtf	
@@ -6,7 +6,7 @@ mul id:361
 Config:Biped
 TechBase:Inner Sphere
 Era:2809
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Black Knight BL-7-KNT.mtf b/megamek/data/mechfiles/mechs/3039u/Black Knight BL-7-KNT.mtf
index e6393baf80a..1dae1c89bfb 100644
--- a/megamek/data/mechfiles/mechs/3039u/Black Knight BL-7-KNT.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Black Knight BL-7-KNT.mtf	
@@ -6,7 +6,7 @@ mul id:360
 Config:Biped
 TechBase:Inner Sphere
 Era:2809
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1.mtf b/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1.mtf
index 5c41e204a69..73de6978ee3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1.mtf	
@@ -6,7 +6,7 @@ mul id:373
 Config:Biped
 TechBase:Inner Sphere
 Era:2757
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1DB.mtf b/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1DB.mtf
index 9d81157e0f3..0272b419801 100644
--- a/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1DB.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1DB.mtf	
@@ -6,7 +6,7 @@ mul id:374
 Config:Biped
 TechBase:Inner Sphere
 Era:3023
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1DC.mtf b/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1DC.mtf
index ac9f7f290b7..5539882579f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1DC.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1DC.mtf	
@@ -6,7 +6,7 @@ mul id:375
 Config:Biped
 TechBase:Inner Sphere
 Era:3024
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1X.mtf b/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1X.mtf
index 14ca9af3bdb..fea50609d17 100644
--- a/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Blackjack BJ-1X.mtf	
@@ -5,7 +5,7 @@ mul id:376
 Config:Biped
 techbase:Inner Sphere
 era:2756
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Bombardier BMB-10D.mtf b/megamek/data/mechfiles/mechs/3039u/Bombardier BMB-10D.mtf
index c0d8a88366d..7197f2b9dd6 100644
--- a/megamek/data/mechfiles/mechs/3039u/Bombardier BMB-10D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Bombardier BMB-10D.mtf	
@@ -6,7 +6,7 @@ mul id:422
 Config:Biped
 TechBase:Inner Sphere
 Era:2866
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Cataphract CTF-1X.mtf b/megamek/data/mechfiles/mechs/3039u/Cataphract CTF-1X.mtf
index 9a8a3dff450..eef9b7d538c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Cataphract CTF-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Cataphract CTF-1X.mtf	
@@ -5,7 +5,7 @@ mul id:466
 Config:Biped
 techbase:Inner Sphere
 era:3025
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Cataphract CTF-2X.mtf b/megamek/data/mechfiles/mechs/3039u/Cataphract CTF-2X.mtf
index 8733fc8c69e..87e391c0d70 100644
--- a/megamek/data/mechfiles/mechs/3039u/Cataphract CTF-2X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Cataphract CTF-2X.mtf	
@@ -6,7 +6,7 @@ mul id:467
 Config:Biped
 TechBase:Inner Sphere
 Era:3027
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-A1.mtf b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-A1.mtf
index 066e497255c..1353091e119 100644
--- a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-A1.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-A1.mtf	
@@ -6,7 +6,7 @@ mul id:477
 Config:Biped
 TechBase:Inner Sphere
 Era:2563
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1 Jenny.mtf b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1 Jenny.mtf
index 545f1696eb7..9c8a409bab4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1 Jenny.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1 Jenny.mtf	
@@ -6,7 +6,7 @@ mul id:479
 Config:Biped
 TechBase:Inner Sphere
 Era:3027
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1.mtf b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1.mtf
index f19df304f9e..a1e624fc576 100644
--- a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1.mtf	
@@ -6,7 +6,7 @@ mul id:478
 Config:Biped
 TechBase:Inner Sphere
 Era:2561
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1b.mtf b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1b.mtf
index 4557171efbc..ab2d7f68557 100644
--- a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1b.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C1b.mtf	
@@ -6,7 +6,7 @@ mul id:480
 Config:Biped
 TechBase:Inner Sphere
 Era:2688
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C4.mtf b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C4.mtf
index fe055ef6194..dc24b152b0a 100644
--- a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C4.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-C4.mtf	
@@ -6,7 +6,7 @@ mul id:482
 Config:Biped
 TechBase:Inner Sphere
 Era:2565
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-K2.mtf b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-K2.mtf
index e51fefa3528..1c64776760c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-K2.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Catapult CPLT-K2.mtf	
@@ -6,7 +6,7 @@ mul id:487
 Config:Biped
 TechBase:Inner Sphere
 Era:2603
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Centurion CN9-A.mtf b/megamek/data/mechfiles/mechs/3039u/Centurion CN9-A.mtf
index 1b03d995bfa..8737ffd0ea3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Centurion CN9-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Centurion CN9-A.mtf	
@@ -6,7 +6,7 @@ mul id:516
 Config:Biped
 TechBase:Inner Sphere
 Era:2801
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Centurion CN9-AH.mtf b/megamek/data/mechfiles/mechs/3039u/Centurion CN9-AH.mtf
index 40ec3e62d72..8c787b8631f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Centurion CN9-AH.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Centurion CN9-AH.mtf	
@@ -6,7 +6,7 @@ mul id:517
 Config:Biped
 TechBase:Inner Sphere
 Era:2874
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Centurion CN9-AL.mtf b/megamek/data/mechfiles/mechs/3039u/Centurion CN9-AL.mtf
index 313637924a2..fd6503caff0 100644
--- a/megamek/data/mechfiles/mechs/3039u/Centurion CN9-AL.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Centurion CN9-AL.mtf	
@@ -6,7 +6,7 @@ mul id:518
 Config:Biped
 TechBase:Inner Sphere
 Era:2915
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Centurion CN9-YLW Yen Lo Wang.mtf b/megamek/data/mechfiles/mechs/3039u/Centurion CN9-YLW Yen Lo Wang.mtf
index 8824bb7455e..77e539abcd9 100644
--- a/megamek/data/mechfiles/mechs/3039u/Centurion CN9-YLW Yen Lo Wang.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Centurion CN9-YLW Yen Lo Wang.mtf	
@@ -6,7 +6,7 @@ mul id:525
 Config:Biped
 TechBase:Inner Sphere
 Era:3027
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Champion CHP-1N2.mtf b/megamek/data/mechfiles/mechs/3039u/Champion CHP-1N2.mtf
index 57acbbb92f1..aa3eaf67bee 100644
--- a/megamek/data/mechfiles/mechs/3039u/Champion CHP-1N2.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Champion CHP-1N2.mtf	
@@ -6,7 +6,7 @@ mul id:549
 Config:Biped
 TechBase:Inner Sphere
 Era:2667
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Champion CHP-2N.mtf b/megamek/data/mechfiles/mechs/3039u/Champion CHP-2N.mtf
index 0166bd4b9f9..8cceab1d26c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Champion CHP-2N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Champion CHP-2N.mtf	
@@ -6,7 +6,7 @@ mul id:551
 Config:Biped
 TechBase:Inner Sphere
 Era:2810
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A1.mtf b/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A1.mtf
index d893b14b7c9..9531523b7b3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A1.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A1.mtf	
@@ -5,7 +5,7 @@ mul id:559
 Config:Biped
 techbase:Inner Sphere
 era:2665
-source:Source:TRO 3039 - Star League
+source:Source:TRO: 3039 - Star League
 rules level:1
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A5.mtf b/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A5.mtf
index 3b995a3fe8a..eb0d93f4bac 100644
--- a/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A5.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A5.mtf	
@@ -6,7 +6,7 @@ mul id:560
 Config:Biped
 TechBase:Inner Sphere
 Era:3023
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A9.mtf b/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A9.mtf
index a6154400c27..3c1f6406eaf 100644
--- a/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A9.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Charger CGR-1A9.mtf	
@@ -5,7 +5,7 @@ mul id:561
 Config:Biped
 techbase:Inner Sphere
 era:3034
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Charger CGR-1L.mtf b/megamek/data/mechfiles/mechs/3039u/Charger CGR-1L.mtf
index 8c34c975670..c42ba2c0e1d 100644
--- a/megamek/data/mechfiles/mechs/3039u/Charger CGR-1L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Charger CGR-1L.mtf	
@@ -6,7 +6,7 @@ mul id:562
 Config:Biped
 TechBase:Inner Sphere
 Era:3022
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Charger CGR-SB.mtf b/megamek/data/mechfiles/mechs/3039u/Charger CGR-SB.mtf
index f142a59128a..7c6dd756c63 100644
--- a/megamek/data/mechfiles/mechs/3039u/Charger CGR-SB.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Charger CGR-SB.mtf	
@@ -6,7 +6,7 @@ mul id:570
 Config:Biped
 TechBase:Inner Sphere
 Era:3025
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Cicada CDA-2A.mtf b/megamek/data/mechfiles/mechs/3039u/Cicada CDA-2A.mtf
index ca7a6e7c55c..0b370f76afc 100644
--- a/megamek/data/mechfiles/mechs/3039u/Cicada CDA-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Cicada CDA-2A.mtf	
@@ -5,7 +5,7 @@ mul id:591
 Config:Biped
 techbase:Inner Sphere
 era:2740
-source:Source:TRO 3039 - Star League
+source:Source:TRO: 3039 - Star League
 rules level:1
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Cicada CDA-2B.mtf b/megamek/data/mechfiles/mechs/3039u/Cicada CDA-2B.mtf
index 090195ba5a0..3a9e4a4b6a1 100644
--- a/megamek/data/mechfiles/mechs/3039u/Cicada CDA-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Cicada CDA-2B.mtf	
@@ -6,7 +6,7 @@ mul id:592
 Config:Biped
 TechBase:Inner Sphere
 Era:2840
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Cicada CDA-3C.mtf b/megamek/data/mechfiles/mechs/3039u/Cicada CDA-3C.mtf
index 62d77c118bb..4335252f96b 100644
--- a/megamek/data/mechfiles/mechs/3039u/Cicada CDA-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Cicada CDA-3C.mtf	
@@ -6,7 +6,7 @@ mul id:593
 Config:Biped
 TechBase:Inner Sphere
 Era:2840
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Clint CLNT-1-2R.mtf b/megamek/data/mechfiles/mechs/3039u/Clint CLNT-1-2R.mtf
index 6922988402e..4da30dab27e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Clint CLNT-1-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Clint CLNT-1-2R.mtf	
@@ -5,7 +5,7 @@ mul id:643
 Config:Biped
 techbase:Inner Sphere
 era:2607
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-3T Denton.mtf b/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-3T Denton.mtf
index 01e5dd0d564..3d7f527f0c4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-3T Denton.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-3T Denton.mtf	
@@ -6,7 +6,7 @@ mul id:645
 Config:Biped
 TechBase:Inner Sphere
 Era:3033
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-3T.mtf b/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-3T.mtf
index acc3b7ed93a..6e1a092e923 100644
--- a/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-3T.mtf	
@@ -5,7 +5,7 @@ mul id:644
 Config:Biped
 techbase:Inner Sphere
 era:2608
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-4T.mtf b/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-4T.mtf
index 27106682763..09aed2eab73 100644
--- a/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-4T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Clint CLNT-2-4T.mtf	
@@ -6,7 +6,7 @@ mul id:648
 Config:Biped
 TechBase:Inner Sphere
 Era:2610
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Commando COM-1D.mtf b/megamek/data/mechfiles/mechs/3039u/Commando COM-1D.mtf
index 6dcadb1d9e1..9e099607c04 100644
--- a/megamek/data/mechfiles/mechs/3039u/Commando COM-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Commando COM-1D.mtf	
@@ -6,7 +6,7 @@ mul id:669
 Config:Biped
 TechBase:Inner Sphere
 Era:2480
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3039u/Commando COM-2D.mtf b/megamek/data/mechfiles/mechs/3039u/Commando COM-2D.mtf
index 01ec48bd657..b6c705dd199 100644
--- a/megamek/data/mechfiles/mechs/3039u/Commando COM-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Commando COM-2D.mtf	
@@ -6,7 +6,7 @@ mul id:670
 Config:Biped
 techbase:Inner Sphere
 era:2486
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/3039u/Commando COM-3A.mtf b/megamek/data/mechfiles/mechs/3039u/Commando COM-3A.mtf
index 5a317e51b95..2dedcf1ef13 100644
--- a/megamek/data/mechfiles/mechs/3039u/Commando COM-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Commando COM-3A.mtf	
@@ -6,7 +6,7 @@ mul id:672
 Config:Biped
 TechBase:Inner Sphere
 Era:3025
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3039u/Crab CRB-20.mtf b/megamek/data/mechfiles/mechs/3039u/Crab CRB-20.mtf
index 4dc8f7c56c1..62a63d454e5 100644
--- a/megamek/data/mechfiles/mechs/3039u/Crab CRB-20.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Crab CRB-20.mtf	
@@ -6,7 +6,7 @@ mul id:715
 Config:Biped
 TechBase:Inner Sphere
 Era:2810
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Crockett CRK-5003-0.mtf b/megamek/data/mechfiles/mechs/3039u/Crockett CRK-5003-0.mtf
index 82ba543e7d8..3d2d75b50c1 100644
--- a/megamek/data/mechfiles/mechs/3039u/Crockett CRK-5003-0.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Crockett CRK-5003-0.mtf	
@@ -6,7 +6,7 @@ mul id:724
 Config:Biped
 TechBase:Inner Sphere
 Era:2881
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3D.mtf b/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3D.mtf
index 6b7da31884f..079542db1ba 100644
--- a/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3D.mtf	
@@ -6,7 +6,7 @@ mul id:749
 Config:Biped
 TechBase:Inner Sphere
 Era:2756
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3K.mtf b/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3K.mtf
index 33983387d74..04240b3c132 100644
--- a/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3K.mtf	
@@ -6,7 +6,7 @@ mul id:750
 Config:Biped
 TechBase:Inner Sphere
 Era:2765
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3L.mtf b/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3L.mtf
index 996036d2edc..8026df752ca 100644
--- a/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3L.mtf	
@@ -6,7 +6,7 @@ mul id:751
 Config:Biped
 techbase:Inner Sphere
 era:2753
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3R.mtf b/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3R.mtf
index 47c0f05212a..03589654082 100644
--- a/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Crusader CRD-3R.mtf	
@@ -6,7 +6,7 @@ mul id:752
 Config:Biped
 TechBase:Inner Sphere
 Era:2752
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-HQ.mtf b/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-HQ.mtf
index 72cd865ccea..ab076938010 100644
--- a/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-HQ.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-HQ.mtf	
@@ -5,7 +5,7 @@ mul id:770
 Config:Biped
 techbase:Inner Sphere
 era:2753
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:3
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-Q.mtf b/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-Q.mtf
index 354800d908d..a26e858e9c2 100644
--- a/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-Q.mtf	
@@ -6,7 +6,7 @@ mul id:771
 Config:Biped
 TechBase:Inner Sphere
 Era:2801
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-Z.mtf b/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-Z.mtf
index 5e9f83111e2..e73b120dcab 100644
--- a/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Cyclops CP-10-Z.mtf	
@@ -6,7 +6,7 @@ mul id:772
 Config:Biped
 techbase:Inner Sphere
 era:2710
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3039u/Daboku DCMS-MX90-D.mtf b/megamek/data/mechfiles/mechs/3039u/Daboku DCMS-MX90-D.mtf
index a39b7b43c1d..8ec3546068c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Daboku DCMS-MX90-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Daboku DCMS-MX90-D.mtf	
@@ -6,7 +6,7 @@ mul id:788
 Config:Biped
 TechBase:Inner Sphere
 Era:3038
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3039u/Dervish DV-6M.mtf b/megamek/data/mechfiles/mechs/3039u/Dervish DV-6M.mtf
index eb0feeee1a0..267305ce086 100644
--- a/megamek/data/mechfiles/mechs/3039u/Dervish DV-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Dervish DV-6M.mtf	
@@ -5,7 +5,7 @@ mul id:878
 Config:Biped
 techbase:Inner Sphere
 era:2570
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Dragon DRG-1C.mtf b/megamek/data/mechfiles/mechs/3039u/Dragon DRG-1C.mtf
index 8029b055abf..6c4957fc042 100644
--- a/megamek/data/mechfiles/mechs/3039u/Dragon DRG-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Dragon DRG-1C.mtf	
@@ -6,7 +6,7 @@ mul id:908
 Config:Biped
 TechBase:Inner Sphere
 Era:2752
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Dragon DRG-1N.mtf b/megamek/data/mechfiles/mechs/3039u/Dragon DRG-1N.mtf
index 4d78e95777b..23ff9de412e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Dragon DRG-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Dragon DRG-1N.mtf	
@@ -6,7 +6,7 @@ mul id:909
 Config:Biped
 techbase:Inner Sphere
 era:2754
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Enforcer ENF-4R.mtf b/megamek/data/mechfiles/mechs/3039u/Enforcer ENF-4R.mtf
index c762050404f..36700d4ab08 100644
--- a/megamek/data/mechfiles/mechs/3039u/Enforcer ENF-4R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Enforcer ENF-4R.mtf	
@@ -6,7 +6,7 @@ mul id:976
 Config:Biped
 techbase:Inner Sphere
 era:2777
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Falcon FLC-4N.mtf b/megamek/data/mechfiles/mechs/3039u/Falcon FLC-4N.mtf
index 3b4664532b4..edc5e337d61 100644
--- a/megamek/data/mechfiles/mechs/3039u/Falcon FLC-4N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Falcon FLC-4N.mtf	
@@ -6,7 +6,7 @@ mul id:1022
 Config:Biped
 TechBase:Inner Sphere
 Era:2582
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-A.mtf b/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-A.mtf
index 05a664df55f..e4a1a454abc 100644
--- a/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-A.mtf	
@@ -5,7 +5,7 @@ mul id:1093
 Config:Biped
 techbase:Inner Sphere
 era:2550
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-H.mtf b/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-H.mtf
index 48d7f64d232..09c1ff2e368 100644
--- a/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-H.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-H.mtf	
@@ -6,7 +6,7 @@ mul id:1096
 Config:Biped
 TechBase:Inner Sphere
 Era:2703
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-K.mtf b/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-K.mtf
index fc4b06c915a..a98cc79c9c1 100644
--- a/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-K.mtf	
@@ -6,7 +6,7 @@ mul id:1097
 Config:Biped
 TechBase:Inner Sphere
 Era:2550
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-M Mirage.mtf b/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-M Mirage.mtf
index 260c3eaaa85..b38109620b2 100644
--- a/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-M Mirage.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Firestarter FS9-M Mirage.mtf	
@@ -6,7 +6,7 @@ mul id:1098
 Config:Biped
 TechBase:Inner Sphere
 Era:2893
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Flashman FLS-7K.mtf b/megamek/data/mechfiles/mechs/3039u/Flashman FLS-7K.mtf
index c4f4bb62451..63043c9bb53 100644
--- a/megamek/data/mechfiles/mechs/3039u/Flashman FLS-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Flashman FLS-7K.mtf	
@@ -6,7 +6,7 @@ mul id:1123
 Config:Biped
 TechBase:Inner Sphere
 Era:2796
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Flea FLE-15.mtf b/megamek/data/mechfiles/mechs/3039u/Flea FLE-15.mtf
index 8d16c6be892..aaa03152482 100644
--- a/megamek/data/mechfiles/mechs/3039u/Flea FLE-15.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Flea FLE-15.mtf	
@@ -6,7 +6,7 @@ mul id:1136
 Config:Biped
 TechBase:Inner Sphere
 Era:2523
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Flea FLE-4.mtf b/megamek/data/mechfiles/mechs/3039u/Flea FLE-4.mtf
index 0517a960e1a..1b799316db0 100644
--- a/megamek/data/mechfiles/mechs/3039u/Flea FLE-4.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Flea FLE-4.mtf	
@@ -6,7 +6,7 @@ mul id:1140
 Config:Biped
 TechBase:Inner Sphere
 Era:2501
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Goliath GOL-1H.mtf b/megamek/data/mechfiles/mechs/3039u/Goliath GOL-1H.mtf
index e834fd5de2a..a7b98013aca 100644
--- a/megamek/data/mechfiles/mechs/3039u/Goliath GOL-1H.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Goliath GOL-1H.mtf	
@@ -6,7 +6,7 @@ mul id:1229
 Config:Quad
 techbase:Inner Sphere
 era:2652
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Grand Dragon DRG-1G.mtf b/megamek/data/mechfiles/mechs/3039u/Grand Dragon DRG-1G.mtf
index 175bc2e3b79..a03e5c32055 100644
--- a/megamek/data/mechfiles/mechs/3039u/Grand Dragon DRG-1G.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Grand Dragon DRG-1G.mtf	
@@ -6,7 +6,7 @@ mul id:1256
 Config:Biped
 TechBase:Inner Sphere
 Era:3024
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Grasshopper GHR-5H.mtf b/megamek/data/mechfiles/mechs/3039u/Grasshopper GHR-5H.mtf
index 07ce32fd849..17ffe6e22bb 100644
--- a/megamek/data/mechfiles/mechs/3039u/Grasshopper GHR-5H.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Grasshopper GHR-5H.mtf	
@@ -6,7 +6,7 @@ mul id:1267
 Config:Biped
 techbase:Inner Sphere
 era:2780
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1E Sparky.mtf b/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1E Sparky.mtf
index f2800c6c572..5d6880600f3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1E Sparky.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1E Sparky.mtf	
@@ -6,7 +6,7 @@ mul id:1295
 Config:Biped
 TechBase:Inner Sphere
 Era:3035
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1N.mtf b/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1N.mtf
index 99dfd823773..c19fbdfbd8e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1N.mtf	
@@ -6,7 +6,7 @@ mul id:1297
 Config:Biped
 techbase:Inner Sphere
 era:2492
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1S.mtf b/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1S.mtf
index a96126201e3..2ac85806f35 100644
--- a/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Griffin GRF-1S.mtf	
@@ -6,7 +6,7 @@ mul id:1298
 Config:Biped
 TechBase:Inner Sphere
 Era:2857
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Guillotine GLT-4L.mtf b/megamek/data/mechfiles/mechs/3039u/Guillotine GLT-4L.mtf
index 277c80803f6..5c384d7c1de 100644
--- a/megamek/data/mechfiles/mechs/3039u/Guillotine GLT-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Guillotine GLT-4L.mtf	
@@ -6,7 +6,7 @@ mul id:1339
 Config:Biped
 TechBase:Inner Sphere
 Era:2825
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Guillotine GLT-4P.mtf b/megamek/data/mechfiles/mechs/3039u/Guillotine GLT-4P.mtf
index a79725fb9b1..b95d31ceca6 100644
--- a/megamek/data/mechfiles/mechs/3039u/Guillotine GLT-4P.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Guillotine GLT-4P.mtf	
@@ -6,7 +6,7 @@ mul id:1340
 Config:Biped
 techbase:Inner Sphere
 era:2833
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Hatamoto-Chi HTM-26T.mtf b/megamek/data/mechfiles/mechs/3039u/Hatamoto-Chi HTM-26T.mtf
index cbb359e5838..5a5d0352655 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hatamoto-Chi HTM-26T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hatamoto-Chi HTM-26T.mtf	
@@ -6,7 +6,7 @@ mul id:1397
 Config:Biped
 TechBase:Inner Sphere
 Era:3039
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Hatchetman HCT-3F.mtf b/megamek/data/mechfiles/mechs/3039u/Hatchetman HCT-3F.mtf
index 06c009b9964..6243feabdf5 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hatchetman HCT-3F.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hatchetman HCT-3F.mtf	
@@ -6,7 +6,7 @@ mul id:1410
 Config:Biped
 techbase:Inner Sphere
 era:3023
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1	
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Hermes HER-1A.mtf b/megamek/data/mechfiles/mechs/3039u/Hermes HER-1A.mtf
index 966e24bfdc9..96f0fc428ae 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hermes HER-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hermes HER-1A.mtf	
@@ -6,7 +6,7 @@ mul id:1485
 Config:Biped
 TechBase:Inner Sphere
 Era:2856
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Hermes HER-1B.mtf b/megamek/data/mechfiles/mechs/3039u/Hermes HER-1B.mtf
index c669dee8295..fd064b03d16 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hermes HER-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hermes HER-1B.mtf	
@@ -6,7 +6,7 @@ mul id:1486
 Config:Biped
 TechBase:Inner Sphere
 Era:2856
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Hermes II HER-2M Mercury.mtf b/megamek/data/mechfiles/mechs/3039u/Hermes II HER-2M Mercury.mtf
index adb63f8c855..fbd832aa302 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hermes II HER-2M Mercury.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hermes II HER-2M Mercury.mtf	
@@ -6,7 +6,7 @@ mul id:1496
 Config:Biped
 TechBase:Inner Sphere
 Era:2802
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Hermes II HER-2S.mtf b/megamek/data/mechfiles/mechs/3039u/Hermes II HER-2S.mtf
index 1f432805da3..2eb817a96a4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hermes II HER-2S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hermes II HER-2S.mtf	
@@ -6,7 +6,7 @@ mul id:1497
 Config:Biped
 TechBase:Inner Sphere
 Era:2798
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Hermes II HER-4K Hermes III.mtf b/megamek/data/mechfiles/mechs/3039u/Hermes II HER-4K Hermes III.mtf
index bcd101e8746..0c685ef7f04 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hermes II HER-4K Hermes III.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hermes II HER-4K Hermes III.mtf	
@@ -6,7 +6,7 @@ mul id:1498
 Config:Biped
 TechBase:Inner Sphere
 Era:3025
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 History:Also sometimes referred to as the Hermes III, this variant of the Hermes II.  It solely appears in the Draconis Combine, suggesting that it was an export-only version. (The HER-4K Hermes III should not be confused with the HER-4K variant of the Hermes, which was an export version for the Draconis Combine of the Hermes II's predecessor.) 
 
diff --git a/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733.mtf b/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733.mtf
index 64e190d521a..56be403ddfa 100644
--- a/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733.mtf	
@@ -6,7 +6,7 @@ mul id:1517
 Config:Biped
 TechBase:Inner Sphere
 Era:2866
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733C.mtf b/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733C.mtf
index cd23f15f153..1a3bf741fac 100644
--- a/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733C.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733C.mtf	
@@ -6,7 +6,7 @@ mul id:1518
 Config:Biped
 TechBase:Inner Sphere
 Era:2866
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733P.mtf b/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733P.mtf
index 1b9b4edd83b..397b897e593 100644
--- a/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733P.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Highlander HGN-733P.mtf	
@@ -6,7 +6,7 @@ mul id:1519
 Config:Biped
 TechBase:Inner Sphere
 Era:2866
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3039u/Hornet HNT-151.mtf b/megamek/data/mechfiles/mechs/3039u/Hornet HNT-151.mtf
index 54cd467ba52..1ad130855f5 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hornet HNT-151.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hornet HNT-151.mtf	
@@ -6,7 +6,7 @@ mul id:1545
 Config:Biped
 TechBase:Inner Sphere
 Era:2760
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Hornet HNT-152.mtf b/megamek/data/mechfiles/mechs/3039u/Hornet HNT-152.mtf
index 5f7b08943b2..a3e3a20ee34 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hornet HNT-152.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hornet HNT-152.mtf	
@@ -6,7 +6,7 @@ mul id:1546
 Config:Biped
 TechBase:Inner Sphere
 Era:2997
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4G.mtf b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4G.mtf
index b324efb43ef..8395cf8e627 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4G.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4G.mtf	
@@ -6,7 +6,7 @@ mul id:1552
 Config:Biped
 techbase:Inner Sphere
 era:2572
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4H.mtf b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4H.mtf
index 02cf3855499..4d56c3c5afb 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4H.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4H.mtf	
@@ -6,7 +6,7 @@ mul id:1555
 Config:Biped
 TechBase:Inner Sphere
 Era:2819
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4J.mtf b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4J.mtf
index fd2d71e5af9..c00471a47c7 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4J.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4J.mtf	
@@ -6,7 +6,7 @@ mul id:1556
 Config:Biped
 TechBase:Inner Sphere
 Era:2856
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4N.mtf b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4N.mtf
index 9eed41f8a81..1a1bbe4e01e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4N.mtf	
@@ -6,7 +6,7 @@ mul id:1557
 Config:Biped
 TechBase:Inner Sphere
 Era:2920
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4P.mtf b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4P.mtf
index b66e6d54814..83b352841ca 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4P.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4P.mtf	
@@ -6,7 +6,7 @@ mul id:1558
 Config:Biped
 TechBase:Inner Sphere
 Era:2937
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4SP.mtf b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4SP.mtf
index 331b0654e85..61493d974f4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4SP.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hunchback HBK-4SP.mtf	
@@ -6,7 +6,7 @@ mul id:1559
 Config:Biped
 TechBase:Inner Sphere
 Era:3025
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Hussar HSR-300-D.mtf b/megamek/data/mechfiles/mechs/3039u/Hussar HSR-300-D.mtf
index d0e21bccaaf..f180444af77 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hussar HSR-300-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hussar HSR-300-D.mtf	
@@ -6,7 +6,7 @@ mul id:1587
 Config:Biped
 TechBase:Inner Sphere
 Era:3035
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Hussar HSR-350-D.mtf b/megamek/data/mechfiles/mechs/3039u/Hussar HSR-350-D.mtf
index 95feb018b96..856fc8cd436 100644
--- a/megamek/data/mechfiles/mechs/3039u/Hussar HSR-350-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Hussar HSR-350-D.mtf	
@@ -6,7 +6,7 @@ mul id:1588
 Config:Biped
 TechBase:Inner Sphere
 Era:3038
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/JagerMech JM6-A.mtf b/megamek/data/mechfiles/mechs/3039u/JagerMech JM6-A.mtf
index fa149ab7732..c07bd193c8f 100644
--- a/megamek/data/mechfiles/mechs/3039u/JagerMech JM6-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/JagerMech JM6-A.mtf	
@@ -6,7 +6,7 @@ mul id:1665
 Config:Biped
 TechBase:Inner Sphere
 Era:2778
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/JagerMech JM6-S.mtf b/megamek/data/mechfiles/mechs/3039u/JagerMech JM6-S.mtf
index 74277e8126c..9da7b8d760a 100644
--- a/megamek/data/mechfiles/mechs/3039u/JagerMech JM6-S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/JagerMech JM6-S.mtf	
@@ -6,7 +6,7 @@ mul id:1670
 Config:Biped
 TechBase:Inner Sphere
 Era:2774
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Javelin JVN-10F Fire Javelin.mtf b/megamek/data/mechfiles/mechs/3039u/Javelin JVN-10F Fire Javelin.mtf
index f3d2accd180..11e81ce399f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Javelin JVN-10F Fire Javelin.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Javelin JVN-10F Fire Javelin.mtf	
@@ -6,7 +6,7 @@ mul id:1674
 Config:Biped
 TechBase:Inner Sphere
 Era:2819
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Javelin JVN-10N.mtf b/megamek/data/mechfiles/mechs/3039u/Javelin JVN-10N.mtf
index 798b3a92b7b..8a743ac38bc 100644
--- a/megamek/data/mechfiles/mechs/3039u/Javelin JVN-10N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Javelin JVN-10N.mtf	
@@ -5,7 +5,7 @@ mul id:1675
 Config:Biped
 techbase:Inner Sphere
 era:2751
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Jenner JR7-A.mtf b/megamek/data/mechfiles/mechs/3039u/Jenner JR7-A.mtf
index 7c34a9ef6e8..a92756151a4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Jenner JR7-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Jenner JR7-A.mtf	
@@ -6,7 +6,7 @@ mul id:1687
 Config:Biped
 techbase:Inner Sphere
 era:2779
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Jenner JR7-D.mtf b/megamek/data/mechfiles/mechs/3039u/Jenner JR7-D.mtf
index 874d5fad578..246cc440b23 100644
--- a/megamek/data/mechfiles/mechs/3039u/Jenner JR7-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Jenner JR7-D.mtf	
@@ -6,7 +6,7 @@ mul id:1692
 Config:Biped
 techbase:Inner Sphere
 era:2785
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Jenner JR7-F.mtf b/megamek/data/mechfiles/mechs/3039u/Jenner JR7-F.mtf
index c9514ea718f..72c2132e8d0 100644
--- a/megamek/data/mechfiles/mechs/3039u/Jenner JR7-F.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Jenner JR7-F.mtf	
@@ -6,7 +6,7 @@ mul id:1693
 Config:Biped
 TechBase:Inner Sphere
 Era:2784
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/King Crab KGC-0000.mtf b/megamek/data/mechfiles/mechs/3039u/King Crab KGC-0000.mtf
index 951ffa89fcb..d3937cea591 100644
--- a/megamek/data/mechfiles/mechs/3039u/King Crab KGC-0000.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/King Crab KGC-0000.mtf	
@@ -6,7 +6,7 @@ mul id:1771
 Config:Biped
 TechBase:Inner Sphere
 Era:2815
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3039u/King Crab KGC-010.mtf b/megamek/data/mechfiles/mechs/3039u/King Crab KGC-010.mtf
index 1d3f39b4f65..169975fa6dc 100644
--- a/megamek/data/mechfiles/mechs/3039u/King Crab KGC-010.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/King Crab KGC-010.mtf	
@@ -6,7 +6,7 @@ mul id:1778
 Config:Biped
 TechBase:Inner Sphere
 Era:2743
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3039u/Kintaro KTO-18.mtf b/megamek/data/mechfiles/mechs/3039u/Kintaro KTO-18.mtf
index 2baa6d887bc..2c0c9958d27 100644
--- a/megamek/data/mechfiles/mechs/3039u/Kintaro KTO-18.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Kintaro KTO-18.mtf	
@@ -6,7 +6,7 @@ mul id:1790
 Config:Biped
 TechBase:Inner Sphere
 Era:2792
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Lancelot LNC25-01X.mtf b/megamek/data/mechfiles/mechs/3039u/Lancelot LNC25-01X.mtf
index 4528579adda..4e339aed80a 100644
--- a/megamek/data/mechfiles/mechs/3039u/Lancelot LNC25-01X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Lancelot LNC25-01X.mtf	
@@ -6,7 +6,7 @@ mul id:1854
 Config:Biped
 TechBase:Inner Sphere
 Era:2765
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Lancelot LNC25-02.mtf b/megamek/data/mechfiles/mechs/3039u/Lancelot LNC25-02.mtf
index 156a36de632..2c58b14979a 100644
--- a/megamek/data/mechfiles/mechs/3039u/Lancelot LNC25-02.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Lancelot LNC25-02.mtf	
@@ -6,7 +6,7 @@ mul id:1855
 Config:Biped
 TechBase:Inner Sphere
 Era:2864
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1E.mtf b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1E.mtf
index 9aff15edd8e..b4368c1c754 100644
--- a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1E.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1E.mtf	
@@ -6,7 +6,7 @@ mul id:1897
 Config:Biped
 TechBase:Inner Sphere
 Era:2811
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1L.mtf b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1L.mtf
index 55fe08d196c..86fa178bd55 100644
--- a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1L.mtf	
@@ -6,7 +6,7 @@ mul id:1898
 Config:Biped
 TechBase:Inner Sphere
 Era:3030
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1M.mtf b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1M.mtf
index d8f69c8ea4f..aa4ea35f4d4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1M.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1M.mtf	
@@ -6,7 +6,7 @@ mul id:1899
 Config:Biped
 TechBase:Inner Sphere
 Era:2571
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1S.mtf b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1S.mtf
index a95225832fe..168a8fbdf0e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1S.mtf	
@@ -6,7 +6,7 @@ mul id:1900
 Config:Biped
 TechBase:Inner Sphere
 Era:2567
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1V.mtf b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1V.mtf
index 6eba9b3dc63..02c13fb3964 100644
--- a/megamek/data/mechfiles/mechs/3039u/Locust LCT-1V.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Locust LCT-1V.mtf	
@@ -6,7 +6,7 @@ mul id:1901
 Config:Biped
 TechBase:Inner Sphere
 Era:2499
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Locust LCT-3V.mtf b/megamek/data/mechfiles/mechs/3039u/Locust LCT-3V.mtf
index 8b343843edb..b4619f723f3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Locust LCT-3V.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Locust LCT-3V.mtf	
@@ -6,7 +6,7 @@ mul id:1907
 Config:Biped
 TechBase:Inner Sphere
 Era:3004
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Longbow LGB-0W.mtf b/megamek/data/mechfiles/mechs/3039u/Longbow LGB-0W.mtf
index a031c5a5418..c197897f1b1 100644
--- a/megamek/data/mechfiles/mechs/3039u/Longbow LGB-0W.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Longbow LGB-0W.mtf	
@@ -6,7 +6,7 @@ mul id:1930
 Config:Biped
 techbase:Inner Sphere
 era:2529
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/Marauder II MAD-4A.mtf b/megamek/data/mechfiles/mechs/3039u/Marauder II MAD-4A.mtf
index b58f2555295..a766d151e1d 100644
--- a/megamek/data/mechfiles/mechs/3039u/Marauder II MAD-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Marauder II MAD-4A.mtf	
@@ -5,7 +5,7 @@ mul id:2055
 Config:Biped
 techbase:Inner Sphere
 era:3012
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3D.mtf b/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3D.mtf
index e70290c6840..139bcb6f8cf 100644
--- a/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3D.mtf	
@@ -6,7 +6,7 @@ mul id:2035
 Config:Biped
 TechBase:Inner Sphere
 Era:2834
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3L.mtf b/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3L.mtf
index c2d30800b3e..c943f29e413 100644
--- a/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3L.mtf	
@@ -6,7 +6,7 @@ mul id:2036
 Config:Biped
 TechBase:Inner Sphere
 Era:2905
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3M.mtf b/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3M.mtf
index a42746ba746..fd60613b73f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3M.mtf	
@@ -6,7 +6,7 @@ mul id:2037
 Config:Biped
 TechBase:Inner Sphere
 Era:2873
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3R.mtf b/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3R.mtf
index 06c46da3411..6f8bec7a921 100644
--- a/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Marauder MAD-3R.mtf	
@@ -6,7 +6,7 @@ mul id:2038
 Config:Biped
 TechBase:Inner Sphere
 Era:2819
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Mercury MCY-98.mtf b/megamek/data/mechfiles/mechs/3039u/Mercury MCY-98.mtf
index ef3c5048a9d..2e452e7f858 100644
--- a/megamek/data/mechfiles/mechs/3039u/Mercury MCY-98.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Mercury MCY-98.mtf	
@@ -6,7 +6,7 @@ mul id:4624
 Config:Biped
 TechBase:Inner Sphere
 Era:2810
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Mongoose MON-67.mtf b/megamek/data/mechfiles/mechs/3039u/Mongoose MON-67.mtf
index 869ff770c34..880e1c8907a 100644
--- a/megamek/data/mechfiles/mechs/3039u/Mongoose MON-67.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Mongoose MON-67.mtf	
@@ -6,7 +6,7 @@ mul id:2210
 Config:Biped
 TechBase:Inner Sphere
 Era:2830
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3039u/Mongoose MON-68.mtf b/megamek/data/mechfiles/mechs/3039u/Mongoose MON-68.mtf
index 3a9b0e022b7..0fdcc1f9026 100644
--- a/megamek/data/mechfiles/mechs/3039u/Mongoose MON-68.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Mongoose MON-68.mtf	
@@ -6,7 +6,7 @@ mul id:4655
 Config:Biped
 TechBase:Inner Sphere
 Era:3039
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3039u/Orion ON1-K.mtf b/megamek/data/mechfiles/mechs/3039u/Orion ON1-K.mtf
index f2027a02d70..efab2324d39 100644
--- a/megamek/data/mechfiles/mechs/3039u/Orion ON1-K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Orion ON1-K.mtf	
@@ -6,7 +6,7 @@ mul id:2332
 Config:Biped
 techbase:Inner Sphere
 era:2525
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Orion ON1-V-DC.mtf b/megamek/data/mechfiles/mechs/3039u/Orion ON1-V-DC.mtf
index 60bd770bd58..f47edac65f0 100644
--- a/megamek/data/mechfiles/mechs/3039u/Orion ON1-V-DC.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Orion ON1-V-DC.mtf	
@@ -6,7 +6,7 @@ mul id:2337
 Config:Biped
 TechBase:Inner Sphere
 Era:2913
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Orion ON1-V.mtf b/megamek/data/mechfiles/mechs/3039u/Orion ON1-V.mtf
index 65729f806a2..6d9a811a0c1 100644
--- a/megamek/data/mechfiles/mechs/3039u/Orion ON1-V.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Orion ON1-V.mtf	
@@ -6,7 +6,7 @@ mul id:2335
 Config:Biped
 TechBase:Inner Sphere
 Era:2799
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Orion ON1-VA.mtf b/megamek/data/mechfiles/mechs/3039u/Orion ON1-VA.mtf
index e844ceecdc7..b3bc46421a8 100644
--- a/megamek/data/mechfiles/mechs/3039u/Orion ON1-VA.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Orion ON1-VA.mtf	
@@ -6,7 +6,7 @@ mul id:2336
 Config:Biped
 TechBase:Inner Sphere
 Era:2901
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2C.mtf b/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2C.mtf
index bfc3dcea5d5..c26798fc1b4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2C.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2C.mtf	
@@ -6,7 +6,7 @@ mul id:2348
 Config:Biped
 techbase:Inner Sphere
 era:2511
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2L.mtf b/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2L.mtf
index 5f60f872cb6..19f4e0d6cec 100644
--- a/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2L.mtf	
@@ -6,7 +6,7 @@ mul id:2352
 Config:Biped
 TechBase:Inner Sphere
 Era:2884
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2M.mtf b/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2M.mtf
index 1a6f2cda588..79557909595 100644
--- a/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2M.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-2M.mtf	
@@ -6,7 +6,7 @@ mul id:2353
 Config:Biped
 TechBase:Inner Sphere
 Era:2793
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-3C.mtf b/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-3C.mtf
index 9d9191abe93..1f0009ea037 100644
--- a/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Ostroc OSR-3C.mtf	
@@ -6,7 +6,7 @@ mul id:2354
 Config:Biped
 TechBase:Inner Sphere
 Era:2876
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Ostscout OTT-7J.mtf b/megamek/data/mechfiles/mechs/3039u/Ostscout OTT-7J.mtf
index e6cb372f7f8..240ce585884 100644
--- a/megamek/data/mechfiles/mechs/3039u/Ostscout OTT-7J.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Ostscout OTT-7J.mtf	
@@ -6,7 +6,7 @@ mul id:2366
 Config:Biped
 techbase:Inner Sphere
 era:2600
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Ostsol OTL-4D.mtf b/megamek/data/mechfiles/mechs/3039u/Ostsol OTL-4D.mtf
index dcc2709a0cb..185a527cac9 100644
--- a/megamek/data/mechfiles/mechs/3039u/Ostsol OTL-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Ostsol OTL-4D.mtf	
@@ -6,7 +6,7 @@ mul id:2371
 Config:Biped
 TechBase:Inner Sphere
 Era:2694
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Ostsol OTL-4F.mtf b/megamek/data/mechfiles/mechs/3039u/Ostsol OTL-4F.mtf
index 4edb7621e6e..99428f89fac 100644
--- a/megamek/data/mechfiles/mechs/3039u/Ostsol OTL-4F.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Ostsol OTL-4F.mtf	
@@ -6,7 +6,7 @@ mul id:2372
 Config:Biped
 TechBase:Inner Sphere
 Era:2871
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Panther PNT-8Z.mtf b/megamek/data/mechfiles/mechs/3039u/Panther PNT-8Z.mtf
index 8d96ad49c1d..fe6df1f2937 100644
--- a/megamek/data/mechfiles/mechs/3039u/Panther PNT-8Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Panther PNT-8Z.mtf	
@@ -6,7 +6,7 @@ mul id:2424
 Config:Biped
 techbase:Inner Sphere
 era:2739
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Panther PNT-9R.mtf b/megamek/data/mechfiles/mechs/3039u/Panther PNT-9R.mtf
index f9104129257..11f39ffca15 100644
--- a/megamek/data/mechfiles/mechs/3039u/Panther PNT-9R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Panther PNT-9R.mtf	
@@ -6,7 +6,7 @@ mul id:2425
 Config:Biped
 TechBase:Inner Sphere
 Era:2759
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1.mtf b/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1.mtf
index 819e87dfdfc..e6702b55dce 100644
--- a/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1.mtf	
@@ -6,7 +6,7 @@ mul id:2491
 Config:Biped
 TechBase:Inner Sphere
 Era:2568
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1D.mtf b/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1D.mtf
index 49deca2bbdc..bd18461cf8d 100644
--- a/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1D.mtf	
@@ -6,7 +6,7 @@ mul id:2494
 Config:Biped
 TechBase:Inner Sphere
 Era:2586
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1K.mtf b/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1K.mtf
index 2d2d23b4b23..f97e06949c7 100644
--- a/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Phoenix Hawk PXH-1K.mtf	
@@ -6,7 +6,7 @@ mul id:2495
 Config:Biped
 TechBase:Inner Sphere
 Era:2603
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-4G.mtf b/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-4G.mtf
index 9183192403f..1d7f8bcb779 100644
--- a/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-4G.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-4G.mtf	
@@ -6,7 +6,7 @@ mul id:2610
 Config:Biped
 TechBase:Inner Sphere
 Era:2779
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-4H.mtf b/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-4H.mtf
index 5e78ba86dbb..d5e0a8445ce 100644
--- a/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-4H.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-4H.mtf	
@@ -6,7 +6,7 @@ mul id:2611
 Config:Biped
 TechBase:Inner Sphere
 Era:2847
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-5A.mtf b/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-5A.mtf
index 9a9f06c3dfa..1e6a68889b1 100644
--- a/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-5A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Quickdraw QKD-5A.mtf	
@@ -6,7 +6,7 @@ mul id:2612
 Config:Biped
 TechBase:Inner Sphere
 Era:3002
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Raven RVN-1X.mtf b/megamek/data/mechfiles/mechs/3039u/Raven RVN-1X.mtf
index fe6f50900a8..46e6142f795 100644
--- a/megamek/data/mechfiles/mechs/3039u/Raven RVN-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Raven RVN-1X.mtf	
@@ -6,7 +6,7 @@ mul id:2662
 Config:Biped
 TechBase:Inner Sphere
 Era:3024
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Raven RVN-2X.mtf b/megamek/data/mechfiles/mechs/3039u/Raven RVN-2X.mtf
index e4b3bd718a3..4651980ed5a 100644
--- a/megamek/data/mechfiles/mechs/3039u/Raven RVN-2X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Raven RVN-2X.mtf	
@@ -6,7 +6,7 @@ mul id:2663
 Config:Biped
 TechBase:Inner Sphere
 Era:3030
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Raven RVN-3X.mtf b/megamek/data/mechfiles/mechs/3039u/Raven RVN-3X.mtf
index a0495a37f00..7f8d455c18f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Raven RVN-3X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Raven RVN-3X.mtf	
@@ -6,7 +6,7 @@ mul id:2665
 Config:Biped
 TechBase:Inner Sphere
 Era:3028
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Raven RVN-4X.mtf b/megamek/data/mechfiles/mechs/3039u/Raven RVN-4X.mtf
index 0690ff565f2..5c0a5a9ef83 100644
--- a/megamek/data/mechfiles/mechs/3039u/Raven RVN-4X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Raven RVN-4X.mtf	
@@ -6,7 +6,7 @@ mul id:2669
 Config:Biped
 TechBase:Inner Sphere
 Era:3031
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-3C.mtf b/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-3C.mtf
index c82eb710bed..cd546e12353 100644
--- a/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-3C.mtf	
@@ -6,7 +6,7 @@ mul id:2695
 Config:Biped
 TechBase:Inner Sphere
 Era:3026
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-3N.mtf b/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-3N.mtf
index 33c875014d1..ce94ec64cab 100644
--- a/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-3N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-3N.mtf	
@@ -6,7 +6,7 @@ mul id:2697
 Config:Biped
 TechBase:Inner Sphere
 Era:2770
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-4D.mtf b/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-4D.mtf
index ecccfd3a659..9c7c73debb4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Rifleman RFL-4D.mtf	
@@ -6,7 +6,7 @@ mul id:2698
 Config:Biped
 TechBase:Inner Sphere
 Era:3021
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3039u/Scorpion SCP-1N (Wednall).mtf b/megamek/data/mechfiles/mechs/3039u/Scorpion SCP-1N (Wednall).mtf
index 663b9dbb7bf..064d17deb4b 100644
--- a/megamek/data/mechfiles/mechs/3039u/Scorpion SCP-1N (Wednall).mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Scorpion SCP-1N (Wednall).mtf	
@@ -6,7 +6,7 @@ mul id:2838
 Config:Quad
 TechBase:Inner Sphere
 Era:3030
-Source:TRO 3039
+Source:TRO: 3039 - Late Succession War - Renaissance
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Scorpion SCP-1N.mtf b/megamek/data/mechfiles/mechs/3039u/Scorpion SCP-1N.mtf
index 4ab286d488d..3f979dbdd3c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Scorpion SCP-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Scorpion SCP-1N.mtf	
@@ -6,7 +6,7 @@ mul id:2837
 Config:Quad
 TechBase:Inner Sphere
 Era:2570
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Sentinel STN-1S.mtf b/megamek/data/mechfiles/mechs/3039u/Sentinel STN-1S.mtf
index 2ade09fa218..b616eeef6bf 100644
--- a/megamek/data/mechfiles/mechs/3039u/Sentinel STN-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Sentinel STN-1S.mtf	
@@ -6,7 +6,7 @@ mul id:2856
 Config:Biped
 TechBase:Inner Sphere
 Era:2651
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3K.mtf b/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3K.mtf
index e3f551663d5..a26c28ba960 100644
--- a/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3K.mtf	
@@ -6,7 +6,7 @@ mul id:2857
 Config:Biped
 TechBase:Inner Sphere
 Era:2830
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3KA.mtf b/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3KA.mtf
index ef6b6b2430a..43d190d443c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3KA.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3KA.mtf	
@@ -6,7 +6,7 @@ mul id:2858
 Config:Biped
 TechBase:Inner Sphere
 Era:2830
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3KB.mtf b/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3KB.mtf
index 924f503cf6b..a331cee137a 100644
--- a/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3KB.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Sentinel STN-3KB.mtf	
@@ -6,7 +6,7 @@ mul id:2859
 Config:Biped
 TechBase:Inner Sphere
 Era:2830
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2D.mtf b/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2D.mtf
index ab9f43c5eab..dd38bc6c6ee 100644
--- a/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2D.mtf	
@@ -6,7 +6,7 @@ mul id:2899
 Config:Biped
 TechBase:Inner Sphere
 Era:2796
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2H.mtf b/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2H.mtf
index 62094e9bd53..a315aadbe12 100644
--- a/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2H.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2H.mtf	
@@ -6,7 +6,7 @@ mul id:2901
 Config:Biped
 TechBase:Inner Sphere
 Era:2550
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2K.mtf b/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2K.mtf
index 1b2883bd158..75d152fba12 100644
--- a/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Shadow Hawk SHD-2K.mtf	
@@ -6,7 +6,7 @@ mul id:2903
 Config:Biped
 TechBase:Inner Sphere
 Era:2803
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Spider SDR-5D.mtf b/megamek/data/mechfiles/mechs/3039u/Spider SDR-5D.mtf
index cd28ab36cd9..41c03e53a24 100644
--- a/megamek/data/mechfiles/mechs/3039u/Spider SDR-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Spider SDR-5D.mtf	
@@ -6,7 +6,7 @@ mul id:3008
 Config:Biped
 TechBase:Inner Sphere
 Era:2853
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Spider SDR-5K.mtf b/megamek/data/mechfiles/mechs/3039u/Spider SDR-5K.mtf
index d5583beaa95..eabcba066d4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Spider SDR-5K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Spider SDR-5K.mtf	
@@ -6,7 +6,7 @@ mul id:3009
 Config:Biped
 TechBase:Inner Sphere
 Era:2850
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Spider SDR-5V.mtf b/megamek/data/mechfiles/mechs/3039u/Spider SDR-5V.mtf
index 50ce3954993..6e39b0dcc1f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Spider SDR-5V.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Spider SDR-5V.mtf	
@@ -6,7 +6,7 @@ mul id:3010
 Config:Biped
 TechBase:Inner Sphere
 Era:2650
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Stalker STK-3F.mtf b/megamek/data/mechfiles/mechs/3039u/Stalker STK-3F.mtf
index c43ec17d054..04fa0abe583 100644
--- a/megamek/data/mechfiles/mechs/3039u/Stalker STK-3F.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Stalker STK-3F.mtf	
@@ -6,7 +6,7 @@ mul id:3035
 Config:Biped
 techbase:Inner Sphere
 era:2594
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/Stalker STK-3H.mtf b/megamek/data/mechfiles/mechs/3039u/Stalker STK-3H.mtf
index 7398c8a0926..e5e0e61a12e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Stalker STK-3H.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Stalker STK-3H.mtf	
@@ -6,7 +6,7 @@ mul id:3038
 Config:Biped
 TechBase:Inner Sphere
 Era:2638
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/Stalker STK-4N.mtf b/megamek/data/mechfiles/mechs/3039u/Stalker STK-4N.mtf
index 624fe93a77e..fcdd69ba9cf 100644
--- a/megamek/data/mechfiles/mechs/3039u/Stalker STK-4N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Stalker STK-4N.mtf	
@@ -6,7 +6,7 @@ mul id:3039
 Config:Biped
 TechBase:Inner Sphere
 Era:2876
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3039u/Stalker STK-4P.mtf b/megamek/data/mechfiles/mechs/3039u/Stalker STK-4P.mtf
index fada742cb9f..54f1558420d 100644
--- a/megamek/data/mechfiles/mechs/3039u/Stalker STK-4P.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Stalker STK-4P.mtf	
@@ -6,7 +6,7 @@ mul id:5120
 Config:Biped
 TechBase:Inner Sphere
 Era:2998
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3039u/Stinger STG-3G.mtf b/megamek/data/mechfiles/mechs/3039u/Stinger STG-3G.mtf
index 1af9d4f2805..dc8a8980a68 100644
--- a/megamek/data/mechfiles/mechs/3039u/Stinger STG-3G.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Stinger STG-3G.mtf	
@@ -6,7 +6,7 @@ mul id:3058
 Config:Biped
 TechBase:Inner Sphere
 Era:2581
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Stinger STG-3R.mtf b/megamek/data/mechfiles/mechs/3039u/Stinger STG-3R.mtf
index 523bcbd6362..be2e8362a8e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Stinger STG-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Stinger STG-3R.mtf	
@@ -6,7 +6,7 @@ mul id:3061
 Config:Biped
 TechBase:Inner Sphere
 Era:2479
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Thorn THE-F.mtf b/megamek/data/mechfiles/mechs/3039u/Thorn THE-F.mtf
index 1e319125744..f75c2a8158c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Thorn THE-F.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Thorn THE-F.mtf	
@@ -6,7 +6,7 @@ mul id:3190
 Config:Biped
 techbase:Inner Sphere
 era:2490
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Thorn THE-S.mtf b/megamek/data/mechfiles/mechs/3039u/Thorn THE-S.mtf
index d009072a8aa..28a487308d3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Thorn THE-S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Thorn THE-S.mtf	
@@ -6,7 +6,7 @@ mul id:3195
 Config:Biped
 TechBase:Inner Sphere
 Era:3035
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Thorn THE-T.mtf b/megamek/data/mechfiles/mechs/3039u/Thorn THE-T.mtf
index a325ff1099c..ee2df7fa31e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Thorn THE-T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Thorn THE-T.mtf	
@@ -6,7 +6,7 @@ mul id:3196
 Config:Biped
 TechBase:Inner Sphere
 Era:3038
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Thug THG-10E.mtf b/megamek/data/mechfiles/mechs/3039u/Thug THG-10E.mtf
index a78551a408d..9957c3c3f64 100644
--- a/megamek/data/mechfiles/mechs/3039u/Thug THG-10E.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Thug THG-10E.mtf	
@@ -6,7 +6,7 @@ mul id:3204
 Config:Biped
 TechBase:Inner Sphere
 Era:2835
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5S.mtf b/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5S.mtf
index 56112fd2fa2..06278747687 100644
--- a/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5S.mtf	
@@ -6,7 +6,7 @@ mul id:3238
 Config:Biped
 techbase:Inner Sphere
 era:2505
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5SE.mtf b/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5SE.mtf
index a14be68619a..17a285ed317 100644
--- a/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5SE.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5SE.mtf	
@@ -5,7 +5,7 @@ mul id:3240
 Config:Biped
 techbase:Inner Sphere
 era:3000
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5SS.mtf b/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5SS.mtf
index 970a676430e..2b065f95c17 100644
--- a/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5SS.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Thunderbolt TDR-5SS.mtf	
@@ -6,7 +6,7 @@ mul id:3241
 Config:Biped
 TechBase:Inner Sphere
 Era:2930
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5J.mtf b/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5J.mtf
index 5cbc53a1f29..62395913560 100644
--- a/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5J.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5J.mtf	
@@ -6,7 +6,7 @@ mul id:3296
 Config:Biped
 TechBase:Inner Sphere
 Era:2850
-Source:TRO SW - Succession Wars
+Source:TRO: SW - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5N.mtf b/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5N.mtf
index bdfadc448f1..2d569d34dcc 100644
--- a/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5N.mtf	
@@ -6,7 +6,7 @@ mul id:3297
 Config:Biped
 TechBase:Inner Sphere
 Era:2799
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5S.mtf b/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5S.mtf
index 634432feead..6e8ab7e93e4 100644
--- a/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-5S.mtf	
@@ -6,7 +6,7 @@ mul id:3298
 Config:Biped
 TechBase:Inner Sphere
 Era:2864
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-7K.mtf b/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-7K.mtf
index d647eed3898..891f1442973 100644
--- a/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Trebuchet TBT-7K.mtf	
@@ -6,7 +6,7 @@ mul id:3299
 Config:Biped
 TechBase:Inner Sphere
 Era:3025
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3039u/UrbanMech UM-R60.mtf b/megamek/data/mechfiles/mechs/3039u/UrbanMech UM-R60.mtf
index 86c8c1f2427..9781bb11490 100644
--- a/megamek/data/mechfiles/mechs/3039u/UrbanMech UM-R60.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/UrbanMech UM-R60.mtf	
@@ -6,7 +6,7 @@ mul id:3354
 Config:Biped
 techbase:Inner Sphere
 era:2675
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/UrbanMech UM-R60L.mtf b/megamek/data/mechfiles/mechs/3039u/UrbanMech UM-R60L.mtf
index 08a65a3c7d2..402295c3dba 100644
--- a/megamek/data/mechfiles/mechs/3039u/UrbanMech UM-R60L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/UrbanMech UM-R60L.mtf	
@@ -6,7 +6,7 @@ mul id:3355
 Config:Biped
 TechBase:Inner Sphere
 Era:2925
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Valkyrie VLK-QA.mtf b/megamek/data/mechfiles/mechs/3039u/Valkyrie VLK-QA.mtf
index 3db105eac12..74ebe14f5ba 100644
--- a/megamek/data/mechfiles/mechs/3039u/Valkyrie VLK-QA.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Valkyrie VLK-QA.mtf	
@@ -6,7 +6,7 @@ mul id:3372
 Config:Biped
 TechBase:Inner Sphere
 Era:2787
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Valkyrie VLK-QF.mtf b/megamek/data/mechfiles/mechs/3039u/Valkyrie VLK-QF.mtf
index b4b69728258..4498156df94 100644
--- a/megamek/data/mechfiles/mechs/3039u/Valkyrie VLK-QF.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Valkyrie VLK-QF.mtf	
@@ -6,7 +6,7 @@ mul id:3378
 Config:Biped
 TechBase:Inner Sphere
 Era:2967
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3039u/Victor VTR-9A.mtf b/megamek/data/mechfiles/mechs/3039u/Victor VTR-9A.mtf
index c7d9467ac57..a2de68cffa2 100644
--- a/megamek/data/mechfiles/mechs/3039u/Victor VTR-9A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Victor VTR-9A.mtf	
@@ -6,7 +6,7 @@ mul id:3407
 Config:Biped
 TechBase:Inner Sphere
 Era:2508
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Victor VTR-9A1.mtf b/megamek/data/mechfiles/mechs/3039u/Victor VTR-9A1.mtf
index 9256a0190fd..485c9f73891 100644
--- a/megamek/data/mechfiles/mechs/3039u/Victor VTR-9A1.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Victor VTR-9A1.mtf	
@@ -6,7 +6,7 @@ mul id:3408
 Config:Biped
 TechBase:Inner Sphere
 Era:2508
-Source:TRO 3039 - Age of War
+Source:TRO: 3039 - Age of War
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Victor VTR-9B.mtf b/megamek/data/mechfiles/mechs/3039u/Victor VTR-9B.mtf
index 57f29d99d92..2cbf3f5bf04 100644
--- a/megamek/data/mechfiles/mechs/3039u/Victor VTR-9B.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Victor VTR-9B.mtf	
@@ -6,7 +6,7 @@ mul id:3409
 Config:Biped
 techbase:Inner Sphere
 era:2510
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Victor VTR-9S.mtf b/megamek/data/mechfiles/mechs/3039u/Victor VTR-9S.mtf
index eebafa252ac..e53f0603921 100644
--- a/megamek/data/mechfiles/mechs/3039u/Victor VTR-9S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Victor VTR-9S.mtf	
@@ -6,7 +6,7 @@ mul id:3414
 Config:Biped
 TechBase:Inner Sphere
 Era:2998
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1AA Avenging Angel.mtf b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1AA Avenging Angel.mtf
index 9cec10fb8d1..315861c8ed7 100644
--- a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1AA Avenging Angel.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1AA Avenging Angel.mtf	
@@ -6,7 +6,7 @@ mul id:3421
 Config:Biped
 TechBase:Inner Sphere
 Era:2863
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1R Vong.mtf b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1R Vong.mtf
index f0c4552ed89..cc1d968e407 100644
--- a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1R Vong.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1R Vong.mtf	
@@ -6,7 +6,7 @@ mul id:3423
 Config:Biped
 TechBase:Inner Sphere
 Era:3020
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1R.mtf b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1R.mtf
index 0e0e33e639f..2965fcb6a8d 100644
--- a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1R.mtf	
@@ -6,7 +6,7 @@ mul id:3422
 Config:Biped
 TechBase:Inner Sphere
 Era:2826
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1SIC.mtf b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1SIC.mtf
index 905d14213fe..5b84ccf2aa3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1SIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1SIC.mtf	
@@ -6,7 +6,7 @@ mul id:3424
 Config:Biped
 TechBase:Inner Sphere
 Era:3031
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1X.mtf b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1X.mtf
index 3923250ebdd..5effb18e78a 100644
--- a/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Vindicator VND-1X.mtf	
@@ -6,7 +6,7 @@ mul id:3425
 Config:Biped
 TechBase:Inner Sphere
 Era:2826
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Vulcan VL-2T.mtf b/megamek/data/mechfiles/mechs/3039u/Vulcan VL-2T.mtf
index f810bc1060c..dd0d6694c0f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Vulcan VL-2T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Vulcan VL-2T.mtf	
@@ -5,7 +5,7 @@ mul id:3458
 Config:Biped
 techbase:Inner Sphere
 era:2777
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Vulcan VL-5T.mtf b/megamek/data/mechfiles/mechs/3039u/Vulcan VL-5T.mtf
index a37d22b4564..f7c40aa05f2 100644
--- a/megamek/data/mechfiles/mechs/3039u/Vulcan VL-5T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Vulcan VL-5T.mtf	
@@ -6,7 +6,7 @@ mul id:3459
 Config:Biped
 TechBase:Inner Sphere
 Era:2778
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6D.mtf b/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6D.mtf
index 5a8df1049b5..6dfddaf94c1 100644
--- a/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6D.mtf	
@@ -6,7 +6,7 @@ mul id:3485
 Config:Biped
 TechBase:Inner Sphere
 Era:2835
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6K.mtf b/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6K.mtf
index 10027ea9528..56b6bc4efa3 100644
--- a/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6K.mtf	
@@ -6,7 +6,7 @@ mul id:3486
 Config:Biped
 TechBase:Inner Sphere
 Era:2830
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6L.mtf b/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6L.mtf
index 0e45186152d..6f561f233fa 100644
--- a/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6L.mtf	
@@ -6,7 +6,7 @@ mul id:3487
 Config:Biped
 TechBase:Inner Sphere
 Era:2825
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6R.mtf b/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6R.mtf
index 241c5e0739a..e9ecb2241e2 100644
--- a/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Warhammer WHM-6R.mtf	
@@ -5,7 +5,7 @@ mul id:3488
 Config:Biped
 techbase:Inner Sphere
 era:2515
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1A.mtf b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1A.mtf
index 01ac75f65ff..ab89ee86680 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1A.mtf	
@@ -6,7 +6,7 @@ mul id:3520
 Config:Biped
 techbase:Inner Sphere
 era:2471
-source:TRO 3039 - Age of War
+source:TRO: 3039 - Age of War
 rules level:1
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1D.mtf b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1D.mtf
index a845ef7cd54..f8ea5b3bb34 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1D.mtf	
@@ -6,7 +6,7 @@ mul id:3521
 Config:Biped
 TechBase:Inner Sphere
 Era:2823
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1K.mtf b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1K.mtf
index 4674c0a1814..41376194094 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1K.mtf	
@@ -6,7 +6,7 @@ mul id:3522
 Config:Biped
 TechBase:Inner Sphere
 Era:2818
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1L.mtf b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1L.mtf
index 6b5b85cdc0f..d776f6b626d 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1L.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1L.mtf	
@@ -6,7 +6,7 @@ mul id:3523
 Config:Biped
 TechBase:Inner Sphere
 Era:2799
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1W.mtf b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1W.mtf
index 742bef90987..522735fe01b 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1W.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wasp WSP-1W.mtf	
@@ -6,7 +6,7 @@ mul id:3525
 Config:Biped
 TechBase:Inner Sphere
 Era:3009
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-0.mtf b/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-0.mtf
index bce722f4691..be13a610bf0 100644
--- a/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-0.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-0.mtf	
@@ -6,7 +6,7 @@ mul id:3537
 Config:Biped
 TechBase:Inner Sphere
 Era:2754
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-1.mtf b/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-1.mtf
index 90780b538e1..25077900516 100644
--- a/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-1.mtf	
@@ -6,7 +6,7 @@ mul id:3538
 Config:Biped
 TechBase:Inner Sphere
 Era:2689
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-1S.mtf b/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-1S.mtf
index 797e7b73e8b..775e6c1b11f 100644
--- a/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Whitworth WTH-1S.mtf	
@@ -5,7 +5,7 @@ mul id:3540
 Config:Biped
 techbase:Inner Sphere
 era:2610
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1.mtf b/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1.mtf
index 1b043dde349..52ecdefe1fa 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1.mtf	
@@ -5,7 +5,7 @@ mul id:3560
 Config:Biped
 techbase:Inner Sphere
 era:3028
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1A.mtf b/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1A.mtf
index 13707c2b45a..5e88956d10c 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1A.mtf	
@@ -6,7 +6,7 @@ mul id:3561
 Config:Biped
 TechBase:Inner Sphere
 Era:3028
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1B.mtf b/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1B.mtf
index bdd5e3e5230..7f5b316f5f6 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wolfhound WLF-1B.mtf	
@@ -6,7 +6,7 @@ mul id:3562
 Config:Biped
 TechBase:Inner Sphere
 Era:3028
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6K.mtf b/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6K.mtf
index 2b3735e7569..d21d21203d8 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6K.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6K.mtf	
@@ -6,7 +6,7 @@ mul id:3571
 Config:Biped
 techbase:Inner Sphere
 era:2598
-source:TRO 3039 - Star League
+source:TRO: 3039 - Star League
 rules level:1
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6M.mtf b/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6M.mtf
index cdc42cf4ad2..6169057e685 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6M.mtf	
@@ -6,7 +6,7 @@ mul id:3572
 Config:Biped
 TechBase:Inner Sphere
 Era:2816
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6R.mtf b/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6R.mtf
index 412743adcef..a2fa78b1ddc 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6R.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wolverine WVR-6R.mtf	
@@ -6,7 +6,7 @@ mul id:3573
 Config:Biped
 TechBase:Inner Sphere
 Era:2575
-Source:TRO 3039 - Star League
+Source:TRO: 3039 - Star League
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3039u/Wyvern WVE-6N.mtf b/megamek/data/mechfiles/mechs/3039u/Wyvern WVE-6N.mtf
index 4888e146eec..b0741aa7ceb 100644
--- a/megamek/data/mechfiles/mechs/3039u/Wyvern WVE-6N.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Wyvern WVE-6N.mtf	
@@ -6,7 +6,7 @@ mul id:3599
 Config:Biped
 TechBase:Inner Sphere
 Era:2821
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-5S.mtf b/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-5S.mtf
index d69c568e130..0a64a97a11e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-5S.mtf	
@@ -5,7 +5,7 @@ mul id:3640
 Config:Biped
 techbase:Inner Sphere
 era:2788
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-5T.mtf b/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-5T.mtf
index 0e6c023a553..43a37f5dfaa 100644
--- a/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-5T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-5T.mtf	
@@ -5,7 +5,7 @@ mul id:3641
 Config:Biped
 techbase:Inner Sphere
 era:2787
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-6S.mtf b/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-6S.mtf
index 5163bac3a7a..f7ca99dc756 100644
--- a/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-6S.mtf	
@@ -6,7 +6,7 @@ mul id:3642
 Config:Biped
 techbase:Inner Sphere
 era:2898
-source:TRO 3039 - Succession Wars
+source:TRO: 3039 - Succession Wars
 rules level:1
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-6T.mtf b/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-6T.mtf
index 203ba7b97fb..8676800c55e 100644
--- a/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-6T.mtf	
+++ b/megamek/data/mechfiles/mechs/3039u/Zeus ZEU-6T.mtf	
@@ -6,7 +6,7 @@ mul id:3643
 Config:Biped
 TechBase:Inner Sphere
 Era:3026
-Source:TRO 3039 - Succession Wars
+Source:TRO: 3039 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-1A.mtf b/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-1A.mtf
index f032b2b22f4..80b3b013902 100644
--- a/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-1A.mtf	
@@ -6,7 +6,7 @@ mul id:3700
 Config:Biped
 TechBase:Inner Sphere
 Era:3009
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:1
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-2A.mtf b/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-2A.mtf
index 7ed0576c601..168a4fbe14b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-2A.mtf	
@@ -6,7 +6,7 @@ mul id:39
 Config:Biped
 techbase:Inner Sphere
 era:3048
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-3A.mtf b/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-3A.mtf
index 7eed405da83..e3d3c1cbd28 100644
--- a/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-3A.mtf	
@@ -6,7 +6,7 @@ mul id:41
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-4A.mtf b/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-4A.mtf
index 5e9c5cdf708..a16929a071d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Annihilator ANH-4A.mtf	
@@ -6,7 +6,7 @@ mul id:42
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Annihilator C.mtf b/megamek/data/mechfiles/mechs/3050U/Annihilator C.mtf
index 480a1fc6756..bb208e0db80 100644
--- a/megamek/data/mechfiles/mechs/3050U/Annihilator C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Annihilator C.mtf	
@@ -6,7 +6,7 @@ mul id:43
 Config:Biped
 TechBase:Clan
 Era:2848
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Assassin ASN-23.mtf b/megamek/data/mechfiles/mechs/3050U/Assassin ASN-23.mtf
index f06b9802087..4b1f54191a1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Assassin ASN-23.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Assassin ASN-23.mtf	
@@ -6,7 +6,7 @@ mul id:128
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Assassin ASN-30.mtf b/megamek/data/mechfiles/mechs/3050U/Assassin ASN-30.mtf
index 89705e43051..f3485ce71c7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Assassin ASN-30.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Assassin ASN-30.mtf	
@@ -6,7 +6,7 @@ mul id:129
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Assassin ASN-99.mtf b/megamek/data/mechfiles/mechs/3050U/Assassin ASN-99.mtf
index 39529e121c6..65d14f3a48e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Assassin ASN-99.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Assassin ASN-99.mtf	
@@ -6,7 +6,7 @@ mul id:130
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Assassin Servitor.mtf b/megamek/data/mechfiles/mechs/3050U/Assassin Servitor.mtf
index f89cd5419ba..c12d5c2b7f7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Assassin Servitor.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Assassin Servitor.mtf	
@@ -6,7 +6,7 @@ mul id:3737
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-C.mtf b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-C.mtf
index 0e7231cddf8..675a8e3a6e5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-C.mtf	
@@ -6,7 +6,7 @@ mul id:138
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-CM.mtf b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-CM.mtf
index 4aaa1192ed2..13c219a965f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-CM.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-CM.mtf	
@@ -6,7 +6,7 @@ mul id:139
 Config:Biped
 techbase:Inner Sphere
 era:3050
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-K.mtf b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-K.mtf
index ae909300a63..d652d00ba57 100644
--- a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-K.mtf	
@@ -6,7 +6,7 @@ mul id:144
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-S.mtf b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-S.mtf
index 28a32424d42..8b5df4dbd67 100644
--- a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-S.mtf	
@@ -6,7 +6,7 @@ mul id:148
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-S2.mtf b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-S2.mtf
index c8e4988071b..4e00205eee8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Atlas AS7-S2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Atlas AS7-S2.mtf	
@@ -6,7 +6,7 @@ mul id:149
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-10KM.mtf b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-10KM.mtf
index 20354176d75..820f042044a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-10KM.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-10KM.mtf	
@@ -6,7 +6,7 @@ mul id:172
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9M.mtf b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9M.mtf
index 3af4109e5aa..e7246253a39 100644
--- a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9M.mtf	
@@ -6,7 +6,7 @@ mul id:178
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Ma.mtf b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Ma.mtf
index 2d4da08ab47..391286f90b0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Ma.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Ma.mtf	
@@ -6,7 +6,7 @@ mul id:5594
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Q (Klatt).mtf b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Q (Klatt).mtf
index da2de2e43f2..ae838967fe5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Q (Klatt).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Q (Klatt).mtf	
@@ -6,7 +6,7 @@ mul id:3770
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Q.mtf b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Q.mtf
index b64fa16ea36..181096aa25e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Awesome AWS-9Q.mtf	
@@ -6,7 +6,7 @@ mul id:179
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Axman AXM-1N.mtf b/megamek/data/mechfiles/mechs/3050U/Axman AXM-1N.mtf
index a90f95962e4..20329427d60 100644
--- a/megamek/data/mechfiles/mechs/3050U/Axman AXM-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Axman AXM-1N.mtf	
@@ -6,7 +6,7 @@ mul id:184
 Config:Biped
 techbase:Inner Sphere
 era:3048
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Axman AXM-2N.mtf b/megamek/data/mechfiles/mechs/3050U/Axman AXM-2N.mtf
index e9dd6e75bff..bbb71cc505d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Axman AXM-2N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Axman AXM-2N.mtf	
@@ -6,7 +6,7 @@ mul id:185
 Config:Biped
 techbase:Inner Sphere
 era:3049
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Axman AXM-4D.mtf b/megamek/data/mechfiles/mechs/3050U/Axman AXM-4D.mtf
index e034c071953..f29646d25ca 100644
--- a/megamek/data/mechfiles/mechs/3050U/Axman AXM-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Axman AXM-4D.mtf	
@@ -6,7 +6,7 @@ mul id:188
 Config:Biped
 techbase:Inner Sphere
 era:3071
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S (Sawyer).mtf b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S (Sawyer).mtf
index ed985370819..6f357b276f9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S (Sawyer).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S (Sawyer).mtf	
@@ -5,7 +5,7 @@ mul id:3786
 Config:Biped
 techbase:Inner Sphere
 era:3057
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S (Vandergriff).mtf b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S (Vandergriff).mtf
index f0565ac36e4..7507b5d539b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S (Vandergriff).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S (Vandergriff).mtf	
@@ -6,7 +6,7 @@ mul id:3787
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S.mtf b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S.mtf
index 75c006641d3..698d85dc7d5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-5S.mtf	
@@ -6,7 +6,7 @@ mul id:247
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-6S.mtf b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-6S.mtf
index 33ac7afb9e8..d189eeae228 100644
--- a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-6S.mtf	
@@ -6,7 +6,7 @@ mul id:248
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-7S.mtf b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-7S.mtf
index aa9d4140638..e43d5d47049 100644
--- a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-7S.mtf	
@@ -6,7 +6,7 @@ mul id:249
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-8S.mtf b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-8S.mtf
index 2dbde1df4d2..e5fd3704406 100644
--- a/megamek/data/mechfiles/mechs/3050U/Banshee BNC-8S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Banshee BNC-8S.mtf	
@@ -6,7 +6,7 @@ mul id:250
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) A.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) A.mtf
index 92e2d186791..d2f68d280d8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) A.mtf	
@@ -6,7 +6,7 @@ mul id:335
 Config:Biped Omnimech
 techbase:Clan
 era:2870
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) B.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) B.mtf
index 72358666c44..77a9a3bb8d0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) B.mtf	
@@ -6,7 +6,7 @@ mul id:336
 Config:Biped Omnimech
 TechBase:Clan
 Era:2870
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) C.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) C.mtf
index 46f7eb596bd..892875b9180 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) C.mtf	
@@ -6,7 +6,7 @@ mul id:337
 Config:Biped Omnimech
 TechBase:Clan
 Era:2870
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) D.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) D.mtf
index ecf5776c429..b7cb380caf3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) D.mtf	
@@ -6,7 +6,7 @@ mul id:338
 Config:Biped Omnimech
 TechBase:Clan
 Era:2870
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) E.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) E.mtf
index 9b1d0d267d3..4dc74fb97f9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) E.mtf	
@@ -6,7 +6,7 @@ mul id:339
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) F.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) F.mtf
index 58ad7a7e7a6..6187ebfcab7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) F.mtf	
@@ -6,7 +6,7 @@ mul id:340
 Config:Biped Omnimech
 TechBase:Clan
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) H.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) H.mtf
index dbfaaf7a36d..b7fccfca6e0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) H.mtf	
@@ -6,7 +6,7 @@ mul id:341
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) Prime.mtf
index 685bd644c86..ee17c5c40ad 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:342
 Config:Biped Omnimech
 techbase:Clan
 era:2870
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) S.mtf b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) S.mtf
index 04a6188149c..344a975ab26 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Hawk (Nova) S.mtf	
@@ -6,7 +6,7 @@ mul id:343
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Knight BL-12-KNT.mtf b/megamek/data/mechfiles/mechs/3050U/Black Knight BL-12-KNT.mtf
index e358fcafb37..d2b229dac90 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Knight BL-12-KNT.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Knight BL-12-KNT.mtf	
@@ -6,7 +6,7 @@ mul id:356
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Knight BL-6-KNT.mtf b/megamek/data/mechfiles/mechs/3050U/Black Knight BL-6-KNT.mtf
index 1258657ab93..a9930e2a14d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Knight BL-6-KNT.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Knight BL-6-KNT.mtf	
@@ -5,7 +5,7 @@ mul id:358
 Config:Biped
 techbase:Inner Sphere
 era:2578
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Knight BL-6-RR.mtf b/megamek/data/mechfiles/mechs/3050U/Black Knight BL-6-RR.mtf
index e8e7177e3d7..52f9e881cd9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Knight BL-6-RR.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Knight BL-6-RR.mtf	
@@ -6,7 +6,7 @@ mul id:3826
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Black Knight BL6b-KNT.mtf b/megamek/data/mechfiles/mechs/3050U/Black Knight BL6b-KNT.mtf
index 1089f7213c4..b3f44398613 100644
--- a/megamek/data/mechfiles/mechs/3050U/Black Knight BL6b-KNT.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Black Knight BL6b-KNT.mtf	
@@ -6,7 +6,7 @@ mul id:357
 Config:Biped
 TechBase:Inner Sphere
 Era:2751
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-2.mtf b/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-2.mtf
index cb9399fc464..143dc7d7543 100644
--- a/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-2.mtf	
@@ -6,7 +6,7 @@ mul id:377
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-3.mtf b/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-3.mtf
index 40ce3de5936..6a8f5937239 100644
--- a/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-3.mtf	
@@ -6,7 +6,7 @@ mul id:388
 Config:Biped
 TechBase:Inner Sphere
 Era:3042
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-4.mtf b/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-4.mtf
index 97b77d7c2cc..feb470eaf67 100644
--- a/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-4.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Blackjack BJ-4.mtf	
@@ -6,7 +6,7 @@ mul id:389
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-05A.mtf b/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-05A.mtf
index 65426429b49..3fe54de629e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-05A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-05A.mtf	
@@ -6,7 +6,7 @@ mul id:421
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-12D.mtf b/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-12D.mtf
index 1f0e47f240e..87035c2134f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-12D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-12D.mtf	
@@ -6,7 +6,7 @@ mul id:423
 Config:Biped
 TechBase:Inner Sphere
 Era:2735
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-14C.mtf b/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-14C.mtf
index ac2c5393ded..bef032d246c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-14C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-14C.mtf	
@@ -6,7 +6,7 @@ mul id:424
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-14K.mtf b/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-14K.mtf
index 9dc683e6a1e..2a8b2f492b4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-14K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Bombardier BMB-14K.mtf	
@@ -6,7 +6,7 @@ mul id:425
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R Archangel.mtf b/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R Archangel.mtf
index d5822f92880..974c8584b7c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R Archangel.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R Archangel.mtf	
@@ -5,7 +5,7 @@ mul id:3883
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3057
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:3
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R Gertrude.mtf b/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R Gertrude.mtf
index 5952b86106d..ce573bdcab0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R Gertrude.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R Gertrude.mtf	
@@ -6,7 +6,7 @@ mul id:3884
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R.mtf b/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R.mtf
index 06f45fcba7e..3893d3d3ecd 100644
--- a/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Caesar CES-3R.mtf	
@@ -5,7 +5,7 @@ mul id:455
 Config:Biped
 techbase:Inner Sphere
 era:3049
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Caesar CES-3S.mtf b/megamek/data/mechfiles/mechs/3050U/Caesar CES-3S.mtf
index 16ced3d5e0c..e72b10800cf 100644
--- a/megamek/data/mechfiles/mechs/3050U/Caesar CES-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Caesar CES-3S.mtf	
@@ -5,7 +5,7 @@ mul id:456
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO 3050 - Civil War
+source:TRO: 3050 - Civil War
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Caesar CES-4R.mtf b/megamek/data/mechfiles/mechs/3050U/Caesar CES-4R.mtf
index 4ee1aea01aa..4a5e0d123cf 100644
--- a/megamek/data/mechfiles/mechs/3050U/Caesar CES-4R.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Caesar CES-4R.mtf	
@@ -6,7 +6,7 @@ mul id:457
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO 3050 - Civil War
+source:TRO: 3050 - Civil War
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Caesar CES-4S.mtf b/megamek/data/mechfiles/mechs/3050U/Caesar CES-4S.mtf
index cea74fdcfe5..c6a52ad5af9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Caesar CES-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Caesar CES-4S.mtf	
@@ -6,7 +6,7 @@ mul id:458
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3D.mtf b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3D.mtf
index 3afcc914017..f4ed08cf118 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3D.mtf	
@@ -6,7 +6,7 @@ mul id:469
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3L.mtf b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3L.mtf
index 46662c8115a..bb0e8edfd49 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3L.mtf	
@@ -6,7 +6,7 @@ mul id:470
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3LL.mtf b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3LL.mtf
index d36e93c6fb0..ee31b445cad 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3LL.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-3LL.mtf	
@@ -5,7 +5,7 @@ mul id:471
 Config:Biped
 techbase:Inner Sphere
 era:3068
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-4L.mtf b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-4L.mtf
index 3db42e1b989..21d2af58898 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-4L.mtf	
@@ -6,7 +6,7 @@ mul id:473
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-4X.mtf b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-4X.mtf
index 7163b5d97d7..76c46982e9f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-4X.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-4X.mtf	
@@ -6,7 +6,7 @@ mul id:474
 Config:Biped
 TechBase:Inner Sphere
 Era:3029
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-5D.mtf b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-5D.mtf
index e357eb32c4f..f531bcbafa3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cataphract CTF-5D.mtf	
@@ -6,7 +6,7 @@ mul id:475
 Config:Biped
 techbase:Inner Sphere
 era:3070
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C2.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C2.mtf
index c973888f264..8c1d4d2e9f1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C2.mtf	
@@ -6,7 +6,7 @@ mul id:5452
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C3.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C3.mtf
index d35da0e5a2f..bbe3dfecef8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C3.mtf	
@@ -6,7 +6,7 @@ mul id:481
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C4C.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C4C.mtf
index 2598e097dac..77dc1e75944 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C4C.mtf	
@@ -6,7 +6,7 @@ mul id:5453
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C5.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C5.mtf
index 3be900313e3..66cceea0623 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C5.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C5.mtf	
@@ -6,7 +6,7 @@ mul id:483
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C6.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C6.mtf
index 0ef53e676e9..20d433b2a90 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C6.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-C6.mtf	
@@ -6,7 +6,7 @@ mul id:485
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-H2.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-H2.mtf
index 9be76a2c215..d20e173194b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-H2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-H2.mtf	
@@ -6,7 +6,7 @@ mul id:486
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K2K.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K2K.mtf
index 42414ff639a..3dab95f0439 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K2K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K2K.mtf	
@@ -6,7 +6,7 @@ mul id:5454
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K3.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K3.mtf
index 81995592df4..681208df357 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K3.mtf	
@@ -6,7 +6,7 @@ mul id:3903
 Config:Biped
 TechBase:Inner Sphere
 Era:3047
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K4.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K4.mtf
index 6a8cd27dd4f..feb971e76d9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K4.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K4.mtf	
@@ -6,7 +6,7 @@ mul id:488
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K5.mtf b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K5.mtf
index 1e22f54de78..acd416a449f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K5.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Catapult CPLT-K5.mtf	
@@ -6,7 +6,7 @@ mul id:489
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN10-B.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN10-B.mtf
index cff3f7a9452..f23fef35ddb 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN10-B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN10-B.mtf	
@@ -6,7 +6,7 @@ mul id:3921
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D.mtf
index 5782e7ecda4..34573587a2d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D.mtf	
@@ -6,7 +6,7 @@ mul id:520
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D3.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D3.mtf
index 6551f7b209d..817edeabffa 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D3.mtf	
@@ -6,7 +6,7 @@ mul id:521
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D3D.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D3D.mtf
index 7638ff5d6f6..1076ec1ed76 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D3D.mtf	
@@ -6,7 +6,7 @@ mul id:5448
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D4D.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D4D.mtf
index 634797560ca..2e5966cd7d8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D4D.mtf	
@@ -6,7 +6,7 @@ mul id:5449
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D5.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D5.mtf
index 1e45f8bfbd8..be03d71c46d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D5.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D5.mtf	
@@ -6,7 +6,7 @@ mul id:522
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D9.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D9.mtf
index c7c88694040..beb632af3b7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D9.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-D9.mtf	
@@ -6,7 +6,7 @@ mul id:523
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-Da.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-Da.mtf
index 96afb6da288..a56b9495747 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-Da.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-Da.mtf	
@@ -6,7 +6,7 @@ mul id:524
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-YLW2.mtf b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-YLW2.mtf
index 26ed70d2812..1a448dee720 100644
--- a/megamek/data/mechfiles/mechs/3050U/Centurion CN9-YLW2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Centurion CN9-YLW2.mtf	
@@ -6,7 +6,7 @@ mul id:3923
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Champion C.mtf b/megamek/data/mechfiles/mechs/3050U/Champion C.mtf
index 822b430b8dc..4d14c454f99 100644
--- a/megamek/data/mechfiles/mechs/3050U/Champion C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Champion C.mtf	
@@ -6,7 +6,7 @@ mul id:547
 Config:Biped
 TechBase:Clan
 Era:2867
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Champion CHP-1N.mtf b/megamek/data/mechfiles/mechs/3050U/Champion CHP-1N.mtf
index c72a70f95c3..ab3874a7b12 100644
--- a/megamek/data/mechfiles/mechs/3050U/Champion CHP-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Champion CHP-1N.mtf	
@@ -6,7 +6,7 @@ mul id:548
 Config:Biped
 TechBase:Inner Sphere
 Era:2602
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Champion CHP-3N.mtf b/megamek/data/mechfiles/mechs/3050U/Champion CHP-3N.mtf
index 311a59f6f6c..ef30d6aa289 100644
--- a/megamek/data/mechfiles/mechs/3050U/Champion CHP-3N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Champion CHP-3N.mtf	
@@ -6,7 +6,7 @@ mul id:552
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Champion CHP-3P.mtf b/megamek/data/mechfiles/mechs/3050U/Champion CHP-3P.mtf
index a8d3eeaae9e..e9dad8c193d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Champion CHP-3P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Champion CHP-3P.mtf	
@@ -6,7 +6,7 @@ mul id:553
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Charger CGR-2A2.mtf b/megamek/data/mechfiles/mechs/3050U/Charger CGR-2A2.mtf
index 653870f12cd..f4409eb3502 100644
--- a/megamek/data/mechfiles/mechs/3050U/Charger CGR-2A2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Charger CGR-2A2.mtf	
@@ -6,7 +6,7 @@ mul id:564
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Charger CGR-3K.mtf b/megamek/data/mechfiles/mechs/3050U/Charger CGR-3K.mtf
index 6dddbd9054c..2b6f6231219 100644
--- a/megamek/data/mechfiles/mechs/3050U/Charger CGR-3K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Charger CGR-3K.mtf	
@@ -6,7 +6,7 @@ mul id:565
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Charger CGR-C.mtf b/megamek/data/mechfiles/mechs/3050U/Charger CGR-C.mtf
index f2b481a541e..dca5ee25a9a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Charger CGR-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Charger CGR-C.mtf	
@@ -6,7 +6,7 @@ mul id:567
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Charger CGR-KMZ.mtf b/megamek/data/mechfiles/mechs/3050U/Charger CGR-KMZ.mtf
index abffa048fc1..4f12fbf25f0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Charger CGR-KMZ.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Charger CGR-KMZ.mtf	
@@ -6,7 +6,7 @@ mul id:568
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Charger CGR-SA5.mtf b/megamek/data/mechfiles/mechs/3050U/Charger CGR-SA5.mtf
index 3132f04b938..745f6294461 100644
--- a/megamek/data/mechfiles/mechs/3050U/Charger CGR-SA5.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Charger CGR-SA5.mtf	
@@ -6,7 +6,7 @@ mul id:569
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3F.mtf b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3F.mtf
index 06ab84716d3..0e124fb7f6a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3F.mtf	
@@ -6,7 +6,7 @@ mul id:594
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3G.mtf b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3G.mtf
index dc823e96482..ac974648d4c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3G.mtf	
@@ -6,7 +6,7 @@ mul id:595
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3M.mtf b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3M.mtf
index 1c8c109aa97..d7ba2d01a6e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3M.mtf	
@@ -6,7 +6,7 @@ mul id:596
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3MA.mtf b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3MA.mtf
index c84dffa4d6c..a5108324f26 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3MA.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3MA.mtf	
@@ -6,7 +6,7 @@ mul id:597
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3P.mtf b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3P.mtf
index 69ca3d50862..c672b1db815 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cicada CDA-3P.mtf	
@@ -6,7 +6,7 @@ mul id:598
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-2-3U.mtf b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-2-3U.mtf
index 6422da6e9a4..68839592995 100644
--- a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-2-3U.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-2-3U.mtf	
@@ -6,7 +6,7 @@ mul id:646
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-2-3UL.mtf b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-2-3UL.mtf
index 88bc31f0003..a8d12b3049b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-2-3UL.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-2-3UL.mtf	
@@ -6,7 +6,7 @@ mul id:647
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-3-3T.mtf b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-3-3T.mtf
index e134fd7aca7..e60cd048e3f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-3-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-3-3T.mtf	
@@ -6,7 +6,7 @@ mul id:649
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-5U.mtf b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-5U.mtf
index 716e76b5bc6..3c4ff0827d9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-5U.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-5U.mtf	
@@ -6,7 +6,7 @@ mul id:650
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-6S.mtf b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-6S.mtf
index 74d8f826f51..a5221993a03 100644
--- a/megamek/data/mechfiles/mechs/3050U/Clint CLNT-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Clint CLNT-6S.mtf	
@@ -6,7 +6,7 @@ mul id:651
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Commando COM-1B.mtf b/megamek/data/mechfiles/mechs/3050U/Commando COM-1B.mtf
index 6efa1c5eee3..f1d2cf0bf24 100644
--- a/megamek/data/mechfiles/mechs/3050U/Commando COM-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Commando COM-1B.mtf	
@@ -6,7 +6,7 @@ mul id:667
 Config:Biped
 TechBase:Inner Sphere
 Era:3015
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:1
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Commando COM-1C.mtf b/megamek/data/mechfiles/mechs/3050U/Commando COM-1C.mtf
index 7447a57b196..47b76351d49 100644
--- a/megamek/data/mechfiles/mechs/3050U/Commando COM-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Commando COM-1C.mtf	
@@ -6,7 +6,7 @@ mul id:668
 Config:Biped
 TechBase:Inner Sphere
 Era:3020
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:1
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Commando COM-4H.mtf b/megamek/data/mechfiles/mechs/3050U/Commando COM-4H.mtf
index 5e48571b493..282aa61d379 100644
--- a/megamek/data/mechfiles/mechs/3050U/Commando COM-4H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Commando COM-4H.mtf	
@@ -6,7 +6,7 @@ mul id:673
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Commando COM-5S.mtf b/megamek/data/mechfiles/mechs/3050U/Commando COM-5S.mtf
index dbfa0bca41c..a33c92bc97f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Commando COM-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Commando COM-5S.mtf	
@@ -6,7 +6,7 @@ mul id:674
 Config:Biped
 techbase:Inner Sphere
 era:3050
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Commando COM-7B.mtf b/megamek/data/mechfiles/mechs/3050U/Commando COM-7B.mtf
index 2c5e7786271..80d1d9f13dc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Commando COM-7B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Commando COM-7B.mtf	
@@ -6,7 +6,7 @@ mul id:675
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Commando COM-7S.mtf b/megamek/data/mechfiles/mechs/3050U/Commando COM-7S.mtf
index 54a80b08655..3d397219a33 100644
--- a/megamek/data/mechfiles/mechs/3050U/Commando COM-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Commando COM-7S.mtf	
@@ -6,7 +6,7 @@ mul id:676
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Crab CRB-27.mtf b/megamek/data/mechfiles/mechs/3050U/Crab CRB-27.mtf
index 9f31d35d327..2d7c36b1149 100644
--- a/megamek/data/mechfiles/mechs/3050U/Crab CRB-27.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Crab CRB-27.mtf	
@@ -6,7 +6,7 @@ mul id:716
 Config:Biped
 techbase:Inner Sphere
 era:2719
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Crab CRB-30.mtf b/megamek/data/mechfiles/mechs/3050U/Crab CRB-30.mtf
index b881305e181..54682fc26d0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Crab CRB-30.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Crab CRB-30.mtf	
@@ -6,7 +6,7 @@ mul id:718
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Crab CRB-45.mtf b/megamek/data/mechfiles/mechs/3050U/Crab CRB-45.mtf
index 624782d2e5d..2ac28d17f71 100644
--- a/megamek/data/mechfiles/mechs/3050U/Crab CRB-45.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Crab CRB-45.mtf	
@@ -6,7 +6,7 @@ mul id:719
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Crab CRB-C.mtf b/megamek/data/mechfiles/mechs/3050U/Crab CRB-C.mtf
index 696f33f14c9..b940589e1ce 100644
--- a/megamek/data/mechfiles/mechs/3050U/Crab CRB-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Crab CRB-C.mtf	
@@ -6,7 +6,7 @@ mul id:720
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5003-1.mtf b/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5003-1.mtf
index 004d080749a..0da2f289f44 100644
--- a/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5003-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5003-1.mtf	
@@ -6,7 +6,7 @@ mul id:725
 Config:Biped
 techbase:Inner Sphere
 era:2735
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5003-3.mtf b/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5003-3.mtf
index cee24897956..dfe8b8f1d20 100644
--- a/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5003-3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5003-3.mtf	
@@ -6,7 +6,7 @@ mul id:727
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5004-1.mtf b/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5004-1.mtf
index 787235a3c2d..2bffb19bb61 100644
--- a/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5004-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5004-1.mtf	
@@ -6,7 +6,7 @@ mul id:728
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5005-1.mtf b/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5005-1.mtf
index af06f6d7cf7..646db54c6f9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5005-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Crockett CRK-5005-1.mtf	
@@ -6,7 +6,7 @@ mul id:729
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-A-DC.mtf b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-A-DC.mtf
index 13f6059fecb..9cc197115af 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-A-DC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-A-DC.mtf	
@@ -6,7 +6,7 @@ mul id:4032
 Config:Biped
 TechBase:Inner Sphere
 Era:3045
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:3
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-A.mtf b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-A.mtf
index e2921bad2aa..96b35234086 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-A.mtf	
@@ -6,7 +6,7 @@ mul id:773
 Config:Biped
 TechBase:Inner Sphere
 Era:3045
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-C.mtf b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-C.mtf
index 48a1f0be047..2ec84cf347c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-C.mtf	
@@ -6,7 +6,7 @@ mul id:775
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-G.mtf b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-G.mtf
index 2f53e7e2d00..6ed6445474a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-G.mtf	
@@ -6,7 +6,7 @@ mul id:778
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-H.mtf b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-H.mtf
index 38b2f9dd61c..32196403707 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-11-H.mtf	
@@ -6,7 +6,7 @@ mul id:779
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-12-K.mtf b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-12-K.mtf
index e5783a8a42f..a79e64982e1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Cyclops CP-12-K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Cyclops CP-12-K.mtf	
@@ -6,7 +6,7 @@ mul id:780
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) A.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) A.mtf
index fb98c4ee45e..698934d0193 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) A.mtf	
@@ -6,7 +6,7 @@ mul id:813
 Config:Biped Omnimech
 TechBase:Clan
 Era:3010
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) B.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) B.mtf
index 6a82f610026..be5599c7063 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) B.mtf	
@@ -6,7 +6,7 @@ mul id:814
 Config:Biped Omnimech
 TechBase:Clan
 Era:3010
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) C.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) C.mtf
index 877340c5e97..1b36aca5c8b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) C.mtf	
@@ -6,7 +6,7 @@ mul id:815
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) D.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) D.mtf
index 465a3210555..854687100f2 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) D.mtf	
@@ -6,7 +6,7 @@ mul id:816
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) H.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) H.mtf
index 9395ee87c8d..c2f45901b85 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) H.mtf	
@@ -6,7 +6,7 @@ mul id:817
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Hohiro.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Hohiro.mtf
index 92bdfde4188..5ffd238172f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Hohiro.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Hohiro.mtf	
@@ -6,7 +6,7 @@ mul id:812
 Config:Biped Omnimech
 TechBase:Clan
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Prime.mtf
index f2eb278effd..02d9baa942a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:818
 Config:Biped Omnimech
 TechBase:Clan
 Era:3010
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Prometheus.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Prometheus.mtf
index b9c4a3a803d..e5259ee3204 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Prometheus.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Prometheus.mtf	
@@ -6,7 +6,7 @@ mul id:810
 Config:Biped Omnimech
 TechBase:Clan
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) S.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) S.mtf
index 838245a1831..3cd1332e294 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) S.mtf	
@@ -6,7 +6,7 @@ mul id:819
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) W.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) W.mtf
index 6f5b499b415..ee6fc85572d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) W.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) W.mtf	
@@ -6,7 +6,7 @@ mul id:821
 Config:Biped Omnimech
 TechBase:Clan
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Widowmaker.mtf b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Widowmaker.mtf
index d677b84d470..ec47fd39f3d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Widowmaker.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Daishi (Dire Wolf) Widowmaker.mtf	
@@ -6,7 +6,7 @@ mul id:811
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) A.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) A.mtf
index 4e4ca2614b7..543797663c1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) A.mtf	
@@ -6,7 +6,7 @@ mul id:838
 Config:Biped Omnimech
 TechBase:Clan
 Era:2874
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) B.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) B.mtf
index 73e19d9d786..8d91b0c2867 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) B.mtf	
@@ -6,7 +6,7 @@ mul id:839
 Config:Biped Omnimech
 TechBase:Clan
 Era:2874
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) C.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) C.mtf
index 7d7cbed0502..fe4bc8539fc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) C.mtf	
@@ -6,7 +6,7 @@ mul id:840
 Config:Biped Omnimech
 TechBase:Clan
 Era:2874
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) D.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) D.mtf
index 17e9d14fa94..206cef7ddc2 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) D.mtf	
@@ -6,7 +6,7 @@ mul id:841
 Config:Biped Omnimech
 TechBase:Clan
 Era:2874
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) E.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) E.mtf
index b91b0e1d298..454d8348700 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) E.mtf	
@@ -6,7 +6,7 @@ mul id:842
 Config:Biped Omnimech
 TechBase:Clan
 Era:3055
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) F.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) F.mtf
index 3d92d1b2644..46b43034304 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) F.mtf	
@@ -6,7 +6,7 @@ mul id:843
 Config:Biped Omnimech
 TechBase:Clan
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) H.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) H.mtf
index c4cf8f53b5c..da082d631d4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) H.mtf	
@@ -6,7 +6,7 @@ mul id:844
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) K.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) K.mtf
index 2096983fb1e..514afdfe137 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) K.mtf	
@@ -6,7 +6,7 @@ mul id:845
 Config:Biped Omnimech
 TechBase:Clan
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) Prime.mtf
index 9ac25384e75..f0ee8887ba0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dasher (Fire Moth) Prime.mtf	
@@ -5,7 +5,7 @@ mul id:846
 Config:Biped Omnimech
 techbase:Clan
 era:2874
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Dervish DV-7D.mtf b/megamek/data/mechfiles/mechs/3050U/Dervish DV-7D.mtf
index 1867bb569c4..008390e6e83 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dervish DV-7D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dervish DV-7D.mtf	
@@ -6,7 +6,7 @@ mul id:880
 Config:Biped
 TechBase:Inner Sphere
 Era:3047
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Dervish DV-8D.mtf b/megamek/data/mechfiles/mechs/3050U/Dervish DV-8D.mtf
index 95cdf05698f..0f0a36edaea 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dervish DV-8D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dervish DV-8D.mtf	
@@ -6,7 +6,7 @@ mul id:881
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Dervish DV-9D.mtf b/megamek/data/mechfiles/mechs/3050U/Dervish DV-9D.mtf
index d62849c1b08..98266242b88 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dervish DV-9D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dervish DV-9D.mtf	
@@ -6,7 +6,7 @@ mul id:883
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragon DRG-5N.mtf b/megamek/data/mechfiles/mechs/3050U/Dragon DRG-5N.mtf
index f5fe4629556..523c728d0b7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragon DRG-5N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragon DRG-5N.mtf	
@@ -6,7 +6,7 @@ mul id:911
 Config:Biped
 TechBase:Inner Sphere
 Era:3047
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragon DRG-7N.mtf b/megamek/data/mechfiles/mechs/3050U/Dragon DRG-7N.mtf
index ca69f83a5ed..88e45c54d0a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragon DRG-7N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragon DRG-7N.mtf	
@@ -6,7 +6,7 @@ mul id:5450
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) A.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) A.mtf
index 202daa923ac..5188a2b5f44 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) A.mtf	
@@ -6,7 +6,7 @@ mul id:917
 Config:Biped Omnimech
 TechBase:Clan
 Era:2940
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) B.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) B.mtf
index ee71f398f97..41855f3da8b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) B.mtf	
@@ -6,7 +6,7 @@ mul id:918
 Config:Biped Omnimech
 TechBase:Clan
 Era:2940
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) C.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) C.mtf
index 18bfaf4696a..2aed4f564c4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) C.mtf	
@@ -6,7 +6,7 @@ mul id:919
 Config:Biped Omnimech
 TechBase:Clan
 Era:2940
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) D.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) D.mtf
index 8b412ccc73b..78d47a0443e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) D.mtf	
@@ -6,7 +6,7 @@ mul id:920
 Config:Biped Omnimech
 TechBase:Clan
 Era:2940
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) E.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) E.mtf
index acbd82b0a7a..0319ac7acd8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) E.mtf	
@@ -6,7 +6,7 @@ mul id:921
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) F.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) F.mtf
index 3ae7368f08a..ca82e99bffa 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) F.mtf	
@@ -6,7 +6,7 @@ mul id:922
 Config:Biped Omnimech
 TechBase:Clan
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) G.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) G.mtf
index d9c51a5f10c..5e522b295e4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) G.mtf	
@@ -6,7 +6,7 @@ mul id:923
 Config:Biped Omnimech
 TechBase:Clan
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) H.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) H.mtf
index cb04858aafb..89158de0811 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) H.mtf	
@@ -6,7 +6,7 @@ mul id:924
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) I.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) I.mtf
index 20bf2097ee7..c12bdd99bfa 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) I.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) I.mtf	
@@ -6,7 +6,7 @@ mul id:925
 Config:Biped Omnimech
 TechBase:Clan
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) Prime.mtf
index 02da31a3d52..29b7e5fe438 100644
--- a/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Dragonfly (Viper) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:926
 Config:Biped Omnimech
 techbase:Clan
 era:2940
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Enforcer ENF-5D.mtf b/megamek/data/mechfiles/mechs/3050U/Enforcer ENF-5D.mtf
index 37c72d669e3..cca99242a09 100644
--- a/megamek/data/mechfiles/mechs/3050U/Enforcer ENF-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Enforcer ENF-5D.mtf	
@@ -6,7 +6,7 @@ mul id:978
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6G.mtf b/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6G.mtf
index 2b417dde27e..9f26e03715f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6G.mtf	
@@ -6,7 +6,7 @@ mul id:980
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6H.mtf b/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6H.mtf
index 5717a80f5a4..5371daffb07 100644
--- a/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6H.mtf	
@@ -6,7 +6,7 @@ mul id:981
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6T.mtf b/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6T.mtf
index 7a2c1bd4fa5..024a5405a30 100644
--- a/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6T.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Enforcer III ENF-6T.mtf	
@@ -6,7 +6,7 @@ mul id:985
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4A.mtf b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4A.mtf
index c77b59b369f..6dc7fd9e2f1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4A.mtf	
@@ -5,7 +5,7 @@ mul id:4147
 Config:Biped
 techbase:Inner Sphere
 era:3007
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:1
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4C.mtf b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4C.mtf
index 7fffdfc5a99..201fef1c437 100644
--- a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4C.mtf	
@@ -6,7 +6,7 @@ mul id:4148
 Config:Biped
 TechBase:Inner Sphere
 Era:2630
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4D.mtf b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4D.mtf
index 9a4aebf085a..9a723dcf4ea 100644
--- a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-4D.mtf	
@@ -6,7 +6,7 @@ mul id:1004
 Config:Biped
 TechBase:Inner Sphere
 Era:2630
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-5E.mtf b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-5E.mtf
index 1331926abae..4c2afdc0d70 100644
--- a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-5E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-5E.mtf	
@@ -6,7 +6,7 @@ mul id:1006
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-5F.mtf b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-5F.mtf
index a325006ff97..5cf38c23136 100644
--- a/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-5F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Exterminator EXT-5F.mtf	
@@ -6,7 +6,7 @@ mul id:1007
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Falcon FLC-4P.mtf b/megamek/data/mechfiles/mechs/3050U/Falcon FLC-4P.mtf
index a720d2f3632..9e8d896ceab 100644
--- a/megamek/data/mechfiles/mechs/3050U/Falcon FLC-4P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Falcon FLC-4P.mtf	
@@ -6,7 +6,7 @@ mul id:1027
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Falcon FLC-5P.mtf b/megamek/data/mechfiles/mechs/3050U/Falcon FLC-5P.mtf
index 5ba25b48a09..77490120e20 100644
--- a/megamek/data/mechfiles/mechs/3050U/Falcon FLC-5P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Falcon FLC-5P.mtf	
@@ -6,7 +6,7 @@ mul id:1028
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Falcon FLC-6C.mtf b/megamek/data/mechfiles/mechs/3050U/Falcon FLC-6C.mtf
index dfdf8a5d00c..0092c53b079 100644
--- a/megamek/data/mechfiles/mechs/3050U/Falcon FLC-6C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Falcon FLC-6C.mtf	
@@ -6,7 +6,7 @@ mul id:1029
 Config:Biped
 TechBase:Clan
 Era:3065
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) A.mtf b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) A.mtf
index 2dd89b7bd1e..6b7b18f21c9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) A.mtf	
@@ -6,7 +6,7 @@ mul id:1046
 Config:Biped Omnimech
 TechBase:Clan
 Era:2948
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) B.mtf b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) B.mtf
index c96f7483fc8..1c6991cdbb1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) B.mtf	
@@ -6,7 +6,7 @@ mul id:1047
 Config:Biped Omnimech
 TechBase:Clan
 Era:2948
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) C.mtf b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) C.mtf
index d2a1297f7e3..0442fa67fc5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) C.mtf	
@@ -6,7 +6,7 @@ mul id:1048
 Config:Biped Omnimech
 TechBase:Clan
 Era:2948
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) D.mtf b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) D.mtf
index adc7b3bb3b1..5ee9676d92f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) D.mtf	
@@ -6,7 +6,7 @@ mul id:1049
 Config:Biped Omnimech
 TechBase:Clan
 Era:2948
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) E.mtf b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) E.mtf
index 1d9dec1776c..583ef01f906 100644
--- a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) E.mtf	
@@ -6,7 +6,7 @@ mul id:1050
 Config:Biped Omnimech
 TechBase:Clan
 Era:3056
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) H.mtf b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) H.mtf
index 99f8ff2f7d1..08aa207ae07 100644
--- a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) H.mtf	
@@ -6,7 +6,7 @@ mul id:1051
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) L.mtf b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) L.mtf
index 77c6e69e389..3173fbf144a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) L.mtf	
@@ -6,7 +6,7 @@ mul id:1052
 Config:Biped Omnimech
 TechBase:Clan
 Era:3069
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) Prime.mtf
index 5dfd7295f44..14fef70ca83 100644
--- a/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Fenris (Ice Ferret) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1053
 Config:Biped Omnimech
 techbase:Clan
 era:2948
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Firefly C.mtf b/megamek/data/mechfiles/mechs/3050U/Firefly C.mtf
index 3e3454a87a2..30b81eaf6d6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firefly C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firefly C.mtf	
@@ -6,7 +6,7 @@ mul id:1082
 Config:Biped
 TechBase:Clan
 Era:2839
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4A.mtf b/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4A.mtf
index c752b9bcb45..8ffe17b54b4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4A.mtf	
@@ -6,7 +6,7 @@ mul id:1087
 Config:Biped
 TechBase:Inner Sphere
 Era:2801
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:1
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4B.mtf b/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4B.mtf
index af2ff8f292a..9bb6204718a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4B.mtf	
@@ -6,7 +6,7 @@ mul id:1088
 Config:Biped
 TechBase:Inner Sphere
 Era:3047
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4C.mtf b/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4C.mtf
index 297887c0cf3..daf4a904651 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4C.mtf	
@@ -6,7 +6,7 @@ mul id:1089
 Config:Biped
 TechBase:Inner Sphere
 Era:3048
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4D.mtf b/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4D.mtf
index a5c179d0f04..300c899e6ba 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firefly FFL-4D.mtf	
@@ -6,7 +6,7 @@ mul id:1090
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-B.mtf b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-B.mtf
index d4715199c8d..c6342a59d0d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-B.mtf	
@@ -6,7 +6,7 @@ mul id:1094
 Config:Biped
 techbase:Inner Sphere
 era:3070
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-C.mtf b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-C.mtf
index aa1947fb9bf..b7d33536320 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-C.mtf	
@@ -6,7 +6,7 @@ mul id:1111
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-P.mtf b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-P.mtf
index 3c364eaf7eb..40df87dddc8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-P.mtf	
@@ -6,7 +6,7 @@ mul id:1095
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S.mtf b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S.mtf
index 5721c183ba7..197ffb18dbd 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S.mtf	
@@ -6,7 +6,7 @@ mul id:1112
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S1.mtf b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S1.mtf
index 116bf694b5e..2894fc0c40e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S1.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S1.mtf	
@@ -5,7 +5,7 @@ mul id:1113
 Config:Biped
 techbase:Inner Sphere
 era:3049
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S2.mtf b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S2.mtf
index dfe259a5429..8aa73cffee7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S2.mtf	
@@ -6,7 +6,7 @@ mul id:5441
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S3.mtf b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S3.mtf
index fe93eae234f..610834eaf5f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Firestarter FS9-S3.mtf	
@@ -6,7 +6,7 @@ mul id:5442
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-8K.mtf b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-8K.mtf
index 1cd94f3f41d..fbfb117ce47 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-8K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-8K.mtf	
@@ -6,7 +6,7 @@ mul id:1124
 Config:Biped
 techbase:Inner Sphere
 era:2701
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9B.mtf b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9B.mtf
index 619ebe6d26f..524cf6709ec 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9B.mtf	
@@ -6,7 +6,7 @@ mul id:1125
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9C.mtf b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9C.mtf
index 7e29bb13c20..6ac983e3cee 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9C.mtf	
@@ -6,7 +6,7 @@ mul id:1126
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9M.mtf b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9M.mtf
index 0df628dec1a..d8681198e17 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-9M.mtf	
@@ -6,7 +6,7 @@ mul id:1127
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-C.mtf b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-C.mtf
index 12c387c8970..d995066232d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flashman FLS-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flashman FLS-C.mtf	
@@ -6,7 +6,7 @@ mul id:1128
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Flea FLE-17.mtf b/megamek/data/mechfiles/mechs/3050U/Flea FLE-17.mtf
index 63b5e808d33..1fa3a392a99 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flea FLE-17.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flea FLE-17.mtf	
@@ -6,7 +6,7 @@ mul id:1137
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Flea FLE-19.mtf b/megamek/data/mechfiles/mechs/3050U/Flea FLE-19.mtf
index 572193da0fd..4d33595db78 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flea FLE-19.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flea FLE-19.mtf	
@@ -6,7 +6,7 @@ mul id:1138
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Flea FLE-20.mtf b/megamek/data/mechfiles/mechs/3050U/Flea FLE-20.mtf
index ed9c72ea688..444ed686e6d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flea FLE-20.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flea FLE-20.mtf	
@@ -6,7 +6,7 @@ mul id:1139
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Flea Fire Ant.mtf b/megamek/data/mechfiles/mechs/3050U/Flea Fire Ant.mtf
index 0a070a20d3c..2c0ddfd56d5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Flea Fire Ant.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Flea Fire Ant.mtf	
@@ -6,7 +6,7 @@ mul id:1135
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) A.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) A.mtf
index 73539e4e853..7a90808dec1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) A.mtf	
@@ -6,7 +6,7 @@ mul id:1203
 Config:Biped Omnimech
 TechBase:Clan
 Era:3001
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) B.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) B.mtf
index 4c9b861741d..b3de1b7d767 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) B.mtf	
@@ -6,7 +6,7 @@ mul id:1204
 Config:Biped Omnimech
 TechBase:Clan
 Era:3001
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) C.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) C.mtf
index 2b8099f47da..6c8aba1d7ca 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) C.mtf	
@@ -6,7 +6,7 @@ mul id:1205
 Config:Biped Omnimech
 TechBase:Clan
 Era:3001
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) D.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) D.mtf
index 39923e2fe01..43f3c02826e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) D.mtf	
@@ -6,7 +6,7 @@ mul id:1206
 Config:Biped Omnimech
 TechBase:Clan
 Era:3001
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) E.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) E.mtf
index 446897dae37..d421ae994b3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) E.mtf	
@@ -6,7 +6,7 @@ mul id:1207
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) H.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) H.mtf
index d34fd7ba7c6..aef6a3ca384 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) H.mtf	
@@ -6,7 +6,7 @@ mul id:1208
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) K.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) K.mtf
index 1ff708532bd..50de5e8cc48 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) K.mtf	
@@ -6,7 +6,7 @@ mul id:1209
 Config:Biped Omnimech
 techbase:Clan
 era:3068
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) P.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) P.mtf
index 37fc1bbc434..cc84e59b44b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) P.mtf	
@@ -6,7 +6,7 @@ mul id:1210
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) Prime.mtf
index e850c8ec325..28ba7970c8f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Gladiator (Executioner) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1211
 Config:Biped Omnimech
 techbase:Clan
 era:3001
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-5K-DC.mtf b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-5K-DC.mtf
index 8a6f75ecb75..50755a051f5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-5K-DC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-5K-DC.mtf	
@@ -6,7 +6,7 @@ mul id:4230
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-5K.mtf b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-5K.mtf
index e065e44e6ba..7184e8ab095 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-5K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-5K.mtf	
@@ -6,7 +6,7 @@ mul id:1258
 Config:Biped
 techbase:Inner Sphere
 era:3050
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-7K.mtf b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-7K.mtf
index 933dc31922f..0c150b13b42 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-7K.mtf	
@@ -6,7 +6,7 @@ mul id:1260
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-9KC.mtf b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-9KC.mtf
index 67bb0050107..c6909445d45 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-9KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-9KC.mtf	
@@ -6,7 +6,7 @@ mul id:1263
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-C.mtf b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-C.mtf
index cf20b86b5a3..a4e7fa4b91a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grand Dragon DRG-C.mtf	
@@ -6,7 +6,7 @@ mul id:1264
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-5J.mtf b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-5J.mtf
index 0f7fdb05559..dbd18519bda 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-5J.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-5J.mtf	
@@ -6,7 +6,7 @@ mul id:1268
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-5N.mtf b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-5N.mtf
index 65c03319dbf..3ba44fc4cce 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-5N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-5N.mtf	
@@ -6,7 +6,7 @@ mul id:4232
 Config:Biped
 TechBase:Inner Sphere
 Era:3040
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-6K.mtf b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-6K.mtf
index 900acd51740..8c2a61babd0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-6K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-6K.mtf	
@@ -6,7 +6,7 @@ mul id:1269
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-7K Gravedigger.mtf b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-7K Gravedigger.mtf
index 07e4aa46c3a..ab60ae85941 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-7K Gravedigger.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-7K Gravedigger.mtf	
@@ -6,7 +6,7 @@ mul id:4233
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-7K.mtf b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-7K.mtf
index ec34dc27a1d..70d14aa4324 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-7K.mtf	
@@ -6,7 +6,7 @@ mul id:1270
 Config:Biped
 techbase:Inner Sphere
 era:3068
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-C.mtf b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-C.mtf
index 54062c20498..e9e9ff23512 100644
--- a/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Grasshopper GHR-C.mtf	
@@ -6,7 +6,7 @@ mul id:1272
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-3N.mtf b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-3N.mtf
index 42276aec981..1c6265ad459 100644
--- a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-3N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-3N.mtf	
@@ -6,7 +6,7 @@ mul id:1338
 Config:Biped
 techbase:Inner Sphere
 era:2499
-source:TRO 3050 - Age of War
+source:TRO: 3050 - Age of War
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-5M.mtf b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-5M.mtf
index 4815d25ecc2..5aa3839945b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-5M.mtf	
@@ -6,7 +6,7 @@ mul id:1341
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB.mtf b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB.mtf
index 79814a1c34a..d59c3aa957d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB.mtf	
@@ -6,7 +6,7 @@ mul id:1342
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB2.mtf b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB2.mtf
index 57eef39e5c0..b63b87186c8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB2.mtf	
@@ -6,7 +6,7 @@ mul id:1343
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB3.mtf b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB3.mtf
index 44897e14b70..66eeda5332c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-6WB3.mtf	
@@ -6,7 +6,7 @@ mul id:5492
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-8D.mtf b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-8D.mtf
index d14b6da9dff..571cb1ac7f5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-8D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Guillotine GLT-8D.mtf	
@@ -6,7 +6,7 @@ mul id:1344
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-27T.mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-27T.mtf
index b4d0388352f..f0969ec84ff 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-27T.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-27T.mtf	
@@ -6,7 +6,7 @@ mul id:1398
 Config:Biped
 TechBase:Inner Sphere
 Era:3042
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-28T (Shin).mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-28T (Shin).mtf
index e28b398d9fe..dc218a6059e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-28T (Shin).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-28T (Shin).mtf	
@@ -6,7 +6,7 @@ mul id:5457
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-28T.mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-28T.mtf
index 5ec21e8ad8a..f9f2bc56e8e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-28T.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Chi HTM-28T.mtf	
@@ -6,7 +6,7 @@ mul id:1401
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-27U.mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-27U.mtf
index 5729fe5782d..24e5d8f6e42 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-27U.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-27U.mtf	
@@ -6,7 +6,7 @@ mul id:1403
 Config:Biped
 TechBase:Inner Sphere
 Era:3047
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-C.mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-C.mtf
index d7a14f10f55..c641d74bcc5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-C.mtf	
@@ -6,7 +6,7 @@ mul id:1404
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-CM.mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-CM.mtf
index 96eb81899e3..ccf16634339 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-CM.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Hi HTM-CM.mtf	
@@ -6,7 +6,7 @@ mul id:1405
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Kaze HTM-27V.mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Kaze HTM-27V.mtf
index c299abec33a..a4306261fc8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Kaze HTM-27V.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Kaze HTM-27V.mtf	
@@ -6,7 +6,7 @@ mul id:1407
 Config:Biped
 TechBase:Inner Sphere
 Era:3048
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Ku HTM-27W.mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Ku HTM-27W.mtf
index 4806638cd71..d4b3b4a4396 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Ku HTM-27W.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Ku HTM-27W.mtf	
@@ -6,7 +6,7 @@ mul id:1408
 Config:Biped
 TechBase:Inner Sphere
 Era:3048
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Mizo HTM-27Y.mtf b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Mizo HTM-27Y.mtf
index 832473e5b2f..17fbba40dc6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatamoto-Mizo HTM-27Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatamoto-Mizo HTM-27Y.mtf	
@@ -6,7 +6,7 @@ mul id:1409
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5D.mtf b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5D.mtf
index bc9f3cf1d5e..e603a90321d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5D.mtf	
@@ -6,7 +6,7 @@ mul id:5445
 Config:Biped
 techbase:Inner Sphere
 era:3062
-source:TRO 3050 - Civil War
+source:TRO: 3050 - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5DD.mtf b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5DD.mtf
index 7aa4e9e87c5..27170b0374a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5DD.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5DD.mtf	
@@ -6,7 +6,7 @@ mul id:5446
 Config:Biped
 techbase:Inner Sphere
 era:3065
-source:TRO 3050 - Civil War
+source:TRO: 3050 - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5K.mtf b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5K.mtf
index dfa9ad19416..20a16c40916 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5K.mtf	
@@ -6,7 +6,7 @@ mul id:1412
 Config:Biped
 techbase:Inner Sphere
 era:3075
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5S.mtf b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5S.mtf
index 68c4bc22f2b..e9501d054eb 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-5S.mtf	
@@ -6,7 +6,7 @@ mul id:1413
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-6D.mtf b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-6D.mtf
index 0e4ee3b87b0..21a659884dc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-6D.mtf	
@@ -6,7 +6,7 @@ mul id:1415
 Config:Biped
 techbase:Inner Sphere
 era:3062
-source:TRO 3050 - Civil War
+source:TRO: 3050 - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-6S.mtf b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-6S.mtf
index ee0ff0dec8b..1bc02fde666 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hatchetman HCT-6S.mtf	
@@ -6,7 +6,7 @@ mul id:1417
 Config:Biped
 techbase:Inner Sphere
 era:3064
-source:TRO 3050 - Civil War
+source:TRO: 3050 - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes HER-1S.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes HER-1S.mtf
index 4c07ac83c41..31420fc38b7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes HER-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes HER-1S.mtf	
@@ -6,7 +6,7 @@ mul id:1487
 Config:Biped
 TechBase:Inner Sphere
 Era:2632
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S.mtf
index c3d8cd0f96e..5c58299ed50 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S.mtf	
@@ -6,7 +6,7 @@ mul id:1489
 Config:Biped
 TechBase:Inner Sphere
 Era:3047
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S1.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S1.mtf
index bc8ab261a6f..e9267afb28b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S1.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S1.mtf	
@@ -6,7 +6,7 @@ mul id:1490
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S2.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S2.mtf
index e93b948993b..a3024c830f6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes HER-3S2.mtf	
@@ -6,7 +6,7 @@ mul id:1491
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes HER-4K.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes HER-4K.mtf
index 7956fae7712..bc02d0bf6e3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes HER-4K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes HER-4K.mtf	
@@ -6,7 +6,7 @@ mul id:1492
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes HER-4M.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes HER-4M.mtf
index 56f6bccae2c..9e3ea5325ee 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes HER-4M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes HER-4M.mtf	
@@ -6,7 +6,7 @@ mul id:1493
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes HER-4S.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes HER-4S.mtf
index c0ca6eb34b6..8cf03d85cfc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes HER-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes HER-4S.mtf	
@@ -6,7 +6,7 @@ mul id:1494
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes HER-4WB.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes HER-4WB.mtf
index a72212d449e..3bbc5c208ec 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes HER-4WB.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes HER-4WB.mtf	
@@ -6,7 +6,7 @@ mul id:1495
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5C.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5C.mtf
index 25dcfb4a1eb..08208734fb1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5C.mtf	
@@ -6,7 +6,7 @@ mul id:1499
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5ME.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5ME.mtf
index 5031c73e099..c3b34fd9d22 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5ME.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5ME.mtf	
@@ -6,7 +6,7 @@ mul id:1500
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5S.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5S.mtf
index 6dda63547df..1d35f516813 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5S.mtf	
@@ -6,7 +6,7 @@ mul id:1501
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5SA.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5SA.mtf
index fb939bdb4f6..1bd5ccb54f4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5SA.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-5SA.mtf	
@@ -6,7 +6,7 @@ mul id:1502
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-6D.mtf b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-6D.mtf
index eef5c94bf5b..4ea9ca44584 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hermes II HER-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hermes II HER-6D.mtf	
@@ -6,7 +6,7 @@ mul id:1504
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-694.mtf b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-694.mtf
index 13e23209fee..9ca1bd54f63 100644
--- a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-694.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-694.mtf	
@@ -6,7 +6,7 @@ mul id:5493
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-732.mtf b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-732.mtf
index 157c112fe0a..7d7690418f9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-732.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-732.mtf	
@@ -6,7 +6,7 @@ mul id:1514
 Config:Biped
 techbase:Inner Sphere
 era:2592
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-734.mtf b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-734.mtf
index eacfe8fe9de..e814101ba77 100644
--- a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-734.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-734.mtf	
@@ -6,7 +6,7 @@ mul id:1520
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-736.mtf b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-736.mtf
index 6fa02941b7b..6ec1668aa73 100644
--- a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-736.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-736.mtf	
@@ -6,7 +6,7 @@ mul id:1521
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-738.mtf b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-738.mtf
index 1965d85cb80..19ff2f51aad 100644
--- a/megamek/data/mechfiles/mechs/3050U/Highlander HGN-738.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Highlander HGN-738.mtf	
@@ -6,7 +6,7 @@ mul id:1522
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Hoplite C.mtf b/megamek/data/mechfiles/mechs/3050U/Hoplite C.mtf
index 2143a9bcf4d..ad2fba21617 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hoplite C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hoplite C.mtf	
@@ -6,7 +6,7 @@ mul id:1540
 Config:Biped
 TechBase:Clan
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4A.mtf b/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4A.mtf
index 01f41d8c2c7..a554bc3e54a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4A.mtf	
@@ -6,7 +6,7 @@ mul id:4329
 Config:Biped
 TechBase:Inner Sphere
 Era:2578
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4B.mtf b/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4B.mtf
index cc2b9179ba5..541ac3bd03b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4B.mtf	
@@ -5,7 +5,7 @@ mul id:4330
 Config:Biped
 techbase:Inner Sphere
 era:2581
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:1
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4C.mtf b/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4C.mtf
index 72985443f8f..debd36e0532 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4C.mtf	
@@ -6,7 +6,7 @@ mul id:4331
 Config:Biped
 TechBase:Inner Sphere
 Era:2584
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4D.mtf b/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4D.mtf
index 27b983d9b2b..bb952595c75 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hoplite HOP-4D.mtf	
@@ -5,7 +5,7 @@ mul id:1543
 Config:Biped
 techbase:Inner Sphere
 era:3050
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Hornet HNT-161.mtf b/megamek/data/mechfiles/mechs/3050U/Hornet HNT-161.mtf
index 16d84e30b36..adf9f311840 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hornet HNT-161.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hornet HNT-161.mtf	
@@ -6,7 +6,7 @@ mul id:1547
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Hornet HNT-171.mtf b/megamek/data/mechfiles/mechs/3050U/Hornet HNT-171.mtf
index e36685eb629..06270e5755f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hornet HNT-171.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hornet HNT-171.mtf	
@@ -6,7 +6,7 @@ mul id:1548
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5H.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5H.mtf
index 61893793d7b..550c2f82f81 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5H.mtf	
@@ -6,7 +6,7 @@ mul id:1560
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5M.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5M.mtf
index 33b5f595d10..9b9f208eae1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5M.mtf	
@@ -6,7 +6,7 @@ mul id:1561
 Config:Biped
 TechBase:Inner Sphere
 Era:3046
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5N.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5N.mtf
index d2ec7f7b464..eaa46bc303c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5N.mtf	
@@ -6,7 +6,7 @@ mul id:1562
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5P.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5P.mtf
index 9e4e7c1fbf6..484c6b5b442 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5P.mtf	
@@ -6,7 +6,7 @@ mul id:1563
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5S.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5S.mtf
index b104677221f..21de4540be5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5S.mtf	
@@ -6,7 +6,7 @@ mul id:1564
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5SG.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5SG.mtf
index efb3b573ffb..db903a230cf 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5SG.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5SG.mtf	
@@ -6,7 +6,7 @@ mul id:1565
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5SS.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5SS.mtf
index 7babe29351a..523dbe140e8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5SS.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-5SS.mtf	
@@ -6,7 +6,7 @@ mul id:1566
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-6N.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-6N.mtf
index bf7e7025512..9742e224edc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-6N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-6N.mtf	
@@ -6,7 +6,7 @@ mul id:4337
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-6S.mtf b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-6S.mtf
index f10350e0f4c..135f95ebd9f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hunchback HBK-6S.mtf	
@@ -6,7 +6,7 @@ mul id:5447
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-200-D.mtf b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-200-D.mtf
index 6c84bb51d32..9803a819a5d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-200-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-200-D.mtf	
@@ -6,7 +6,7 @@ mul id:1585
 Config:Biped
 TechBase:Inner Sphere
 Era:2620
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-400-D.mtf b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-400-D.mtf
index db2e9d8b286..65b90b7dc03 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-400-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-400-D.mtf	
@@ -6,7 +6,7 @@ mul id:1589
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-500-D.mtf b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-500-D.mtf
index 7d483cd0f13..2549107cefc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-500-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-500-D.mtf	
@@ -6,7 +6,7 @@ mul id:1590
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-900-D.mtf b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-900-D.mtf
index a1d992cab63..f9056bdbe63 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-900-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-900-D.mtf	
@@ -6,7 +6,7 @@ mul id:1591
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-950-D.mtf b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-950-D.mtf
index 31757e5450a..af83c1886e9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hussar HSR-950-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Hussar HSR-950-D.mtf	
@@ -6,7 +6,7 @@ mul id:1592
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Imp C.mtf b/megamek/data/mechfiles/mechs/3050U/Imp C.mtf
index 7d6b47d3b1d..04d6e83a2c0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Imp C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Imp C.mtf	
@@ -6,7 +6,7 @@ mul id:1606
 Config:Biped
 TechBase:Clan
 Era:2863
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Imp IMP-2E.mtf b/megamek/data/mechfiles/mechs/3050U/Imp IMP-2E.mtf
index 72992188c45..816e200f274 100644
--- a/megamek/data/mechfiles/mechs/3050U/Imp IMP-2E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Imp IMP-2E.mtf	
@@ -6,7 +6,7 @@ mul id:4358
 Config:Biped
 TechBase:Inner Sphere
 Era:3005
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:1
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Imp IMP-3E.mtf b/megamek/data/mechfiles/mechs/3050U/Imp IMP-3E.mtf
index ab0b51ae6a5..e136e551969 100644
--- a/megamek/data/mechfiles/mechs/3050U/Imp IMP-3E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Imp IMP-3E.mtf	
@@ -6,7 +6,7 @@ mul id:1610
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Imp IMP-4E.mtf b/megamek/data/mechfiles/mechs/3050U/Imp IMP-4E.mtf
index 0362e95c9c2..1b5cb661c7c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Imp IMP-4E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Imp IMP-4E.mtf	
@@ -6,7 +6,7 @@ mul id:1611
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DD.mtf b/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DD.mtf
index f48025e073a..40c8f3aa7f0 100644
--- a/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DD.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DD.mtf	
@@ -6,7 +6,7 @@ mul id:1666
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DDa.mtf b/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DDa.mtf
index 71b411a9902..ed13b222047 100644
--- a/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DDa.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DDa.mtf	
@@ -6,7 +6,7 @@ mul id:1667
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DGr.mtf b/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DGr.mtf
index 15794c61537..2f2633e28bf 100644
--- a/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DGr.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-DGr.mtf	
@@ -5,7 +5,7 @@ mul id:4389
 Config:Biped
 techbase:Inner Sphere
 era:3058
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-H.mtf b/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-H.mtf
index efcd2f56707..778d9d371e3 100644
--- a/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/JagerMech JM6-H.mtf	
@@ -6,7 +6,7 @@ mul id:1669
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-D.mtf b/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-D.mtf
index 1445a6c1d63..677b826db92 100644
--- a/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-D.mtf	
@@ -6,7 +6,7 @@ mul id:4390
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-F.mtf b/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-F.mtf
index 3f8e252aa3b..a3401e4ec62 100644
--- a/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-F.mtf	
@@ -6,7 +6,7 @@ mul id:4391
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-G.mtf b/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-G.mtf
index 3652b7e7e59..b0a1387e628 100644
--- a/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/JagerMech JM7-G.mtf	
@@ -6,7 +6,7 @@ mul id:4392
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Jagermech JM6-DG.mtf b/megamek/data/mechfiles/mechs/3050U/Jagermech JM6-DG.mtf
index c3c46935206..5c370993ff7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Jagermech JM6-DG.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Jagermech JM6-DG.mtf	
@@ -6,7 +6,7 @@ mul id:1668
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-10P.mtf b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-10P.mtf
index 4e6837450a2..17441feeaf4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-10P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-10P.mtf	
@@ -6,7 +6,7 @@ mul id:1676
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11A Fire Javelin.mtf b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11A Fire Javelin.mtf
index 6386a38bc10..26988ecfac5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11A Fire Javelin.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11A Fire Javelin.mtf	
@@ -6,7 +6,7 @@ mul id:1677
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11B.mtf b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11B.mtf
index 50a8e2e74ce..294b3f7348d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11B.mtf	
@@ -6,7 +6,7 @@ mul id:1678
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11D.mtf b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11D.mtf
index f500a9a506a..86f26e5cfdd 100644
--- a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11D.mtf	
@@ -6,7 +6,7 @@ mul id:1679
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11F.mtf b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11F.mtf
index 4bcab6d84bc..d8675c311d4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Javelin JVN-11F.mtf	
@@ -6,7 +6,7 @@ mul id:1680
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C.mtf b/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C.mtf
index bf752f3b3c8..16bd605a6b8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C.mtf	
@@ -6,7 +6,7 @@ mul id:1688
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C2.mtf b/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C2.mtf
index e96f9874abd..ca318d7a929 100644
--- a/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C2.mtf	
@@ -6,7 +6,7 @@ mul id:1689
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C3.mtf b/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C3.mtf
index 4c84c65bd40..e6dd923206b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Jenner JR7-C3.mtf	
@@ -6,7 +6,7 @@ mul id:1690
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Jenner JR7-K.mtf b/megamek/data/mechfiles/mechs/3050U/Jenner JR7-K.mtf
index 7c85f4ca927..533d5a3a102 100644
--- a/megamek/data/mechfiles/mechs/3050U/Jenner JR7-K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Jenner JR7-K.mtf	
@@ -6,7 +6,7 @@ mul id:1694
 Config:Biped
 techbase:Inner Sphere
 era:3047
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-2.mtf b/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-2.mtf
index 5a00b259535..57e325ffe4c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-2.mtf	
@@ -6,7 +6,7 @@ mul id:1760
 Config:Biped
 techbase:Inner Sphere
 era:3035
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-C.mtf b/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-C.mtf
index b32ae22c015..d9e741b40ca 100644
--- a/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-C.mtf	
@@ -6,7 +6,7 @@ mul id:1761
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-CJ.mtf b/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-CJ.mtf
index 72009be9438..24573e31fff 100644
--- a/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-CJ.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-CJ.mtf	
@@ -6,7 +6,7 @@ mul id:1762
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-CM.mtf b/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-CM.mtf
index ca1526a1ec5..9e727541269 100644
--- a/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-CM.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Katana (Crockett) CRK-5003-CM.mtf	
@@ -6,7 +6,7 @@ mul id:1763
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-000.mtf b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-000.mtf
index b14b3f998ab..9b77cd94e46 100644
--- a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-000.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-000.mtf	
@@ -5,7 +5,7 @@ mul id:1770
 Config:Biped
 techbase:Inner Sphere
 era:2743
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-001.mtf b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-001.mtf
index 868c2b6c0cf..1733f066997 100644
--- a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-001.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-001.mtf	
@@ -6,7 +6,7 @@ mul id:1773
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-005.mtf b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-005.mtf
index db9283f77f9..6d36953772c 100644
--- a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-005.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-005.mtf	
@@ -6,7 +6,7 @@ mul id:1774
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-007.mtf b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-007.mtf
index 0af53169af8..72730f15575 100644
--- a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-007.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-007.mtf	
@@ -6,7 +6,7 @@ mul id:1776
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-008.mtf b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-008.mtf
index c2da6a09d3c..168f62cf8e6 100644
--- a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-008.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-008.mtf	
@@ -6,7 +6,7 @@ mul id:1777
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-008B.mtf b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-008B.mtf
index 7d751370e88..f94e76ab53d 100644
--- a/megamek/data/mechfiles/mechs/3050U/King Crab KGC-008B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/King Crab KGC-008B.mtf	
@@ -6,7 +6,7 @@ mul id:5494
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-19.mtf b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-19.mtf
index 5484264211a..6f0024e0708 100644
--- a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-19.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-19.mtf	
@@ -6,7 +6,7 @@ mul id:1791
 Config:Biped
 TechBase:Inner Sphere
 Era:2587
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-20.mtf b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-20.mtf
index fe110ddcb17..81fbacce150 100644
--- a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-20.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-20.mtf	
@@ -6,7 +6,7 @@ mul id:1793
 Config:Biped
 techbase:Inner Sphere
 era:3035
-source:TRO 3050 - Succession War
+source:TRO: 3050 - Succession War
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-21.mtf b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-21.mtf
index afa0a9d6c28..e864a780d60 100644
--- a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-21.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-21.mtf	
@@ -6,7 +6,7 @@ mul id:1794
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-C.mtf b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-C.mtf
index 20edc7cbb73..b768d9a01fd 100644
--- a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-C.mtf	
@@ -6,7 +6,7 @@ mul id:1795
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-K.mtf b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-K.mtf
index 527247de2e7..bb45fc6027e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Kintaro KTO-K.mtf	
@@ -6,7 +6,7 @@ mul id:1796
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) A.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) A.mtf
index f54c61d07b3..fa5af162d5c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) A.mtf	
@@ -6,7 +6,7 @@ mul id:1827
 Config:Biped Omnimech
 TechBase:Clan
 Era:2926
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) B.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) B.mtf
index d53e7db0b81..768e1f98498 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) B.mtf	
@@ -6,7 +6,7 @@ mul id:1828
 Config:Biped Omnimech
 TechBase:Clan
 Era:2926
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) C.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) C.mtf
index b33f4f43917..776befc56fe 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) C.mtf	
@@ -6,7 +6,7 @@ mul id:1829
 Config:Biped Omnimech
 TechBase:Clan
 Era:2926
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) D.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) D.mtf
index acf4e32db95..6dfe0c19c5c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) D.mtf	
@@ -6,7 +6,7 @@ mul id:1830
 Config:Biped Omnimech
 TechBase:Clan
 Era:2926
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) E.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) E.mtf
index af101f6e087..643fa620c4b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) E.mtf	
@@ -6,7 +6,7 @@ mul id:1831
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) F.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) F.mtf
index dc11a576769..eb72ebc08e9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) F.mtf	
@@ -6,7 +6,7 @@ mul id:1832
 Config:Biped Omnimech
 TechBase:Clan
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) G.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) G.mtf
index dd91489b924..a4e05ce3f58 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) G.mtf	
@@ -6,7 +6,7 @@ mul id:1833
 Config:Biped Omnimech
 TechBase:Clan
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) H.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) H.mtf
index 81e33735f69..7158505777c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) H.mtf	
@@ -6,7 +6,7 @@ mul id:1834
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) P.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) P.mtf
index f8a30116a0b..cfe4908b492 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) P.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) P.mtf	
@@ -6,7 +6,7 @@ mul id:1835
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) Prime.mtf
index e5ec1371ee1..36ff98d30f1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Koshi (Mist Lynx) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1836
 Config:Biped Omnimech
 techbase:Clan
 era:2926
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-01.mtf b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-01.mtf
index 430ddb8fb91..5552c80a02b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-01.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-01.mtf	
@@ -6,7 +6,7 @@ mul id:1853
 Config:Biped
 techbase:Inner Sphere
 era:2581
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-03.mtf b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-03.mtf
index 2209b1dcd60..9a1fc8dc50f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-03.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-03.mtf	
@@ -6,7 +6,7 @@ mul id:1856
 Config:Biped
 TechBase:Inner Sphere
 Era:2876
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-04.mtf b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-04.mtf
index 87e74215c21..7bdf5b0c34a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-04.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-04.mtf	
@@ -6,7 +6,7 @@ mul id:1857
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-05.mtf b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-05.mtf
index 441c9ff9ac1..ba991e8bac6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-05.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-05.mtf	
@@ -6,7 +6,7 @@ mul id:1858
 Config:Biped
 TechBase:Inner Sphere
 Era:2594
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-06.mtf b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-06.mtf
index 0f5e82ed8dc..1ff496f22e4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-06.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-06.mtf	
@@ -6,7 +6,7 @@ mul id:1859
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-08.mtf b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-08.mtf
index 153b8719bda..5268bf81658 100644
--- a/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-08.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Lancelot LNC25-08.mtf	
@@ -6,7 +6,7 @@ mul id:1860
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) A.mtf b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) A.mtf
index ef1d29bde44..ecb38905589 100644
--- a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) A.mtf	
@@ -6,7 +6,7 @@ mul id:1923
 Config:Biped Omnimech
 TechBase:Clan
 Era:2926
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) B.mtf b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) B.mtf
index a187bd99f9e..9ca6f00e03e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) B.mtf	
@@ -6,7 +6,7 @@ mul id:1924
 Config:Biped Omnimech
 TechBase:Clan
 Era:2926
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) C.mtf b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) C.mtf
index b41be2d9920..ce15771550c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) C.mtf	
@@ -6,7 +6,7 @@ mul id:1925
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) D.mtf b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) D.mtf
index c3b7f504813..dff121fb1b0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) D.mtf	
@@ -6,7 +6,7 @@ mul id:1926
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) E.mtf b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) E.mtf
index 04847d3e951..197da3c9d23 100644
--- a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) E.mtf	
@@ -6,7 +6,7 @@ mul id:1927
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) F.mtf b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) F.mtf
index 53a8ef83050..dcf59c7c0ce 100644
--- a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) F.mtf	
@@ -6,7 +6,7 @@ mul id:5489
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) H.mtf b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) H.mtf
index 5b5c8311779..c915fd6678a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) H.mtf	
@@ -6,7 +6,7 @@ mul id:1928
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) Prime.mtf
index 271cb65e20d..2a58c5be89b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Loki (Hellbringer) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1929
 Config:Biped Omnimech
 techbase:Clan
 era:2926
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) A.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) A.mtf
index ccd0d5f65a1..6191f4718be 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) A.mtf	
@@ -6,7 +6,7 @@ mul id:1978
 Config:Biped Omnimech
 TechBase:Clan
 Era:2945
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) B.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) B.mtf
index f786cbcbf1b..e3abb42e9a3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) B.mtf	
@@ -6,7 +6,7 @@ mul id:1979
 Config:Biped Omnimech
 TechBase:Clan
 Era:2945
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) C.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) C.mtf
index 3af32eb668d..53bc1302372 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) C.mtf	
@@ -6,7 +6,7 @@ mul id:1980
 Config:Biped Omnimech
 TechBase:Clan
 Era:2945
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) D.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) D.mtf
index 291159d3606..4fb67004765 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) D.mtf	
@@ -6,7 +6,7 @@ mul id:1981
 Config:Biped Omnimech
 TechBase:Clan
 Era:2945
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) E.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) E.mtf
index ee083ccfe79..b0cd0596ccc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) E.mtf	
@@ -6,7 +6,7 @@ mul id:1982
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) F.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) F.mtf
index a330bf72c17..6b45422abc8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) F.mtf	
@@ -6,7 +6,7 @@ mul id:1983
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) H.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) H.mtf
index c5d8b875a87..87f7406002d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) H.mtf	
@@ -6,7 +6,7 @@ mul id:1984
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) Prime.mtf
index 561336078e0..af6a264c52f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1985
 Config:Biped Omnimech
 techbase:Clan
 era:2945
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) Pryde.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) Pryde.mtf
index d9ad16bdc07..f9160c37b0b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) Pryde.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) Pryde.mtf	
@@ -6,7 +6,7 @@ mul id:1977
 Config:Biped Omnimech
 techbase:Clan
 era:3052
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) S.mtf b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) S.mtf
index 686449a26cf..6d60cba07aa 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mad Cat (Timber Wolf) S.mtf	
@@ -6,7 +6,7 @@ mul id:1986
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) A.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) A.mtf
index 5b42ca44379..5c894553be8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) A.mtf	
@@ -6,7 +6,7 @@ mul id:2002
 Config:Biped Omnimech
 techbase:Clan
 era:2945
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) B.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) B.mtf
index f4366f74b70..4a8ddc2c8eb 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) B.mtf	
@@ -6,7 +6,7 @@ mul id:2003
 Config:Biped Omnimech
 techbase:Clan
 era:2945
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) C.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) C.mtf
index a09e3c36aee..12fbce24f51 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) C.mtf	
@@ -6,7 +6,7 @@ mul id:2004
 Config:Biped Omnimech
 techbase:Clan
 era:2945
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) D.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) D.mtf
index a5bc77faf62..e03e9e8b274 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) D.mtf	
@@ -6,7 +6,7 @@ mul id:2005
 Config:Biped Omnimech
 TechBase:Clan
 Era:2945
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) E.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) E.mtf
index 5cb7d60a932..561ba6e1ce0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) E.mtf	
@@ -6,7 +6,7 @@ mul id:2006
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) G.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) G.mtf
index 54ef90fdb4c..de8fb804300 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) G.mtf	
@@ -6,7 +6,7 @@ mul id:2007
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) H.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) H.mtf
index 1736e398c7d..f92f0d66b7d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) H.mtf	
@@ -6,7 +6,7 @@ mul id:2008
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) M.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) M.mtf
index 938697f8b52..bf5c3c21979 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) M.mtf	
@@ -6,7 +6,7 @@ mul id:2009
 Config:Biped Omnimech
 techbase:Clan
 era:3068
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) Prime.mtf
index 24afd5ec914..6c1edd021aa 100644
--- a/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Man O' War (Gargoyle) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2010
 Config:Biped Omnimech
 techbase:Clan
 era:2945
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) A.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) A.mtf
index 7562e9e371f..ebf8a40ec9f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) A.mtf	
@@ -6,7 +6,7 @@ mul id:2091
 Config:Biped Omnimech
 TechBase:Clan
 Era:2999
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) B.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) B.mtf
index d9ce9e23900..10173fa9027 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) B.mtf	
@@ -6,7 +6,7 @@ mul id:2092
 Config:Biped Omnimech
 TechBase:Clan
 Era:2999
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) C.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) C.mtf
index 6dca7c199cf..75db99d1f9a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) C.mtf	
@@ -6,7 +6,7 @@ mul id:2093
 Config:Biped Omnimech
 TechBase:Clan
 Era:2999
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) D.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) D.mtf
index 952f9d73224..4f130fc9041 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) D.mtf	
@@ -6,7 +6,7 @@ mul id:2094
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) E.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) E.mtf
index ae092124ea8..47d47232d69 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) E.mtf	
@@ -6,7 +6,7 @@ mul id:2095
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) H.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) H.mtf
index 992faccc9cf..58fb80ba949 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) H.mtf	
@@ -6,7 +6,7 @@ mul id:2096
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) Prime.mtf
index 6ff63e57fb8..fc5c2057d8d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Masakari (Warhawk) Prime.mtf	
@@ -5,7 +5,7 @@ mul id:2097
 Config:Biped Omnimech
 techbase:Clan
 era:2999
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-1K.mtf b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-1K.mtf
index 10e39725370..f92db9e3577 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-1K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-1K.mtf	
@@ -6,7 +6,7 @@ mul id:2100
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-1R.mtf b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-1R.mtf
index 049653f6f20..1be5482f1ad 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-1R.mtf	
@@ -6,7 +6,7 @@ mul id:2101
 Config:Biped
 TechBase:Inner Sphere
 Era:3048
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-2R.mtf b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-2R.mtf
index a3e7c8ebdd6..3da2e859c53 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-2R.mtf	
@@ -6,7 +6,7 @@ mul id:5460
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-3R.mtf b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-3R.mtf
index 75f95622bad..edd20635394 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-3R.mtf	
@@ -6,7 +6,7 @@ mul id:2102
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-C.mtf b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-C.mtf
index 2600b208959..01b557ba2a2 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mauler MAL-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mauler MAL-C.mtf	
@@ -6,7 +6,7 @@ mul id:2103
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3050U/Mercury MCY-102.mtf b/megamek/data/mechfiles/mechs/3050U/Mercury MCY-102.mtf
index 42567adcbea..5c1d0539ca4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mercury MCY-102.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mercury MCY-102.mtf	
@@ -6,7 +6,7 @@ mul id:2169
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Mercury MCY-104.mtf b/megamek/data/mechfiles/mechs/3050U/Mercury MCY-104.mtf
index 9dbff2a84a0..8798d3f368a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mercury MCY-104.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mercury MCY-104.mtf	
@@ -6,7 +6,7 @@ mul id:2170
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Mercury MCY-97.mtf b/megamek/data/mechfiles/mechs/3050U/Mercury MCY-97.mtf
index 09400d42a39..a3a55d64337 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mercury MCY-97.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mercury MCY-97.mtf	
@@ -6,7 +6,7 @@ mul id:2171
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Mercury MCY-99.mtf b/megamek/data/mechfiles/mechs/3050U/Mercury MCY-99.mtf
index 7e8477e64b4..0c29763a349 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mercury MCY-99.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mercury MCY-99.mtf	
@@ -6,7 +6,7 @@ mul id:2172
 Config:Biped
 TechBase:Inner Sphere
 Era:2742
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Mongoose MON-66.mtf b/megamek/data/mechfiles/mechs/3050U/Mongoose MON-66.mtf
index 7137314ff54..5b59c7c2e43 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mongoose MON-66.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mongoose MON-66.mtf	
@@ -6,7 +6,7 @@ mul id:2208
 Config:Biped
 techbase:Inner Sphere
 era:2660
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Mongoose MON-69.mtf b/megamek/data/mechfiles/mechs/3050U/Mongoose MON-69.mtf
index f5db0f69a9f..bf3c62fe6dc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mongoose MON-69.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mongoose MON-69.mtf	
@@ -6,7 +6,7 @@ mul id:4656
 Config:Biped
 TechBase:Inner Sphere
 Era:2819
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Mongoose MON-70.mtf b/megamek/data/mechfiles/mechs/3050U/Mongoose MON-70.mtf
index 918105535dd..07642d78883 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mongoose MON-70.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mongoose MON-70.mtf	
@@ -6,7 +6,7 @@ mul id:2213
 Config:Biped
 TechBase:Inner Sphere
 Era:2819
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Mongoose MON-76.mtf b/megamek/data/mechfiles/mechs/3050U/Mongoose MON-76.mtf
index 113f20013f3..baaa477644f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Mongoose MON-76.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Mongoose MON-76.mtf	
@@ -6,7 +6,7 @@ mul id:2214
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3050U/Orion ON1-M-DC.mtf b/megamek/data/mechfiles/mechs/3050U/Orion ON1-M-DC.mtf
index 88ce985d28d..e0eea71eb16 100644
--- a/megamek/data/mechfiles/mechs/3050U/Orion ON1-M-DC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Orion ON1-M-DC.mtf	
@@ -6,7 +6,7 @@ mul id:4760
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Orion ON1-M.mtf b/megamek/data/mechfiles/mechs/3050U/Orion ON1-M.mtf
index 18148d9bc57..34f7ab20ed9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Orion ON1-M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Orion ON1-M.mtf	
@@ -6,7 +6,7 @@ mul id:2334
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Orion ON1-MA.mtf b/megamek/data/mechfiles/mechs/3050U/Orion ON1-MA.mtf
index 870979f4c31..e1d99f15fe5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Orion ON1-MA.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Orion ON1-MA.mtf	
@@ -6,7 +6,7 @@ mul id:4756
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Orion ON1-MB.mtf b/megamek/data/mechfiles/mechs/3050U/Orion ON1-MB.mtf
index 4ac0f7b133e..ce78cca99a2 100644
--- a/megamek/data/mechfiles/mechs/3050U/Orion ON1-MB.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Orion ON1-MB.mtf	
@@ -6,7 +6,7 @@ mul id:4757
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Orion ON1-MC.mtf b/megamek/data/mechfiles/mechs/3050U/Orion ON1-MC.mtf
index c2550a46e85..d74eec50e53 100644
--- a/megamek/data/mechfiles/mechs/3050U/Orion ON1-MC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Orion ON1-MC.mtf	
@@ -6,7 +6,7 @@ mul id:4758
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Orion ON1-MD.mtf b/megamek/data/mechfiles/mechs/3050U/Orion ON1-MD.mtf
index 2b2895c8176..0ddbf91055e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Orion ON1-MD.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Orion ON1-MD.mtf	
@@ -6,7 +6,7 @@ mul id:4759
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Orion ON2-M.mtf b/megamek/data/mechfiles/mechs/3050U/Orion ON2-M.mtf
index 9941dd7b966..0d31d0b91ff 100644
--- a/megamek/data/mechfiles/mechs/3050U/Orion ON2-M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Orion ON2-M.mtf	
@@ -6,7 +6,7 @@ mul id:2338
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3050U/Panther PNT-10K.mtf b/megamek/data/mechfiles/mechs/3050U/Panther PNT-10K.mtf
index c7ed92e8420..72fbd12c446 100644
--- a/megamek/data/mechfiles/mechs/3050U/Panther PNT-10K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Panther PNT-10K.mtf	
@@ -6,7 +6,7 @@ mul id:2416
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Panther PNT-10KA.mtf b/megamek/data/mechfiles/mechs/3050U/Panther PNT-10KA.mtf
index 35ad3568b32..90e4848fdaf 100644
--- a/megamek/data/mechfiles/mechs/3050U/Panther PNT-10KA.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Panther PNT-10KA.mtf	
@@ -6,7 +6,7 @@ mul id:4785
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Panther PNT-12A.mtf b/megamek/data/mechfiles/mechs/3050U/Panther PNT-12A.mtf
index d5a21a54a3b..18ac5548946 100644
--- a/megamek/data/mechfiles/mechs/3050U/Panther PNT-12A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Panther PNT-12A.mtf	
@@ -6,7 +6,7 @@ mul id:2418
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Panther PNT-14S.mtf b/megamek/data/mechfiles/mechs/3050U/Panther PNT-14S.mtf
index 7ccc4459ba6..297f47c2c98 100644
--- a/megamek/data/mechfiles/mechs/3050U/Panther PNT-14S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Panther PNT-14S.mtf	
@@ -6,7 +6,7 @@ mul id:2422
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Panther PNT-16K.mtf b/megamek/data/mechfiles/mechs/3050U/Panther PNT-16K.mtf
index 9ea04bbee6b..8d908a0c83c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Panther PNT-16K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Panther PNT-16K.mtf	
@@ -6,7 +6,7 @@ mul id:2423
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Panther PNT-C.mtf b/megamek/data/mechfiles/mechs/3050U/Panther PNT-C.mtf
index f4a062c9cd6..0ddd63a3fe9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Panther PNT-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Panther PNT-C.mtf	
@@ -6,7 +6,7 @@ mul id:2426
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Panther PNT-CA.mtf b/megamek/data/mechfiles/mechs/3050U/Panther PNT-CA.mtf
index 82c75d4d0ec..e67fb140b45 100644
--- a/megamek/data/mechfiles/mechs/3050U/Panther PNT-CA.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Panther PNT-CA.mtf	
@@ -6,7 +6,7 @@ mul id:5443
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) A.mtf b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) A.mtf
index 88b3259c13b..f961067b031 100644
--- a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) A.mtf	
@@ -6,7 +6,7 @@ mul id:2591
 Config:Biped Omnimech
 techbase:Clan
 era:3012
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) B.mtf b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) B.mtf
index 9dd982ce564..f9223c840d7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) B.mtf	
@@ -6,7 +6,7 @@ mul id:2592
 Config:Biped Omnimech
 TechBase:Clan
 Era:3010
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) C.mtf b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) C.mtf
index 8522e23c854..e7b978d27e2 100644
--- a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) C.mtf	
@@ -6,7 +6,7 @@ mul id:2593
 Config:Biped Omnimech
 TechBase:Clan
 Era:3012
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) D.mtf b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) D.mtf
index a7e60785a17..864f5073d40 100644
--- a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) D.mtf	
@@ -6,7 +6,7 @@ mul id:2594
 Config:Biped Omnimech
 TechBase:Clan
 Era:3010
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) E.mtf b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) E.mtf
index 2ab8fd14751..29595139a70 100644
--- a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) E.mtf	
@@ -6,7 +6,7 @@ mul id:2595
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) H.mtf b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) H.mtf
index 95385e2e150..20ae28afedd 100644
--- a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) H.mtf	
@@ -6,7 +6,7 @@ mul id:2596
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) J.mtf b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) J.mtf
index 819779b08c0..fad0895fed1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) J.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) J.mtf	
@@ -6,7 +6,7 @@ mul id:2597
 Config:Biped Omnimech
 TechBase:Clan
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) Prime.mtf
index 152b43b24d0..1795446414b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Puma (Adder) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Puma (Adder) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2598
 Config:Biped Omnimech
 techbase:Clan
 era:3010
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5K.mtf b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5K.mtf
index e14aaf19ddb..6cf6ad3fe63 100644
--- a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5K.mtf	
@@ -6,7 +6,7 @@ mul id:2613
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5K2.mtf b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5K2.mtf
index 050aba0b4b4..5dc19f7e989 100644
--- a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5K2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5K2.mtf	
@@ -6,7 +6,7 @@ mul id:4886
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5M.mtf b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5M.mtf
index 5e10088a9fe..6312beeea7b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-5M.mtf	
@@ -6,7 +6,7 @@ mul id:2614
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-8K.mtf b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-8K.mtf
index 6952bd637ac..5f766306a3c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-8K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-8K.mtf	
@@ -6,7 +6,7 @@ mul id:2616
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-C.mtf b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-C.mtf
index 6c8adf888ef..edc71ba25b6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Quickdraw QKD-C.mtf	
@@ -6,7 +6,7 @@ mul id:2618
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Raven RVN-3L.mtf b/megamek/data/mechfiles/mechs/3050U/Raven RVN-3L.mtf
index 0e90cea9110..349d8ba0122 100644
--- a/megamek/data/mechfiles/mechs/3050U/Raven RVN-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Raven RVN-3L.mtf	
@@ -6,7 +6,7 @@ mul id:2664
 Config:Biped
 TechBase:Inner Sphere
 Era:3048
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Raven RVN-3M.mtf b/megamek/data/mechfiles/mechs/3050U/Raven RVN-3M.mtf
index 3670fd7c3cd..bb03e78bf52 100644
--- a/megamek/data/mechfiles/mechs/3050U/Raven RVN-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Raven RVN-3M.mtf	
@@ -6,7 +6,7 @@ mul id:5444
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Raven RVN-4L.mtf b/megamek/data/mechfiles/mechs/3050U/Raven RVN-4L.mtf
index 8c908edcf15..1e8c4cbe39d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Raven RVN-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Raven RVN-4L.mtf	
@@ -6,7 +6,7 @@ mul id:2666
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Raven RVN-4LC.mtf b/megamek/data/mechfiles/mechs/3050U/Raven RVN-4LC.mtf
index ef6e07382c7..018bd83fc71 100644
--- a/megamek/data/mechfiles/mechs/3050U/Raven RVN-4LC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Raven RVN-4LC.mtf	
@@ -6,7 +6,7 @@ mul id:2667
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Raven RVN-SR.mtf b/megamek/data/mechfiles/mechs/3050U/Raven RVN-SR.mtf
index 45a330def3b..e84637063a7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Raven RVN-SR.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Raven RVN-SR.mtf	
@@ -6,7 +6,7 @@ mul id:2670
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Raven RVN-SS.mtf b/megamek/data/mechfiles/mechs/3050U/Raven RVN-SS.mtf
index d50642c6489..c4da9ef98e8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Raven RVN-SS.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Raven RVN-SS.mtf	
@@ -6,7 +6,7 @@ mul id:2671
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) (Kotare).mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) (Kotare).mtf
index 7ead92492a9..f738185c24a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) (Kotare).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) (Kotare).mtf	
@@ -6,7 +6,7 @@ mul id:5488
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) A.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) A.mtf
index f37ef531851..f8cd5756b3d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) A.mtf	
@@ -6,7 +6,7 @@ mul id:2749
 Config:Biped Omnimech
 TechBase:Clan
 Era:2930
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) B.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) B.mtf
index cacd571af09..972831159c9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) B.mtf	
@@ -6,7 +6,7 @@ mul id:2750
 Config:Biped Omnimech
 TechBase:Clan
 Era:2930
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) C.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) C.mtf
index 075d2b768bd..aa2a1800f86 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) C.mtf	
@@ -6,7 +6,7 @@ mul id:2751
 Config:Biped Omnimech
 TechBase:Clan
 Era:2930
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) D.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) D.mtf
index f3052bb4d74..b8ab0da31a7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) D.mtf	
@@ -6,7 +6,7 @@ mul id:2752
 Config:Biped Omnimech
 TechBase:Clan
 Era:2930
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) E.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) E.mtf
index 30065071714..f89114c7793 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) E.mtf	
@@ -6,7 +6,7 @@ mul id:2753
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) F.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) F.mtf
index e37e534c52d..f7ca2c66609 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) F.mtf	
@@ -6,7 +6,7 @@ mul id:2754
 Config:Biped Omnimech
 TechBase:Clan
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) G.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) G.mtf
index 8a6502cad20..40125224ca0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) G.mtf	
@@ -6,7 +6,7 @@ mul id:2755
 Config:Biped Omnimech
 TechBase:Clan
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) H.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) H.mtf
index 00c5b2f718f..daf7c102017 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) H.mtf	
@@ -6,7 +6,7 @@ mul id:2756
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) Prime.mtf
index cf710ee1a4b..d0112d55d38 100644
--- a/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Ryoken (Stormcrow) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2757
 Config:Biped Omnimech
 techbase:Clan
 era:2930
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-3L.mtf b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-3L.mtf
index 548aa9f59ea..463878dd05f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-3L.mtf	
@@ -6,7 +6,7 @@ mul id:2860
 Config:Biped
 TechBase:Inner Sphere
 Era:2652
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-3M.mtf b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-3M.mtf
index 3bba3b34fcc..82c1e1415ea 100644
--- a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-3M.mtf	
@@ -6,7 +6,7 @@ mul id:2862
 Config:Biped
 TechBase:Inner Sphere
 Era:3035
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-4D.mtf b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-4D.mtf
index 9a49a07c1d2..93f41ee0215 100644
--- a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-4D.mtf	
@@ -6,7 +6,7 @@ mul id:2863
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-5WB.mtf b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-5WB.mtf
index 4d70c6376f4..62d043e8749 100644
--- a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-5WB.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-5WB.mtf	
@@ -6,7 +6,7 @@ mul id:2864
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-C.mtf b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-C.mtf
index 1c83607b8d6..f05841cb625 100644
--- a/megamek/data/mechfiles/mechs/3050U/Sentinel STN-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Sentinel STN-C.mtf	
@@ -6,7 +6,7 @@ mul id:2865
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Shogun C.mtf b/megamek/data/mechfiles/mechs/3050U/Shogun C.mtf
index e629e73d612..a0644a783a8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Shogun C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Shogun C.mtf	
@@ -5,7 +5,7 @@ mul id:2931
 Config:Biped
 techbase:Clan
 era:2850
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2E.mtf b/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2E.mtf
index 29c1dd370b3..5a67181d423 100644
--- a/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2E.mtf	
@@ -6,7 +6,7 @@ mul id:2932
 Config:Biped
 TechBase:Inner Sphere
 Era:3005
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2F (Trisha).mtf b/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2F (Trisha).mtf
index 4f35ad975cc..34723c09fc6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2F (Trisha).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2F (Trisha).mtf	
@@ -6,7 +6,7 @@ mul id:5058
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2F.mtf b/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2F.mtf
index 7f6cc08d888..c088763e714 100644
--- a/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Shogun SHG-2F.mtf	
@@ -5,7 +5,7 @@ mul id:2933
 Config:Biped
 techbase:Inner Sphere
 era:3029
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Spider SDR-7K.mtf b/megamek/data/mechfiles/mechs/3050U/Spider SDR-7K.mtf
index 7617f19f2d9..3ba052636d0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Spider SDR-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Spider SDR-7K.mtf	
@@ -6,7 +6,7 @@ mul id:3011
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Spider SDR-7K2.mtf b/megamek/data/mechfiles/mechs/3050U/Spider SDR-7K2.mtf
index 342625276a2..074ce4028a2 100644
--- a/megamek/data/mechfiles/mechs/3050U/Spider SDR-7K2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Spider SDR-7K2.mtf	
@@ -6,7 +6,7 @@ mul id:3012
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Spider SDR-7KC.mtf b/megamek/data/mechfiles/mechs/3050U/Spider SDR-7KC.mtf
index 566420077e8..e07729421db 100644
--- a/megamek/data/mechfiles/mechs/3050U/Spider SDR-7KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Spider SDR-7KC.mtf	
@@ -6,7 +6,7 @@ mul id:3013
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Spider SDR-7M.mtf b/megamek/data/mechfiles/mechs/3050U/Spider SDR-7M.mtf
index 0a116b98511..4cfd4da4c86 100644
--- a/megamek/data/mechfiles/mechs/3050U/Spider SDR-7M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Spider SDR-7M.mtf	
@@ -6,7 +6,7 @@ mul id:3015
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Spider SDR-8M.mtf b/megamek/data/mechfiles/mechs/3050U/Spider SDR-8M.mtf
index 20f4ff1e26f..d377c05c2ef 100644
--- a/megamek/data/mechfiles/mechs/3050U/Spider SDR-8M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Spider SDR-8M.mtf	
@@ -6,7 +6,7 @@ mul id:3017
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Spider SDR-C.mtf b/megamek/data/mechfiles/mechs/3050U/Spider SDR-C.mtf
index 88c4dd0d2a0..f1113d6d42a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Spider SDR-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Spider SDR-C.mtf	
@@ -6,7 +6,7 @@ mul id:3020
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Stalker STK-3F (Jamison).mtf b/megamek/data/mechfiles/mechs/3050U/Stalker STK-3F (Jamison).mtf
index ef052fd9607..de9efd37ac1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Stalker STK-3F (Jamison).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Stalker STK-3F (Jamison).mtf	
@@ -6,7 +6,7 @@ mul id:5119
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Stalker STK-5M.mtf b/megamek/data/mechfiles/mechs/3050U/Stalker STK-5M.mtf
index dc7c86857a9..7164d8870fc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Stalker STK-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Stalker STK-5M.mtf	
@@ -6,7 +6,7 @@ mul id:3040
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Stalker STK-5S.mtf b/megamek/data/mechfiles/mechs/3050U/Stalker STK-5S.mtf
index 2777412c05d..a9e24b5f6f8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Stalker STK-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Stalker STK-5S.mtf	
@@ -6,7 +6,7 @@ mul id:3041
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Stalker STK-6M.mtf b/megamek/data/mechfiles/mechs/3050U/Stalker STK-6M.mtf
index 4f536de0a7c..5ee65948bb4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Stalker STK-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Stalker STK-6M.mtf	
@@ -6,7 +6,7 @@ mul id:5121
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Stalker STK-7D.mtf b/megamek/data/mechfiles/mechs/3050U/Stalker STK-7D.mtf
index 7d99e300a32..445a102d8ba 100644
--- a/megamek/data/mechfiles/mechs/3050U/Stalker STK-7D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Stalker STK-7D.mtf	
@@ -6,7 +6,7 @@ mul id:3043
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Stalker STK-8S.mtf b/megamek/data/mechfiles/mechs/3050U/Stalker STK-8S.mtf
index 9a3d9bbbaa4..57c3d502740 100644
--- a/megamek/data/mechfiles/mechs/3050U/Stalker STK-8S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Stalker STK-8S.mtf	
@@ -6,7 +6,7 @@ mul id:3044
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) A.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) A.mtf
index 00616bc2cad..d7097a34de9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) A.mtf	
@@ -6,7 +6,7 @@ mul id:3174
 Config:Biped Omnimech
 TechBase:Clan
 Era:2872
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) B.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) B.mtf
index aa93d703235..73c66fefd12 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) B.mtf	
@@ -6,7 +6,7 @@ mul id:3175
 Config:Biped Omnimech
 TechBase:Clan
 Era:2872
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) C.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) C.mtf
index 23aa9a045ec..4b8afcbea12 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) C.mtf	
@@ -6,7 +6,7 @@ mul id:3176
 Config:Biped Omnimech
 TechBase:Clan
 Era:2872
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) D.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) D.mtf
index 4732a6982f7..87fbd44b8f1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) D.mtf	
@@ -6,7 +6,7 @@ mul id:3177
 Config:Biped Omnimech
 TechBase:Clan
 Era:2872
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) E.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) E.mtf
index f16c5f8531e..76e8b55628d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) E.mtf	
@@ -6,7 +6,7 @@ mul id:3178
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) F.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) F.mtf
index 480b22925ed..587e0760455 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) F.mtf	
@@ -6,7 +6,7 @@ mul id:5490
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) G.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) G.mtf
index 6e77a00e5ee..99a620f68d7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) G.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) G.mtf	
@@ -6,7 +6,7 @@ mul id:3179
 Config:Biped Omnimech
 techbase:Clan
 era:3068
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) H.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) H.mtf
index 38736e0420e..25cea776031 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) H.mtf	
@@ -6,7 +6,7 @@ mul id:3180
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) HH.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) HH.mtf
index 4f4ab6ae8ce..e3e22539704 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) HH.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) HH.mtf	
@@ -6,7 +6,7 @@ mul id:3181
 Config:Biped Omnimech
 techbase:Clan
 era:3070
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) M.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) M.mtf
index 825fd9d9b71..058534b2b9a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) M.mtf	
@@ -6,7 +6,7 @@ mul id:3182
 Config:Biped Omnimech
 TechBase:Clan
 Era:3051
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) Prime.mtf
index d6a3edabc3b..cc9f53bbe78 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thor (Summoner) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:3183
 Config:Biped Omnimech
 techbase:Clan
 era:2872
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3050U/Thorn THE-N.mtf b/megamek/data/mechfiles/mechs/3050U/Thorn THE-N.mtf
index 7c9034aae0e..0764056c6b6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thorn THE-N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thorn THE-N.mtf	
@@ -6,7 +6,7 @@ mul id:3191
 Config:Biped
 TechBase:Inner Sphere
 Era:2549
-Source:TRO 3050 - Age of War
+Source:TRO: 3050 - Age of War
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Thorn THE-N1.mtf b/megamek/data/mechfiles/mechs/3050U/Thorn THE-N1.mtf
index 4fd75fb1987..3f98ef0209d 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thorn THE-N1.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thorn THE-N1.mtf	
@@ -6,7 +6,7 @@ mul id:3192
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Thorn THE-N2.mtf b/megamek/data/mechfiles/mechs/3050U/Thorn THE-N2.mtf
index d8a7c506e6b..6b3c82a5259 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thorn THE-N2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thorn THE-N2.mtf	
@@ -6,7 +6,7 @@ mul id:3193
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3050U/Thug THG-11E (Reich).mtf b/megamek/data/mechfiles/mechs/3050U/Thug THG-11E (Reich).mtf
index 52b5e21d861..0e5602d37d5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thug THG-11E (Reich).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thug THG-11E (Reich).mtf	
@@ -6,7 +6,7 @@ mul id:5228
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3071
-Source:FM:Mercenaries SII - Jihad
+Source:Mercenaries Supplemental II - Jihad
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Thug THG-11E.mtf b/megamek/data/mechfiles/mechs/3050U/Thug THG-11E.mtf
index e57dbce2286..fda18069cb3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thug THG-11E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thug THG-11E.mtf	
@@ -6,7 +6,7 @@ mul id:3205
 Config:Biped
 techbase:Inner Sphere
 era:2572
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Thug THG-12E.mtf b/megamek/data/mechfiles/mechs/3050U/Thug THG-12E.mtf
index 86ff765ef9d..6849390fa48 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thug THG-12E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thug THG-12E.mtf	
@@ -6,7 +6,7 @@ mul id:3207
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Thug THG-12K.mtf b/megamek/data/mechfiles/mechs/3050U/Thug THG-12K.mtf
index 17df70f8fbc..1174c59d031 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thug THG-12K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thug THG-12K.mtf	
@@ -6,7 +6,7 @@ mul id:3208
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Thug THG-13K.mtf b/megamek/data/mechfiles/mechs/3050U/Thug THG-13K.mtf
index c22c311be79..1e63f02e359 100644
--- a/megamek/data/mechfiles/mechs/3050U/Thug THG-13K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Thug THG-13K.mtf	
@@ -6,7 +6,7 @@ mul id:3209
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-3C.mtf b/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-3C.mtf
index 80763b59635..d81be4f7130 100644
--- a/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-3C.mtf	
@@ -6,7 +6,7 @@ mul id:3295
 Config:Biped
 techbase:Inner Sphere
 era:2780
-source:TRO 3050 - Star League
+source:TRO: 3050 - Star League
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-7M.mtf b/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-7M.mtf
index 0fc83c10021..c046f4f23ad 100644
--- a/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-7M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-7M.mtf	
@@ -6,7 +6,7 @@ mul id:3300
 Config:Biped
 TechBase:Inner Sphere
 Era:3048
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-8B.mtf b/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-8B.mtf
index ecba4bce04a..d21023af610 100644
--- a/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-8B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-8B.mtf	
@@ -6,7 +6,7 @@ mul id:3301
 Config:Biped
 techbase:Inner Sphere
 era:3071
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-9K.mtf b/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-9K.mtf
index aa4292e5b0a..46f13c819d7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-9K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Trebuchet TBT-9K.mtf	
@@ -6,7 +6,7 @@ mul id:3302
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) A.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) A.mtf
index 118f7c69177..0987a6313e0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) A.mtf	
@@ -6,7 +6,7 @@ mul id:3340
 Config:Biped Omnimech
 TechBase:Clan
 Era:2890
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) B.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) B.mtf
index 203d2246820..c4847fa5448 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) B.mtf	
@@ -6,7 +6,7 @@ mul id:3341
 Config:Biped Omnimech
 TechBase:Clan
 Era:2890
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) C.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) C.mtf
index f57ae3a93e5..1b2f4f8a859 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) C.mtf	
@@ -6,7 +6,7 @@ mul id:3342
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) D.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) D.mtf
index b37e7552186..ce99829ecd6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) D.mtf	
@@ -6,7 +6,7 @@ mul id:3343
 Config:Biped Omnimech
 TechBase:Clan
 Era:2890
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) E.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) E.mtf
index a24c6dc499e..194cd210631 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) E.mtf	
@@ -6,7 +6,7 @@ mul id:3344
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) F.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) F.mtf
index 533e5b512e8..839c0009499 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) F.mtf	
@@ -6,7 +6,7 @@ mul id:3345
 Config:Biped Omnimech
 TechBase:Clan
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) H.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) H.mtf
index 43f558af438..a783ed77aa4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) H.mtf	
@@ -6,7 +6,7 @@ mul id:3346
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) Prime.mtf
index 3a112f55e9e..865cb380555 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:3347
 Config:Biped Omnimech
 techbase:Clan
 era:2890
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) S.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) S.mtf
index 3233a649b63..a276f1b9b4b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) S.mtf	
@@ -6,7 +6,7 @@ mul id:3348
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) W.mtf b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) W.mtf
index 0a678d418ea..bf7f8d18b84 100644
--- a/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) W.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Uller (Kit Fox) W.mtf	
@@ -6,7 +6,7 @@ mul id:3350
 Config:Biped Omnimech
 TechBase:Clan
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R63.mtf b/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R63.mtf
index 7eb810fa68d..6c7c04525dd 100644
--- a/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R63.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R63.mtf	
@@ -6,7 +6,7 @@ mul id:3356
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R68.mtf b/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R68.mtf
index 75f8730b422..287ce17271b 100644
--- a/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R68.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R68.mtf	
@@ -6,7 +6,7 @@ mul id:3357
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R70.mtf b/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R70.mtf
index 873bad25181..ae8dfdedd8b 100644
--- a/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R70.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/UrbanMech UM-R70.mtf	
@@ -6,7 +6,7 @@ mul id:3359
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Urbanmech UM-R69.mtf b/megamek/data/mechfiles/mechs/3050U/Urbanmech UM-R69.mtf
index 545928bb505..953043c46b4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Urbanmech UM-R69.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Urbanmech UM-R69.mtf	
@@ -6,7 +6,7 @@ mul id:3358
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3050U/Victor VTR-10D.mtf b/megamek/data/mechfiles/mechs/3050U/Victor VTR-10D.mtf
index 559f261eb5a..5f83bee2cec 100644
--- a/megamek/data/mechfiles/mechs/3050U/Victor VTR-10D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Victor VTR-10D.mtf	
@@ -6,7 +6,7 @@ mul id:3404
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Victor VTR-10L.mtf b/megamek/data/mechfiles/mechs/3050U/Victor VTR-10L.mtf
index a13b6df96ea..7e924be0097 100644
--- a/megamek/data/mechfiles/mechs/3050U/Victor VTR-10L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Victor VTR-10L.mtf	
@@ -6,7 +6,7 @@ mul id:3405
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Victor VTR-10S.mtf b/megamek/data/mechfiles/mechs/3050U/Victor VTR-10S.mtf
index cec0022f1af..b6ce310853e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Victor VTR-10S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Victor VTR-10S.mtf	
@@ -6,7 +6,7 @@ mul id:5458
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Victor VTR-11D.mtf b/megamek/data/mechfiles/mechs/3050U/Victor VTR-11D.mtf
index 83ece8593e4..25a55bdbe41 100644
--- a/megamek/data/mechfiles/mechs/3050U/Victor VTR-11D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Victor VTR-11D.mtf	
@@ -6,7 +6,7 @@ mul id:3406
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Victor VTR-9D.mtf b/megamek/data/mechfiles/mechs/3050U/Victor VTR-9D.mtf
index c2d85ca2d2d..34e151828a9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Victor VTR-9D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Victor VTR-9D.mtf	
@@ -6,7 +6,7 @@ mul id:3410
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Victor VTR-9K.mtf b/megamek/data/mechfiles/mechs/3050U/Victor VTR-9K.mtf
index c4a5b305ad7..75f23dd4412 100644
--- a/megamek/data/mechfiles/mechs/3050U/Victor VTR-9K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Victor VTR-9K.mtf	
@@ -6,7 +6,7 @@ mul id:3411
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Victor VTR-C.mtf b/megamek/data/mechfiles/mechs/3050U/Victor VTR-C.mtf
index db3cfccf19a..b875039942b 100644
--- a/megamek/data/mechfiles/mechs/3050U/Victor VTR-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Victor VTR-C.mtf	
@@ -6,7 +6,7 @@ mul id:3415
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Vindicator VND-3L.mtf b/megamek/data/mechfiles/mechs/3050U/Vindicator VND-3L.mtf
index 89be871ece2..2df5824d04e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vindicator VND-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vindicator VND-3L.mtf	
@@ -6,7 +6,7 @@ mul id:3426
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Vindicator VND-4L.mtf b/megamek/data/mechfiles/mechs/3050U/Vindicator VND-4L.mtf
index 8821bb37806..33fb01c08b7 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vindicator VND-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vindicator VND-4L.mtf	
@@ -6,7 +6,7 @@ mul id:3429
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Vindicator VND-5L.mtf b/megamek/data/mechfiles/mechs/3050U/Vindicator VND-5L.mtf
index 79dddac9e83..32128ce2b28 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vindicator VND-5L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vindicator VND-5L.mtf	
@@ -6,7 +6,7 @@ mul id:3430
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Vindicator VND-6L.mtf b/megamek/data/mechfiles/mechs/3050U/Vindicator VND-6L.mtf
index cfcd37e19e0..353c8c054e9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vindicator VND-6L.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vindicator VND-6L.mtf	
@@ -6,7 +6,7 @@ mul id:3431
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulcan VT-5M.mtf b/megamek/data/mechfiles/mechs/3050U/Vulcan VT-5M.mtf
index daaaea04a97..2b1aa17448a 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulcan VT-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulcan VT-5M.mtf	
@@ -6,7 +6,7 @@ mul id:3461
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulcan VT-5S.mtf b/megamek/data/mechfiles/mechs/3050U/Vulcan VT-5S.mtf
index 69e4b1e1976..212fd872f72 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulcan VT-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulcan VT-5S.mtf	
@@ -6,7 +6,7 @@ mul id:3462
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulcan VT-6C.mtf b/megamek/data/mechfiles/mechs/3050U/Vulcan VT-6C.mtf
index 9cceceff38e..cd86cef360c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulcan VT-6C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulcan VT-6C.mtf	
@@ -6,7 +6,7 @@ mul id:3464
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulcan VT-6M.mtf b/megamek/data/mechfiles/mechs/3050U/Vulcan VT-6M.mtf
index c1c7c629cd5..82fb2b916a3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulcan VT-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulcan VT-6M.mtf	
@@ -6,7 +6,7 @@ mul id:3465
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) A.mtf b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) A.mtf
index 07e5ee063fe..44fc21f5af9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) A.mtf	
@@ -6,7 +6,7 @@ mul id:3466
 Config:Biped Omnimech
 TechBase:Clan
 Era:2963
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) B.mtf b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) B.mtf
index 2e67560c69c..24297cd7b20 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) B.mtf	
@@ -6,7 +6,7 @@ mul id:3467
 Config:Biped Omnimech
 TechBase:Clan
 Era:2963
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) C.mtf b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) C.mtf
index 41849dcad21..930bc7d9637 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) C.mtf	
@@ -6,7 +6,7 @@ mul id:3468
 Config:Biped Omnimech
 TechBase:Clan
 Era:2963
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) D.mtf b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) D.mtf
index 1ed3cd2b2fd..d94e13b09ed 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) D.mtf	
@@ -6,7 +6,7 @@ mul id:3469
 Config:Biped Omnimech
 TechBase:Clan
 Era:3054
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) E.mtf b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) E.mtf
index c28d4a3f41b..6cf819a42bc 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) E.mtf	
@@ -6,7 +6,7 @@ mul id:3470
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) F.mtf b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) F.mtf
index 32a4833d076..18e53c68bd5 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) F.mtf	
@@ -6,7 +6,7 @@ mul id:3471
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) H.mtf b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) H.mtf
index 729f9fccd69..7bbe0eb539e 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) H.mtf	
@@ -6,7 +6,7 @@ mul id:3472
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) Prime.mtf b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) Prime.mtf
index 863de15d45e..8a147da5d55 100644
--- a/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Vulture (Mad Dog) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:3473
 Config:Biped Omnimech
 techbase:Clan
 era:2963
-source:TRO 3050 - Succession Wars
+source:TRO: 3050 - Succession Wars
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-1H.mtf b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-1H.mtf
index ae450aa7bc2..bd0636bd0e3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-1H.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-1H.mtf	
@@ -6,7 +6,7 @@ mul id:3539
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-2.mtf b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-2.mtf
index 3b268807a37..df22a5e9dee 100644
--- a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-2.mtf	
@@ -6,7 +6,7 @@ mul id:3541
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-2A.mtf b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-2A.mtf
index 9d85e94f8a3..05364332360 100644
--- a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-2A.mtf	
@@ -6,7 +6,7 @@ mul id:3542
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-3.mtf b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-3.mtf
index a87f54ec061..caf14eb907f 100644
--- a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-3.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-3.mtf	
@@ -6,7 +6,7 @@ mul id:3543
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-K.mtf b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-K.mtf
index 4549e4756d8..c5a41b139b4 100644
--- a/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-K.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Whitworth WTH-K.mtf	
@@ -6,7 +6,7 @@ mul id:3545
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-1.mtf b/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-1.mtf
index e1a7191cf05..f93a6599eab 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-1.mtf	
@@ -6,7 +6,7 @@ mul id:3554
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-2.mtf b/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-2.mtf
index 3c0a205ba26..5740d68e898 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-2.mtf	
@@ -6,7 +6,7 @@ mul id:3556
 Config:Biped
 techbase:Inner Sphere
 era:3071
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-B.mtf b/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-B.mtf
index bd89d04b0fb..e8f416a42b3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-B.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-B.mtf	
@@ -6,7 +6,7 @@ mul id:3558
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-C.mtf b/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-C.mtf
index 819d4f95375..7ed46c492d6 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolf Trap (Tora) WFT-C.mtf	
@@ -6,7 +6,7 @@ mul id:3559
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolfhound IIC.mtf b/megamek/data/mechfiles/mechs/3050U/Wolfhound IIC.mtf
index 8626e82e784..41ce06d13e0 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolfhound IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolfhound IIC.mtf	
@@ -5,7 +5,7 @@ mul id:3570
 Config:Biped
 techbase:Clan
 era:3051
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-1 (Allard).mtf b/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-1 (Allard).mtf
index 663afdec6fb..5c16514cacd 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-1 (Allard).mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-1 (Allard).mtf	
@@ -6,7 +6,7 @@ mul id:5416
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-2.mtf b/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-2.mtf
index 613d30be8b5..1944b0702d3 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-2.mtf	
@@ -6,7 +6,7 @@ mul id:3563
 Config:Biped
 techbase:Inner Sphere
 era:3052
-source:TRO 3050 - Clan Invasion
+source:TRO: 3050 - Clan Invasion
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-3S.mtf b/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-3S.mtf
index 713920dba26..1f8e9512fe8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-3S.mtf	
@@ -6,7 +6,7 @@ mul id:3566
 Config:Biped
 techbase:Inner Sphere
 era:3064
-source:TRO 3050 - Civil War
+source:TRO: 3050 - Civil War
 rules level:2	
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-4W.mtf b/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-4W.mtf
index 02e026c7e4c..3359e3aca28 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-4W.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wolfhound WLF-4W.mtf	
@@ -6,7 +6,7 @@ mul id:3567
 Config:Biped
 techbase:Inner Sphere
 era:3069
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-10N.mtf b/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-10N.mtf
index 8fe68f56f80..bf7a3cbc1e8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-10N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-10N.mtf	
@@ -6,7 +6,7 @@ mul id:3596
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-5N.mtf b/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-5N.mtf
index 0a98aeee209..7832758fbc9 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-5N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-5N.mtf	
@@ -6,7 +6,7 @@ mul id:3597
 Config:Biped
 TechBase:Inner Sphere
 Era:2660
-Source:TRO 3050 - Star League
+Source:TRO: 3050 - Star League
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-9N.mtf b/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-9N.mtf
index 9257488e449..fd968ca90a1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-9N.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Wyvern WVE-9N.mtf	
@@ -6,7 +6,7 @@ mul id:3600
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3050U/Zeus X ZEU-9WD.mtf b/megamek/data/mechfiles/mechs/3050U/Zeus X ZEU-9WD.mtf
index c82f611bbfd..e2ea77c4181 100644
--- a/megamek/data/mechfiles/mechs/3050U/Zeus X ZEU-9WD.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Zeus X ZEU-9WD.mtf	
@@ -6,7 +6,7 @@ mul id:3646
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3050U - Civil War
+Source:TRO: 3050U - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-10WB.mtf b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-10WB.mtf
index a28bf5efab9..d8014caf3b8 100644
--- a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-10WB.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-10WB.mtf	
@@ -6,7 +6,7 @@ mul id:3639
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3050 - Jihad
+Source:TRO: 3050 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S-DC.mtf b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S-DC.mtf
index 54fed5031b7..e0a142a4957 100644
--- a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S-DC.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S-DC.mtf	
@@ -6,7 +6,7 @@ mul id:5438
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S.mtf b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S.mtf
index d8fc8104f59..0281bfe3f67 100644
--- a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S.mtf	
@@ -6,7 +6,7 @@ mul id:3644
 Config:Biped
 TechBase:Inner Sphere
 Era:3048
-Source:TRO 3050 - Succession Wars
+Source:TRO: 3050 - Succession Wars
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S2.mtf b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S2.mtf
index 9e3c362d05e..6480d8971d1 100644
--- a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S2.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9S2.mtf	
@@ -6,7 +6,7 @@ mul id:5459
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3050 - Clan Invasion
+Source:TRO: 3050 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9T.mtf b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9T.mtf
index 2361edc62a0..6a90ecdaa5c 100644
--- a/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9T.mtf	
+++ b/megamek/data/mechfiles/mechs/3050U/Zeus ZEU-9T.mtf	
@@ -6,7 +6,7 @@ mul id:3645
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3050 - Civil War
+Source:TRO: 3050 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Albatross ALB-3U.mtf b/megamek/data/mechfiles/mechs/3055U/Albatross ALB-3U.mtf
index a1f9e85c5f5..4a0fc335bf5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Albatross ALB-3U.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Albatross ALB-3U.mtf	
@@ -6,7 +6,7 @@ mul id:27
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Albatross ALB-4U.mtf b/megamek/data/mechfiles/mechs/3055U/Albatross ALB-4U.mtf
index 8aa8e4f1264..ec9fe6565b6 100644
--- a/megamek/data/mechfiles/mechs/3055U/Albatross ALB-4U.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Albatross ALB-4U.mtf	
@@ -6,7 +6,7 @@ mul id:29
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-3M.mtf b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-3M.mtf
index 3f95838f9db..a1caf8f095e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-3M.mtf	
@@ -6,7 +6,7 @@ mul id:48
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-3R.mtf b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-3R.mtf
index 2e70d752282..50e4cf9746c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-3R.mtf	
@@ -6,7 +6,7 @@ mul id:49
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-5M.mtf b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-5M.mtf
index dfa4444388a..c97a4691012 100644
--- a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-5M.mtf	
@@ -6,7 +6,7 @@ mul id:50
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-5Q.mtf b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-5Q.mtf
index 7fe732a3e29..e761aeae8e9 100644
--- a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-5Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-5Q.mtf	
@@ -6,7 +6,7 @@ mul id:51
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-6M.mtf b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-6M.mtf
index 14d73644655..fb977b1c36b 100644
--- a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-6M.mtf	
@@ -6,7 +6,7 @@ mul id:52
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-8M.mtf b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-8M.mtf
index 5f7622db5bc..314c5cd2f41 100644
--- a/megamek/data/mechfiles/mechs/3055U/Anvil ANV-8M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Anvil ANV-8M.mtf	
@@ -6,7 +6,7 @@ mul id:53
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Apollo APL-1M.mtf b/megamek/data/mechfiles/mechs/3055U/Apollo APL-1M.mtf
index 5fde2d2754a..69ae2c7d7fe 100644
--- a/megamek/data/mechfiles/mechs/3055U/Apollo APL-1M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Apollo APL-1M.mtf	
@@ -6,7 +6,7 @@ mul id:54
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Apollo APL-1R.mtf b/megamek/data/mechfiles/mechs/3055U/Apollo APL-1R.mtf
index 252488235cd..78d60191412 100644
--- a/megamek/data/mechfiles/mechs/3055U/Apollo APL-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Apollo APL-1R.mtf	
@@ -6,7 +6,7 @@ mul id:55
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Apollo APL-2S.mtf b/megamek/data/mechfiles/mechs/3055U/Apollo APL-2S.mtf
index 4e5cf5ee91d..11ae8823cbe 100644
--- a/megamek/data/mechfiles/mechs/3055U/Apollo APL-2S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Apollo APL-2S.mtf	
@@ -6,7 +6,7 @@ mul id:56
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Apollo APL-3T.mtf b/megamek/data/mechfiles/mechs/3055U/Apollo APL-3T.mtf
index 934a7208f8f..788751be605 100644
--- a/megamek/data/mechfiles/mechs/3055U/Apollo APL-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Apollo APL-3T.mtf	
@@ -6,7 +6,7 @@ mul id:57
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Aquagladius AQS-3.mtf b/megamek/data/mechfiles/mechs/3055U/Aquagladius AQS-3.mtf
index 4f1b00942be..3e55d7f5d92 100644
--- a/megamek/data/mechfiles/mechs/3055U/Aquagladius AQS-3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Aquagladius AQS-3.mtf	
@@ -6,7 +6,7 @@ mul id:58
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Aquagladius AQS-4.mtf b/megamek/data/mechfiles/mechs/3055U/Aquagladius AQS-4.mtf
index fd9a0c92db5..eeb52404181 100644
--- a/megamek/data/mechfiles/mechs/3055U/Aquagladius AQS-4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Aquagladius AQS-4.mtf	
@@ -6,7 +6,7 @@ mul id:59
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Baboon (Howler) 2.mtf b/megamek/data/mechfiles/mechs/3055U/Baboon (Howler) 2.mtf
index 8b13abffbf3..0da582b5d86 100644
--- a/megamek/data/mechfiles/mechs/3055U/Baboon (Howler) 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Baboon (Howler) 2.mtf	
@@ -6,7 +6,7 @@ mul id:190
 Config:Biped
 TechBase:Clan
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3055U/Baboon (Howler) 3.mtf b/megamek/data/mechfiles/mechs/3055U/Baboon (Howler) 3.mtf
index 7fb66374af9..deb9bcea0b8 100644
--- a/megamek/data/mechfiles/mechs/3055U/Baboon (Howler) 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Baboon (Howler) 3.mtf	
@@ -6,7 +6,7 @@ mul id:191
 Config:Biped
 TechBase:Clan
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3055U/Baboon (Howler).mtf b/megamek/data/mechfiles/mechs/3055U/Baboon (Howler).mtf
index fae78c1ed68..5ce936c53c4 100644
--- a/megamek/data/mechfiles/mechs/3055U/Baboon (Howler).mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Baboon (Howler).mtf	
@@ -5,7 +5,7 @@ mul id:189
 Config:Biped
 techbase:Clan
 era:2871
-source:TRO 3055 - Succession Wars
+source:TRO: 3055 - Succession Wars
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/3055U/Bandersnatch BNDR-01A.mtf b/megamek/data/mechfiles/mechs/3055U/Bandersnatch BNDR-01A.mtf
index cbf9ff647ac..b71c448447e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Bandersnatch BNDR-01A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Bandersnatch BNDR-01A.mtf	
@@ -6,7 +6,7 @@ mul id:217
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Bandersnatch BNDR-01B.mtf b/megamek/data/mechfiles/mechs/3055U/Bandersnatch BNDR-01B.mtf
index 9df080a04a1..1dd0f6c6bb5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Bandersnatch BNDR-01B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Bandersnatch BNDR-01B.mtf	
@@ -6,7 +6,7 @@ mul id:219
 Config:Biped
 techbase:Inner Sphere
 era:3065
-source:TRO 3055 - Civil War
+source:TRO: 3055 - Civil War
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Battle Hawk BH-K305.mtf b/megamek/data/mechfiles/mechs/3055U/Battle Hawk BH-K305.mtf
index 953d67b17d0..bf06a3b2d69 100644
--- a/megamek/data/mechfiles/mechs/3055U/Battle Hawk BH-K305.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Battle Hawk BH-K305.mtf	
@@ -6,7 +6,7 @@ mul id:275
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Battle Hawk BH-K306.mtf b/megamek/data/mechfiles/mechs/3055U/Battle Hawk BH-K306.mtf
index c1266a12fc1..7130d48f057 100644
--- a/megamek/data/mechfiles/mechs/3055U/Battle Hawk BH-K306.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Battle Hawk BH-K306.mtf	
@@ -6,7 +6,7 @@ mul id:276
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 2.mtf b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 2.mtf
index ef1bba406f3..53df4f08141 100644
--- a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 2.mtf	
@@ -6,7 +6,7 @@ mul id:319
 Config:Biped
 TechBase:Clan
 Era:3061
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 3.mtf b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 3.mtf
index a334fbb65cc..d32de8ea74b 100644
--- a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 3.mtf	
@@ -6,7 +6,7 @@ mul id:320
 Config:Biped
 TechBase:Clan
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 4.mtf b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 4.mtf
index 1b710a3293e..5a4ffa33ab2 100644
--- a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 4.mtf	
@@ -6,7 +6,7 @@ mul id:3814
 Config:Biped
 TechBase:Clan
 Era:2846
-Source:TRO 3055 - Succession Wars
+Source:TRO: 3055 - Succession Wars
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 5.mtf b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 5.mtf
index 6d00bb6f099..5b361fcce84 100644
--- a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 5.mtf	
@@ -5,7 +5,7 @@ mul id:3815
 Config:Biped
 techbase:Clan
 era:2846
-source:TRO 3055 - Succession Wars
+source:TRO: 3055 - Succession Wars
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 6.mtf b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 6.mtf
index bf871755262..1836088ef71 100644
--- a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino) 6.mtf	
@@ -5,7 +5,7 @@ mul id:3816
 Config:Biped
 techbase:Clan
 era:2999
-source:TRO 3055 - Succession Wars
+source:TRO: 3055 - Succession Wars
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino).mtf b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino).mtf
index 6cae5bbdcc0..a0e524b96bd 100644
--- a/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino).mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Behemoth (Stone Rhino).mtf	
@@ -6,7 +6,7 @@ mul id:318
 Config:Biped
 techbase:Clan
 era:2847
-source:TRO 3055 - Succession Wars
+source:TRO: 3055 - Succession Wars
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-A3.mtf b/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-A3.mtf
index d26942f814d..5f4bb304973 100644
--- a/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-A3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-A3.mtf	
@@ -6,7 +6,7 @@ mul id:329
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-B3.mtf b/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-B3.mtf
index 2c9256c97a9..d5ce9340bb2 100644
--- a/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-B3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-B3.mtf	
@@ -6,7 +6,7 @@ mul id:330
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-C3.mtf b/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-C3.mtf
index 547202d239c..0dce1ec94ca 100644
--- a/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-C3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Berserker BRZ-C3.mtf	
@@ -6,7 +6,7 @@ mul id:331
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Bombard BMB-010.mtf b/megamek/data/mechfiles/mechs/3055U/Bombard BMB-010.mtf
index ee051a60ef7..0e684b61c28 100644
--- a/megamek/data/mechfiles/mechs/3055U/Bombard BMB-010.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Bombard BMB-010.mtf	
@@ -6,7 +6,7 @@ mul id:418
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Bombard BMB-013.mtf b/megamek/data/mechfiles/mechs/3055U/Bombard BMB-013.mtf
index 6d4537f9c18..88779dd4ae5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Bombard BMB-013.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Bombard BMB-013.mtf	
@@ -6,7 +6,7 @@ mul id:419
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Bombard BMB-1X.mtf b/megamek/data/mechfiles/mechs/3055U/Bombard BMB-1X.mtf
index e12954f9662..a7e11d362b0 100644
--- a/megamek/data/mechfiles/mechs/3055U/Bombard BMB-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Bombard BMB-1X.mtf	
@@ -6,7 +6,7 @@ mul id:420
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Cerberus MR-5M.mtf b/megamek/data/mechfiles/mechs/3055U/Cerberus MR-5M.mtf
index 2cf00a14734..c2fd60bf9ab 100644
--- a/megamek/data/mechfiles/mechs/3055U/Cerberus MR-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Cerberus MR-5M.mtf	
@@ -6,7 +6,7 @@ mul id:526
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Cerberus MR-6B.mtf b/megamek/data/mechfiles/mechs/3055U/Cerberus MR-6B.mtf
index 23f008a1061..cba9a1f60e7 100644
--- a/megamek/data/mechfiles/mechs/3055U/Cerberus MR-6B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Cerberus MR-6B.mtf	
@@ -6,7 +6,7 @@ mul id:527
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Cerberus MR-V2.mtf b/megamek/data/mechfiles/mechs/3055U/Cerberus MR-V2.mtf
index dd09368097f..3c8a302eb49 100644
--- a/megamek/data/mechfiles/mechs/3055U/Cerberus MR-V2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Cerberus MR-V2.mtf	
@@ -6,7 +6,7 @@ mul id:528
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Cerberus MR-V3.mtf b/megamek/data/mechfiles/mechs/3055U/Cerberus MR-V3.mtf
index 68699442bff..cd073da68e2 100644
--- a/megamek/data/mechfiles/mechs/3055U/Cerberus MR-V3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Cerberus MR-V3.mtf	
@@ -6,7 +6,7 @@ mul id:529
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Colossus CL-P3.mtf b/megamek/data/mechfiles/mechs/3055U/Colossus CL-P3.mtf
index 84c0ddd6393..f98979a79b5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Colossus CL-P3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Colossus CL-P3.mtf	
@@ -6,7 +6,7 @@ mul id:661
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:4
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Colossus CLS-4S.mtf b/megamek/data/mechfiles/mechs/3055U/Colossus CLS-4S.mtf
index 835980628e3..1a7fdd0e42d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Colossus CLS-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Colossus CLS-4S.mtf	
@@ -6,7 +6,7 @@ mul id:662
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Colossus CLS-5S.mtf b/megamek/data/mechfiles/mechs/3055U/Colossus CLS-5S.mtf
index ce89a8a7cb0..216b725affe 100644
--- a/megamek/data/mechfiles/mechs/3055U/Colossus CLS-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Colossus CLS-5S.mtf	
@@ -6,7 +6,7 @@ mul id:663
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-002.mtf b/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-002.mtf
index ae55f7b51bb..1f102c35169 100644
--- a/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-002.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-002.mtf	
@@ -6,7 +6,7 @@ mul id:690
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-003.mtf b/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-003.mtf
index fedf832df3b..5043d94e74f 100644
--- a/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-003.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-003.mtf	
@@ -6,7 +6,7 @@ mul id:691
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-004.mtf b/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-004.mtf
index 71036460510..1d31a1b3122 100644
--- a/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-004.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Copperhead CPR-HD-004.mtf	
@@ -6,7 +6,7 @@ mul id:692
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-1B.mtf b/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-1B.mtf
index 3abb1ac0612..020a0fb0d5d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-1B.mtf	
@@ -6,7 +6,7 @@ mul id:766
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-2A.mtf b/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-2A.mtf
index 9d8f301809b..134a001b840 100644
--- a/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-2A.mtf	
@@ -6,7 +6,7 @@ mul id:767
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-2B.mtf b/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-2B.mtf
index 7c78fd3bf53..ffa3dd28ecf 100644
--- a/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Cudgel CDG-2B.mtf	
@@ -6,7 +6,7 @@ mul id:768
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-3C.mtf b/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-3C.mtf
index a3cb1c07281..3048bc0fc08 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-3C.mtf	
@@ -6,7 +6,7 @@ mul id:789
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-3D.mtf b/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-3D.mtf
index 233afb152f6..42bedb4bf5e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-3D.mtf	
@@ -6,7 +6,7 @@ mul id:790
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-4A.mtf b/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-4A.mtf
index 27a90c49e43..5dd5808916b 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-4A.mtf	
@@ -6,7 +6,7 @@ mul id:791
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-4B.mtf b/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-4B.mtf
index df9d629233f..7397c848ae2 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-4B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daedalus DAD-4B.mtf	
@@ -6,7 +6,7 @@ mul id:792
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-01.mtf b/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-01.mtf
index 95b3c28343a..6e3d064e29f 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-01.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-01.mtf	
@@ -6,7 +6,7 @@ mul id:797
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-02.mtf b/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-02.mtf
index b769c2263d0..6bb76c2012f 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-02.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-02.mtf	
@@ -6,7 +6,7 @@ mul id:800
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-03.mtf b/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-03.mtf
index 7a73eef3ad5..2576a212059 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-03.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daikyu DAI-03.mtf	
@@ -6,7 +6,7 @@ mul id:801
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-1K.mtf b/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-1K.mtf
index 7b790c59194..44b7d9aa0ab 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-1K.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-1K.mtf	
@@ -6,7 +6,7 @@ mul id:802
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-2K.mtf b/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-2K.mtf
index c28e5ff0fc4..8d2d6420b29 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-2K.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-2K.mtf	
@@ -6,7 +6,7 @@ mul id:804
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-4K.mtf b/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-4K.mtf
index b085acff30c..8de0d876f7f 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-4K.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-4K.mtf	
@@ -6,7 +6,7 @@ mul id:805
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-5K.mtf b/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-5K.mtf
index f1378ecfa55..535016c89ce 100644
--- a/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-5K.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Daimyo DMO-5K.mtf	
@@ -6,7 +6,7 @@ mul id:806
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Dart DRT-3S.mtf b/megamek/data/mechfiles/mechs/3055U/Dart DRT-3S.mtf
index d8a402164af..c1540a7c7f9 100644
--- a/megamek/data/mechfiles/mechs/3055U/Dart DRT-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Dart DRT-3S.mtf	
@@ -6,7 +6,7 @@ mul id:828
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Dart DRT-4S.mtf b/megamek/data/mechfiles/mechs/3055U/Dart DRT-4S.mtf
index 394ea618303..245e2641338 100644
--- a/megamek/data/mechfiles/mechs/3055U/Dart DRT-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Dart DRT-4S.mtf	
@@ -6,7 +6,7 @@ mul id:829
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:1
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Dart DRT-6S.mtf b/megamek/data/mechfiles/mechs/3055U/Dart DRT-6S.mtf
index 9850b5d6d9f..c8c11788bf9 100644
--- a/megamek/data/mechfiles/mechs/3055U/Dart DRT-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Dart DRT-6S.mtf	
@@ -6,7 +6,7 @@ mul id:830
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Falconer FLC-8R.mtf b/megamek/data/mechfiles/mechs/3055U/Falconer FLC-8R.mtf
index 023535c5f5d..d79ee742909 100644
--- a/megamek/data/mechfiles/mechs/3055U/Falconer FLC-8R.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Falconer FLC-8R.mtf	
@@ -6,7 +6,7 @@ mul id:1033
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Fireball ALM-7D.mtf b/megamek/data/mechfiles/mechs/3055U/Fireball ALM-7D.mtf
index 023ec7b4423..1ec2228d308 100644
--- a/megamek/data/mechfiles/mechs/3055U/Fireball ALM-7D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Fireball ALM-7D.mtf	
@@ -6,7 +6,7 @@ mul id:1075
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3055U/Fireball ALM-8D.mtf b/megamek/data/mechfiles/mechs/3055U/Fireball ALM-8D.mtf
index 32ca9f5cc3a..6a668c6c641 100644
--- a/megamek/data/mechfiles/mechs/3055U/Fireball ALM-8D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Fireball ALM-8D.mtf	
@@ -6,7 +6,7 @@ mul id:1076
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3055U/Fireball ALM-9D.mtf b/megamek/data/mechfiles/mechs/3055U/Fireball ALM-9D.mtf
index 45597978c33..de4519ffede 100644
--- a/megamek/data/mechfiles/mechs/3055U/Fireball ALM-9D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Fireball ALM-9D.mtf	
@@ -6,7 +6,7 @@ mul id:1077
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P2.mtf b/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P2.mtf
index e2c9043800f..861e95319d1 100644
--- a/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P2.mtf	
@@ -6,7 +6,7 @@ mul id:1120
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P4.mtf b/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P4.mtf
index dc786ee15fa..4d084784583 100644
--- a/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P4.mtf	
@@ -6,7 +6,7 @@ mul id:1121
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P5.mtf b/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P5.mtf
index 74ed958f1c3..31021bf5c52 100644
--- a/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P5.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Flashfire FLS-P5.mtf	
@@ -6,7 +6,7 @@ mul id:1122
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Galahad (Glass Spider) 3.mtf b/megamek/data/mechfiles/mechs/3055U/Galahad (Glass Spider) 3.mtf
index 6ffca82ca4d..9468debb37a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Galahad (Glass Spider) 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Galahad (Glass Spider) 3.mtf	
@@ -6,7 +6,7 @@ mul id:1172
 Config:Biped
 TechBase:Clan
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-1GLS.mtf b/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-1GLS.mtf
index 56b5d8ca0f3..9461c294969 100644
--- a/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-1GLS.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-1GLS.mtf	
@@ -6,7 +6,7 @@ mul id:1182
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-2GLS.mtf b/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-2GLS.mtf
index e7e672586fd..b25b7897f55 100644
--- a/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-2GLS.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-2GLS.mtf	
@@ -6,7 +6,7 @@ mul id:1183
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-3GLS.mtf b/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-3GLS.mtf
index 4d84fe0b938..2c73c21623d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-3GLS.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-3GLS.mtf	
@@ -6,7 +6,7 @@ mul id:1185
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-4GLS.mtf b/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-4GLS.mtf
index c8d0e7f7860..9b63a9ed750 100644
--- a/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-4GLS.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Gallowglas GAL-4GLS.mtf	
@@ -6,7 +6,7 @@ mul id:1186
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Gallowglas WD.mtf b/megamek/data/mechfiles/mechs/3055U/Gallowglas WD.mtf
index de7162f82a6..40a99953c88 100644
--- a/megamek/data/mechfiles/mechs/3055U/Gallowglas WD.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Gallowglas WD.mtf	
@@ -6,7 +6,7 @@ mul id:1188
 Config:Biped
 TechBase:Clan
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Goshawk (Vapor Eagle) 3.mtf b/megamek/data/mechfiles/mechs/3055U/Goshawk (Vapor Eagle) 3.mtf
index 4ba5c479cc5..e41c20519ca 100644
--- a/megamek/data/mechfiles/mechs/3055U/Goshawk (Vapor Eagle) 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Goshawk (Vapor Eagle) 3.mtf	
@@ -6,7 +6,7 @@ mul id:1245
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Goshawk (Vapor Eagle) 4.mtf b/megamek/data/mechfiles/mechs/3055U/Goshawk (Vapor Eagle) 4.mtf
index 04940c0e87d..b8f1fa44b11 100644
--- a/megamek/data/mechfiles/mechs/3055U/Goshawk (Vapor Eagle) 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Goshawk (Vapor Eagle) 4.mtf	
@@ -6,7 +6,7 @@ mul id:1246
 Config:Biped
 TechBase:Clan
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Grand Crusader GRN-D-01.mtf b/megamek/data/mechfiles/mechs/3055U/Grand Crusader GRN-D-01.mtf
index de426e02d8b..3f49385daa0 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grand Crusader GRN-D-01.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grand Crusader GRN-D-01.mtf	
@@ -6,7 +6,7 @@ mul id:1252
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Grand Crusader GRN-D-02.mtf b/megamek/data/mechfiles/mechs/3055U/Grand Crusader GRN-D-02.mtf
index d43fb84d1d8..0a54794fada 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grand Crusader GRN-D-02.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grand Crusader GRN-D-02.mtf	
@@ -6,7 +6,7 @@ mul id:1253
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Grand Crusader II GRN-D-03.mtf b/megamek/data/mechfiles/mechs/3055U/Grand Crusader II GRN-D-03.mtf
index ea230444f27..820d92d2d0b 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grand Crusader II GRN-D-03.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grand Crusader II GRN-D-03.mtf	
@@ -6,7 +6,7 @@ mul id:1254
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Grand Crusader II GRN-D-04.mtf b/megamek/data/mechfiles/mechs/3055U/Grand Crusader II GRN-D-04.mtf
index cd6aafbca98..46471c629a7 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grand Crusader II GRN-D-04.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grand Crusader II GRN-D-04.mtf	
@@ -6,7 +6,7 @@ mul id:1255
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Grand Titan T-IT-N10M.mtf b/megamek/data/mechfiles/mechs/3055U/Grand Titan T-IT-N10M.mtf
index bfeff81f36a..9dd4c63ab29 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grand Titan T-IT-N10M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grand Titan T-IT-N10M.mtf	
@@ -6,7 +6,7 @@ mul id:1265
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Grand Titan T-IT-N11M.mtf b/megamek/data/mechfiles/mechs/3055U/Grand Titan T-IT-N11M.mtf
index 96e48823ce2..16b59a2b315 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grand Titan T-IT-N11M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grand Titan T-IT-N11M.mtf	
@@ -6,7 +6,7 @@ mul id:1266
 Config:Biped
 techbase:Inner Sphere
 era:3058
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Great Turtle GTR-1.mtf b/megamek/data/mechfiles/mechs/3055U/Great Turtle GTR-1.mtf
index 595e54a93d4..328fc03f044 100644
--- a/megamek/data/mechfiles/mechs/3055U/Great Turtle GTR-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Great Turtle GTR-1.mtf	
@@ -6,7 +6,7 @@ mul id:1281
 Config:Quad
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Great Turtle GTR-2.mtf b/megamek/data/mechfiles/mechs/3055U/Great Turtle GTR-2.mtf
index b424cef3ce1..8b99c959b14 100644
--- a/megamek/data/mechfiles/mechs/3055U/Great Turtle GTR-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Great Turtle GTR-2.mtf	
@@ -6,7 +6,7 @@ mul id:1282
 Config:Quad
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR29.mtf b/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR29.mtf
index 561ab459c3a..9bc45ceb35c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR29.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR29.mtf	
@@ -6,7 +6,7 @@ mul id:1328
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR30.mtf b/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR30.mtf
index ee10c924f9b..42c694a0756 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR30.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR30.mtf	
@@ -6,7 +6,7 @@ mul id:1329
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR31.mtf b/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR31.mtf
index 348f94e4f62..5e55848db72 100644
--- a/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR31.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Grim Reaper GRM-R-PR31.mtf	
@@ -6,7 +6,7 @@ mul id:1330
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Gunslinger GUN-1ERD.mtf b/megamek/data/mechfiles/mechs/3055U/Gunslinger GUN-1ERD.mtf
index 3787b832b57..bd41d358d90 100644
--- a/megamek/data/mechfiles/mechs/3055U/Gunslinger GUN-1ERD.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Gunslinger GUN-1ERD.mtf	
@@ -5,7 +5,7 @@ mul id:1347
 Config:Biped
 techbase:Inner Sphere
 era:3053
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3055U/Gunslinger GUN-2ERD.mtf b/megamek/data/mechfiles/mechs/3055U/Gunslinger GUN-2ERD.mtf
index 99975925480..4bd47f9d997 100644
--- a/megamek/data/mechfiles/mechs/3055U/Gunslinger GUN-2ERD.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Gunslinger GUN-2ERD.mtf	
@@ -6,7 +6,7 @@ mul id:1349
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-3T.mtf b/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-3T.mtf
index aa734bbc4bc..c5184c8a08e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-3T.mtf	
@@ -6,7 +6,7 @@ mul id:1360
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-4T.mtf b/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-4T.mtf
index e1a42716334..1cc12ddacf3 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-4T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-4T.mtf	
@@ -6,7 +6,7 @@ mul id:1361
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-4U.mtf b/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-4U.mtf
index 674fb5e081c..8c71f452c6c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-4U.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-4U.mtf	
@@ -6,7 +6,7 @@ mul id:1362
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-6P.mtf b/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-6P.mtf
index 476cbd6fbb7..04ff5a7ef27 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-6P.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hachiwara HCA-6P.mtf	
@@ -6,7 +6,7 @@ mul id:1363
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3C.mtf b/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3C.mtf
index 028b3a260a4..1b3ac95ca97 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3C.mtf	
@@ -6,7 +6,7 @@ mul id:1365
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3M.mtf b/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3M.mtf
index 04fc30c913f..d857b5f5c98 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3M.mtf	
@@ -6,7 +6,7 @@ mul id:1366
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3P.mtf b/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3P.mtf
index 2e2375f910e..37580249fa5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3P.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3P.mtf	
@@ -6,7 +6,7 @@ mul id:1367
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3S.mtf b/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3S.mtf
index a6aa56a68ff..ccf4981e818 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hammer HMR-3S.mtf	
@@ -6,7 +6,7 @@ mul id:1368
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 2.mtf b/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 2.mtf
index cb71815f072..4c9c9102e63 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 2.mtf	
@@ -6,7 +6,7 @@ mul id:1474
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 3.mtf b/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 3.mtf
index 04d7048582d..1e61d473bf5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 3.mtf	
@@ -6,7 +6,7 @@ mul id:1475
 Config:Biped
 TechBase:Clan
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 4.mtf b/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 4.mtf
index a4359e8dfdc..a4d6effa48c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 4.mtf	
@@ -6,7 +6,7 @@ mul id:1476
 Config:Biped
 TechBase:Clan
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 5.mtf b/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 5.mtf
index e06e9fb80e7..a86ebe113e6 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hellhound (Conjurer) 5.mtf	
@@ -6,7 +6,7 @@ mul id:1477
 Config:Biped
 TechBase:Clan
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Hercules HRC-LS-9000.mtf b/megamek/data/mechfiles/mechs/3055U/Hercules HRC-LS-9000.mtf
index 8eb3581c8da..91f4b85a811 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hercules HRC-LS-9000.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hercules HRC-LS-9000.mtf	
@@ -6,7 +6,7 @@ mul id:1482
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Hercules HRC-LS-9001.mtf b/megamek/data/mechfiles/mechs/3055U/Hercules HRC-LS-9001.mtf
index 24523611aac..53a6cb4d183 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hercules HRC-LS-9001.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hercules HRC-LS-9001.mtf	
@@ -6,7 +6,7 @@ mul id:1484
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Hitman HM-1.mtf b/megamek/data/mechfiles/mechs/3055U/Hitman HM-1.mtf
index 08ccf42a261..967fa061abb 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hitman HM-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hitman HM-1.mtf	
@@ -6,7 +6,7 @@ mul id:1533
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Hitman HM-2.mtf b/megamek/data/mechfiles/mechs/3055U/Hitman HM-2.mtf
index e8ccb20dd9c..66f03103f21 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hitman HM-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hitman HM-2.mtf	
@@ -6,7 +6,7 @@ mul id:1535
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Hollander BZK-F3.mtf b/megamek/data/mechfiles/mechs/3055U/Hollander BZK-F3.mtf
index b7ee2b72718..dce3332f9a8 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hollander BZK-F3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hollander BZK-F3.mtf	
@@ -6,7 +6,7 @@ mul id:1536
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Hollander BZK-G1.mtf b/megamek/data/mechfiles/mechs/3055U/Hollander BZK-G1.mtf
index 1b2af616920..b1908c09c3c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hollander BZK-G1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hollander BZK-G1.mtf	
@@ -6,7 +6,7 @@ mul id:1537
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Hollander II BZK-F5.mtf b/megamek/data/mechfiles/mechs/3055U/Hollander II BZK-F5.mtf
index 3d8f7fa634e..a2467912554 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hollander II BZK-F5.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hollander II BZK-F5.mtf	
@@ -6,7 +6,7 @@ mul id:1538
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Hollander II BZK-F7.mtf b/megamek/data/mechfiles/mechs/3055U/Hollander II BZK-F7.mtf
index bb12a63c94f..80cc999ef93 100644
--- a/megamek/data/mechfiles/mechs/3055U/Hollander II BZK-F7.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Hollander II BZK-F7.mtf	
@@ -6,7 +6,7 @@ mul id:1539
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4L.mtf b/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4L.mtf
index 56334b237c5..6bb1aa0d5ed 100644
--- a/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4L.mtf	
@@ -6,7 +6,7 @@ mul id:1580
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4M.mtf b/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4M.mtf
index ff76b0decfc..2406620f0b5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4M.mtf	
@@ -6,7 +6,7 @@ mul id:1581
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4N.mtf b/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4N.mtf
index a3a85a56c36..5492d8049ed 100644
--- a/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4N.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4N.mtf	
@@ -6,7 +6,7 @@ mul id:1582
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4O.mtf b/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4O.mtf
index 2b5422d7727..ab801cd58dc 100644
--- a/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4O.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Huron Warrior HUR-WO-R4O.mtf	
@@ -6,7 +6,7 @@ mul id:1583
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Jackal JA-KL-1532.mtf b/megamek/data/mechfiles/mechs/3055U/Jackal JA-KL-1532.mtf
index 37aa2a30ae6..fe6e86cbd0d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Jackal JA-KL-1532.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Jackal JA-KL-1532.mtf	
@@ -6,7 +6,7 @@ mul id:1653
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Jackal JA-KL-55.mtf b/megamek/data/mechfiles/mechs/3055U/Jackal JA-KL-55.mtf
index 87b787fb1b4..4b660afef19 100644
--- a/megamek/data/mechfiles/mechs/3055U/Jackal JA-KL-55.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Jackal JA-KL-55.mtf	
@@ -6,7 +6,7 @@ mul id:1655
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Jenner IIC 4.mtf b/megamek/data/mechfiles/mechs/3055U/Jenner IIC 4.mtf
index 8e9b947b78c..b32d795ebea 100644
--- a/megamek/data/mechfiles/mechs/3055U/Jenner IIC 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Jenner IIC 4.mtf	
@@ -6,7 +6,7 @@ mul id:1701
 Config:Biped
 TechBase:Clan
 Era:3061
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T1.mtf b/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T1.mtf
index 1efd5d06880..c818737fa7a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T1.mtf	
@@ -6,7 +6,7 @@ mul id:1713
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T2.mtf b/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T2.mtf
index 165ea69cfcd..b91e210bb84 100644
--- a/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T2.mtf	
@@ -6,7 +6,7 @@ mul id:1714
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T3.mtf b/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T3.mtf
index 1010d4340d3..8863f6188d7 100644
--- a/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Juggernaut JG-R9T3.mtf	
@@ -6,7 +6,7 @@ mul id:1715
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2.mtf b/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2.mtf
index 4969d3997b7..0908b99e0f5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2.mtf	
@@ -6,7 +6,7 @@ mul id:1810
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2A.mtf b/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2A.mtf
index d9d2d49d4fb..74ac14d1f6b 100644
--- a/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2A.mtf	
@@ -6,7 +6,7 @@ mul id:1811
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2C.mtf b/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2C.mtf
index 0e246e8132f..ffafcd79bfd 100644
--- a/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Komodo KIM-2C.mtf	
@@ -6,7 +6,7 @@ mul id:1812
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Komodo KIM-3C.mtf b/megamek/data/mechfiles/mechs/3055U/Komodo KIM-3C.mtf
index 79e5170691f..66cb5f6c5e4 100644
--- a/megamek/data/mechfiles/mechs/3055U/Komodo KIM-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Komodo KIM-3C.mtf	
@@ -6,7 +6,7 @@ mul id:1813
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Koto KT-P2.mtf b/megamek/data/mechfiles/mechs/3055U/Koto KT-P2.mtf
index 8b7861c6a4d..08529132e40 100644
--- a/megamek/data/mechfiles/mechs/3055U/Koto KT-P2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Koto KT-P2.mtf	
@@ -6,7 +6,7 @@ mul id:1840
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Koto KTO-2A.mtf b/megamek/data/mechfiles/mechs/3055U/Koto KTO-2A.mtf
index 0834c3dff2a..6c19328c85a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Koto KTO-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Koto KTO-2A.mtf	
@@ -6,7 +6,7 @@ mul id:1837
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Koto KTO-3A.mtf b/megamek/data/mechfiles/mechs/3055U/Koto KTO-3A.mtf
index c9f74f36ea4..2f29e54748a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Koto KTO-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Koto KTO-3A.mtf	
@@ -6,7 +6,7 @@ mul id:1838
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Koto KTO-4A.mtf b/megamek/data/mechfiles/mechs/3055U/Koto KTO-4A.mtf
index 917fb4277f4..765618f258a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Koto KTO-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Koto KTO-4A.mtf	
@@ -6,7 +6,7 @@ mul id:1839
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Kraken (Bane) 4.mtf b/megamek/data/mechfiles/mechs/3055U/Kraken (Bane) 4.mtf
index 55d17d94507..29300590a81 100644
--- a/megamek/data/mechfiles/mechs/3055U/Kraken (Bane) 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Kraken (Bane) 4.mtf	
@@ -6,7 +6,7 @@ mul id:1844
 Config:Biped
 TechBase:Clan
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3055U/Linebacker A.mtf b/megamek/data/mechfiles/mechs/3055U/Linebacker A.mtf
index bf02f567c46..d4cb2af5d2e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Linebacker A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Linebacker A.mtf	
@@ -6,7 +6,7 @@ mul id:1886
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Linebacker B.mtf b/megamek/data/mechfiles/mechs/3055U/Linebacker B.mtf
index 6f7ffb7c764..21b046edefa 100644
--- a/megamek/data/mechfiles/mechs/3055U/Linebacker B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Linebacker B.mtf	
@@ -6,7 +6,7 @@ mul id:1887
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Linebacker C.mtf b/megamek/data/mechfiles/mechs/3055U/Linebacker C.mtf
index c9b2126ba0b..35d5296bd3f 100644
--- a/megamek/data/mechfiles/mechs/3055U/Linebacker C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Linebacker C.mtf	
@@ -6,7 +6,7 @@ mul id:1888
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Linebacker D.mtf b/megamek/data/mechfiles/mechs/3055U/Linebacker D.mtf
index 4b10f451b4d..743b1ed17b6 100644
--- a/megamek/data/mechfiles/mechs/3055U/Linebacker D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Linebacker D.mtf	
@@ -6,7 +6,7 @@ mul id:1889
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Linebacker E.mtf b/megamek/data/mechfiles/mechs/3055U/Linebacker E.mtf
index cad2f079190..b46014bb165 100644
--- a/megamek/data/mechfiles/mechs/3055U/Linebacker E.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Linebacker E.mtf	
@@ -6,7 +6,7 @@ mul id:1890
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Linebacker H.mtf b/megamek/data/mechfiles/mechs/3055U/Linebacker H.mtf
index 019c925a11e..b299fa11924 100644
--- a/megamek/data/mechfiles/mechs/3055U/Linebacker H.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Linebacker H.mtf	
@@ -6,7 +6,7 @@ mul id:1891
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Linebacker Prime.mtf b/megamek/data/mechfiles/mechs/3055U/Linebacker Prime.mtf
index ec8f537a8dd..c1f80089a58 100644
--- a/megamek/data/mechfiles/mechs/3055U/Linebacker Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Linebacker Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1892
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-1B.mtf b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-1B.mtf
index 69623f7a959..1c8053023ba 100644
--- a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-1B.mtf	
@@ -6,7 +6,7 @@ mul id:1946
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-2.mtf b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-2.mtf
index 073b0d4fc09..72fa54a0b85 100644
--- a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-2.mtf	
@@ -6,7 +6,7 @@ mul id:1947
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-3.mtf b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-3.mtf
index b992b4d0d3e..409da5f96d1 100644
--- a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-3.mtf	
@@ -6,7 +6,7 @@ mul id:1948
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-3C.mtf b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-3C.mtf
index c6daf376441..549b18ca734 100644
--- a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-3C.mtf	
@@ -6,7 +6,7 @@ mul id:1949
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-4.mtf b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-4.mtf
index ecf294ee4bf..f7580c02a16 100644
--- a/megamek/data/mechfiles/mechs/3055U/Longshot LNG-4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Longshot LNG-4.mtf	
@@ -6,7 +6,7 @@ mul id:1950
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-L.mtf b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-L.mtf
index 79bb72d6d16..9dcaefa22de 100644
--- a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-L.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-L.mtf	
@@ -6,7 +6,7 @@ mul id:2022
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-S.mtf b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-S.mtf
index d3e1f24d28b..d53f8a6658e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-S.mtf	
@@ -6,7 +6,7 @@ mul id:2023
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T.mtf b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T.mtf
index 17dce6167de..b9310a9e0fd 100644
--- a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T.mtf	
@@ -6,7 +6,7 @@ mul id:2024
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T2.mtf b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T2.mtf
index d7cd03e7d17..4ed781e993d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T2.mtf	
@@ -6,7 +6,7 @@ mul id:2025
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T3.mtf b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T3.mtf
index 1c5df643ae1..58012fde388 100644
--- a/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Mantis MTS-T3.mtf	
@@ -6,7 +6,7 @@ mul id:2026
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Mantis SA-MN.mtf b/megamek/data/mechfiles/mechs/3055U/Mantis SA-MN.mtf
index 77b08c2064b..cf57af597a4 100644
--- a/megamek/data/mechfiles/mechs/3055U/Mantis SA-MN.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Mantis SA-MN.mtf	
@@ -6,7 +6,7 @@ mul id:2027
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Morpheus MR-P1.mtf b/megamek/data/mechfiles/mechs/3055U/Morpheus MR-P1.mtf
index 3aae9bc9263..3906a4905a9 100644
--- a/megamek/data/mechfiles/mechs/3055U/Morpheus MR-P1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Morpheus MR-P1.mtf	
@@ -6,7 +6,7 @@ mul id:2225
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3S.mtf b/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3S.mtf
index 700fb1565c7..afe164dacd5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3S.mtf	
@@ -6,7 +6,7 @@ mul id:2226
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3T.mtf b/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3T.mtf
index 3a67a44980e..a045043675d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3T.mtf	
@@ -6,7 +6,7 @@ mul id:2227
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3W.mtf b/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3W.mtf
index 9f78d6ad5a3..484885bbde3 100644
--- a/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3W.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Morpheus MRP-3W.mtf	
@@ -6,7 +6,7 @@ mul id:2228
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Naga A.mtf b/megamek/data/mechfiles/mechs/3055U/Naga A.mtf
index a5ff6c17ce6..9a4432508ea 100644
--- a/megamek/data/mechfiles/mechs/3055U/Naga A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Naga A.mtf	
@@ -6,7 +6,7 @@ mul id:2247
 Config:Biped Omnimech
 TechBase:Clan
 Era:2869
-Source:TRO 3055 - Succession Wars
+Source:TRO: 3055 - Succession Wars
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Naga B.mtf b/megamek/data/mechfiles/mechs/3055U/Naga B.mtf
index 7b93efb80f8..aaf3dd1760c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Naga B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Naga B.mtf	
@@ -6,7 +6,7 @@ mul id:2248
 Config:Biped Omnimech
 TechBase:Clan
 Era:2869
-Source:TRO 3055 - Succession Wars
+Source:TRO: 3055 - Succession Wars
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Naga C.mtf b/megamek/data/mechfiles/mechs/3055U/Naga C.mtf
index b62f0889022..5656230cfb3 100644
--- a/megamek/data/mechfiles/mechs/3055U/Naga C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Naga C.mtf	
@@ -6,7 +6,7 @@ mul id:2249
 Config:Biped Omnimech
 TechBase:Clan
 Era:2869
-Source:TRO 3055 - Succession Wars
+Source:TRO: 3055 - Succession Wars
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Naga D.mtf b/megamek/data/mechfiles/mechs/3055U/Naga D.mtf
index 4bad8119c5d..6bfe5a32339 100644
--- a/megamek/data/mechfiles/mechs/3055U/Naga D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Naga D.mtf	
@@ -6,7 +6,7 @@ mul id:2250
 Config:Biped Omnimech
 TechBase:Clan
 Era:2869
-Source:TRO 3055 - Succession Wars
+Source:TRO: 3055 - Succession Wars
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Naga Prime.mtf b/megamek/data/mechfiles/mechs/3055U/Naga Prime.mtf
index 21aaeab73d9..ef7ef34518d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Naga Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Naga Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2251
 Config:Biped Omnimech
 TechBase:Clan
 Era:2945
-Source:TRO 3055 - Succession Wars
+Source:TRO: 3055 - Succession Wars
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3A.mtf b/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3A.mtf
index d2cea233b32..dbc5ff60cc7 100644
--- a/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3A.mtf	
@@ -6,7 +6,7 @@ mul id:2252
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3B.mtf b/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3B.mtf
index 01dfa32ebbc..b1be30e2297 100644
--- a/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3B.mtf	
@@ -6,7 +6,7 @@ mul id:2254
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3C.mtf b/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3C.mtf
index 347f8ec1a42..b82888eb342 100644
--- a/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Naginata NG-C3C.mtf	
@@ -6,7 +6,7 @@ mul id:2255
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3055U/Nexus II NXS2-A.mtf b/megamek/data/mechfiles/mechs/3055U/Nexus II NXS2-A.mtf
index c3ce6073d06..a2486060702 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nexus II NXS2-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nexus II NXS2-A.mtf	
@@ -6,7 +6,7 @@ mul id:2261
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Nexus II NXS2-B.mtf b/megamek/data/mechfiles/mechs/3055U/Nexus II NXS2-B.mtf
index fd73a9390fa..998092b10ad 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nexus II NXS2-B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nexus II NXS2-B.mtf	
@@ -6,7 +6,7 @@ mul id:2262
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Nexus NXS1-A.mtf b/megamek/data/mechfiles/mechs/3055U/Nexus NXS1-A.mtf
index 0e8903b177f..cb67274571d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nexus NXS1-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nexus NXS1-A.mtf	
@@ -6,7 +6,7 @@ mul id:2259
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Nexus NXS1-B.mtf b/megamek/data/mechfiles/mechs/3055U/Nexus NXS1-B.mtf
index 59a3f2cc740..2528a8e169a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nexus NXS1-B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nexus NXS1-B.mtf	
@@ -6,7 +6,7 @@ mul id:2260
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-4S.mtf b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-4S.mtf
index 097dd5f08cf..8350b45e28c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-4S.mtf	
@@ -5,7 +5,7 @@ mul id:2279
 Config:Biped
 techbase:Inner Sphere
 era:3053
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-4T.mtf b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-4T.mtf
index 3e4573c7c83..e353f3ab0ca 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-4T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-4T.mtf	
@@ -6,7 +6,7 @@ mul id:2280
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-5S.mtf b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-5S.mtf
index 2e9380df35c..3af6b0be877 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-5S.mtf	
@@ -6,7 +6,7 @@ mul id:2281
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-5T.mtf b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-5T.mtf
index e810780fa00..b5ae7ace760 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-5T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-5T.mtf	
@@ -6,7 +6,7 @@ mul id:2282
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-6S.mtf b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-6S.mtf
index 664ca701aa4..0ec1d7a05c7 100644
--- a/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Nightsky NGS-6S.mtf	
@@ -6,7 +6,7 @@ mul id:2283
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS.mtf b/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS.mtf
index 53b89c125a2..42f7c9c82b8 100644
--- a/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS.mtf	
@@ -6,7 +6,7 @@ mul id:2321
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS2.mtf b/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS2.mtf
index d9c06205611..1bcd85bd741 100644
--- a/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS2.mtf	
@@ -6,7 +6,7 @@ mul id:2322
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS3.mtf b/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS3.mtf
index fd21f40d258..dd1bf6fec0c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Onslaught SA-OS3.mtf	
@@ -6,7 +6,7 @@ mul id:2323
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Paladin PAL-1.mtf b/megamek/data/mechfiles/mechs/3055U/Paladin PAL-1.mtf
index 9a5ac38cfe2..0708b6953cc 100644
--- a/megamek/data/mechfiles/mechs/3055U/Paladin PAL-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Paladin PAL-1.mtf	
@@ -6,7 +6,7 @@ mul id:2408
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Paladin PAL-2.mtf b/megamek/data/mechfiles/mechs/3055U/Paladin PAL-2.mtf
index c98d745f418..d4f64357a34 100644
--- a/megamek/data/mechfiles/mechs/3055U/Paladin PAL-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Paladin PAL-2.mtf	
@@ -6,7 +6,7 @@ mul id:2409
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Paladin PAL-3.mtf b/megamek/data/mechfiles/mechs/3055U/Paladin PAL-3.mtf
index 673183d05fd..ca2a22b6aa3 100644
--- a/megamek/data/mechfiles/mechs/3055U/Paladin PAL-3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Paladin PAL-3.mtf	
@@ -6,7 +6,7 @@ mul id:2410
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-4D.mtf b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-4D.mtf
index f7033293683..812a2f82c54 100644
--- a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-4D.mtf	
@@ -5,7 +5,7 @@ mul id:2465
 Config:Biped
 techbase:Inner Sphere
 era:3053
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-4F.mtf b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-4F.mtf
index c0425301d51..789d307448d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-4F.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-4F.mtf	
@@ -6,7 +6,7 @@ mul id:2466
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6M.mtf b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6M.mtf
index 329f8199bd5..0125c97b1f2 100644
--- a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6M.mtf	
@@ -6,7 +6,7 @@ mul id:2467
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6S.mtf b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6S.mtf
index a55900d1f4e..fe6b3ca5804 100644
--- a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6S.mtf	
@@ -6,7 +6,7 @@ mul id:2468
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6T.mtf b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6T.mtf
index 565b1569287..6b80c7b2333 100644
--- a/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Penetrator PTR-6T.mtf	
@@ -6,7 +6,7 @@ mul id:2469
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Peregrine (Horned Owl) 4.mtf b/megamek/data/mechfiles/mechs/3055U/Peregrine (Horned Owl) 4.mtf
index d58647e6739..6b70334115e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Peregrine (Horned Owl) 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Peregrine (Horned Owl) 4.mtf	
@@ -6,7 +6,7 @@ mul id:2475
 Config:Biped
 TechBase:Clan
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Peregrine (Horned Owl) 5.mtf b/megamek/data/mechfiles/mechs/3055U/Peregrine (Horned Owl) 5.mtf
index 9c9d216d049..e3098cb458c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Peregrine (Horned Owl) 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Peregrine (Horned Owl) 5.mtf	
@@ -6,7 +6,7 @@ mul id:2476
 Config:Biped
 TechBase:Clan
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Phantom A.mtf b/megamek/data/mechfiles/mechs/3055U/Phantom A.mtf
index 73829bbfb6c..ab78172f8ad 100644
--- a/megamek/data/mechfiles/mechs/3055U/Phantom A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Phantom A.mtf	
@@ -6,7 +6,7 @@ mul id:2481
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Phantom B.mtf b/megamek/data/mechfiles/mechs/3055U/Phantom B.mtf
index efcfd580e61..f29c527e7ae 100644
--- a/megamek/data/mechfiles/mechs/3055U/Phantom B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Phantom B.mtf	
@@ -6,7 +6,7 @@ mul id:2482
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Phantom C.mtf b/megamek/data/mechfiles/mechs/3055U/Phantom C.mtf
index b7526d1f201..c56296cf95f 100644
--- a/megamek/data/mechfiles/mechs/3055U/Phantom C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Phantom C.mtf	
@@ -6,7 +6,7 @@ mul id:2483
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Phantom D.mtf b/megamek/data/mechfiles/mechs/3055U/Phantom D.mtf
index 9f8a1d305be..e1a604c1c74 100644
--- a/megamek/data/mechfiles/mechs/3055U/Phantom D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Phantom D.mtf	
@@ -6,7 +6,7 @@ mul id:2484
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Phantom E.mtf b/megamek/data/mechfiles/mechs/3055U/Phantom E.mtf
index 034c0c4a7ca..9a58e1b9c3e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Phantom E.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Phantom E.mtf	
@@ -6,7 +6,7 @@ mul id:2485
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Phantom H.mtf b/megamek/data/mechfiles/mechs/3055U/Phantom H.mtf
index 19f72d9aae9..f13bf1c0058 100644
--- a/megamek/data/mechfiles/mechs/3055U/Phantom H.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Phantom H.mtf	
@@ -6,7 +6,7 @@ mul id:2486
 Config:Biped Omnimech
 techbase:Clan
 era:3062
-source:TRO 3055 - Civil War
+source:TRO: 3055 - Civil War
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Phantom Prime.mtf b/megamek/data/mechfiles/mechs/3055U/Phantom Prime.mtf
index 2824f5bc542..a5ea4c5c369 100644
--- a/megamek/data/mechfiles/mechs/3055U/Phantom Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Phantom Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2487
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Porcupine PRC-1N.mtf b/megamek/data/mechfiles/mechs/3055U/Porcupine PRC-1N.mtf
index 4784e66d924..28fe90ee927 100644
--- a/megamek/data/mechfiles/mechs/3055U/Porcupine PRC-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Porcupine PRC-1N.mtf	
@@ -6,7 +6,7 @@ mul id:2555
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3055U/Porcupine PRC-2N.mtf b/megamek/data/mechfiles/mechs/3055U/Porcupine PRC-2N.mtf
index ad3505279d9..ba2a57e5536 100644
--- a/megamek/data/mechfiles/mechs/3055U/Porcupine PRC-2N.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Porcupine PRC-2N.mtf	
@@ -6,7 +6,7 @@ mul id:2556
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3055U/Pouncer A.mtf b/megamek/data/mechfiles/mechs/3055U/Pouncer A.mtf
index 089a8201386..eb885cf41fa 100644
--- a/megamek/data/mechfiles/mechs/3055U/Pouncer A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Pouncer A.mtf	
@@ -6,7 +6,7 @@ mul id:2557
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Pouncer B.mtf b/megamek/data/mechfiles/mechs/3055U/Pouncer B.mtf
index a76dfe899cf..5ece4a2a415 100644
--- a/megamek/data/mechfiles/mechs/3055U/Pouncer B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Pouncer B.mtf	
@@ -6,7 +6,7 @@ mul id:2558
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Pouncer C.mtf b/megamek/data/mechfiles/mechs/3055U/Pouncer C.mtf
index bf7cf8e7055..4df623c3a50 100644
--- a/megamek/data/mechfiles/mechs/3055U/Pouncer C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Pouncer C.mtf	
@@ -6,7 +6,7 @@ mul id:2559
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Pouncer D.mtf b/megamek/data/mechfiles/mechs/3055U/Pouncer D.mtf
index 4b5d574085d..877a7003f55 100644
--- a/megamek/data/mechfiles/mechs/3055U/Pouncer D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Pouncer D.mtf	
@@ -6,7 +6,7 @@ mul id:2560
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Pouncer E.mtf b/megamek/data/mechfiles/mechs/3055U/Pouncer E.mtf
index 8bcef614b23..b4298bd7b53 100644
--- a/megamek/data/mechfiles/mechs/3055U/Pouncer E.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Pouncer E.mtf	
@@ -6,7 +6,7 @@ mul id:2561
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Pouncer H.mtf b/megamek/data/mechfiles/mechs/3055U/Pouncer H.mtf
index 498de963800..7ab3e374acd 100644
--- a/megamek/data/mechfiles/mechs/3055U/Pouncer H.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Pouncer H.mtf	
@@ -6,7 +6,7 @@ mul id:2562
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Pouncer Prime.mtf b/megamek/data/mechfiles/mechs/3055U/Pouncer Prime.mtf
index c18d5baacdd..252c837bf31 100644
--- a/megamek/data/mechfiles/mechs/3055U/Pouncer Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Pouncer Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2563
 Config:Biped Omnimech
 TechBase:Clan
 Era:3050
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Prowler PWR-1X.mtf b/megamek/data/mechfiles/mechs/3055U/Prowler PWR-1X.mtf
index 9dedc7ef80e..db7498092af 100644
--- a/megamek/data/mechfiles/mechs/3055U/Prowler PWR-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Prowler PWR-1X.mtf	
@@ -6,7 +6,7 @@ mul id:2581
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Prowler PWR-1X1.mtf b/megamek/data/mechfiles/mechs/3055U/Prowler PWR-1X1.mtf
index 7a045ecd4dd..a0cf3edb794 100644
--- a/megamek/data/mechfiles/mechs/3055U/Prowler PWR-1X1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Prowler PWR-1X1.mtf	
@@ -6,7 +6,7 @@ mul id:2582
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-A.mtf b/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-A.mtf
index b23d339b1d7..dca35ee7fda 100644
--- a/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-A.mtf	
@@ -6,7 +6,7 @@ mul id:2628
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-B.mtf b/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-B.mtf
index 88bd001131c..867562ebed5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-B.mtf	
@@ -6,7 +6,7 @@ mul id:2629
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-C.mtf b/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-C.mtf
index f745e6bd7a0..cc151cc2572 100644
--- a/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Raijin II RJN-200-C.mtf	
@@ -6,7 +6,7 @@ mul id:2630
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Raijin RJN 101-A.mtf b/megamek/data/mechfiles/mechs/3055U/Raijin RJN 101-A.mtf
index a458a284a8f..549e54d7021 100644
--- a/megamek/data/mechfiles/mechs/3055U/Raijin RJN 101-A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Raijin RJN 101-A.mtf	
@@ -6,7 +6,7 @@ mul id:2626
 Config:Biped
 techbase:Inner Sphere
 era:3053
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-1A.mtf b/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-1A.mtf
index 9322121a330..7bf43044ff2 100644
--- a/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-1A.mtf	
@@ -6,7 +6,7 @@ mul id:2631
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-1B.mtf b/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-1B.mtf
index 076e4ad3dba..20afe85aa4e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-1B.mtf	
@@ -6,7 +6,7 @@ mul id:2633
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-2A.mtf b/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-2A.mtf
index 82c8c9402a2..335c2e08eed 100644
--- a/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Rakshasa MDG-2A.mtf	
@@ -6,7 +6,7 @@ mul id:2634
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Ronin SA-RN.mtf b/megamek/data/mechfiles/mechs/3055U/Ronin SA-RN.mtf
index 61907cd4599..1e6178f380c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Ronin SA-RN.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Ronin SA-RN.mtf	
@@ -6,7 +6,7 @@ mul id:2738
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Ronin SA-RN7.mtf b/megamek/data/mechfiles/mechs/3055U/Ronin SA-RN7.mtf
index 145cebbdf01..1e9fc723a2d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Ronin SA-RN7.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Ronin SA-RN7.mtf	
@@ -6,7 +6,7 @@ mul id:2739
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-5S.mtf b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-5S.mtf
index 0e5ce98e2cd..db57b4b054e 100644
--- a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-5S.mtf	
@@ -6,7 +6,7 @@ mul id:2782
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-5T.mtf b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-5T.mtf
index e22705f373f..0b7f894f9e7 100644
--- a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-5T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-5T.mtf	
@@ -6,7 +6,7 @@ mul id:2783
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-6S.mtf b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-6S.mtf
index 0fecf4ea9af..610805fd130 100644
--- a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-6S.mtf	
@@ -6,7 +6,7 @@ mul id:2784
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-6T.mtf b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-6T.mtf
index 40244bcc159..639a7dd50b6 100644
--- a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-6T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-6T.mtf	
@@ -6,7 +6,7 @@ mul id:2785
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-7S.mtf b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-7S.mtf
index 753f4a41be9..a4b7efd2cfc 100644
--- a/megamek/data/mechfiles/mechs/3055U/Salamander PPR-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Salamander PPR-7S.mtf	
@@ -6,7 +6,7 @@ mul id:2786
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-001.mtf b/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-001.mtf
index 03c62ab7a54..9e1b8ef0eb8 100644
--- a/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-001.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-001.mtf	
@@ -6,7 +6,7 @@ mul id:2798
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-002.mtf b/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-002.mtf
index 3baab883bae..a99e5388c38 100644
--- a/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-002.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-002.mtf	
@@ -6,7 +6,7 @@ mul id:2799
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-003.mtf b/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-003.mtf
index 115bcd3bb09..3236ae12308 100644
--- a/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-003.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Sasquatch SQS-TH-003.mtf	
@@ -6,7 +6,7 @@ mul id:2800
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3055 - Jihad
+Source:TRO: 3055 - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3055U/Scarabus SCB-9A.mtf b/megamek/data/mechfiles/mechs/3055U/Scarabus SCB-9A.mtf
index 3a05034f103..ea08aa02ba3 100644
--- a/megamek/data/mechfiles/mechs/3055U/Scarabus SCB-9A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Scarabus SCB-9A.mtf	
@@ -6,7 +6,7 @@ mul id:2813
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Scarabus SCB-9T.mtf b/megamek/data/mechfiles/mechs/3055U/Scarabus SCB-9T.mtf
index 5f4add72b6c..5028766735c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Scarabus SCB-9T.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Scarabus SCB-9T.mtf	
@@ -6,7 +6,7 @@ mul id:2814
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Silver Fox SVR-5X.mtf b/megamek/data/mechfiles/mechs/3055U/Silver Fox SVR-5X.mtf
index 924b25059eb..2d69b30f518 100644
--- a/megamek/data/mechfiles/mechs/3055U/Silver Fox SVR-5X.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Silver Fox SVR-5X.mtf	
@@ -6,7 +6,7 @@ mul id:2944
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Silver Fox SVR-5Y.mtf b/megamek/data/mechfiles/mechs/3055U/Silver Fox SVR-5Y.mtf
index f029b7a0072..0e9774b87fd 100644
--- a/megamek/data/mechfiles/mechs/3055U/Silver Fox SVR-5Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Silver Fox SVR-5Y.mtf	
@@ -6,7 +6,7 @@ mul id:2945
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Snake SNK-1V.mtf b/megamek/data/mechfiles/mechs/3055U/Snake SNK-1V.mtf
index 7def0b3e36d..61c0a7d1500 100644
--- a/megamek/data/mechfiles/mechs/3055U/Snake SNK-1V.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Snake SNK-1V.mtf	
@@ -6,7 +6,7 @@ mul id:2974
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Snake SNK-2B.mtf b/megamek/data/mechfiles/mechs/3055U/Snake SNK-2B.mtf
index a365976f1fb..8caa6d2cd9a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Snake SNK-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Snake SNK-2B.mtf	
@@ -6,7 +6,7 @@ mul id:2976
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Spatha SP1-X.mtf b/megamek/data/mechfiles/mechs/3055U/Spatha SP1-X.mtf
index 1de45682002..4490021d67a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Spatha SP1-X.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Spatha SP1-X.mtf	
@@ -6,7 +6,7 @@ mul id:2998
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3055U/Stealth STH-1D.mtf b/megamek/data/mechfiles/mechs/3055U/Stealth STH-1D.mtf
index f7b7d68fb80..bdabce66b52 100644
--- a/megamek/data/mechfiles/mechs/3055U/Stealth STH-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Stealth STH-1D.mtf	
@@ -6,7 +6,7 @@ mul id:3052
 Config:Biped
 techbase:Inner Sphere
 era:3054
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D.mtf b/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D.mtf
index b55127b9b9f..2e94559d979 100644
--- a/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D.mtf	
@@ -6,7 +6,7 @@ mul id:3054
 Config:Biped
 techbase:Inner Sphere
 era:3061
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D1.mtf b/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D1.mtf
index 761be45cfbe..8bd37ddde41 100644
--- a/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D1.mtf	
@@ -6,7 +6,7 @@ mul id:3055
 Config:Biped
 techbase:Inner Sphere
 era:3062
-source:TRO 3055 - Civil War
+source:TRO: 3055 - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D2.mtf b/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D2.mtf
index 90695d84a4d..1f749694271 100644
--- a/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Stealth STH-2D2.mtf	
@@ -6,7 +6,7 @@ mul id:3056
 Config:Biped
 techbase:Inner Sphere
 era:3062
-source:TRO 3055 - Civil War
+source:TRO: 3055 - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Stealth STH-3S.mtf b/megamek/data/mechfiles/mechs/3055U/Stealth STH-3S.mtf
index 3615ee2db2a..18ae9382583 100644
--- a/megamek/data/mechfiles/mechs/3055U/Stealth STH-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Stealth STH-3S.mtf	
@@ -6,7 +6,7 @@ mul id:3057
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-1.mtf b/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-1.mtf
index 1e5742e1d7c..462d62c0480 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-1.mtf	
@@ -5,7 +5,7 @@ mul id:3160
 Config:Quad
 techbase:Inner Sphere
 era:3054
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-2A.mtf b/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-2A.mtf
index 065dd0ed91c..a20f7940463 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-2A.mtf	
@@ -6,7 +6,7 @@ mul id:3161
 Config:Quad
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-3A.mtf b/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-3A.mtf
index 56689acb7a4..b9bf5ff9fa4 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-3A.mtf	
@@ -6,7 +6,7 @@ mul id:3162
 Config:Quad
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-4A.mtf b/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-4A.mtf
index 39ff552281d..59158b61a81 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tarantula ZPH-4A.mtf	
@@ -6,7 +6,7 @@ mul id:3163
 Config:Quad
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3G.mtf b/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3G.mtf
index 076518bbc8f..aa5035a015d 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3G.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3G.mtf	
@@ -6,7 +6,7 @@ mul id:5188
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3M.mtf b/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3M.mtf
index 96645366116..ce87ad47c38 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3M.mtf	
@@ -6,7 +6,7 @@ mul id:3169
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3M2_Storm_Tempest.mtf b/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3M2_Storm_Tempest.mtf
index d71a21df5bf..a34344bfdb3 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3M2_Storm_Tempest.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3M2_Storm_Tempest.mtf	
@@ -6,7 +6,7 @@ mul id:3170
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3MA.mtf b/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3MA.mtf
index 407c68f8d33..b9389e72e78 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3MA.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tempest TMP-3MA.mtf	
@@ -6,7 +6,7 @@ mul id:5189
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3055U/Thunder THR-1L.mtf b/megamek/data/mechfiles/mechs/3055U/Thunder THR-1L.mtf
index 3aa26b76844..86182bd07ff 100644
--- a/megamek/data/mechfiles/mechs/3055U/Thunder THR-1L.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Thunder THR-1L.mtf	
@@ -6,7 +6,7 @@ mul id:3214
 Config:Biped
 techbase:Inner Sphere
 era:3055
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Thunder THR-2L.mtf b/megamek/data/mechfiles/mechs/3055U/Thunder THR-2L.mtf
index dabd887d588..b41ceed1e2c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Thunder THR-2L.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Thunder THR-2L.mtf	
@@ -6,7 +6,7 @@ mul id:3215
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Thunder THR-3L.mtf b/megamek/data/mechfiles/mechs/3055U/Thunder THR-3L.mtf
index f76ef092a2e..edd3bb2bcb7 100644
--- a/megamek/data/mechfiles/mechs/3055U/Thunder THR-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Thunder THR-3L.mtf	
@@ -6,7 +6,7 @@ mul id:3216
 Config:Biped
 techbase:Inner Sphere
 era:3066
-source:TRO 3055 - Civil War
+source:TRO: 3055 - Civil War
 rules level:3
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3055U/Tsunami TS-P1.mtf b/megamek/data/mechfiles/mechs/3055U/Tsunami TS-P1.mtf
index 8c57b09d674..9cc250912bf 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tsunami TS-P1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tsunami TS-P1.mtf	
@@ -6,7 +6,7 @@ mul id:3311
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Tsunami TS-P1D.mtf b/megamek/data/mechfiles/mechs/3055U/Tsunami TS-P1D.mtf
index b65ce480198..cfd8ea47f25 100644
--- a/megamek/data/mechfiles/mechs/3055U/Tsunami TS-P1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Tsunami TS-P1D.mtf	
@@ -6,7 +6,7 @@ mul id:3312
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:3
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Venom SDR-9K.mtf b/megamek/data/mechfiles/mechs/3055U/Venom SDR-9K.mtf
index 917f71cc6cc..8772081d996 100644
--- a/megamek/data/mechfiles/mechs/3055U/Venom SDR-9K.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Venom SDR-9K.mtf	
@@ -6,7 +6,7 @@ mul id:3398
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KA.mtf b/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KA.mtf
index 50ed1bc47a4..bbb49b8ed8a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KA.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KA.mtf	
@@ -6,7 +6,7 @@ mul id:3399
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KB.mtf b/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KB.mtf
index a86e7f90479..9bb606b6485 100644
--- a/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KB.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KB.mtf	
@@ -6,7 +6,7 @@ mul id:3400
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KC.mtf b/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KC.mtf
index a5c31e90e69..6bf4ff25715 100644
--- a/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Venom SDR-9KC.mtf	
@@ -6,7 +6,7 @@ mul id:3401
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3055U/Viper (Black Python) 3.mtf b/megamek/data/mechfiles/mechs/3055U/Viper (Black Python) 3.mtf
index a44813cbad1..1ab8f69beb5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Viper (Black Python) 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Viper (Black Python) 3.mtf	
@@ -6,7 +6,7 @@ mul id:3434
 Config:Biped
 TechBase:Clan
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Viper (Black Python) 4.mtf b/megamek/data/mechfiles/mechs/3055U/Viper (Black Python) 4.mtf
index 99a71fbd9a4..a35d3af99e3 100644
--- a/megamek/data/mechfiles/mechs/3055U/Viper (Black Python) 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Viper (Black Python) 4.mtf	
@@ -6,7 +6,7 @@ mul id:3435
 Config:Biped
 TechBase:Clan
 Era:3067
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus) 4.mtf b/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus) 4.mtf
index 7b111c82552..84c20651fa6 100644
--- a/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus) 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus) 4.mtf	
@@ -6,7 +6,7 @@ mul id:3444
 Config:Biped
 TechBase:Clan
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus) 5.mtf b/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus) 5.mtf
index 48050174d3b..5d73066479c 100644
--- a/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus) 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus) 5.mtf	
@@ -6,7 +6,7 @@ mul id:3445
 Config:Biped
 TechBase:Clan
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus).mtf b/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus).mtf
index c97e1fff829..743a183ab64 100644
--- a/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus).mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Vixen (Incubus).mtf	
@@ -6,7 +6,7 @@ mul id:3441
 Config:Biped
 TechBase:Clan
 Era:2954
-Source:TRO 3055 - Succession Wars
+Source:TRO: 3055 - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3055U/Volkh VKH-1.mtf b/megamek/data/mechfiles/mechs/3055U/Volkh VKH-1.mtf
index b098b5d2a4d..f68080f49f5 100644
--- a/megamek/data/mechfiles/mechs/3055U/Volkh VKH-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Volkh VKH-1.mtf	
@@ -6,7 +6,7 @@ mul id:3447
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/Volkh VKH-7.mtf b/megamek/data/mechfiles/mechs/3055U/Volkh VKH-7.mtf
index cb82d72ab29..88b0654670b 100644
--- a/megamek/data/mechfiles/mechs/3055U/Volkh VKH-7.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Volkh VKH-7.mtf	
@@ -6,7 +6,7 @@ mul id:3448
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3055U/War Dog WR-DG-02FC.mtf b/megamek/data/mechfiles/mechs/3055U/War Dog WR-DG-02FC.mtf
index 9865824f6e5..b181b855e75 100644
--- a/megamek/data/mechfiles/mechs/3055U/War Dog WR-DG-02FC.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/War Dog WR-DG-02FC.mtf	
@@ -6,7 +6,7 @@ mul id:3476
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/War Dog WR-DG-03FC.mtf b/megamek/data/mechfiles/mechs/3055U/War Dog WR-DG-03FC.mtf
index d78ee62401c..78619003e03 100644
--- a/megamek/data/mechfiles/mechs/3055U/War Dog WR-DG-03FC.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/War Dog WR-DG-03FC.mtf	
@@ -6,7 +6,7 @@ mul id:3477
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3055U/Watchman WTC-4DM.mtf b/megamek/data/mechfiles/mechs/3055U/Watchman WTC-4DM.mtf
index 926a6a13cf7..a774c48c442 100644
--- a/megamek/data/mechfiles/mechs/3055U/Watchman WTC-4DM.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Watchman WTC-4DM.mtf	
@@ -6,7 +6,7 @@ mul id:3533
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Watchman WTC-4M.mtf b/megamek/data/mechfiles/mechs/3055U/Watchman WTC-4M.mtf
index dcebfcdc0dd..1ee2f28f3ec 100644
--- a/megamek/data/mechfiles/mechs/3055U/Watchman WTC-4M.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Watchman WTC-4M.mtf	
@@ -6,7 +6,7 @@ mul id:3534
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Werewolf WER-LF-004.mtf b/megamek/data/mechfiles/mechs/3055U/Werewolf WER-LF-004.mtf
index 9acbd1d6be0..fbf9e6a83e9 100644
--- a/megamek/data/mechfiles/mechs/3055U/Werewolf WER-LF-004.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Werewolf WER-LF-004.mtf	
@@ -6,7 +6,7 @@ mul id:3535
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Werewolf WER-LF-005.mtf b/megamek/data/mechfiles/mechs/3055U/Werewolf WER-LF-005.mtf
index 301d882a7df..78f48e0d052 100644
--- a/megamek/data/mechfiles/mechs/3055U/Werewolf WER-LF-005.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Werewolf WER-LF-005.mtf	
@@ -6,7 +6,7 @@ mul id:3536
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3055U/Wraith TR1.mtf b/megamek/data/mechfiles/mechs/3055U/Wraith TR1.mtf
index 5a91fc0a2c7..8f27682493a 100644
--- a/megamek/data/mechfiles/mechs/3055U/Wraith TR1.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Wraith TR1.mtf	
@@ -5,7 +5,7 @@ mul id:3588
 Config:Biped
 techbase:Inner Sphere
 era:3055
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Wraith TR2.mtf b/megamek/data/mechfiles/mechs/3055U/Wraith TR2.mtf
index c8b81947a6f..d8db7f73aab 100644
--- a/megamek/data/mechfiles/mechs/3055U/Wraith TR2.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Wraith TR2.mtf	
@@ -6,7 +6,7 @@ mul id:3589
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3055 - Clan Invasion
+Source:TRO: 3055 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3055U/Wraith TR3.mtf b/megamek/data/mechfiles/mechs/3055U/Wraith TR3.mtf
index 95f0cd53f05..5536873b25b 100644
--- a/megamek/data/mechfiles/mechs/3055U/Wraith TR3.mtf	
+++ b/megamek/data/mechfiles/mechs/3055U/Wraith TR3.mtf	
@@ -6,7 +6,7 @@ mul id:3591
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3055 - Civil War
+Source:TRO: 3055 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-O.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-O.mtf
index e2e4198c557..7f933766c81 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-O.mtf	
@@ -6,7 +6,7 @@ mul id:160
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OA.mtf
index 69d38417f5f..342479ec70e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OA.mtf	
@@ -6,7 +6,7 @@ mul id:161
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OB.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OB.mtf
index f44d9a21321..d9e9c9eb11a 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OB.mtf	
@@ -6,7 +6,7 @@ mul id:162
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OC.mtf
index b06c9b8ec98..4c11c312184 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OC.mtf	
@@ -6,7 +6,7 @@ mul id:163
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OD.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OD.mtf
index ddb847618f6..be042ef8db1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OD.mtf	
@@ -6,7 +6,7 @@ mul id:164
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OE.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OE.mtf
index 72762822923..c9799f820be 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OE.mtf	
@@ -6,7 +6,7 @@ mul id:165
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OF.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OF.mtf
index 5e7dc89828f..9eb86df6cd7 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OF.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OF.mtf	
@@ -6,7 +6,7 @@ mul id:166
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OG.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OG.mtf
index 17bd484391f..921e2ce76aa 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OG.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OG.mtf	
@@ -6,7 +6,7 @@ mul id:167
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OH.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OH.mtf
index 982e2ccb9fc..d4343b3c457 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OH.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OH.mtf	
@@ -6,7 +6,7 @@ mul id:168
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OI.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OI.mtf
index 46196fa117e..c80afe4b98a 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OI.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OI.mtf	
@@ -6,7 +6,7 @@ mul id:169
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3078
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OR.mtf b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OR.mtf
index 9623679aaa7..58df7ed9eb7 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OR.mtf	
@@ -6,7 +6,7 @@ mul id:170
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra A.mtf
index ee7dbc0029e..9a2a0ac9a13 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra A.mtf	
@@ -6,7 +6,7 @@ mul id:261
 Config:Biped Omnimech
 TechBase:Clan
 Era:2873
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra B.mtf
index 8a8eb88b82e..e0a2af3093f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra B.mtf	
@@ -6,7 +6,7 @@ mul id:262
 Config:Biped Omnimech
 TechBase:Clan
 Era:2873
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2O.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2O.mtf
index fec02e4bf5c..06e3b477867 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2O.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2O.mtf	
@@ -6,7 +6,7 @@ mul id:263
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OA.mtf
index 9fa4480b3ee..1ed6a63ca88 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OA.mtf	
@@ -6,7 +6,7 @@ mul id:264
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OB.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OB.mtf
index bdf85905253..66462f13b5f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OB.mtf	
@@ -6,7 +6,7 @@ mul id:265
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OC.mtf
index 169d5f99b1f..5ae62020418 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OC.mtf	
@@ -6,7 +6,7 @@ mul id:266
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OD.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OD.mtf
index 3a771e7789b..55e715fe5fe 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OD.mtf	
@@ -6,7 +6,7 @@ mul id:267
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OE.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OE.mtf
index 00f0bd98da9..809e4150472 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OE.mtf	
@@ -6,7 +6,7 @@ mul id:268
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OF.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OF.mtf
index bd3e37559aa..1d7ff004ffc 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OF.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OF.mtf	
@@ -6,7 +6,7 @@ mul id:269
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra C.mtf
index ba937e69ec3..16c217dec18 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra C.mtf	
@@ -6,7 +6,7 @@ mul id:270
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra H.mtf
index 7547ebd756f..7349f1be473 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra H.mtf	
@@ -6,7 +6,7 @@ mul id:272
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra Prime.mtf
index 9a96759d469..165ad73c7e2 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Battle Cobra Prime.mtf	
@@ -6,7 +6,7 @@ mul id:273
 Config:Biped Omnimech
 techbase:Clan
 era:2873
-source:TRO 3058 - Succession Wars
+source:TRO: 3058 - Succession Wars
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-O.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-O.mtf
index 1cd5f1bb101..03df2d611cf 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-O.mtf	
@@ -6,7 +6,7 @@ mul id:345
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OA.mtf
index 7916b1a392e..2b576ffb1bf 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OA.mtf	
@@ -6,7 +6,7 @@ mul id:347
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OB.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OB.mtf
index b6dc9b3f1c0..ea6bbab1624 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OB.mtf	
@@ -6,7 +6,7 @@ mul id:348
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OC.mtf
index 921c7e4543b..ee4adb2b6dc 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OC.mtf	
@@ -6,7 +6,7 @@ mul id:349
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OD.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OD.mtf
index b3ccf6156dc..b3f51a9ce98 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OD.mtf	
@@ -6,7 +6,7 @@ mul id:350
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OE.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OE.mtf
index 54e313d97ef..5ee309da9e4 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OE.mtf	
@@ -6,7 +6,7 @@ mul id:351
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OF.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OF.mtf
index 8b6d318aff7..5d4f0493726 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OF.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OF.mtf	
@@ -6,7 +6,7 @@ mul id:352
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OR.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OR.mtf
index e1912bef113..9b190bdadf1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OR.mtf	
@@ -6,7 +6,7 @@ mul id:3825
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OX.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OX.mtf
index 0cf077543fb..c30f45c3508 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OX.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OX.mtf	
@@ -6,7 +6,7 @@ mul id:354
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner A.mtf
index cd482305fc1..33ca16e925d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner A.mtf	
@@ -6,7 +6,7 @@ mul id:363
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner B.mtf
index 97de5e9589d..e63284e34b5 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner B.mtf	
@@ -6,7 +6,7 @@ mul id:364
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner C.mtf
index 6f9ef9fb82f..bef6d709e7c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner C.mtf	
@@ -6,7 +6,7 @@ mul id:365
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner D.mtf
index 20fdc3b8590..b349fd283a8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner D.mtf	
@@ -6,7 +6,7 @@ mul id:366
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner E.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner E.mtf
index db9cab179bd..fc82d4cf77d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner E.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner E.mtf	
@@ -6,7 +6,7 @@ mul id:367
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner H.mtf
index 1e48c0f24b6..9f84195e5b9 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner H.mtf	
@@ -6,7 +6,7 @@ mul id:368
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner Prime.mtf
index 126441dacb0..a5a6f7ad31d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Black Lanner Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Black Lanner Prime.mtf	
@@ -6,7 +6,7 @@ mul id:369
 Config:Biped Omnimech
 techbase:Clan
 era:3052
-source:TRO 3058 - Clan Invasion
+source:TRO: 3058 - Clan Invasion
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-O.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-O.mtf
index 200828f8cd1..4f011d3d750 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-O.mtf	
@@ -5,7 +5,7 @@ mul id:378
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3057
-source:TRO 3058 - Clan Invasion
+source:TRO: 3058 - Clan Invasion
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OA.mtf
index 0b6a36d9774..385e128abe6 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OA.mtf	
@@ -6,7 +6,7 @@ mul id:379
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OB.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OB.mtf
index 49e1f350294..dc657b730e1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OB.mtf	
@@ -6,7 +6,7 @@ mul id:380
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OC.mtf
index 933337e41eb..e47f05fdf77 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OC.mtf	
@@ -6,7 +6,7 @@ mul id:381
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OD.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OD.mtf
index 6256d2a8d04..6d11e4bd732 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OD.mtf	
@@ -6,7 +6,7 @@ mul id:382
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OE.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OE.mtf
index be54136042c..69a9d39844e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OE.mtf	
@@ -6,7 +6,7 @@ mul id:383
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OF.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OF.mtf
index d70a73f69a5..443f6e49fd1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OF.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OF.mtf	
@@ -6,7 +6,7 @@ mul id:384
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OR.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OR.mtf
index 8c396655d42..fe14f8cd2da 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OR.mtf	
@@ -6,7 +6,7 @@ mul id:385
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OX.mtf b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OX.mtf
index 299fe87f3e6..f481d0bf699 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OX.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Blackjack BJ2-OX.mtf	
@@ -7,7 +7,7 @@ Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3074
 Rules Level:3
-source:TRO 3058 - Jihad
+source:TRO: 3058 - Jihad
 
 Mass:50
 Engine:200 XL Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-L1.mtf b/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-L1.mtf
index b7e1419f224..e7dd3811121 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-L1.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-L1.mtf	
@@ -6,7 +6,7 @@ mul id:447
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-S2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-S2.mtf
index 4541685adf6..1b185a53ae5 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-S2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-S2.mtf	
@@ -6,7 +6,7 @@ mul id:448
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-X1.mtf b/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-X1.mtf
index 84f2f027729..ce704410d73 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-X1.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-X1.mtf	
@@ -6,7 +6,7 @@ mul id:450
 Config:Biped
 techbase:Inner Sphere
 era:3053
-source:TRO 3058 - Clan Invasion
+source:TRO: 3058 - Clan Invasion
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-X2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-X2.mtf
index 12889a931a1..73c8eb93f0b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-X2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Bushwacker BSW-X2.mtf	
@@ -6,7 +6,7 @@ mul id:451
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) A.mtf
index 154f265e656..0fa6d49bacd 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) A.mtf	
@@ -6,7 +6,7 @@ mul id:490
 Config:Biped Omnimech
 TechBase:Clan
 Era:3049
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) B.mtf
index fedb6e6e34e..89d3dd04bef 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) B.mtf	
@@ -6,7 +6,7 @@ mul id:491
 Config:Biped Omnimech
 TechBase:Clan
 Era:3049
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) C.mtf
index f1f8b46ad10..e96a57a3520 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) C.mtf	
@@ -6,7 +6,7 @@ mul id:492
 Config:Biped Omnimech
 TechBase:Clan
 Era:3049
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) D.mtf
index 0ddbd17a1f4..d9bf33b885f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) D.mtf	
@@ -6,7 +6,7 @@ mul id:493
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) H.mtf
index c2339ee4dd3..86b20120e8b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) H.mtf	
@@ -6,7 +6,7 @@ mul id:495
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-source:TRO Clan Invasion - Civil War
+source:TRO: Clan Invasion - Civil War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) Prime.mtf
index 42e349a6254..5afa3b02e77 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cauldron-Born (Ebon Jaguar) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:496
 Config:Biped Omnimech
 techbase:Clan
 era:3049
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6X.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6X.mtf
index c5063114f46..5aecc73e303 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6X.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6X.mtf	
@@ -5,7 +5,7 @@ mul id:532
 Config:Biped
 techbase:Inner Sphere
 era:2609
-source:TRO 3058 - Star League
+source:TRO: 3058 - Star League
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6Y.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6Y.mtf
index 4d2b6697207..54a9155181c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6Y.mtf	
@@ -6,7 +6,7 @@ mul id:533
 Config:Biped
 TechBase:Inner Sphere
 Era:2766
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6Z.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6Z.mtf
index 04254d4f1e6..d464c06f5df 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-6Z.mtf	
@@ -6,7 +6,7 @@ mul id:534
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-7A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-7A.mtf
index 0db3b94bf79..be455fda86c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-7A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Cestus CTS-7A.mtf	
@@ -6,7 +6,7 @@ mul id:535
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7V.mtf b/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7V.mtf
index fa17ff43a56..eaf2273993c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7V.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7V.mtf	
@@ -6,7 +6,7 @@ mul id:543
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7W.mtf b/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7W.mtf
index 0d5aa331046..c0d8627809e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7W.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7W.mtf	
@@ -6,7 +6,7 @@ mul id:544
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7Z.mtf b/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7Z.mtf
index 3d2db0d9288..fd4167ff6b6 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Chameleon CLN-7Z.mtf	
@@ -6,7 +6,7 @@ mul id:545
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Crossbow A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Crossbow A.mtf
index 4d390df65d9..6358abf99ae 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Crossbow A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Crossbow A.mtf	
@@ -6,7 +6,7 @@ mul id:730
 Config:Biped Omnimech
 TechBase:Clan
 Era:2870
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Crossbow B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Crossbow B.mtf
index b023b566f02..12d22ca5ae1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Crossbow B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Crossbow B.mtf	
@@ -6,7 +6,7 @@ mul id:731
 Config:Biped Omnimech
 TechBase:Clan
 Era:2870
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Crossbow C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Crossbow C.mtf
index b5e37c25547..848d5431a87 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Crossbow C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Crossbow C.mtf	
@@ -6,7 +6,7 @@ mul id:732
 Config:Biped Omnimech
 TechBase:Clan
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Crossbow D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Crossbow D.mtf
index 15d1b34e419..b2dca1ea7fc 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Crossbow D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Crossbow D.mtf	
@@ -6,7 +6,7 @@ mul id:736
 Config:Biped Omnimech
 TechBase:Clan
 Era:3064
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Crossbow H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Crossbow H.mtf
index 9363aae6d11..993c17b3ebb 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Crossbow H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Crossbow H.mtf	
@@ -6,7 +6,7 @@ mul id:738
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Crossbow Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Crossbow Prime.mtf
index 260e089f3e9..06efaab287c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Crossbow Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Crossbow Prime.mtf	
@@ -6,7 +6,7 @@ mul id:739
 Config:Biped Omnimech
 techbase:Clan
 era:2870
-source:TRO 3058 - Succession Wars
+source:TRO: 3058 - Succession Wars
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-1D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-1D.mtf
index 61657246439..192b23ab600 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-1D.mtf	
@@ -6,7 +6,7 @@ mul id:893
 Config:Biped
 TechBase:Inner Sphere
 Era:3036
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:1
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-2.mtf
index b3591ce8937..324659d194c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-2.mtf	
@@ -5,7 +5,7 @@ mul id:894
 Config:Biped
 techbase:Inner Sphere
 era:3048
-source:TRO 3058 - Succession Wars
+source:TRO: 3058 - Succession Wars
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-3.mtf b/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-3.mtf
index b303115cf58..12b9813ec1a 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-3.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Devastator DVS-3.mtf	
@@ -6,7 +6,7 @@ mul id:895
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-3F.mtf b/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-3F.mtf
index dcaf75785f2..1053d445251 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-3F.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-3F.mtf	
@@ -6,7 +6,7 @@ mul id:913
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-4F.mtf b/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-4F.mtf
index 4d3c1a237e9..65e7d5e1f29 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-4F.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-4F.mtf	
@@ -6,7 +6,7 @@ mul id:914
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-6FC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-6FC.mtf
index 03e0e4ee7ce..7298fbfe0cf 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-6FC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Dragon Fire DGR-6FC.mtf	
@@ -6,7 +6,7 @@ mul id:915
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-5A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-5A.mtf
index e868cb26cff..61e9cd5d90d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-5A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-5A.mtf	
@@ -6,7 +6,7 @@ mul id:963
 Config:Biped
 TechBase:Inner Sphere
 Era:2502
-Source:TRO 3058 - Age of War
+Source:TRO: 3058 - Age of War
 Rules Level:1
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6A.mtf
index a383b1182a4..28ccb74a406 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6A.mtf	
@@ -6,7 +6,7 @@ mul id:964
 Config:Biped
 TechBase:Inner Sphere
 Era:2612
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6D.mtf
index b5aab8f5957..98ceb48da6f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6D.mtf	
@@ -6,7 +6,7 @@ mul id:966
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6L.mtf b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6L.mtf
index 67f23954813..68bbe57c561 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6L.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6L.mtf	
@@ -6,7 +6,7 @@ mul id:967
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6M.mtf b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6M.mtf
index ec8a6758b8d..ce7cc9096bb 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6M.mtf	
@@ -6,7 +6,7 @@ mul id:968
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6S.mtf b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6S.mtf
index 231e427f656..87e1e8de0ea 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-6S.mtf	
@@ -6,7 +6,7 @@ mul id:970
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-7L.mtf b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-7L.mtf
index 8bdf1b6c925..4a9a4543bf1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-7L.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Emperor EMP-7L.mtf	
@@ -6,7 +6,7 @@ mul id:971
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6J.mtf b/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6J.mtf
index 850d4a5f320..0af8c2466b9 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6J.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6J.mtf	
@@ -6,7 +6,7 @@ mul id:972
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6Q.mtf b/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6Q.mtf
index 786d5aef3d0..18c8104a6b5 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6Q.mtf	
@@ -6,7 +6,7 @@ mul id:973
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6S.mtf b/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6S.mtf
index 664058e6a06..3a6ad1fa48a 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Enfield END-6S.mtf	
@@ -6,7 +6,7 @@ mul id:974
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-B1.mtf b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-B1.mtf
index 1840903708e..387a396d026 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-B1.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-B1.mtf	
@@ -6,7 +6,7 @@ mul id:997
 Config:Biped
 TechBase:Inner Sphere
 Era:2619
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-B2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-B2.mtf
index 227b0b8581d..94b0a38e657 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-B2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-B2.mtf	
@@ -6,7 +6,7 @@ mul id:998
 Config:Biped
 TechBase:Inner Sphere
 Era:2620
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-C1.mtf b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-C1.mtf
index 64a2b43dad5..6a729d2b6d7 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-C1.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-C1.mtf	
@@ -6,7 +6,7 @@ mul id:1000
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-CS.mtf b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-CS.mtf
index b18b739693a..44e66f69971 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-CS.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-CS.mtf	
@@ -6,7 +6,7 @@ mul id:1002
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-D1.mtf b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-D1.mtf
index c1b47fdae17..5bd9c66174f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-D1.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Excalibur EXC-D1.mtf	
@@ -6,7 +6,7 @@ mul id:1003
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K.mtf b/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K.mtf
index 0a4c988677e..3a0dad6b250 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K.mtf	
@@ -6,7 +6,7 @@ mul id:1030
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K1A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K1A.mtf
index 00eacad4cef..a4cda3338bd 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K1A.mtf	
@@ -6,7 +6,7 @@ mul id:1031
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K1B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K1B.mtf
index 965522756ff..66ec48115c3 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Falcon Hawk FNHK-9K1B.mtf	
@@ -6,7 +6,7 @@ mul id:1032
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon A.mtf
index 5a3affc7804..bd1120d9a64 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon A.mtf	
@@ -6,7 +6,7 @@ mul id:1063
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon B.mtf
index 2e258a78e5e..3aaab1b29e0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon B.mtf	
@@ -6,7 +6,7 @@ mul id:1064
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon C.mtf
index e5162083edd..171d2373fd0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon C.mtf	
@@ -6,7 +6,7 @@ mul id:1065
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon D.mtf
index 4aaab973e27..2cf0abcdfbb 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon D.mtf	
@@ -6,7 +6,7 @@ mul id:1066
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon E.mtf b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon E.mtf
index f1e54a11607..f501d9c477b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon E.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon E.mtf	
@@ -6,7 +6,7 @@ mul id:1067
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon H.mtf
index 4ecf6e6752e..408e0709431 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon H.mtf	
@@ -6,7 +6,7 @@ mul id:1069
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon Prime.mtf
index ad0ea858102..35957bb800a 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Fire Falcon Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1070
 Config:Biped Omnimech
 techbase:Clan
 era:3052
-source:TRO 3058 - Clan Invasion
+source:TRO: 3058 - Clan Invasion
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-O.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-O.mtf
index 8710fb8b760..bb19c048993 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-O.mtf	
@@ -6,7 +6,7 @@ mul id:1099
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OA.mtf
index 4903eb32ef0..528a57084c8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OA.mtf	
@@ -6,7 +6,7 @@ mul id:1100
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OB.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OB.mtf
index e1d1f6b9419..db602b153b0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OB.mtf	
@@ -6,7 +6,7 @@ mul id:1101
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OC.mtf
index 4b0aa0e1539..cdcc9e06fe2 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OC.mtf	
@@ -6,7 +6,7 @@ mul id:1102
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OD.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OD.mtf
index f0c2e824f93..b513f086449 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OD.mtf	
@@ -6,7 +6,7 @@ mul id:1103
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OE.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OE.mtf
index 3036efc3bac..4d86c3f796c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OE.mtf	
@@ -6,7 +6,7 @@ mul id:1104
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OF.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OF.mtf
index e6be569e0bb..3a0812045e1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OF.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OF.mtf	
@@ -6,7 +6,7 @@ mul id:1105
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OG.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OG.mtf
index ad8780231f4..47d89e737e6 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OG.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OG.mtf	
@@ -6,7 +6,7 @@ mul id:1106
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OH.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OH.mtf
index acb67d2eae3..87e004fd244 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OH.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OH.mtf	
@@ -6,7 +6,7 @@ mul id:1107
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OR.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OR.mtf
index 509f127ca96..40cf6447666 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OR.mtf	
@@ -6,7 +6,7 @@ mul id:1108
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OX.mtf b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OX.mtf
index 0af9774d191..8bcbc7f81a8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OX.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Firestarter FS9-OX.mtf	
@@ -6,7 +6,7 @@ mul id:1110
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) A.mtf
index ad940b4f211..40b1f082aa0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) A.mtf	
@@ -6,7 +6,7 @@ mul id:1286
 Config:Biped Omnimech
 TechBase:Clan
 Era:3053
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) B.mtf
index dfdb17f925e..edc49e592f3 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) B.mtf	
@@ -6,7 +6,7 @@ mul id:1287
 Config:Biped Omnimech
 TechBase:Clan
 Era:3053
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) C.mtf
index 817bf7931fd..25c09fe0f37 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) C.mtf	
@@ -6,7 +6,7 @@ mul id:1288
 Config:Biped Omnimech
 TechBase:Clan
 Era:3053
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) D.mtf
index 833154af25e..58afbc23337 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) D.mtf	
@@ -6,7 +6,7 @@ mul id:1289
 Config:Biped Omnimech
 TechBase:Clan
 Era:3053
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) E.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) E.mtf
index 93006e31751..f86ed31aeea 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) E.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) E.mtf	
@@ -6,7 +6,7 @@ mul id:1290
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) F.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) F.mtf
index 57ce30b1ecb..01e127af80a 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) F.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) F.mtf	
@@ -6,7 +6,7 @@ mul id:1291
 Config:Biped Omnimech
 TechBase:Clan
 Era:3069
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) H.mtf
index cbc1aa7de0b..b7d59f10956 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) H.mtf	
@@ -6,7 +6,7 @@ mul id:1292
 Config:Biped Omnimech
 TechBase:Clan
 Era:3064
-source:TRO Clan Invasion - Civil War
+source:TRO: Clan Invasion - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) Prime.mtf
index 02fa2b0fa08..27a10b23e27 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grendel (Mongrel) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1293
 Config:Biped Omnimech
 techbase:Clan
 era:3052
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grizzly 2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grizzly 2.mtf
index a1e133c4aa3..dfb0536c0bb 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grizzly 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grizzly 2.mtf	
@@ -6,7 +6,7 @@ mul id:1333
 Config:Biped
 TechBase:Clan
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Grizzly.mtf b/megamek/data/mechfiles/mechs/3058Uu/Grizzly.mtf
index 2ac2991d4fa..b0be83db954 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Grizzly.mtf
+++ b/megamek/data/mechfiles/mechs/3058Uu/Grizzly.mtf
@@ -5,7 +5,7 @@ mul id:1332
 Config:Biped
 techbase:Clan
 era:2947
-source:TRO 3058 - Succession Wars
+source:TRO: 3058 - Succession Wars
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) A.mtf
index 9b4c93b6dee..77211974ae3 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) A.mtf	
@@ -6,7 +6,7 @@ mul id:1378
 Config:Biped Omnimech
 TechBase:Clan
 Era:3037
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) B.mtf
index f4dea4df888..4d44f7152ef 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) B.mtf	
@@ -6,7 +6,7 @@ mul id:1379
 Config:Biped Omnimech
 TechBase:Clan
 Era:3037
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) C.mtf
index 825e45ddecc..4b5226a9b98 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) C.mtf	
@@ -6,7 +6,7 @@ mul id:1380
 Config:Biped Omnimech
 TechBase:Clan
 Era:3037
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) D.mtf
index 27b4c11a742..da1dd75d088 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) D.mtf	
@@ -6,7 +6,7 @@ mul id:1381
 Config:Biped Omnimech
 TechBase:Clan
 Era:3037
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) H.mtf
index 99cd8fa6b56..e8ed6075095 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) H.mtf	
@@ -6,7 +6,7 @@ mul id:1383
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-source:TRO Clan Invasion - Civil War
+source:TRO: Clan Invasion - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) Prime.mtf
index e426e6a1972..bcad0fe5717 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hankyu (Arctic Cheetah) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1384
 Config:Biped Omnimech
 techbase:Clan
 era:3037
-source:TRO Clan Invasion - Succession Wars
+source:TRO: Clan Invasion - Succession Wars
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC 2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC 2.mtf
index 77be8037ede..3cebc062f85 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC 2.mtf	
@@ -6,7 +6,7 @@ mul id:1569
 Config:Biped
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC 3.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC 3.mtf
index 59fa44fb59c..f7931f537cb 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC 3.mtf	
@@ -6,7 +6,7 @@ mul id:1570
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC.mtf
index a360136d4fa..c16ef835c44 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Hunchback IIC.mtf	
@@ -6,7 +6,7 @@ mul id:1568
 Config:Biped
 TechBase:Clan
 Era:2856
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher A.mtf
index 5f9bb3d41c2..1d37bf3e73b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher A.mtf	
@@ -6,7 +6,7 @@ mul id:1779
 Config:Biped Omnimech
 TechBase:Clan
 Era:2887
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher B.mtf
index 8a62e9c3d93..6d5cc7dd202 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher B.mtf	
@@ -6,7 +6,7 @@ mul id:1780
 Config:Biped Omnimech
 TechBase:Clan
 Era:2887
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher C.mtf
index 279e98eddf1..df36a1fb146 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher C.mtf	
@@ -6,7 +6,7 @@ mul id:1781
 Config:Biped Omnimech
 TechBase:Clan
 Era:2887
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher D.mtf
index 41cebd64119..48233a98b5f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher D.mtf	
@@ -6,7 +6,7 @@ mul id:1782
 Config:Biped Omnimech
 TechBase:Clan
 Era:2887
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher E.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher E.mtf
index 8da8a36de84..7da5105b299 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher E.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher E.mtf	
@@ -6,7 +6,7 @@ mul id:1783
 Config:Biped Omnimech
 TechBase:Clan
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher H.mtf
index 86e158f1ad8..5cc5a3aa793 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher H.mtf	
@@ -6,7 +6,7 @@ mul id:1785
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher Prime.mtf
index 00bd75f62e4..8263fd8de13 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kingfisher Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kingfisher Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1786
 Config:Biped Omnimech
 TechBase:Clan
 Era:2887
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kodiak 2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kodiak 2.mtf
index 7afcbb71b2a..4326a83b5c0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kodiak 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kodiak 2.mtf	
@@ -6,7 +6,7 @@ mul id:1806
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kodiak 3.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kodiak 3.mtf
index 0cb155785fc..caec0962621 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kodiak 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kodiak 3.mtf	
@@ -6,7 +6,7 @@ mul id:1807
 Config:Biped
 TechBase:Clan
 Era:3068
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kodiak 4.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kodiak 4.mtf
index f01fa89f8ce..2465fb60f16 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kodiak 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kodiak 4.mtf	
@@ -6,7 +6,7 @@ mul id:1808
 Config:Biped
 TechBase:Clan
 Era:3066
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kodiak 5.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kodiak 5.mtf
index bffa0b6f612..104828fa819 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kodiak 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kodiak 5.mtf	
@@ -6,7 +6,7 @@ mul id:1809
 Config:Biped
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Kodiak.mtf b/megamek/data/mechfiles/mechs/3058Uu/Kodiak.mtf
index d5da196abca..49d880817c6 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Kodiak.mtf
+++ b/megamek/data/mechfiles/mechs/3058Uu/Kodiak.mtf
@@ -6,7 +6,7 @@ mul id:1805
 Config:Biped
 techbase:Clan
 era:3001
-source:TRO 3058 - Succession Wars
+source:TRO: 3058 - Succession Wars
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH2.mtf
index ca8e57b4b8b..bc3be270b7b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH2.mtf	
@@ -6,7 +6,7 @@ mul id:1893
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH3.mtf b/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH3.mtf
index 8fb2ddfca31..d18f11a8bea 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH3.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH3.mtf	
@@ -6,7 +6,7 @@ mul id:1894
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH8.mtf b/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH8.mtf
index 5d86248324b..61cd918c313 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH8.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW1-LH8.mtf	
@@ -6,7 +6,7 @@ mul id:1895
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW2-LHW.mtf b/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW2-LHW.mtf
index 9e7faf76e3a..e6d880dd272 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW2-LHW.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Lineholder KW2-LHW.mtf	
@@ -6,7 +6,7 @@ mul id:1896
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7Q.mtf b/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7Q.mtf
index 5b4d4f87a3a..7157f5ad539 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7Q.mtf	
@@ -6,7 +6,7 @@ mul id:1936
 Config:Biped
 TechBase:Inner Sphere
 Era:2610
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:1
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7V.mtf b/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7V.mtf
index 35b0d01cf81..e8390567ee7 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7V.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Longbow LGB-7V.mtf	
@@ -6,7 +6,7 @@ mul id:1937
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-8Q.mtf b/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-8Q.mtf
index 2e581219dd3..3d37d711e52 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-8Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-8Q.mtf	
@@ -6,7 +6,7 @@ mul id:1966
 Config:Biped
 TechBase:Inner Sphere
 Era:2853
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9C.mtf
index 95a0dcd5ad1..4c48b44562d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9C.mtf	
@@ -6,7 +6,7 @@ mul id:1967
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9Q.mtf b/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9Q.mtf
index 67c74eff03c..45e17c05667 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9Q.mtf	
@@ -6,7 +6,7 @@ mul id:1968
 Config:Biped
 TechBase:Inner Sphere
 Era:2761
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9R.mtf b/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9R.mtf
index c6c83a66ce2..d51764879b0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9R.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Lynx LNX-9R.mtf	
@@ -6,7 +6,7 @@ mul id:1969
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-5K.mtf b/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-5K.mtf
index 4b046b70f4a..62a6ad8d5f6 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-5K.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-5K.mtf	
@@ -6,7 +6,7 @@ mul id:1988
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-6E.mtf b/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-6E.mtf
index 1d0ca062adf..e8e8fc2a898 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-6E.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-6E.mtf	
@@ -6,7 +6,7 @@ mul id:1989
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-6K.mtf b/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-6K.mtf
index af9e18b3037..fb6cb7c0168 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-6K.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Maelstrom MTR-6K.mtf	
@@ -6,7 +6,7 @@ mul id:1990
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1A.mtf
index f287954854f..a3ee2f455eb 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1A.mtf	
@@ -6,7 +6,7 @@ mul id:2177
 Config:Biped
 TechBase:Inner Sphere
 Era:3010
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1B.mtf
index c4f7151fae6..a75e74c7222 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1B.mtf	
@@ -6,7 +6,7 @@ mul id:2178
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1C.mtf
index 7870b253f76..d5a73dd5a1f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Merlin MLN-1C.mtf	
@@ -6,7 +6,7 @@ mul id:2180
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr A.mtf
index cab3d5dacef..144f5b2c6b6 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr A.mtf	
@@ -6,7 +6,7 @@ mul id:2263
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr B.mtf
index a7cf11a5a55..ac371a482b9 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr B.mtf	
@@ -6,7 +6,7 @@ mul id:2264
 Config:Biped Omnimech
 techbase:Clan
 era:3052
-source:TRO 3058 - Clan Invasion
+source:TRO: 3058 - Clan Invasion
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr C.mtf
index ddd6ffc3cb5..0912ee7002b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr C.mtf	
@@ -6,7 +6,7 @@ mul id:2265
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr D.mtf
index 316bd43ab8e..ac10a907e4d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr D.mtf	
@@ -6,7 +6,7 @@ mul id:2266
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr E.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr E.mtf
index 178f71e2775..f9a558cb3d3 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr E.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr E.mtf	
@@ -6,7 +6,7 @@ mul id:2267
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr H.mtf
index cabd94f4db8..905c5fe65ea 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr H.mtf	
@@ -6,7 +6,7 @@ mul id:2269
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr Prime.mtf
index 57a6b6ee14d..03bded0764b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Gyr Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Gyr Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2270
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Hawk NTK-2Q.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Hawk NTK-2Q.mtf
index bdad2ba9a9b..e5cc4385f2c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Hawk NTK-2Q.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Hawk NTK-2Q.mtf	
@@ -6,7 +6,7 @@ mul id:2271
 Config:Biped
 TechBase:Inner Sphere
 Era:2656
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Night Hawk NTK-2S.mtf b/megamek/data/mechfiles/mechs/3058Uu/Night Hawk NTK-2S.mtf
index aa6a66a7bd9..b4dbe8bcb99 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Night Hawk NTK-2S.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Night Hawk NTK-2S.mtf	
@@ -6,7 +6,7 @@ mul id:2272
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9FC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9FC.mtf
index cf21dedd1b3..666908fe4ee 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9FC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9FC.mtf	
@@ -6,7 +6,7 @@ mul id:2285
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9J.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9J.mtf
index 3049cef2733..eaefe6102b8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9J.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9J.mtf	
@@ -6,7 +6,7 @@ mul id:2286
 Config:Biped
 TechBase:Inner Sphere
 Era:2767
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9SS.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9SS.mtf
index 22f68904c7e..6cf7a85d22b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9SS.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nightstar NSR-9SS.mtf	
@@ -6,7 +6,7 @@ mul id:2287
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) A.mtf
index c64ef7def9d..e3b89bc5f72 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) A.mtf	
@@ -6,7 +6,7 @@ mul id:2289
 Config:Biped Omnimech
 TechBase:Clan
 Era:3049
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) B.mtf
index 5d0e01e2d98..69b98c66164 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) B.mtf	
@@ -6,7 +6,7 @@ mul id:2290
 Config:Biped Omnimech
 TechBase:Clan
 Era:3049
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) C.mtf
index c273c51b882..034b5a139c7 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) C.mtf	
@@ -6,7 +6,7 @@ mul id:2291
 Config:Biped Omnimech
 TechBase:Clan
 Era:3049
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) D.mtf
index 5df7c7abdab..0b3b4378bc3 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) D.mtf	
@@ -6,7 +6,7 @@ mul id:2292
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) H.mtf
index be0c8e951c0..0108a73de1c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) H.mtf	
@@ -6,7 +6,7 @@ mul id:2294
 Config:Biped Omnimech
 TechBase:Clan
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) N.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) N.mtf
index 8eb0393b407..1c5ca2f03f0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) N.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) N.mtf	
@@ -6,7 +6,7 @@ mul id:2295
 Config:Biped Omnimech
 TechBase:Clan
 Era:3068
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) Prime.mtf
index c891d370935..7c911a7bcda 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Nobori-nin (Huntsman) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2296
 Config:Biped Omnimech
 techbase:Clan
 era:3049
-source:TRO 3058 - Clan Invasion
+source:TRO: 3058 - Clan Invasion
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M10.mtf b/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M10.mtf
index fec918ac296..a56e67bb331 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M10.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M10.mtf	
@@ -6,7 +6,7 @@ mul id:2310
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M11.mtf b/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M11.mtf
index 7437cd5a8cf..04be5149e77 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M11.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M11.mtf	
@@ -6,7 +6,7 @@ mul id:2311
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M12.mtf b/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M12.mtf
index 46e796ba08a..0f6fea02e82 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M12.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/O-Bakemono OBK-M12.mtf	
@@ -6,7 +6,7 @@ mul id:2312
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1.mtf b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1.mtf
index 4fbca6d2d8d..7cfa6d49e3d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1.mtf	
@@ -6,7 +6,7 @@ mul id:2384
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1A.mtf
index 06ec01d19b5..3bbe77c9d6e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1A.mtf	
@@ -6,7 +6,7 @@ mul id:2385
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1B.mtf
index 445cee82455..e0c574b9c22 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1B.mtf	
@@ -6,7 +6,7 @@ mul id:2386
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1C.mtf
index f6a83e58d52..1a17c931f0f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1C.mtf	
@@ -6,7 +6,7 @@ mul id:2387
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1D.mtf
index e88d27e58be..37109a57b86 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1D.mtf	
@@ -6,7 +6,7 @@ mul id:2388
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1E.mtf b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1E.mtf
index b644fef63d1..f0ff744046f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1E.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1E.mtf	
@@ -6,7 +6,7 @@ mul id:2389
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1F.mtf b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1F.mtf
index 384c6034e90..e0417e4f6d2 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1F.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1F.mtf	
@@ -6,7 +6,7 @@ mul id:2390
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1R.mtf b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1R.mtf
index 6ff55fc136c..ef7bb2c35d2 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Owens OW-1R.mtf	
@@ -6,7 +6,7 @@ mul id:2391
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-1N.mtf b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-1N.mtf
index e4c2441c32b..115a2a73a23 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-1N.mtf	
@@ -6,7 +6,7 @@ mul id:2524
 Config:Biped
 TechBase:Inner Sphere
 Era:2575
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:1
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-3Z.mtf b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-3Z.mtf
index b4d547256c9..b1c06055a1b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-3Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-3Z.mtf	
@@ -5,7 +5,7 @@ mul id:2525
 Config:Biped
 techbase:Inner Sphere
 era:2594
-source:TRO 3058 - Star League
+source:TRO: 3058 - Star League
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-4Z.mtf b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-4Z.mtf
index 87cc2a3a227..f0b65c232f9 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-4Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-4Z.mtf	
@@ -6,7 +6,7 @@ mul id:2527
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-5L.mtf b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-5L.mtf
index acd79346331..c6ff4d6e1f3 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-5L.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-5L.mtf	
@@ -6,7 +6,7 @@ mul id:2528
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:3
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-5Z.mtf b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-5Z.mtf
index 09f35fef3bd..f879b6c41a5 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-5Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Pillager PLG-5Z.mtf	
@@ -6,7 +6,7 @@ mul id:2529
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Piranha 2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Piranha 2.mtf
index 41af36a1353..d541eb6f0b9 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Piranha 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Piranha 2.mtf	
@@ -6,7 +6,7 @@ mul id:2536
 Config:Biped
 TechBase:Clan
 Era:3067
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Piranha 3.mtf b/megamek/data/mechfiles/mechs/3058Uu/Piranha 3.mtf
index 22166ef28b4..6f111888877 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Piranha 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Piranha 3.mtf	
@@ -6,7 +6,7 @@ mul id:2537
 Config:Biped
 TechBase:Clan
 Era:3068
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Piranha.mtf b/megamek/data/mechfiles/mechs/3058Uu/Piranha.mtf
index 6d00182cb32..3cd97f4e4f1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Piranha.mtf
+++ b/megamek/data/mechfiles/mechs/3058Uu/Piranha.mtf
@@ -6,7 +6,7 @@ mul id:2535
 Config:Biped
 TechBase:Clan
 Era:3051
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-O.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-O.mtf
index 998cbb0f0e8..0abf1eee4fd 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-O.mtf	
@@ -6,7 +6,7 @@ mul id:2647
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OA.mtf
index 10ba7b143b8..a0e269c9a3d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OA.mtf	
@@ -6,7 +6,7 @@ mul id:2648
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OB.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OB.mtf
index b0c52af7691..f5037c2e84a 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OB.mtf	
@@ -6,7 +6,7 @@ mul id:2649
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OC.mtf
index 5f3408686c2..b294c58a1d4 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OC.mtf	
@@ -6,7 +6,7 @@ mul id:2650
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OD.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OD.mtf
index 82a7b23680e..7a3c7eae019 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OD.mtf	
@@ -6,7 +6,7 @@ mul id:2651
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3052
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OE.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OE.mtf
index 32bd4fa5dd1..062afd565a4 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OE.mtf	
@@ -6,7 +6,7 @@ mul id:2652
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OF.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OF.mtf
index 28759525f04..ea12ff209df 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OF.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OF.mtf	
@@ -6,7 +6,7 @@ mul id:2653
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OG.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OG.mtf
index 9751ed38f2d..85c29647731 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OG.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OG.mtf	
@@ -6,7 +6,7 @@ mul id:2654
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OR.mtf b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OR.mtf
index 5a7bd4e1b6d..7545f4afdb2 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Raptor RTX1-OR.mtf	
@@ -6,7 +6,7 @@ mul id:2655
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat A.mtf
index f0f2c2efe97..aadad078fb7 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat A.mtf	
@@ -6,7 +6,7 @@ mul id:2887
 Config:Biped Omnimech
 TechBase:Clan
 Era:3003
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat B.mtf
index c6d82cdd200..3c4e9eb1c8e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat B.mtf	
@@ -6,7 +6,7 @@ mul id:2888
 Config:Biped Omnimech
 TechBase:Clan
 Era:3003
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat C.mtf
index 418730b56ce..a9d73002f03 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat C.mtf	
@@ -6,7 +6,7 @@ mul id:2889
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat H.mtf
index 0f4b1c8f79d..2f886ce651b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat H.mtf	
@@ -6,7 +6,7 @@ mul id:2890
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat Prime.mtf
index 41bbc031c42..d9b5411560d 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Shadow Cat Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2892
 Config:Biped Omnimech
 techbase:Clan
 era:3003
-source:TRO 3058 - Succession Wars
+source:TRO: 3058 - Succession Wars
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-8A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-8A.mtf
index e27bddafcf5..cdc55a2500c 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-8A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-8A.mtf	
@@ -6,7 +6,7 @@ mul id:2939
 Config:Biped
 TechBase:Inner Sphere
 Era:2621
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-8C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-8C.mtf
index 0520217d15d..6e8092c48a1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-8C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-8C.mtf	
@@ -6,7 +6,7 @@ mul id:2940
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-9C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-9C.mtf
index 326e9c9b3fb..0ae7d2f03e0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-9C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Shootist ST-9C.mtf	
@@ -6,7 +6,7 @@ mul id:2941
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-N2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-N2.mtf
index 07efcbfa9bd..abf865ef7f8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-N2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-N2.mtf	
@@ -6,7 +6,7 @@ mul id:2995
 Config:Biped
 TechBase:Inner Sphere
 Era:2765
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-N3.mtf b/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-N3.mtf
index fe51aa422d0..088d9a013c5 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-N3.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-N3.mtf	
@@ -6,7 +6,7 @@ mul id:2996
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-NF.mtf b/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-NF.mtf
index 3e694d72a47..46461bdb0ce 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-NF.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Spartan SPT-NF.mtf	
@@ -6,7 +6,7 @@ mul id:2997
 Config:Biped
 TechBase:Inner Sphere
 Era:2770
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-4F.mtf b/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-4F.mtf
index 0df761a2c4b..574e2b0b733 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-4F.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-4F.mtf	
@@ -5,7 +5,7 @@ mul id:3002
 Config:Biped
 techbase:Inner Sphere
 era:2640
-source:TRO 3058 - Star League
+source:TRO: 3058 - Star League
 rules level:4
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-5F.mtf b/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-5F.mtf
index b9fe9f08ff4..7bead2480e8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-5F.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-5F.mtf	
@@ -6,7 +6,7 @@ mul id:3003
 Config:Biped
 TechBase:Inner Sphere
 Era:3053
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-5S.mtf b/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-5S.mtf
index d846f6cec39..71f0b5b4aa4 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-5S.mtf	
@@ -6,7 +6,7 @@ mul id:3004
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-ST.mtf b/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-ST.mtf
index 980ea4c68d6..faf179ba842 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-ST.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Spector SPR-ST.mtf	
@@ -6,7 +6,7 @@ mul id:3005
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-2C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-2C.mtf
index 78ab49f0b38..07f96975cfe 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-2C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-2C.mtf	
@@ -6,7 +6,7 @@ mul id:3048
 Config:Biped
 TechBase:Inner Sphere
 Era:2772
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-3C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-3C.mtf
index 2bddc0e9ff6..cc6b0c43c16 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-3C.mtf	
@@ -6,7 +6,7 @@ mul id:3049
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-3D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-3D.mtf
index df549294a24..5aae36d5444 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Starslayer STY-3D.mtf	
@@ -6,7 +6,7 @@ mul id:3050
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-O.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-O.mtf
index a3f3259cd75..955c181ac0f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-O.mtf	
@@ -6,7 +6,7 @@ mul id:3084
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OA.mtf
index 563e5fc0d24..65171111f40 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OA.mtf	
@@ -6,7 +6,7 @@ mul id:3085
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OB.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OB.mtf
index 909c81442e9..4fe1366c4d0 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OB.mtf	
@@ -6,7 +6,7 @@ mul id:3086
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OC.mtf
index 64282a941f7..93d358f7f65 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OC.mtf	
@@ -6,7 +6,7 @@ mul id:3087
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OD.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OD.mtf
index 42110831871..8a2e328a552 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OD.mtf	
@@ -6,7 +6,7 @@ mul id:3088
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OE.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OE.mtf
index 919924cef3a..9400bbda0ee 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OE.mtf	
@@ -6,7 +6,7 @@ mul id:3089
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OF.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OF.mtf
index d4f3ead8c1a..108ff4f6f73 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OF.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OF.mtf	
@@ -6,7 +6,7 @@ mul id:3090
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OG.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OG.mtf
index 035927d105c..3f3ab24592b 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OG.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OG.mtf	
@@ -6,7 +6,7 @@ mul id:3091
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OR.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OR.mtf
index 7895afb1b64..506952fb4fb 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OR.mtf	
@@ -6,7 +6,7 @@ mul id:3092
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OX.mtf b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OX.mtf
index 7c9a1ac7984..afc190be76e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OX.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Strider SR1-OX.mtf	
@@ -6,7 +6,7 @@ mul id:3093
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2C.mtf
index 96fde3b66a2..e51c4a134f3 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2C.mtf	
@@ -6,7 +6,7 @@ mul id:3094
 Config:Biped
 TechBase:Inner Sphere
 Era:2571
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2D.mtf
index fe102f2b648..dfd10a0f2bf 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2D.mtf	
@@ -6,7 +6,7 @@ mul id:3095
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2S.mtf b/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2S.mtf
index 1e9248aa859..4385f804737 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2S.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Striker STC-2S.mtf	
@@ -6,7 +6,7 @@ mul id:3096
 Config:Biped
 TechBase:Inner Sphere
 Era:2845
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:1
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-O Samual.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-O Samual.mtf
index 11dd25ded2c..6511c796312 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-O Samual.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-O Samual.mtf	
@@ -6,7 +6,7 @@ mul id:3124
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-O.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-O.mtf
index 7e3d63c26eb..b7da405d43e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-O.mtf	
@@ -6,7 +6,7 @@ mul id:3123
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OA.mtf
index 57757bd7f84..050b1d1192e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OA.mtf	
@@ -6,7 +6,7 @@ mul id:3125
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OB.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OB.mtf
index 9cc5a20f738..6df0e3903bb 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OB.mtf	
@@ -6,7 +6,7 @@ mul id:3126
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OC.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OC.mtf
index 1e95841589b..a69505ded8a 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OC.mtf	
@@ -6,7 +6,7 @@ mul id:3127
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OD.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OD.mtf
index fc4fb18080f..4a8d30e4e6f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OD.mtf	
@@ -6,7 +6,7 @@ mul id:3128
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OE.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OE.mtf
index 605f3f1bc8c..bd59b3f20f1 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OE.mtf	
@@ -6,7 +6,7 @@ mul id:3129
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OR.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OR.mtf
index 70f729ac0a1..426c2b0fb53 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OR.mtf	
@@ -6,7 +6,7 @@ mul id:3130
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OX.mtf b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OX.mtf
index d3c1b09ca21..8330d21d8fd 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OX.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Sunder SD1-OX.mtf	
@@ -6,7 +6,7 @@ mul id:3131
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3058 - Jihad
+Source:TRO: 3058 - Jihad
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Supernova 2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Supernova 2.mtf
index 8c5797bc66d..8430f192448 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Supernova 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Supernova 2.mtf	
@@ -6,7 +6,7 @@ mul id:3133
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Supernova 3.mtf b/megamek/data/mechfiles/mechs/3058Uu/Supernova 3.mtf
index 5397800ff7e..ac6c9c54bf8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Supernova 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Supernova 3.mtf	
@@ -6,7 +6,7 @@ mul id:3134
 Config:Biped
 TechBase:Clan
 Era:3064
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Supernova 4.mtf b/megamek/data/mechfiles/mechs/3058Uu/Supernova 4.mtf
index 5b5a3e28c28..4347a381443 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Supernova 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Supernova 4.mtf	
@@ -6,7 +6,7 @@ mul id:3135
 Config:Biped
 TechBase:Clan
 Era:3067
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Supernova.mtf b/megamek/data/mechfiles/mechs/3058Uu/Supernova.mtf
index 15d285b72a8..68bf95c779f 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Supernova.mtf
+++ b/megamek/data/mechfiles/mechs/3058Uu/Supernova.mtf
@@ -6,7 +6,7 @@ mul id:3132
 Config:Biped
 TechBase:Clan
 Era:2846
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5V.mtf b/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5V.mtf
index f2e833764bf..4c31d1d5eb9 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5V.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5V.mtf	
@@ -6,7 +6,7 @@ mul id:3152
 Config:Biped
 TechBase:Inner Sphere
 Era:2670
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5W.mtf b/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5W.mtf
index a16f346f7a7..d3be3395c05 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5W.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5W.mtf	
@@ -6,7 +6,7 @@ mul id:3153
 Config:Biped
 TechBase:Inner Sphere
 Era:2760
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5Z.mtf b/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5Z.mtf
index c612604ddd7..9857b93c9aa 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Talon TLN-5Z.mtf	
@@ -6,7 +6,7 @@ mul id:3154
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Thresher 2.mtf b/megamek/data/mechfiles/mechs/3058Uu/Thresher 2.mtf
index 6139475fa00..bad1177f8e7 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Thresher 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Thresher 2.mtf	
@@ -6,7 +6,7 @@ mul id:3199
 Config:Biped
 TechBase:Clan
 Era:2858
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Thresher.mtf b/megamek/data/mechfiles/mechs/3058Uu/Thresher.mtf
index ce3a927f80d..6353c301957 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Thresher.mtf
+++ b/megamek/data/mechfiles/mechs/3058Uu/Thresher.mtf
@@ -6,7 +6,7 @@ mul id:3198
 Config:Biped
 TechBase:Clan
 Era:2849
-Source:TRO 3058 - Succession Wars
+Source:TRO: 3058 - Succession Wars
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7KMA.mtf b/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7KMA.mtf
index 39a5b45e162..a2bdf6ddba8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7KMA.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7KMA.mtf	
@@ -6,7 +6,7 @@ mul id:3220
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:3
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7S.mtf b/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7S.mtf
index a76a941ce4e..89487852cb5 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7S.mtf	
@@ -6,7 +6,7 @@ mul id:3221
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3058 - Civil War
+Source:TRO: 3058 - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7X.mtf b/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7X.mtf
index e43cf4aa819..40ea84b24bc 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7X.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7X.mtf	
@@ -6,7 +6,7 @@ mul id:3222
 Config:Biped
 TechBase:Inner Sphere
 Era:2771
-Source:TRO 3058 - Star League
+Source:TRO: 3058 - Star League
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7Y.mtf b/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7Y.mtf
index a7e317e3ce8..cfdc7a1f2b8 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Thunder Hawk TDK-7Y.mtf	
@@ -6,7 +6,7 @@ mul id:3223
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3058 - Clan Invasion
+Source:TRO: 3058 - Clan Invasion
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Turkina A.mtf b/megamek/data/mechfiles/mechs/3058Uu/Turkina A.mtf
index ed94efd19ae..f6bc5add353 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Turkina A.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Turkina A.mtf	
@@ -6,7 +6,7 @@ mul id:3326
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Turkina B.mtf b/megamek/data/mechfiles/mechs/3058Uu/Turkina B.mtf
index 8a6e312aa22..31d3fe4636e 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Turkina B.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Turkina B.mtf	
@@ -6,7 +6,7 @@ mul id:3327
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Turkina C.mtf b/megamek/data/mechfiles/mechs/3058Uu/Turkina C.mtf
index cae290ca0c8..d36ede3b7a7 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Turkina C.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Turkina C.mtf	
@@ -6,7 +6,7 @@ mul id:3328
 Config:Biped Omnimech
 techbase:Clan
 era:3052
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 rules level:2
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Turkina D.mtf b/megamek/data/mechfiles/mechs/3058Uu/Turkina D.mtf
index a420fbf21ca..2aaa0af2b74 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Turkina D.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Turkina D.mtf	
@@ -6,7 +6,7 @@ mul id:3329
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Turkina H.mtf b/megamek/data/mechfiles/mechs/3058Uu/Turkina H.mtf
index c5779307a9d..c3161752a17 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Turkina H.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Turkina H.mtf	
@@ -6,7 +6,7 @@ mul id:3331
 Config:Biped Omnimech
 TechBase:Clan
 Era:3062
-source:TRO Clan Invasion - Civil War
+source:TRO: Clan Invasion - Civil War
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3058Uu/Turkina Prime.mtf b/megamek/data/mechfiles/mechs/3058Uu/Turkina Prime.mtf
index 271a7f8f4df..7c299a87e06 100644
--- a/megamek/data/mechfiles/mechs/3058Uu/Turkina Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3058Uu/Turkina Prime.mtf	
@@ -6,7 +6,7 @@ mul id:3332
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1.mtf
index eb50f2b5666..c13c5ab5253 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1.mtf	
@@ -6,7 +6,7 @@ mul id:91
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1A.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1A.mtf
index a154e409e95..baa6b1316e0 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1A.mtf	
@@ -6,7 +6,7 @@ mul id:92
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1B.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1B.mtf
index 812a752004b..7d2ecc69a7b 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1B.mtf	
@@ -6,7 +6,7 @@ mul id:93
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1C.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1C.mtf
index 35cb3d624af..39a5ce5c440 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1C.mtf	
@@ -6,7 +6,7 @@ mul id:94
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1D.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1D.mtf
index e8ba6975db5..56b112a5334 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1D.mtf	
@@ -6,7 +6,7 @@ mul id:95
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1E.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1E.mtf
index 61da071e92e..20744e18c24 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1E.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1E.mtf	
@@ -6,7 +6,7 @@ mul id:96
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1F.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1F.mtf
index 1f1eea84d6a..ec421912091 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1F.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Fox AF1F.mtf	
@@ -6,7 +6,7 @@ mul id:97
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf 2.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf 2.mtf
index fbe94f62236..cf4f67fe337 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf 2.mtf	
@@ -6,7 +6,7 @@ mul id:100
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf A.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf A.mtf
index 865a2fcd2ce..c6d9ec50781 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf A.mtf	
@@ -6,7 +6,7 @@ mul id:101
 Config:Biped Omnimech
 TechBase:Clan
 Era:3067
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf J.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf J.mtf
index b19f55f950b..23d7d0850cf 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf J.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf J.mtf	
@@ -6,7 +6,7 @@ mul id:102
 Config:Biped Omnimech
 TechBase:Clan
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf Prime.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf Prime.mtf
index 7615a368369..76f1644116c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf Prime.mtf	
@@ -6,7 +6,7 @@ mul id:103
 Config:Biped Omnimech
 TechBase:Clan
 Era:3067
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf.mtf b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf.mtf
index 78ef1eee2b7..719b2cf0228 100644
--- a/megamek/data/mechfiles/mechs/3060u/Arctic Wolf.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Arctic Wolf.mtf	
@@ -6,7 +6,7 @@ mul id:99
 Config:Biped
 TechBase:Clan
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Barghest BGS-1T.mtf b/megamek/data/mechfiles/mechs/3060u/Barghest BGS-1T.mtf
index cfb2862857f..63768b7961c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Barghest BGS-1T.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Barghest BGS-1T.mtf	
@@ -5,7 +5,7 @@ mul id:252
 Config:Quad
 techbase:Inner Sphere
 era:3058
-source:TRO 3060 - Clan Invasion
+source:TRO: 3060 - Clan Invasion
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Barghest BGS-2T.mtf b/megamek/data/mechfiles/mechs/3060u/Barghest BGS-2T.mtf
index 40c4fae17ad..77093b74c19 100644
--- a/megamek/data/mechfiles/mechs/3060u/Barghest BGS-2T.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Barghest BGS-2T.mtf	
@@ -6,7 +6,7 @@ mul id:253
 Config:Quad
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060 - Clan Invasion
+Source:TRO: 3060 - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Barghest BGS-3T.mtf b/megamek/data/mechfiles/mechs/3060u/Barghest BGS-3T.mtf
index 2ef54888684..4dc3cc0afe1 100644
--- a/megamek/data/mechfiles/mechs/3060u/Barghest BGS-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Barghest BGS-3T.mtf	
@@ -6,7 +6,7 @@ mul id:254
 Config:Quad
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3060 - Civil War 
+Source:TRO: 3060 - Civil War 
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Barghest BGS-7S.mtf b/megamek/data/mechfiles/mechs/3060u/Barghest BGS-7S.mtf
index 24a7a25e931..c93ac3517b7 100644
--- a/megamek/data/mechfiles/mechs/3060u/Barghest BGS-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Barghest BGS-7S.mtf	
@@ -6,7 +6,7 @@ mul id:255
 Config:Quad
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3060 - Jihad
+Source:TRO: 3060 - Jihad
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Beowulf BEO-12.mtf b/megamek/data/mechfiles/mechs/3060u/Beowulf BEO-12.mtf
index 697293c1b37..93621f75be6 100644
--- a/megamek/data/mechfiles/mechs/3060u/Beowulf BEO-12.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Beowulf BEO-12.mtf	
@@ -6,7 +6,7 @@ mul id:327
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Beowulf BEO-14.mtf b/megamek/data/mechfiles/mechs/3060u/Beowulf BEO-14.mtf
index 7bf8b3f3580..6fe9de38d7b 100644
--- a/megamek/data/mechfiles/mechs/3060u/Beowulf BEO-14.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Beowulf BEO-14.mtf	
@@ -6,7 +6,7 @@ mul id:328
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-3K.mtf b/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-3K.mtf
index b957ec27f7b..8c3c110a192 100644
--- a/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-3K.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-3K.mtf	
@@ -6,7 +6,7 @@ mul id:332
 Config:Quad
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-4K.mtf b/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-4K.mtf
index 6b6b5456f54..4b7b21be5d1 100644
--- a/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-4K.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-4K.mtf	
@@ -6,7 +6,7 @@ mul id:333
 Config:Quad
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-5KC.mtf b/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-5KC.mtf
index 70c5c6dae07..c05c6ee28c9 100644
--- a/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-5KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Bishamon BSN-5KC.mtf	
@@ -6,7 +6,7 @@ mul id:334
 Config:Quad
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Black Watch BKW-7R.mtf b/megamek/data/mechfiles/mechs/3060u/Black Watch BKW-7R.mtf
index ca39e507533..e3a412412ff 100644
--- a/megamek/data/mechfiles/mechs/3060u/Black Watch BKW-7R.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Black Watch BKW-7R.mtf	
@@ -6,7 +6,7 @@ mul id:371
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3060u/Black Watch BKW-9R.mtf b/megamek/data/mechfiles/mechs/3060u/Black Watch BKW-9R.mtf
index 8d294054eaa..ddcf5000f54 100644
--- a/megamek/data/mechfiles/mechs/3060u/Black Watch BKW-9R.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Black Watch BKW-9R.mtf	
@@ -6,7 +6,7 @@ mul id:372
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3060u/Blitzkrieg BTZ-3F.mtf b/megamek/data/mechfiles/mechs/3060u/Blitzkrieg BTZ-3F.mtf
index 880ba286f80..77cd4d2d6b2 100644
--- a/megamek/data/mechfiles/mechs/3060u/Blitzkrieg BTZ-3F.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Blitzkrieg BTZ-3F.mtf	
@@ -6,7 +6,7 @@ mul id:394
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Blitzkrieg BTZ-4F.mtf b/megamek/data/mechfiles/mechs/3060u/Blitzkrieg BTZ-4F.mtf
index be279143447..98dfab68976 100644
--- a/megamek/data/mechfiles/mechs/3060u/Blitzkrieg BTZ-4F.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Blitzkrieg BTZ-4F.mtf	
@@ -6,7 +6,7 @@ mul id:395
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-3R.mtf b/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-3R.mtf
index 33ed2d0b950..4b640af8048 100644
--- a/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-3R.mtf	
@@ -6,7 +6,7 @@ mul id:436
 Config:Biped
 TechBase:Inner Sphere
 Era:3055
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-5W.mtf b/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-5W.mtf
index 7c7218ceced..701f9b1a55e 100644
--- a/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-5W.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-5W.mtf	
@@ -6,7 +6,7 @@ mul id:437
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-6W.mtf b/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-6W.mtf
index 37a66c4b8ce..35c71c5cceb 100644
--- a/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-6W.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Buccaneer BCN-6W.mtf	
@@ -6,7 +6,7 @@ mul id:438
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Canis 2.mtf b/megamek/data/mechfiles/mechs/3060u/Canis 2.mtf
index b1700f1c7a2..9f54044c1e3 100644
--- a/megamek/data/mechfiles/mechs/3060u/Canis 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Canis 2.mtf	
@@ -6,7 +6,7 @@ mul id:460
 Config:Biped
 TechBase:Clan
 Era:3071
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3060u/Canis.mtf b/megamek/data/mechfiles/mechs/3060u/Canis.mtf
index d02d2d8800e..cf491fda155 100644
--- a/megamek/data/mechfiles/mechs/3060u/Canis.mtf
+++ b/megamek/data/mechfiles/mechs/3060u/Canis.mtf
@@ -6,7 +6,7 @@ mul id:459
 Config:Biped
 TechBase:Clan
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3060u/Clint IIC 2.mtf b/megamek/data/mechfiles/mechs/3060u/Clint IIC 2.mtf
index 08871e91c5d..b2fd16aebad 100644
--- a/megamek/data/mechfiles/mechs/3060u/Clint IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Clint IIC 2.mtf	
@@ -6,7 +6,7 @@ mul id:653
 Config:Biped
 TechBase:Clan
 Era:3073
-Source:TRO 3060 - Jihad
+Source:TRO: 3060 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Clint IIC.mtf b/megamek/data/mechfiles/mechs/3060u/Clint IIC.mtf
index d313fd82117..b9f5198824c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Clint IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Clint IIC.mtf	
@@ -5,7 +5,7 @@ mul id:652
 Config:Biped
 techbase:Clan
 era:2842
-source:TRO 3060 - Early Succesion Wars
+source:TRO: 3060 - Early Succession Wars
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Cobra CBR-02.mtf b/megamek/data/mechfiles/mechs/3060u/Cobra CBR-02.mtf
index 77bf422fc57..f5e904ede53 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cobra CBR-02.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cobra CBR-02.mtf	
@@ -6,7 +6,7 @@ mul id:655
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Cobra CBR-03.mtf b/megamek/data/mechfiles/mechs/3060u/Cobra CBR-03.mtf
index 784b07d774d..9306d22892a 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cobra CBR-03.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cobra CBR-03.mtf	
@@ -6,7 +6,7 @@ mul id:656
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Commando IIC.mtf b/megamek/data/mechfiles/mechs/3060u/Commando IIC.mtf
index 7504289c0f9..3e9b8f10a84 100644
--- a/megamek/data/mechfiles/mechs/3060u/Commando IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Commando IIC.mtf	
@@ -6,7 +6,7 @@ mul id:678
 Config:Biped
 techbase:Clan
 era:2856
-source:TRO 3060 - Succession Wars
+source:TRO: 3060 - Succession Wars
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/3060u/Corvis 2.mtf b/megamek/data/mechfiles/mechs/3060u/Corvis 2.mtf
index 78dfc03cdc9..54ecaa327da 100644
--- a/megamek/data/mechfiles/mechs/3060u/Corvis 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Corvis 2.mtf	
@@ -6,7 +6,7 @@ mul id:701
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Corvis.mtf b/megamek/data/mechfiles/mechs/3060u/Corvis.mtf
index ea847a4ebc0..c9ef1ef7924 100644
--- a/megamek/data/mechfiles/mechs/3060u/Corvis.mtf
+++ b/megamek/data/mechfiles/mechs/3060u/Corvis.mtf
@@ -6,7 +6,7 @@ mul id:700
 Config:Biped
 TechBase:Clan
 Era:2845
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Cossack C-1FC.mtf b/megamek/data/mechfiles/mechs/3060u/Cossack C-1FC.mtf
index 6cf07bbef3b..d2439b4d065 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cossack C-1FC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cossack C-1FC.mtf	
@@ -6,7 +6,7 @@ mul id:702
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3060u/Cossack C-SK1.mtf b/megamek/data/mechfiles/mechs/3060u/Cossack C-SK1.mtf
index d8526436164..d106f145a5a 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cossack C-SK1.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cossack C-SK1.mtf	
@@ -6,7 +6,7 @@ mul id:703
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3060u/Cougar A.mtf b/megamek/data/mechfiles/mechs/3060u/Cougar A.mtf
index fd6d5c45a56..276ac8f625e 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cougar A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cougar A.mtf	
@@ -6,7 +6,7 @@ mul id:704
 Config:Biped Omnimech
 TechBase:Clan
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Cougar B.mtf b/megamek/data/mechfiles/mechs/3060u/Cougar B.mtf
index be476082912..267ebe8d901 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cougar B.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cougar B.mtf	
@@ -6,7 +6,7 @@ mul id:705
 Config:Biped Omnimech
 TechBase:Clan
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Cougar C.mtf b/megamek/data/mechfiles/mechs/3060u/Cougar C.mtf
index f22d0476d82..e54c97ab967 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cougar C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cougar C.mtf	
@@ -6,7 +6,7 @@ mul id:706
 Config:Biped Omnimech
 TechBase:Clan
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Cougar D.mtf b/megamek/data/mechfiles/mechs/3060u/Cougar D.mtf
index 9dd0d5ad0e8..8fa5e3415d2 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cougar D.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cougar D.mtf	
@@ -6,7 +6,7 @@ mul id:707
 Config:Biped Omnimech
 TechBase:Clan
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Cougar Prime.mtf b/megamek/data/mechfiles/mechs/3060u/Cougar Prime.mtf
index a4224def830..58eba8e294e 100644
--- a/megamek/data/mechfiles/mechs/3060u/Cougar Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Cougar Prime.mtf	
@@ -6,7 +6,7 @@ mul id:712
 Config:Biped Omnimech
 TechBase:Clan
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Duan Gung D9-G10.mtf b/megamek/data/mechfiles/mechs/3060u/Duan Gung D9-G10.mtf
index 065b9ccf31e..b04e5abf3bc 100644
--- a/megamek/data/mechfiles/mechs/3060u/Duan Gung D9-G10.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Duan Gung D9-G10.mtf	
@@ -6,7 +6,7 @@ mul id:934
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3060u/Duan Gung D9-G9.mtf b/megamek/data/mechfiles/mechs/3060u/Duan Gung D9-G9.mtf
index 1da79fe0991..dbff7398a3f 100644
--- a/megamek/data/mechfiles/mechs/3060u/Duan Gung D9-G9.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Duan Gung D9-G9.mtf	
@@ -6,7 +6,7 @@ mul id:935
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3060u/Eagle EGL-1M.mtf b/megamek/data/mechfiles/mechs/3060u/Eagle EGL-1M.mtf
index a13a0dcdf92..3bf82fc7d36 100644
--- a/megamek/data/mechfiles/mechs/3060u/Eagle EGL-1M.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Eagle EGL-1M.mtf	
@@ -6,7 +6,7 @@ mul id:936
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3060u/Eagle EGL-2M.mtf b/megamek/data/mechfiles/mechs/3060u/Eagle EGL-2M.mtf
index f6f578a0619..b89d0ed6ea4 100644
--- a/megamek/data/mechfiles/mechs/3060u/Eagle EGL-2M.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Eagle EGL-2M.mtf	
@@ -6,7 +6,7 @@ mul id:937
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3060u/Eagle EGL-3M.mtf b/megamek/data/mechfiles/mechs/3060u/Eagle EGL-3M.mtf
index 41a0c27d07b..0469660f7a7 100644
--- a/megamek/data/mechfiles/mechs/3060u/Eagle EGL-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Eagle EGL-3M.mtf	
@@ -6,7 +6,7 @@ mul id:938
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3060u/Enforcer III ENF-6M.mtf b/megamek/data/mechfiles/mechs/3060u/Enforcer III ENF-6M.mtf
index 6330c168eda..761d9c3ab9c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Enforcer III ENF-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Enforcer III ENF-6M.mtf	
@@ -6,7 +6,7 @@ mul id:982
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Enforcer III ENF-6NAIS.mtf b/megamek/data/mechfiles/mechs/3060u/Enforcer III ENF-6NAIS.mtf
index 0231e2267a9..e2293180e49 100644
--- a/megamek/data/mechfiles/mechs/3060u/Enforcer III ENF-6NAIS.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Enforcer III ENF-6NAIS.mtf	
@@ -6,7 +6,7 @@ mul id:984
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Fire Scorpion 2.mtf b/megamek/data/mechfiles/mechs/3060u/Fire Scorpion 2.mtf
index d26826bfe96..a13f7c9623b 100644
--- a/megamek/data/mechfiles/mechs/3060u/Fire Scorpion 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Fire Scorpion 2.mtf	
@@ -6,7 +6,7 @@ mul id:1072
 Config:Quad
 TechBase:Clan
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Fire Scorpion 3.mtf b/megamek/data/mechfiles/mechs/3060u/Fire Scorpion 3.mtf
index 70c7acdb2d3..9786d3be4ee 100644
--- a/megamek/data/mechfiles/mechs/3060u/Fire Scorpion 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Fire Scorpion 3.mtf	
@@ -6,7 +6,7 @@ mul id:1073
 Config:Quad
 techbase:Clan
 era:3071
-source:TRO 3060 - Jihad
+source:TRO: 3060 - Jihad
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Fire Scorpion.mtf b/megamek/data/mechfiles/mechs/3060u/Fire Scorpion.mtf
index 944f03537c7..a3a7cdf4c7a 100644
--- a/megamek/data/mechfiles/mechs/3060u/Fire Scorpion.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Fire Scorpion.mtf	
@@ -6,7 +6,7 @@ mul id:1071
 Config:Quad
 TechBase:Clan
 Era:2852
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Garm GRM-01A.mtf b/megamek/data/mechfiles/mechs/3060u/Garm GRM-01A.mtf
index b0a1dc4b6b0..3af43c05d80 100644
--- a/megamek/data/mechfiles/mechs/3060u/Garm GRM-01A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Garm GRM-01A.mtf	
@@ -6,7 +6,7 @@ mul id:1189
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Garm GRM-01A2.mtf b/megamek/data/mechfiles/mechs/3060u/Garm GRM-01A2.mtf
index f8babc818c7..143d3498086 100644
--- a/megamek/data/mechfiles/mechs/3060u/Garm GRM-01A2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Garm GRM-01A2.mtf	
@@ -6,7 +6,7 @@ mul id:1190
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Garm GRM-01B.mtf b/megamek/data/mechfiles/mechs/3060u/Garm GRM-01B.mtf
index 7c2fc307c30..bc53a3dbef6 100644
--- a/megamek/data/mechfiles/mechs/3060u/Garm GRM-01B.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Garm GRM-01B.mtf	
@@ -6,7 +6,7 @@ mul id:1191
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Garm GRM-01C.mtf b/megamek/data/mechfiles/mechs/3060u/Garm GRM-01C.mtf
index b2c454253f7..b949f40bf4d 100644
--- a/megamek/data/mechfiles/mechs/3060u/Garm GRM-01C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Garm GRM-01C.mtf	
@@ -6,7 +6,7 @@ mul id:1192
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3060u/Great Wyrm 2.mtf b/megamek/data/mechfiles/mechs/3060u/Great Wyrm 2.mtf
index 4f50cf50721..5028fdad813 100644
--- a/megamek/data/mechfiles/mechs/3060u/Great Wyrm 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Great Wyrm 2.mtf	
@@ -6,7 +6,7 @@ mul id:1285
 Config:Biped
 TechBase:Clan
 Era:3069
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Great Wyrm.mtf b/megamek/data/mechfiles/mechs/3060u/Great Wyrm.mtf
index f570572a655..7db1af2d65c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Great Wyrm.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Great Wyrm.mtf	
@@ -6,7 +6,7 @@ mul id:1284
 Config:Biped
 TechBase:Clan
 Era:2844
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Guillotine IIC 2.mtf b/megamek/data/mechfiles/mechs/3060u/Guillotine IIC 2.mtf
index 8536e24a472..b3682247e83 100644
--- a/megamek/data/mechfiles/mechs/3060u/Guillotine IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Guillotine IIC 2.mtf	
@@ -6,7 +6,7 @@ mul id:1346
 Config:Biped
 TechBase:Clan
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Guillotine IIC.mtf b/megamek/data/mechfiles/mechs/3060u/Guillotine IIC.mtf
index 1418a0367bc..1a14c2793f0 100644
--- a/megamek/data/mechfiles/mechs/3060u/Guillotine IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Guillotine IIC.mtf	
@@ -6,7 +6,7 @@ mul id:1345
 Config:Biped
 techbase:Clan
 era:2889
-source:TRO 3060
+source:TRO: 3060
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Ha Otoko 2.mtf b/megamek/data/mechfiles/mechs/3060u/Ha Otoko 2.mtf
index 01e1d151115..ab8f121384f 100644
--- a/megamek/data/mechfiles/mechs/3060u/Ha Otoko 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Ha Otoko 2.mtf	
@@ -6,7 +6,7 @@ mul id:1356
 Config:Biped
 TechBase:Clan
 Era:3074
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Ha Otoko HKO-1C.mtf b/megamek/data/mechfiles/mechs/3060u/Ha Otoko HKO-1C.mtf
index 9a337d63a83..b85333fc221 100644
--- a/megamek/data/mechfiles/mechs/3060u/Ha Otoko HKO-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Ha Otoko HKO-1C.mtf	
@@ -6,7 +6,7 @@ mul id:1357
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Ha Otoko.mtf b/megamek/data/mechfiles/mechs/3060u/Ha Otoko.mtf
index 20a9b8f51d8..b96c92d9316 100644
--- a/megamek/data/mechfiles/mechs/3060u/Ha Otoko.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Ha Otoko.mtf	
@@ -6,7 +6,7 @@ mul id:1355
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-O.mtf b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-O.mtf
index 80c67f2bae0..dddb9010a44 100644
--- a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-O.mtf	
@@ -6,7 +6,7 @@ mul id:1420
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3060
-source:TRO 3060
+source:TRO: 3060
 rules level:2
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OA.mtf b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OA.mtf
index 49f61a800cf..4e0ae64dd14 100644
--- a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OA.mtf	
@@ -6,7 +6,7 @@ mul id:1421
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3060
-source:TRO 3060
+source:TRO: 3060
 rules level:2
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OB.mtf b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OB.mtf
index 9044c895c76..534d8c3c0bc 100644
--- a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OB.mtf	
@@ -6,7 +6,7 @@ mul id:1422
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OC.mtf b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OC.mtf
index fb2f4c4e414..401a249403b 100644
--- a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OC.mtf	
@@ -6,7 +6,7 @@ mul id:1423
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OD.mtf b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OD.mtf
index c05d3407d01..d5c44399b61 100644
--- a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OD.mtf	
@@ -6,7 +6,7 @@ mul id:1424
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OE.mtf b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OE.mtf
index ee6de246af0..84ef31eddf2 100644
--- a/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Hauptmann HA1-OE.mtf	
@@ -6,7 +6,7 @@ mul id:1425
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Helios HEL-3D.mtf b/megamek/data/mechfiles/mechs/3060u/Helios HEL-3D.mtf
index 2cabf5a67db..0830750d191 100644
--- a/megamek/data/mechfiles/mechs/3060u/Helios HEL-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Helios HEL-3D.mtf	
@@ -6,7 +6,7 @@ mul id:1464
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Helios HEL-4A.mtf b/megamek/data/mechfiles/mechs/3060u/Helios HEL-4A.mtf
index 45e0ef2bc35..03ab2f0631f 100644
--- a/megamek/data/mechfiles/mechs/3060u/Helios HEL-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Helios HEL-4A.mtf	
@@ -6,7 +6,7 @@ mul id:1465
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Helios HEL-6X.mtf b/megamek/data/mechfiles/mechs/3060u/Helios HEL-6X.mtf
index b177668a45c..db0d73a6461 100644
--- a/megamek/data/mechfiles/mechs/3060u/Helios HEL-6X.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Helios HEL-6X.mtf	
@@ -6,7 +6,7 @@ mul id:1466
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Helios HEL-C.mtf b/megamek/data/mechfiles/mechs/3060u/Helios HEL-C.mtf
index 1f8a552bc4a..deaf31ab6c1 100644
--- a/megamek/data/mechfiles/mechs/3060u/Helios HEL-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Helios HEL-C.mtf	
@@ -6,7 +6,7 @@ mul id:1467
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Highlander IIC 2.mtf b/megamek/data/mechfiles/mechs/3060u/Highlander IIC 2.mtf
index ad06de1c10d..8b001fff222 100644
--- a/megamek/data/mechfiles/mechs/3060u/Highlander IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Highlander IIC 2.mtf	
@@ -6,7 +6,7 @@ mul id:1525
 Config:Biped
 TechBase:Clan
 Era:3072
-Source:TRO 3060 - Jihad
+Source:TRO: 3060 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Highlander IIC.mtf b/megamek/data/mechfiles/mechs/3060u/Highlander IIC.mtf
index b8fac9accaf..3b546f1325f 100644
--- a/megamek/data/mechfiles/mechs/3060u/Highlander IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Highlander IIC.mtf	
@@ -6,7 +6,7 @@ mul id:1524
 Config:Biped
 techbase:Clan
 era:2858
-source:TRO 3060 - Early Succession War
+source:TRO: 3060 - Early Succession War
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Icestorm 2.mtf b/megamek/data/mechfiles/mechs/3060u/Icestorm 2.mtf
index 7a18e46c577..1d003824237 100644
--- a/megamek/data/mechfiles/mechs/3060u/Icestorm 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Icestorm 2.mtf	
@@ -6,7 +6,7 @@ mul id:1603
 Config:Biped
 TechBase:Clan
 Era:3068
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3060u/Icestorm.mtf b/megamek/data/mechfiles/mechs/3060u/Icestorm.mtf
index d735c4f407a..34dd8cb3eaf 100644
--- a/megamek/data/mechfiles/mechs/3060u/Icestorm.mtf
+++ b/megamek/data/mechfiles/mechs/3060u/Icestorm.mtf
@@ -6,7 +6,7 @@ mul id:1602
 Config:Biped
 TechBase:Clan
 Era:2830
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3060u/Initiate INI-02.mtf b/megamek/data/mechfiles/mechs/3060u/Initiate INI-02.mtf
index f7f512ea1ad..887b446c561 100644
--- a/megamek/data/mechfiles/mechs/3060u/Initiate INI-02.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Initiate INI-02.mtf	
@@ -6,7 +6,7 @@ mul id:1620
 Config:Biped
 techbase:Inner Sphere
 era:3058
-source:TRO 3060
+source:TRO: 3060
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Initiate INI-04.mtf b/megamek/data/mechfiles/mechs/3060u/Initiate INI-04.mtf
index 02c80e07faa..ace1545308b 100644
--- a/megamek/data/mechfiles/mechs/3060u/Initiate INI-04.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Initiate INI-04.mtf	
@@ -6,7 +6,7 @@ mul id:1621
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/JagerMech III JM6-D3.mtf b/megamek/data/mechfiles/mechs/3060u/JagerMech III JM6-D3.mtf
index f6954e901ac..ab680488db2 100644
--- a/megamek/data/mechfiles/mechs/3060u/JagerMech III JM6-D3.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/JagerMech III JM6-D3.mtf	
@@ -6,7 +6,7 @@ mul id:1672
 Config:Biped
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/JagerMech III JM6-D4.mtf b/megamek/data/mechfiles/mechs/3060u/JagerMech III JM6-D4.mtf
index c903acbf387..ddb82ecf973 100644
--- a/megamek/data/mechfiles/mechs/3060u/JagerMech III JM6-D4.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/JagerMech III JM6-D4.mtf	
@@ -6,7 +6,7 @@ mul id:1673
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G7L.mtf b/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G7L.mtf
index 0be2104fed5..51dd636af35 100644
--- a/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G7L.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G7L.mtf	
@@ -6,7 +6,7 @@ mul id:1707
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3060 - Jihad
+Source:TRO: 3060 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G8A.mtf b/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G8A.mtf
index fbf92fdc91a..14d55d939e8 100644
--- a/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G8A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G8A.mtf	
@@ -5,7 +5,7 @@ mul id:1708
 Config:Biped
 techbase:Inner Sphere
 era:3060
-source:TRO 3060 - Clan Invasion
+source:TRO: 3060 - Clan Invasion
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G9CC.mtf b/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G9CC.mtf
index dcb4c2c2d70..a8b2803e2fa 100644
--- a/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G9CC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Jinggau JN-G9CC.mtf	
@@ -6,7 +6,7 @@ mul id:1710
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3060 - Jihad
+Source:TRO: 3060 - Jihad
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3060u/Kabuto KBO-7A.mtf b/megamek/data/mechfiles/mechs/3060u/Kabuto KBO-7A.mtf
index aff14998d45..717dbefc230 100644
--- a/megamek/data/mechfiles/mechs/3060u/Kabuto KBO-7A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Kabuto KBO-7A.mtf	
@@ -6,7 +6,7 @@ mul id:1728
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3060u/Kabuto KBO-7B.mtf b/megamek/data/mechfiles/mechs/3060u/Kabuto KBO-7B.mtf
index 931b79a1835..89c111558a5 100644
--- a/megamek/data/mechfiles/mechs/3060u/Kabuto KBO-7B.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Kabuto KBO-7B.mtf	
@@ -6,7 +6,7 @@ mul id:1729
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3060u/Mandrill.mtf b/megamek/data/mechfiles/mechs/3060u/Mandrill.mtf
index 7b6fcbcd1c1..73b62a915a1 100644
--- a/megamek/data/mechfiles/mechs/3060u/Mandrill.mtf
+++ b/megamek/data/mechfiles/mechs/3060u/Mandrill.mtf
@@ -6,7 +6,7 @@ mul id:2011
 Config:Biped
 TechBase:Clan
 Era:2829
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Marshal MHL-2L.mtf b/megamek/data/mechfiles/mechs/3060u/Marshal MHL-2L.mtf
index 953991040b9..fa1db215a66 100644
--- a/megamek/data/mechfiles/mechs/3060u/Marshal MHL-2L.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Marshal MHL-2L.mtf	
@@ -6,7 +6,7 @@ mul id:2088
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Marshal MHL-6MC.mtf b/megamek/data/mechfiles/mechs/3060u/Marshal MHL-6MC.mtf
index f9e7d193374..de23b8a7f18 100644
--- a/megamek/data/mechfiles/mechs/3060u/Marshal MHL-6MC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Marshal MHL-6MC.mtf	
@@ -6,7 +6,7 @@ mul id:2089
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Marshal MHL-X1.mtf b/megamek/data/mechfiles/mechs/3060u/Marshal MHL-X1.mtf
index 44280f45f28..7f4d22dfdec 100644
--- a/megamek/data/mechfiles/mechs/3060u/Marshal MHL-X1.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Marshal MHL-X1.mtf	
@@ -6,7 +6,7 @@ mul id:2090
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Matador 2.mtf b/megamek/data/mechfiles/mechs/3060u/Matador 2.mtf
index 8000de26f86..138eafbb0f8 100644
--- a/megamek/data/mechfiles/mechs/3060u/Matador 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Matador 2.mtf	
@@ -6,7 +6,7 @@ mul id:2099
 Config:Biped
 TechBase:Clan
 Era:3069
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Matador.mtf b/megamek/data/mechfiles/mechs/3060u/Matador.mtf
index 5275ab40e92..89cdec4d2f1 100644
--- a/megamek/data/mechfiles/mechs/3060u/Matador.mtf
+++ b/megamek/data/mechfiles/mechs/3060u/Matador.mtf
@@ -6,7 +6,7 @@ mul id:2098
 Config:Biped
 TechBase:Clan
 Era:2846
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-O.mtf b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-O.mtf
index d9d1604e2d1..441a0b47999 100644
--- a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-O.mtf	
@@ -6,7 +6,7 @@ mul id:2160
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OA.mtf b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OA.mtf
index a6bbcb0ea81..4846f8d3c75 100644
--- a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OA.mtf	
@@ -6,7 +6,7 @@ mul id:2161
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OB.mtf b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OB.mtf
index 6c89ea6830a..c366ceef106 100644
--- a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OB.mtf	
@@ -6,7 +6,7 @@ mul id:2162
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OC.mtf b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OC.mtf
index 61a8973bcec..b6e8cf661bd 100644
--- a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OC.mtf	
@@ -6,7 +6,7 @@ mul id:2163
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OD.mtf b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OD.mtf
index 60b650005c8..63953866d35 100644
--- a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OD.mtf	
@@ -6,7 +6,7 @@ mul id:2164
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OE.mtf b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OE.mtf
index 721c3df33f0..fdf01f3e46e 100644
--- a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OE.mtf	
@@ -6,7 +6,7 @@ mul id:2165
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OF.mtf b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OF.mtf
index 1fd7555bb0f..b57080e1194 100644
--- a/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OF.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Men Shen MS1-OF.mtf	
@@ -6,7 +6,7 @@ mul id:2166
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Nova Cat A.mtf b/megamek/data/mechfiles/mechs/3060u/Nova Cat A.mtf
index 7c92d30d928..2ae28681f44 100644
--- a/megamek/data/mechfiles/mechs/3060u/Nova Cat A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Nova Cat A.mtf	
@@ -6,7 +6,7 @@ mul id:2299
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Nova Cat B.mtf b/megamek/data/mechfiles/mechs/3060u/Nova Cat B.mtf
index bc95b7f7a1e..0ef853e4a24 100644
--- a/megamek/data/mechfiles/mechs/3060u/Nova Cat B.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Nova Cat B.mtf	
@@ -6,7 +6,7 @@ mul id:2300
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Nova Cat C.mtf b/megamek/data/mechfiles/mechs/3060u/Nova Cat C.mtf
index f5d023e417c..75201a2a3e0 100644
--- a/megamek/data/mechfiles/mechs/3060u/Nova Cat C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Nova Cat C.mtf	
@@ -6,7 +6,7 @@ mul id:2301
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Nova Cat D.mtf b/megamek/data/mechfiles/mechs/3060u/Nova Cat D.mtf
index 11c4af93c96..133ca18a17e 100644
--- a/megamek/data/mechfiles/mechs/3060u/Nova Cat D.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Nova Cat D.mtf	
@@ -6,7 +6,7 @@ mul id:2302
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Nova Cat E.mtf b/megamek/data/mechfiles/mechs/3060u/Nova Cat E.mtf
index 3dd4094d717..b321fe3b6cd 100644
--- a/megamek/data/mechfiles/mechs/3060u/Nova Cat E.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Nova Cat E.mtf	
@@ -6,7 +6,7 @@ mul id:2303
 Config:Biped Omnimech
 TechBase:Clan
 Era:3064
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Nova Cat F.mtf b/megamek/data/mechfiles/mechs/3060u/Nova Cat F.mtf
index 60153807f66..e3a968f235f 100644
--- a/megamek/data/mechfiles/mechs/3060u/Nova Cat F.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Nova Cat F.mtf	
@@ -6,7 +6,7 @@ mul id:2304
 Config:Biped Omnimech
 TechBase:Clan
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Nova Cat G.mtf b/megamek/data/mechfiles/mechs/3060u/Nova Cat G.mtf
index 4f24af0df65..8d9af7daf3c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Nova Cat G.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Nova Cat G.mtf	
@@ -6,7 +6,7 @@ mul id:2305
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Nova Cat Prime.mtf b/megamek/data/mechfiles/mechs/3060u/Nova Cat Prime.mtf
index 4df2e9c1c9e..083457bffbf 100644
--- a/megamek/data/mechfiles/mechs/3060u/Nova Cat Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Nova Cat Prime.mtf	
@@ -6,7 +6,7 @@ mul id:2306
 Config:Biped Omnimech
 techbase:Clan
 era:3059
-source:TRO 3060
+source:TRO: 3060
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3060u/Orion IIC.mtf b/megamek/data/mechfiles/mechs/3060u/Orion IIC.mtf
index 37d88291aa3..476c21f6cb7 100644
--- a/megamek/data/mechfiles/mechs/3060u/Orion IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Orion IIC.mtf	
@@ -6,7 +6,7 @@ mul id:2340
 Config:Biped
 TechBase:Clan
 Era:2841
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3060u/Pack Hunter 2.mtf b/megamek/data/mechfiles/mechs/3060u/Pack Hunter 2.mtf
index f6f94e798b6..0a2015023b0 100644
--- a/megamek/data/mechfiles/mechs/3060u/Pack Hunter 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Pack Hunter 2.mtf	
@@ -6,7 +6,7 @@ mul id:2393
 Config:Biped
 TechBase:Clan
 Era:3065
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Pack Hunter 3.mtf b/megamek/data/mechfiles/mechs/3060u/Pack Hunter 3.mtf
index e4fe5581224..1dae1ecea30 100644
--- a/megamek/data/mechfiles/mechs/3060u/Pack Hunter 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Pack Hunter 3.mtf	
@@ -6,7 +6,7 @@ mul id:2394
 Config:Biped
 TechBase:Clan
 Era:3068
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Pack Hunter 4.mtf b/megamek/data/mechfiles/mechs/3060u/Pack Hunter 4.mtf
index 7fbfa311c7f..f281f2356cd 100644
--- a/megamek/data/mechfiles/mechs/3060u/Pack Hunter 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Pack Hunter 4.mtf	
@@ -6,7 +6,7 @@ mul id:2395
 Config:Biped
 TechBase:Clan
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Pack Hunter.mtf b/megamek/data/mechfiles/mechs/3060u/Pack Hunter.mtf
index 6687879fcc4..481e6476e56 100644
--- a/megamek/data/mechfiles/mechs/3060u/Pack Hunter.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Pack Hunter.mtf	
@@ -6,7 +6,7 @@ mul id:2392
 Config:Biped
 techbase:Clan
 era:3059
-source:TRO 3060
+source:TRO: 3060
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Predator 2.mtf b/megamek/data/mechfiles/mechs/3060u/Predator 2.mtf
index fdc6e17ff3c..4864255ac11 100644
--- a/megamek/data/mechfiles/mechs/3060u/Predator 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Predator 2.mtf	
@@ -6,7 +6,7 @@ mul id:2568
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Predator.mtf b/megamek/data/mechfiles/mechs/3060u/Predator.mtf
index aeb8a8d8707..cd4ea4dcc44 100644
--- a/megamek/data/mechfiles/mechs/3060u/Predator.mtf
+++ b/megamek/data/mechfiles/mechs/3060u/Predator.mtf
@@ -6,7 +6,7 @@ mul id:2567
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Sentry SNT-04.mtf b/megamek/data/mechfiles/mechs/3060u/Sentry SNT-04.mtf
index e64652ffb4a..ac361354698 100644
--- a/megamek/data/mechfiles/mechs/3060u/Sentry SNT-04.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Sentry SNT-04.mtf	
@@ -6,7 +6,7 @@ mul id:2866
 Config:Biped
 TechBase:Inner Sphere
 Era:3056
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Sentry SNT-W5.mtf b/megamek/data/mechfiles/mechs/3060u/Sentry SNT-W5.mtf
index 1b0ca4e4192..4cafdc6d0b2 100644
--- a/megamek/data/mechfiles/mechs/3060u/Sentry SNT-W5.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Sentry SNT-W5.mtf	
@@ -6,7 +6,7 @@ mul id:2867
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3060u/Shugenja SJA-7D.mtf b/megamek/data/mechfiles/mechs/3060u/Shugenja SJA-7D.mtf
index 44022a9663b..3c4930407f7 100644
--- a/megamek/data/mechfiles/mechs/3060u/Shugenja SJA-7D.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Shugenja SJA-7D.mtf	
@@ -6,7 +6,7 @@ mul id:2942
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3060u/Shugenja SJA-8H.mtf b/megamek/data/mechfiles/mechs/3060u/Shugenja SJA-8H.mtf
index 55a9ed00182..670d2a3c563 100644
--- a/megamek/data/mechfiles/mechs/3060u/Shugenja SJA-8H.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Shugenja SJA-8H.mtf	
@@ -6,7 +6,7 @@ mul id:2943
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-3C.mtf b/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-3C.mtf
index 7d914a2b975..8db140ab720 100644
--- a/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-3C.mtf	
@@ -6,7 +6,7 @@ mul id:2951
 Config:Quad
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-5C.mtf b/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-5C.mtf
index 367219a7220..9011b6c7480 100644
--- a/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-5C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-5C.mtf	
@@ -6,7 +6,7 @@ mul id:2952
 Config:Quad
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-6C.mtf b/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-6C.mtf
index 54b479a0183..8e658382cca 100644
--- a/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-6C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Sirocco SRC-6C.mtf	
@@ -6,7 +6,7 @@ mul id:2953
 Config:Quad
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3060u/Snow Fox 2.mtf b/megamek/data/mechfiles/mechs/3060u/Snow Fox 2.mtf
index f26affd8bf1..a82379a5958 100644
--- a/megamek/data/mechfiles/mechs/3060u/Snow Fox 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Snow Fox 2.mtf	
@@ -6,7 +6,7 @@ mul id:2980
 Config:Quad
 TechBase:Clan
 Era:3015
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3060u/Snow Fox 3.mtf b/megamek/data/mechfiles/mechs/3060u/Snow Fox 3.mtf
index 275d72992df..d8caeb0a41f 100644
--- a/megamek/data/mechfiles/mechs/3060u/Snow Fox 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Snow Fox 3.mtf	
@@ -6,7 +6,7 @@ mul id:2981
 Config:Quad
 TechBase:Clan
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3060u/Snow Fox.mtf b/megamek/data/mechfiles/mechs/3060u/Snow Fox.mtf
index ee7f86952ed..d5c1fda06ff 100644
--- a/megamek/data/mechfiles/mechs/3060u/Snow Fox.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Snow Fox.mtf	
@@ -6,7 +6,7 @@ mul id:2979
 Config:Quad
 TechBase:Clan
 Era:3015
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3060u/Stalking Spider 2.mtf b/megamek/data/mechfiles/mechs/3060u/Stalking Spider 2.mtf
index 1d120d65fb7..f5604ff7c2f 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stalking Spider 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stalking Spider 2.mtf	
@@ -6,7 +6,7 @@ mul id:3046
 Config:Quad
 TechBase:Clan
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Stalking Spider 3.mtf b/megamek/data/mechfiles/mechs/3060u/Stalking Spider 3.mtf
index 004460778e8..bcb63a17409 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stalking Spider 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stalking Spider 3.mtf	
@@ -6,7 +6,7 @@ mul id:3047
 Config:Quad
 TechBase:Clan
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Stalking Spider.mtf b/megamek/data/mechfiles/mechs/3060u/Stalking Spider.mtf
index 35349220e51..1eca4625286 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stalking Spider.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stalking Spider.mtf	
@@ -6,7 +6,7 @@ mul id:3045
 Config:Quad
 TechBase:Clan
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) A.mtf b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) A.mtf
index 61ca7d37ccf..6006813b4b8 100644
--- a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) A.mtf	
@@ -6,7 +6,7 @@ mul id:399
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-Source:TRO 3060 - Clan Invasion
+Source:TRO: 3060 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) B.mtf b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) B.mtf
index f48c49cf85f..b0c44be40a9 100644
--- a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) B.mtf	
@@ -6,7 +6,7 @@ mul id:400
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-Source:TRO 3060 - Clan Invasion
+Source:TRO: 3060 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) C.mtf b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) C.mtf
index 9493f165ff2..4dd83545405 100644
--- a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) C.mtf	
@@ -6,7 +6,7 @@ mul id:401
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-Source:TRO 3060 - Clan Invasion
+Source:TRO: 3060 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) D.mtf b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) D.mtf
index 2beb94a1314..b8ba7786632 100644
--- a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) D.mtf	
@@ -6,7 +6,7 @@ mul id:402
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-Source:TRO 3060 - Clan Invasion
+Source:TRO: 3060 - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) Prime.mtf b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) Prime.mtf
index 07ef875fa0d..a1ca9d83d45 100644
--- a/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Star Adder (Blood Asp) Prime.mtf	
@@ -5,7 +5,7 @@ mul id:406
 Config:Biped Omnimech
 techbase:Clan
 era:3060
-source:TRO 3060 - Clan Invasion
+source:TRO: 3060 - Clan Invasion
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk A.mtf b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk A.mtf
index 5713243cc63..ff0c2f39680 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk A.mtf	
@@ -6,7 +6,7 @@ mul id:3076
 Config:Biped Omnimech
 TechBase:Clan
 Era:2970
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk B.mtf b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk B.mtf
index 82ece85cbba..139d579064d 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk B.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk B.mtf	
@@ -6,7 +6,7 @@ mul id:3077
 Config:Biped Omnimech
 TechBase:Clan
 Era:2970
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk C.mtf b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk C.mtf
index 2c6d2a36bcb..841f1526a6b 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk C.mtf	
@@ -6,7 +6,7 @@ mul id:3078
 Config:Biped Omnimech
 TechBase:Clan
 Era:2970
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk D.mtf b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk D.mtf
index 62b52deda97..384e71266c7 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk D.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk D.mtf	
@@ -6,7 +6,7 @@ mul id:3079
 Config:Biped Omnimech
 TechBase:Clan
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk E.mtf b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk E.mtf
index ab6166c91fe..ccca840c16a 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk E.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk E.mtf	
@@ -6,7 +6,7 @@ mul id:3080
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk F.mtf b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk F.mtf
index aee8f6cfaed..dd5f9ae7f6c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk F.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk F.mtf	
@@ -6,7 +6,7 @@ mul id:3081
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk G.mtf b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk G.mtf
index af71b456f18..fbb3bf5ec39 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk G.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk G.mtf	
@@ -6,7 +6,7 @@ mul id:3082
 Config:Biped Omnimech
 TechBase:Clan
 Era:3073
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk Prime.mtf b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk Prime.mtf
index 3e6c2115f90..b71f0e1b77e 100644
--- a/megamek/data/mechfiles/mechs/3060u/Stooping Hawk Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Stooping Hawk Prime.mtf	
@@ -6,7 +6,7 @@ mul id:3083
 Config:Biped Omnimech
 TechBase:Clan
 Era:2970
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3060u/Tai-sho TSH-7S.mtf b/megamek/data/mechfiles/mechs/3060u/Tai-sho TSH-7S.mtf
index c986cb93c13..2efe56f2f3a 100644
--- a/megamek/data/mechfiles/mechs/3060u/Tai-sho TSH-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Tai-sho TSH-7S.mtf	
@@ -6,7 +6,7 @@ mul id:3150
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3060u/Tai-sho TSH-8S.mtf b/megamek/data/mechfiles/mechs/3060u/Tai-sho TSH-8S.mtf
index f1a3e3ad0a5..e08ef1cd64f 100644
--- a/megamek/data/mechfiles/mechs/3060u/Tai-sho TSH-8S.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Tai-sho TSH-8S.mtf	
@@ -6,7 +6,7 @@ mul id:3151
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3060u/Thunder Stallion 2.mtf b/megamek/data/mechfiles/mechs/3060u/Thunder Stallion 2.mtf
index 6ff555aa122..9f4a6d6600c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Thunder Stallion 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Thunder Stallion 2.mtf	
@@ -6,7 +6,7 @@ mul id:3225
 Config:Quad
 TechBase:Clan
 Era:2877
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3060u/Thunder Stallion 3.mtf b/megamek/data/mechfiles/mechs/3060u/Thunder Stallion 3.mtf
index e90580c1f8e..7f647d23ec3 100644
--- a/megamek/data/mechfiles/mechs/3060u/Thunder Stallion 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Thunder Stallion 3.mtf	
@@ -6,7 +6,7 @@ mul id:3226
 Config:Quad
 TechBase:Clan
 Era:3069
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3060u/Thunder Stallion.mtf b/megamek/data/mechfiles/mechs/3060u/Thunder Stallion.mtf
index db9571e8f91..0bc9d432843 100644
--- a/megamek/data/mechfiles/mechs/3060u/Thunder Stallion.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Thunder Stallion.mtf	
@@ -6,7 +6,7 @@ mul id:3224
 Config:Quad
 TechBase:Clan
 Era:2850
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9C.mtf b/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9C.mtf
index 8e423a8a740..1567c2f8841 100644
--- a/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9C.mtf	
@@ -6,7 +6,7 @@ mul id:3252
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9H.mtf b/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9H.mtf
index 1c0c1f5464e..5cf9db24ab5 100644
--- a/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9H.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9H.mtf	
@@ -6,7 +6,7 @@ mul id:3254
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9J.mtf b/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9J.mtf
index 377b1df41b0..b52c0251eb2 100644
--- a/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9J.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Ti Ts'ang TSG-9J.mtf	
@@ -6,7 +6,7 @@ mul id:3255
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1A.mtf b/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1A.mtf
index 954e2e2b43f..dd94f8b28ed 100644
--- a/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1A.mtf	
@@ -6,7 +6,7 @@ mul id:3278
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1B.mtf b/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1B.mtf
index 2c473b6b627..3217e377540 100644
--- a/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1B.mtf	
@@ -6,7 +6,7 @@ mul id:3279
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1C.mtf b/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1C.mtf
index 114116d38fe..1f41b234823 100644
--- a/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Toyama TYM-1C.mtf	
@@ -6,7 +6,7 @@ mul id:3280
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3060u/UrbanMech IIC 2.mtf b/megamek/data/mechfiles/mechs/3060u/UrbanMech IIC 2.mtf
index 354108a207e..b59ea6e8780 100644
--- a/megamek/data/mechfiles/mechs/3060u/UrbanMech IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/UrbanMech IIC 2.mtf	
@@ -6,7 +6,7 @@ mul id:3362
 Config:Biped
 TechBase:Clan
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/UrbanMech IIC.mtf b/megamek/data/mechfiles/mechs/3060u/UrbanMech IIC.mtf
index d295173aa41..05390a673ef 100644
--- a/megamek/data/mechfiles/mechs/3060u/UrbanMech IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/UrbanMech IIC.mtf	
@@ -6,7 +6,7 @@ mul id:3361
 Config:Biped
 techbase:Clan
 era:2849
-source:TRO 3060
+source:TRO: 3060
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3060u/Ursus 2.mtf b/megamek/data/mechfiles/mechs/3060u/Ursus 2.mtf
index 23a389d092f..06b1dd20f56 100644
--- a/megamek/data/mechfiles/mechs/3060u/Ursus 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Ursus 2.mtf	
@@ -6,7 +6,7 @@ mul id:3364
 Config:Biped
 TechBase:Clan
 Era:3074
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Ursus.mtf b/megamek/data/mechfiles/mechs/3060u/Ursus.mtf
index e692fc71e6d..7ab9b096268 100644
--- a/megamek/data/mechfiles/mechs/3060u/Ursus.mtf
+++ b/megamek/data/mechfiles/mechs/3060u/Ursus.mtf
@@ -6,7 +6,7 @@ mul id:3363
 Config:Biped
 TechBase:Clan
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3060u/Viking VKG-2F.mtf b/megamek/data/mechfiles/mechs/3060u/Viking VKG-2F.mtf
index 6de2307852b..213006bfbe3 100644
--- a/megamek/data/mechfiles/mechs/3060u/Viking VKG-2F.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Viking VKG-2F.mtf	
@@ -6,7 +6,7 @@ mul id:3417
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Viking VKG-2G.mtf b/megamek/data/mechfiles/mechs/3060u/Viking VKG-2G.mtf
index 39a1a6599aa..e84c827b6e3 100644
--- a/megamek/data/mechfiles/mechs/3060u/Viking VKG-2G.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Viking VKG-2G.mtf	
@@ -6,7 +6,7 @@ mul id:3418
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Viking VKG-3A.mtf b/megamek/data/mechfiles/mechs/3060u/Viking VKG-3A.mtf
index 59966a4f2f8..a81467319ed 100644
--- a/megamek/data/mechfiles/mechs/3060u/Viking VKG-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Viking VKG-3A.mtf	
@@ -6,7 +6,7 @@ mul id:3419
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Viking VKG-3W.mtf b/megamek/data/mechfiles/mechs/3060u/Viking VKG-3W.mtf
index 720ec2f03d2..eace3c2cddb 100644
--- a/megamek/data/mechfiles/mechs/3060u/Viking VKG-3W.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Viking VKG-3W.mtf	
@@ -6,7 +6,7 @@ mul id:3420
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Wyvern IIC 2.mtf b/megamek/data/mechfiles/mechs/3060u/Wyvern IIC 2.mtf
index 90d7a99f706..703d1b17c54 100644
--- a/megamek/data/mechfiles/mechs/3060u/Wyvern IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Wyvern IIC 2.mtf	
@@ -6,7 +6,7 @@ mul id:3602
 Config:Biped
 TechBase:Clan
 Era:3071
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:3
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Wyvern IIC.mtf b/megamek/data/mechfiles/mechs/3060u/Wyvern IIC.mtf
index 37b28f48b03..5f70ff11a94 100644
--- a/megamek/data/mechfiles/mechs/3060u/Wyvern IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Wyvern IIC.mtf	
@@ -6,7 +6,7 @@ mul id:3601
 Config:Biped
 TechBase:Clan
 Era:2843
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3060u/Yeoman YMN-10-OR.mtf b/megamek/data/mechfiles/mechs/3060u/Yeoman YMN-10-OR.mtf
index 6cb4b3ccead..96ae1b81033 100644
--- a/megamek/data/mechfiles/mechs/3060u/Yeoman YMN-10-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Yeoman YMN-10-OR.mtf	
@@ -6,7 +6,7 @@ mul id:3618
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Yeoman YMN-6Y.mtf b/megamek/data/mechfiles/mechs/3060u/Yeoman YMN-6Y.mtf
index 287e064127f..c04ac1c2168 100644
--- a/megamek/data/mechfiles/mechs/3060u/Yeoman YMN-6Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Yeoman YMN-6Y.mtf	
@@ -6,7 +6,7 @@ mul id:3619
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H10G.mtf b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H10G.mtf
index 722e0ad4d00..10cb8b940ec 100644
--- a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H10G.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H10G.mtf	
@@ -6,7 +6,7 @@ mul id:3624
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H11G.mtf b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H11G.mtf
index aeca2306b4c..4a533fe9035 100644
--- a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H11G.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H11G.mtf	
@@ -6,7 +6,7 @@ mul id:3625
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9G.mtf b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9G.mtf
index 6dc215d66c4..8889b362a69 100644
--- a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9G.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9G.mtf	
@@ -6,7 +6,7 @@ mul id:3626
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9GB.mtf b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9GB.mtf
index cc5db8f67bf..cd55eb7ea89 100644
--- a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9GB.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9GB.mtf	
@@ -6,7 +6,7 @@ mul id:3627
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9GC.mtf b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9GC.mtf
index 43e55c71ca9..b9d353a1c0c 100644
--- a/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9GC.mtf	
+++ b/megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H9GC.mtf	
@@ -6,7 +6,7 @@ mul id:3628
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3060
+Source:TRO: 3060
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Bowman 2.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Bowman 2.mtf
index 26ec9a862d4..b6983638f94 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Bowman 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Bowman 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:2974
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Late Succession War - LosTech
 
 Mass:70
 Engine:350 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Bowman 3.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Bowman 3.mtf
index 59320770b51..ba2df1e4480 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Bowman 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Bowman 3.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3076
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:70
 Engine:350 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Burrock 2.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Burrock 2.mtf
index 23c68727fbf..a6ff33e9c2d 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Burrock 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Burrock 2.mtf	
@@ -5,7 +5,7 @@ mul id:5694
 Config:Biped
 techbase:Clan
 era:3071
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Lobo 2.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Lobo 2.mtf
index dfb6f337a27..26b7e8d7570 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Lobo 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Lobo 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3072
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:40
 Engine:240 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Mad Cat Mk II 2.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Mad Cat Mk II 2.mtf
index fa4a4ecad7a..18f1fbdcd7a 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Mad Cat Mk II 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Mad Cat Mk II 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3069
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:90
 Engine:360 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Mad Cat Mk II 3.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Mad Cat Mk II 3.mtf
index f8364bffd49..48f01128b15 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Mad Cat Mk II 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Mad Cat Mk II 3.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3082
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Early Republic
 
 Mass:90
 Engine:360 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Pinion 3.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Pinion 3.mtf
index 9a284b2e32a..012f61f4435 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Pinion 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Pinion 3.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3069
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:45
 Engine:225 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Rabid Coyote 2.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Rabid Coyote 2.mtf
index 429d1099530..1be662f299a 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Rabid Coyote 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Rabid Coyote 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3071
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:55
 Engine:275 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Scylla 2.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Scylla 2.mtf
index 43fc2578cbc..0e81e8b623f 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Scylla 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Scylla 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3079
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:100
 Engine:400 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Scylla 3.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Scylla 3.mtf
index f2de0189fd9..0dbe62a1fc4 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Scylla 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Scylla 3.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3082
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Early Republic
 
 Mass:100
 Engine:400 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Solitaire 2.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Solitaire 2.mtf
index ceb943f42d5..55d12e93bae 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Solitaire 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Solitaire 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3080
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:25
 Engine:250 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Spirit 2.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Spirit 2.mtf
index f044f2ac901..239aee6780e 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Spirit 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/Clan Meks/Spirit 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3068
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:35
 Engine:245 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Akuma AKU-2XK.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Akuma AKU-2XK.mtf
index 19ca9f17ef4..7d080a28752 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Akuma AKU-2XK.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Akuma AKU-2XK.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3083
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Early Republic
 
 Mass:90
 Engine:270 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Anubis ABS-4C.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Anubis ABS-4C.mtf
index 6f2dc9645e6..22c4eadbeda 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Anubis ABS-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Anubis ABS-4C.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3082
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Early Republic
 
 Mass:30
 Engine:240 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Argus AGS-5D.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Argus AGS-5D.mtf
index 91e5a29f894..6b16fecf505 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Argus AGS-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Argus AGS-5D.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3071
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:60
 Engine:300 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Argus AGS-6F.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Argus AGS-6F.mtf
index 2e97ded5ca8..4e1c512b1aa 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Argus AGS-6F.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Argus AGS-6F.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3078
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:60
 Engine:300 Light Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Chimera CMA-2k.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Chimera CMA-2k.mtf
index ddc9ba9122a..7b110891af5 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Chimera CMA-2k.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Chimera CMA-2k.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3069
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:40
 Engine:280 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Fafnir FNR-5WB.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Fafnir FNR-5WB.mtf
index cc0b34b69c6..158315ed98c 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Fafnir FNR-5WB.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Fafnir FNR-5WB.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3073
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:100
 Engine:300 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Gurkha GUR-8G.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Gurkha GUR-8G.mtf
index c82d506126f..40077efaa02 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Gurkha GUR-8G.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Gurkha GUR-8G.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3069
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:35
 Engine:245 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3050U/Hellspawn HSN-10G.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Hellspawn HSN-10G.mtf
similarity index 98%
rename from megamek/data/mechfiles/mechs/3050U/Hellspawn HSN-10G.mtf
rename to megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Hellspawn HSN-10G.mtf
index 72fb768475b..78afd122183 100644
--- a/megamek/data/mechfiles/mechs/3050U/Hellspawn HSN-10G.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Hellspawn HSN-10G.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3076
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:45
 Engine:270 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Hellspawn HSN-10SR.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Hellspawn HSN-10SR.mtf
index e86daad2823..f7d9eea6c8d 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Hellspawn HSN-10SR.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Hellspawn HSN-10SR.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3081
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Early Republic
 
 Mass:45
 Engine:270 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Lao Hu LHU-3L.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Lao Hu LHU-3L.mtf
index c3cfead718c..8323a69e039 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Lao Hu LHU-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Lao Hu LHU-3L.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3069
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:75
 Engine:375 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Lightray LGH-7W.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Lightray LGH-7W.mtf
index fab719859f5..49caffff94b 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Lightray LGH-7W.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Lightray LGH-7W.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3069
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:55
 Engine:385 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Ninja-To NJT-4.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Ninja-To NJT-4.mtf
index ee24927bf89..c4ea2373c97 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Ninja-To NJT-4.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Ninja-To NJT-4.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3075
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:65
 Engine:390 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Osiris OSR-5D.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Osiris OSR-5D.mtf
index e2e42badbad..03a6b7e89cc 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Osiris OSR-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Osiris OSR-5D.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3081
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Early Republic
 
 Mass:30
 Engine:210 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Razorback RZK-10S.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Razorback RZK-10S.mtf
index bacbf1c712b..71cb0aaac28 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Razorback RZK-10S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Razorback RZK-10S.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3079
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:30
 Engine:180 Light Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Razorback RZK-10T.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Razorback RZK-10T.mtf
index 7018aa1660b..e268cec6da8 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Razorback RZK-10T.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Razorback RZK-10T.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3071
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:30
 Engine:210 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Red Shift RDS-3A.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Red Shift RDS-3A.mtf
index eaa8b62b134..4dfb1aceec2 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Red Shift RDS-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Red Shift RDS-3A.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3068
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:20
 Engine:180 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Sha Yu SYU-6B.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Sha Yu SYU-6B.mtf
index 07308c72f71..b5edec999dd 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Sha Yu SYU-6B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Sha Yu SYU-6B.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3070
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:40
 Engine:280 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Stiletto STO-4C.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Stiletto STO-4C.mtf
index c42043f63f7..f885bdbb532 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Stiletto STO-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Stiletto STO-4C.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3076
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:35
 Engine:280 Light Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Templar TLR1-OE.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Templar TLR1-OE.mtf
index 3026e9fc379..3b8f2f62e96 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Templar TLR1-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Templar TLR1-OE.mtf	
@@ -6,7 +6,7 @@ mul id:5708
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3064
-Source:3067 Unabridged
+source:3067 Unabridged - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Tessen TSN-C3M.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Tessen TSN-C3M.mtf
index df0ad6d3c62..233dcc630aa 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Tessen TSN-C3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Tessen TSN-C3M.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3077
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:50
 Engine:300 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Thanatos THS-4T.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Thanatos THS-4T.mtf
index 42ed5fda2c5..b8033ecc2cc 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Thanatos THS-4T.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Thanatos THS-4T.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3062
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Civil War
 
 Mass:75
 Engine:300 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Thanatos THS-6S.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Thanatos THS-6S.mtf
index e55f1f6f062..fe8617b33a0 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Thanatos THS-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Thanatos THS-6S.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3081
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Early Republic
 
 Mass:75
 Engine:300 Light Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Uziel UZL-8S.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Uziel UZL-8S.mtf
index bdebd743578..fa764802b31 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Uziel UZL-8S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Uziel UZL-8S.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3075
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:50
 Engine:250 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Verfolger VR6-C.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Verfolger VR6-C.mtf
index d78aba8d22d..7958615ad70 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Verfolger VR6-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Verfolger VR6-C.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3068
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 
 Mass:65
 Engine:325 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Verfolger VR6-T.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Verfolger VR6-T.mtf
index 22fd923dbce..0e1c999bb0c 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Verfolger VR6-T.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/Verfolger VR6-T.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3082
 Rules Level:2
-source:3067 Unabridged
+source:3067 Unabridged - Early Republic
 
 Mass:65
 Engine:325 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/White Flame WHF-4C.mtf b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/White Flame WHF-4C.mtf
index 60e01aef47b..f2db6a5e94b 100644
--- a/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/White Flame WHF-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067 Unabridged/IS Meks/White Flame WHF-4C.mtf	
@@ -6,7 +6,7 @@ mul id:5693
 Config:Quad
 techbase:Inner Sphere
 era:3077
-source:3067 Unabridged
+source:3067 Unabridged - Jihad
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3067/Akuma AKU-1X.mtf b/megamek/data/mechfiles/mechs/3067/Akuma AKU-1X.mtf
index e9ee93c7880..a58a5756062 100644
--- a/megamek/data/mechfiles/mechs/3067/Akuma AKU-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Akuma AKU-1X.mtf	
@@ -5,7 +5,7 @@ mul id:3691
 Config:Biped
 techbase:Inner Sphere
 era:3058
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3067/Akuma AKU-1XJ.mtf b/megamek/data/mechfiles/mechs/3067/Akuma AKU-1XJ.mtf
index 3d7e592a358..c632f427b94 100644
--- a/megamek/data/mechfiles/mechs/3067/Akuma AKU-1XJ.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Akuma AKU-1XJ.mtf	
@@ -5,7 +5,7 @@ mul id:3692
 Config:Biped
 techbase:Inner Sphere
 era:3064
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3067/Anubis ABS-3L.mtf b/megamek/data/mechfiles/mechs/3067/Anubis ABS-3L.mtf
index 4f932ce7b32..93ae819d272 100644
--- a/megamek/data/mechfiles/mechs/3067/Anubis ABS-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Anubis ABS-3L.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:30
 Engine:240 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Anubis ABS-3R.mtf b/megamek/data/mechfiles/mechs/3067/Anubis ABS-3R.mtf
index 6dcb7851e0e..7a4354f7e6d 100644
--- a/megamek/data/mechfiles/mechs/3067/Anubis ABS-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Anubis ABS-3R.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3064
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:30
 Engine:240 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Anubis ABS-3T.mtf b/megamek/data/mechfiles/mechs/3067/Anubis ABS-3T.mtf
index d4c4b4c0ad7..55da0db060f 100644
--- a/megamek/data/mechfiles/mechs/3067/Anubis ABS-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Anubis ABS-3T.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3067
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:30
 Engine:240 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Arcas 2.mtf b/megamek/data/mechfiles/mechs/3067/Arcas 2.mtf
index cb8227f5ef9..7d29e5a4b4b 100644
--- a/megamek/data/mechfiles/mechs/3067/Arcas 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Arcas 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3061
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:65
 Engine:325 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Arcas.mtf b/megamek/data/mechfiles/mechs/3067/Arcas.mtf
index 771efc0552f..d6f67e41a52 100644
--- a/megamek/data/mechfiles/mechs/3067/Arcas.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Arcas.mtf
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3061
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:65
 Engine:325 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Argus AGS-2D.mtf b/megamek/data/mechfiles/mechs/3067/Argus AGS-2D.mtf
index 21367e25807..b50af4a6f1f 100644
--- a/megamek/data/mechfiles/mechs/3067/Argus AGS-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Argus AGS-2D.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3062
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:60
 Engine:300 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Argus AGS-4D.mtf b/megamek/data/mechfiles/mechs/3067/Argus AGS-4D.mtf
index 28c9b439b16..d5bf295c3cc 100644
--- a/megamek/data/mechfiles/mechs/3067/Argus AGS-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Argus AGS-4D.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3062
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:60
 Engine:300 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Axman AXM-3S.mtf b/megamek/data/mechfiles/mechs/3067/Axman AXM-3S.mtf
index 4b493386e64..2e6df4cef27 100644
--- a/megamek/data/mechfiles/mechs/3067/Axman AXM-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Axman AXM-3S.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3060
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:65
 Engine:260 Light Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Blood Kite 2.mtf b/megamek/data/mechfiles/mechs/3067/Blood Kite 2.mtf
index 9884129c787..8fcf46b3acb 100644
--- a/megamek/data/mechfiles/mechs/3067/Blood Kite 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Blood Kite 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3066
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:85
 Engine:255 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Blood Kite.mtf b/megamek/data/mechfiles/mechs/3067/Blood Kite.mtf
index 33a0b3c7b5e..99ff8cab02e 100644
--- a/megamek/data/mechfiles/mechs/3067/Blood Kite.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Blood Kite.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:2907
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:85
 Engine:255 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Bloodhound B1-HND.mtf b/megamek/data/mechfiles/mechs/3067/Bloodhound B1-HND.mtf
index 58f0a90e2df..224baac3f28 100644
--- a/megamek/data/mechfiles/mechs/3067/Bloodhound B1-HND.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Bloodhound B1-HND.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3064
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:45
 Engine:315 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Bloodhound B2-HND.mtf b/megamek/data/mechfiles/mechs/3067/Bloodhound B2-HND.mtf
index 0d9533b728e..fbe232c4c37 100644
--- a/megamek/data/mechfiles/mechs/3067/Bloodhound B2-HND.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Bloodhound B2-HND.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3067
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:45
 Engine:315 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Blue Flame BLF-21.mtf b/megamek/data/mechfiles/mechs/3067/Blue Flame BLF-21.mtf
index 6ce4e262efe..382882e0970 100644
--- a/megamek/data/mechfiles/mechs/3067/Blue Flame BLF-21.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Blue Flame BLF-21.mtf	
@@ -6,7 +6,7 @@ mul id:3840
 Config:Quad
 techbase:Inner Sphere
 era:3062
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3067/Brigand LDT-1.mtf b/megamek/data/mechfiles/mechs/3067/Brigand LDT-1.mtf
index 4dab6397abf..445a16d0adf 100644
--- a/megamek/data/mechfiles/mechs/3067/Brigand LDT-1.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Brigand LDT-1.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3065
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:25
 Engine:150 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Brigand LDT-X1.mtf b/megamek/data/mechfiles/mechs/3067/Brigand LDT-X1.mtf
index fac3cd95aaf..04b631ac388 100644
--- a/megamek/data/mechfiles/mechs/3067/Brigand LDT-X1.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Brigand LDT-X1.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3066
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:25
 Engine:150 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Brigand LDT-X2.mtf b/megamek/data/mechfiles/mechs/3067/Brigand LDT-X2.mtf
index 5dbfd8b9b01..c01afba29eb 100644
--- a/megamek/data/mechfiles/mechs/3067/Brigand LDT-X2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Brigand LDT-X2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3066
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:25
 Engine:150 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Burrock.mtf b/megamek/data/mechfiles/mechs/3067/Burrock.mtf
index b5f067d247a..4345b78a978 100644
--- a/megamek/data/mechfiles/mechs/3067/Burrock.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Burrock.mtf
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3066
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:75
 Engine:375 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Chimera CMA-1S.mtf b/megamek/data/mechfiles/mechs/3067/Chimera CMA-1S.mtf
index f73ff4d8411..23f7823e49b 100644
--- a/megamek/data/mechfiles/mechs/3067/Chimera CMA-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Chimera CMA-1S.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:40
 Engine:240 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Chimera CMA-C.mtf b/megamek/data/mechfiles/mechs/3067/Chimera CMA-C.mtf
index f826b1cb539..94bacf5afbc 100644
--- a/megamek/data/mechfiles/mechs/3067/Chimera CMA-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Chimera CMA-C.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:40
 Engine:240 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Crimson Langur A.mtf b/megamek/data/mechfiles/mechs/3067/Crimson Langur A.mtf
index d048072dc45..029c88256bf 100644
--- a/megamek/data/mechfiles/mechs/3067/Crimson Langur A.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Crimson Langur A.mtf	
@@ -6,7 +6,7 @@ mul id:4016
 Config:Biped Omnimech
 TechBase:Clan
 Era:3065
-source:TRO 3067 - Civil War
+source:TRO: 3067 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3067/Crimson Langur B.mtf b/megamek/data/mechfiles/mechs/3067/Crimson Langur B.mtf
index b6f92e8626d..0bde8f8de9b 100644
--- a/megamek/data/mechfiles/mechs/3067/Crimson Langur B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Crimson Langur B.mtf	
@@ -6,7 +6,7 @@ mul id:4017
 Config:Biped Omnimech
 TechBase:Clan
 Era:3065
-source:TRO 3067 - Civil War
+source:TRO: 3067 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3067/Crimson Langur C.mtf b/megamek/data/mechfiles/mechs/3067/Crimson Langur C.mtf
index 8dfa1f1a929..5bb7fd2a1a3 100644
--- a/megamek/data/mechfiles/mechs/3067/Crimson Langur C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Crimson Langur C.mtf	
@@ -6,7 +6,7 @@ mul id:4018
 Config:Biped Omnimech
 TechBase:Clan
 Era:3065
-source:TRO 3067 - Civil War
+source:TRO: 3067 - Civil War
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3067/Crimson Langur Prime.mtf b/megamek/data/mechfiles/mechs/3067/Crimson Langur Prime.mtf
index 5ebb665e93a..64863bf6a43 100644
--- a/megamek/data/mechfiles/mechs/3067/Crimson Langur Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Crimson Langur Prime.mtf	
@@ -5,7 +5,7 @@ mul id:4019
 Config:Biped Omnimech
 techbase:Clan
 era:3065
-source:TRO 3067 - Civil War
+source:TRO: 3067 - Civil War
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3067/Cronus CNS-5M.mtf b/megamek/data/mechfiles/mechs/3067/Cronus CNS-5M.mtf
index adc02df7acd..993cfd31d2f 100644
--- a/megamek/data/mechfiles/mechs/3067/Cronus CNS-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Cronus CNS-5M.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3060
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:55
 Engine:330 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Fafnir FNR-5.mtf b/megamek/data/mechfiles/mechs/3067/Fafnir FNR-5.mtf
index 71f7ce506fb..3e48705452c 100644
--- a/megamek/data/mechfiles/mechs/3067/Fafnir FNR-5.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Fafnir FNR-5.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:100
 Engine:300 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Fafnir FNR-5B.mtf b/megamek/data/mechfiles/mechs/3067/Fafnir FNR-5B.mtf
index 8aaa45bab40..fd217fa0eb8 100644
--- a/megamek/data/mechfiles/mechs/3067/Fafnir FNR-5B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Fafnir FNR-5B.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3065
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:100
 Engine:300 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Gurkha GUR-2G.mtf b/megamek/data/mechfiles/mechs/3067/Gurkha GUR-2G.mtf
index 7731590ca10..760f5f29128 100644
--- a/megamek/data/mechfiles/mechs/3067/Gurkha GUR-2G.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Gurkha GUR-2G.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:35
 Engine:245 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Gurkha GUR-4G.mtf b/megamek/data/mechfiles/mechs/3067/Gurkha GUR-4G.mtf
index 4f869a91f28..87fcd817f87 100644
--- a/megamek/data/mechfiles/mechs/3067/Gurkha GUR-4G.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Gurkha GUR-4G.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3065
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:35
 Engine:245 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Hellfire 2.mtf b/megamek/data/mechfiles/mechs/3067/Hellfire 2.mtf
index f2c1d53225b..32e58aa224c 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellfire 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Hellfire 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3067
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:60
 Engine:300 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Hellfire.mtf b/megamek/data/mechfiles/mechs/3067/Hellfire.mtf
index 34fe9bfa22a..c876ae77737 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellfire.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Hellfire.mtf
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3058
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:60
 Engine:240 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Hellion A.mtf b/megamek/data/mechfiles/mechs/3067/Hellion A.mtf
index 3189f658143..cc92adf22ac 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellion A.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Hellion A.mtf	
@@ -6,7 +6,7 @@ mul id:4303
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3067/Hellion B.mtf b/megamek/data/mechfiles/mechs/3067/Hellion B.mtf
index f434987b8e4..474427c82de 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellion B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Hellion B.mtf	
@@ -6,7 +6,7 @@ mul id:4304
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3067/Hellion C.mtf b/megamek/data/mechfiles/mechs/3067/Hellion C.mtf
index b448ecd4ba3..5722d253b1b 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellion C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Hellion C.mtf	
@@ -6,7 +6,7 @@ mul id:4305
 Config:Biped Omnimech
 TechBase:Clan
 Era:3061
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3067/Hellion Prime.mtf b/megamek/data/mechfiles/mechs/3067/Hellion Prime.mtf
index 67f3af49c49..60962d2ccb6 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellion Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Hellion Prime.mtf	
@@ -6,7 +6,7 @@ mul id:4306
 Config:Biped Omnimech
 techbase:Clan
 era:3059
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-7D.mtf b/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-7D.mtf
index 4e2204b842d..fcc88f2b1ff 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-7D.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-7D.mtf	
@@ -6,7 +6,7 @@ mul id:4307
 Config:Biped
 techbase:Inner Sphere
 era:3062
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-8E.mtf b/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-8E.mtf
index 7a22552b659..aaca7d2325c 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-8E.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-8E.mtf	
@@ -6,7 +6,7 @@ mul id:4308
 Config:Biped
 techbase:Inner Sphere
 era:3068
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-9F.mtf b/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-9F.mtf
index 6e069363922..f4369bdf802 100644
--- a/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-9F.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Hellspawn HSN-9F.mtf	
@@ -6,7 +6,7 @@ mul id:4309
 Config:Biped
 techbase:Inner Sphere
 era:3068
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-2B.mtf b/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-2B.mtf
index c1b5910089c..2235c9c7ac7 100644
--- a/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-2B.mtf	
@@ -6,7 +6,7 @@ mul id:4478
 Config:Biped
 techbase:Inner Sphere
 era:3062
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-3B.mtf b/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-3B.mtf
index 94615034f58..87efecd527d 100644
--- a/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-3B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-3B.mtf	
@@ -6,7 +6,7 @@ mul id:4479
 Config:Biped
 techbase:Inner Sphere
 era:3063
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-3C.mtf b/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-3C.mtf
index a6d58d83efc..a592b4f85a4 100644
--- a/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Lao Hu LHU-3C.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3064
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:75
 Engine:375 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Legacy LGC-01.mtf b/megamek/data/mechfiles/mechs/3067/Legacy LGC-01.mtf
index aa9c05f2e18..ef8f093b295 100644
--- a/megamek/data/mechfiles/mechs/3067/Legacy LGC-01.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Legacy LGC-01.mtf	
@@ -6,7 +6,7 @@ mul id:4488
 Config:Biped
 techbase:Inner Sphere
 era:3064
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3067/Legacy LGC-02.mtf b/megamek/data/mechfiles/mechs/3067/Legacy LGC-02.mtf
index 168b9ed05ae..bf0f1ea06d3 100644
--- a/megamek/data/mechfiles/mechs/3067/Legacy LGC-02.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Legacy LGC-02.mtf	
@@ -6,7 +6,7 @@ mul id:4489
 Config:Biped
 techbase:Inner Sphere
 era:3064
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3067/Lightray LGH-4W.mtf b/megamek/data/mechfiles/mechs/3067/Lightray LGH-4W.mtf
index fce15f473d5..24dd33c0c65 100644
--- a/megamek/data/mechfiles/mechs/3067/Lightray LGH-4W.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Lightray LGH-4W.mtf	
@@ -6,7 +6,7 @@ mul id:4519
 Config:Biped
 techbase:Inner Sphere
 era:3065
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3067/Lightray LGH-4Y.mtf b/megamek/data/mechfiles/mechs/3067/Lightray LGH-4Y.mtf
index 33b01006dc5..65b5dd516da 100644
--- a/megamek/data/mechfiles/mechs/3067/Lightray LGH-4Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Lightray LGH-4Y.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3064
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:55
 Engine:385 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Lightray LGH-5W.mtf b/megamek/data/mechfiles/mechs/3067/Lightray LGH-5W.mtf
index 4de7c0562b2..60f548e84b7 100644
--- a/megamek/data/mechfiles/mechs/3067/Lightray LGH-5W.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Lightray LGH-5W.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3065
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:55
 Engine:385 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Lobo.mtf b/megamek/data/mechfiles/mechs/3067/Lobo.mtf
index e7afabdbbac..0238cfe0d69 100644
--- a/megamek/data/mechfiles/mechs/3067/Lobo.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Lobo.mtf
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3059
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:40
 Engine:240 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Mad Cat Mk II.mtf b/megamek/data/mechfiles/mechs/3067/Mad Cat Mk II.mtf
index 62e7096017c..1ca63f519f9 100644
--- a/megamek/data/mechfiles/mechs/3067/Mad Cat Mk II.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Mad Cat Mk II.mtf	
@@ -6,7 +6,7 @@ mul id:4565
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3067/Ninja-To NJT-2.mtf b/megamek/data/mechfiles/mechs/3067/Ninja-To NJT-2.mtf
index 094e193240c..84baf91964a 100644
--- a/megamek/data/mechfiles/mechs/3067/Ninja-To NJT-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Ninja-To NJT-2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3062
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:65
 Engine:390 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Ninja-To NJT-3.mtf b/megamek/data/mechfiles/mechs/3067/Ninja-To NJT-3.mtf
index 8cd98e91420..aa6c097d468 100644
--- a/megamek/data/mechfiles/mechs/3067/Ninja-To NJT-3.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Ninja-To NJT-3.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3068
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:65
 Engine:390 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-1K.mtf b/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-1K.mtf
index 876d06ce390..159792d1062 100644
--- a/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-1K.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-1K.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3058
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:70
 Engine:350 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-2K.mtf b/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-2K.mtf
index b085f613a15..bf7ce5a9472 100644
--- a/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-2K.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-2K.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3059
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:70
 Engine:350 XL Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-2KO.mtf b/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-2KO.mtf
index a37369a6921..05769f864d7 100644
--- a/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-2KO.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/No-Dachi NDA-2KO.mtf	
@@ -6,7 +6,7 @@ mul id:4733
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3067/Osiris OSR-3D.mtf b/megamek/data/mechfiles/mechs/3067/Osiris OSR-3D.mtf
index 48ff094f3a0..bc93ac93721 100644
--- a/megamek/data/mechfiles/mechs/3067/Osiris OSR-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Osiris OSR-3D.mtf	
@@ -6,7 +6,7 @@ mul id:4763
 Config:Biped
 techbase:Inner Sphere
 era:3063
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3067/Osiris OSR-4D.mtf b/megamek/data/mechfiles/mechs/3067/Osiris OSR-4D.mtf
index 89b9545fd20..d9938707060 100644
--- a/megamek/data/mechfiles/mechs/3067/Osiris OSR-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Osiris OSR-4D.mtf	
@@ -6,7 +6,7 @@ mul id:4764
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3067/Perseus P1 A.mtf b/megamek/data/mechfiles/mechs/3067/Perseus P1 A.mtf
index 6ad73bc9e82..7715ee4f174 100644
--- a/megamek/data/mechfiles/mechs/3067/Perseus P1 A.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Perseus P1 A.mtf	
@@ -6,7 +6,7 @@ mul id:4809
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3067/Perseus P1 B.mtf b/megamek/data/mechfiles/mechs/3067/Perseus P1 B.mtf
index ef5c58af6fd..d50e06659fb 100644
--- a/megamek/data/mechfiles/mechs/3067/Perseus P1 B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Perseus P1 B.mtf	
@@ -6,7 +6,7 @@ mul id:4810
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3058
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3067/Perseus P1 C.mtf b/megamek/data/mechfiles/mechs/3067/Perseus P1 C.mtf
index 83d7ea492b4..17a55ca852f 100644
--- a/megamek/data/mechfiles/mechs/3067/Perseus P1 C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Perseus P1 C.mtf	
@@ -6,7 +6,7 @@ mul id:4811
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3058
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3067/Perseus P1 D.mtf b/megamek/data/mechfiles/mechs/3067/Perseus P1 D.mtf
index 136e118efb1..887d3f87640 100644
--- a/megamek/data/mechfiles/mechs/3067/Perseus P1 D.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Perseus P1 D.mtf	
@@ -6,7 +6,7 @@ mul id:4812
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3058
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3067/Perseus P1 Prime.mtf b/megamek/data/mechfiles/mechs/3067/Perseus P1 Prime.mtf
index e9538f4fc69..632a627baab 100644
--- a/megamek/data/mechfiles/mechs/3067/Perseus P1 Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Perseus P1 Prime.mtf	
@@ -6,7 +6,7 @@ mul id:4807
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3058
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3067/Pinion 2.mtf b/megamek/data/mechfiles/mechs/3067/Pinion 2.mtf
index ccf14248f1b..35e1d1ef856 100644
--- a/megamek/data/mechfiles/mechs/3067/Pinion 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Pinion 2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3068
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:45
 Engine:225 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Pinion.mtf b/megamek/data/mechfiles/mechs/3067/Pinion.mtf
index 32963bd9ed1..63be81667ae 100644
--- a/megamek/data/mechfiles/mechs/3067/Pinion.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Pinion.mtf
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3065
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:45
 Engine:225 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Rabid Coyote.mtf b/megamek/data/mechfiles/mechs/3067/Rabid Coyote.mtf
index 430429fdf2d..7066fa800b5 100644
--- a/megamek/data/mechfiles/mechs/3067/Rabid Coyote.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Rabid Coyote.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3066
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:55
 Engine:275 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Razorback RZK-9S.mtf b/megamek/data/mechfiles/mechs/3067/Razorback RZK-9S.mtf
index b7759071e3e..08a2960fa0d 100644
--- a/megamek/data/mechfiles/mechs/3067/Razorback RZK-9S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Razorback RZK-9S.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:30
 Engine:180 Light Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Razorback RZK-9T.mtf b/megamek/data/mechfiles/mechs/3067/Razorback RZK-9T.mtf
index 47536964867..56484aa61b7 100644
--- a/megamek/data/mechfiles/mechs/3067/Razorback RZK-9T.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Razorback RZK-9T.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3066
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:30
 Engine:180 Light Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Red Shift RDS-2A.mtf b/megamek/data/mechfiles/mechs/3067/Red Shift RDS-2A.mtf
index 94990314c21..c2bc240c811 100644
--- a/megamek/data/mechfiles/mechs/3067/Red Shift RDS-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Red Shift RDS-2A.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3062
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:20
 Engine:180 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Red Shift RDS-2B.mtf b/megamek/data/mechfiles/mechs/3067/Red Shift RDS-2B.mtf
index 409e9a8f134..a6ab5046d16 100644
--- a/megamek/data/mechfiles/mechs/3067/Red Shift RDS-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Red Shift RDS-2B.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:20
 Engine:180 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Sagittaire SGT-8R.mtf b/megamek/data/mechfiles/mechs/3067/Sagittaire SGT-8R.mtf
index 4b972cb1675..21bbb1129eb 100644
--- a/megamek/data/mechfiles/mechs/3067/Sagittaire SGT-8R.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Sagittaire SGT-8R.mtf	
@@ -6,7 +6,7 @@ mul id:4967
 Config:Biped
 techbase:Inner Sphere
 era:3063
-source:TRO 3067 - Civil War
+source:TRO: 3067 - Civil War
 rules level:2
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3067/Savage Coyote A.mtf b/megamek/data/mechfiles/mechs/3067/Savage Coyote A.mtf
index 3a0763ce5c1..d81c27dbbed 100644
--- a/megamek/data/mechfiles/mechs/3067/Savage Coyote A.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Savage Coyote A.mtf	
@@ -6,7 +6,7 @@ mul id:4982
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Savage Coyote B.mtf b/megamek/data/mechfiles/mechs/3067/Savage Coyote B.mtf
index bbfc7fd1b0e..dc719349896 100644
--- a/megamek/data/mechfiles/mechs/3067/Savage Coyote B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Savage Coyote B.mtf	
@@ -6,7 +6,7 @@ mul id:4983
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Savage Coyote C.mtf b/megamek/data/mechfiles/mechs/3067/Savage Coyote C.mtf
index 0f6ee338440..46aee51ffb3 100644
--- a/megamek/data/mechfiles/mechs/3067/Savage Coyote C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Savage Coyote C.mtf	
@@ -6,7 +6,7 @@ mul id:4984
 Config:Biped Omnimech
 TechBase:Clan
 Era:3064
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Savage Coyote Prime.mtf b/megamek/data/mechfiles/mechs/3067/Savage Coyote Prime.mtf
index 1b262467902..a29d678fdd4 100644
--- a/megamek/data/mechfiles/mechs/3067/Savage Coyote Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Savage Coyote Prime.mtf	
@@ -6,7 +6,7 @@ mul id:4985
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Scylla.mtf b/megamek/data/mechfiles/mechs/3067/Scylla.mtf
index 77b75ecb7fb..fca57442881 100644
--- a/megamek/data/mechfiles/mechs/3067/Scylla.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Scylla.mtf
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3062
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:100
 Engine:400 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Sha Yu SYU-2B.mtf b/megamek/data/mechfiles/mechs/3067/Sha Yu SYU-2B.mtf
index 623dbd585f6..4162929b6e0 100644
--- a/megamek/data/mechfiles/mechs/3067/Sha Yu SYU-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Sha Yu SYU-2B.mtf	
@@ -6,7 +6,7 @@ mul id:5026
 Config:Biped
 techbase:Inner Sphere
 era:3063
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3067/Sha Yu SYU-4B.mtf b/megamek/data/mechfiles/mechs/3067/Sha Yu SYU-4B.mtf
index 131b71f9853..538645869cf 100644
--- a/megamek/data/mechfiles/mechs/3067/Sha Yu SYU-4B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Sha Yu SYU-4B.mtf	
@@ -6,7 +6,7 @@ mul id:5027
 Config:Biped
 techbase:Inner Sphere
 era:3065
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3067/Solitaire.mtf b/megamek/data/mechfiles/mechs/3067/Solitaire.mtf
index 334c37419aa..d366b074a83 100644
--- a/megamek/data/mechfiles/mechs/3067/Solitaire.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Solitaire.mtf
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Clan
 Era:3064
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:25
 Engine:250 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Spirit.mtf b/megamek/data/mechfiles/mechs/3067/Spirit.mtf
index eff827357c8..63e33273430 100644
--- a/megamek/data/mechfiles/mechs/3067/Spirit.mtf
+++ b/megamek/data/mechfiles/mechs/3067/Spirit.mtf
@@ -8,7 +8,7 @@ Config:Biped
 TechBase:Clan
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:35
 Engine:245 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Stiletto STO-4A.mtf b/megamek/data/mechfiles/mechs/3067/Stiletto STO-4A.mtf
index 68a70c89723..c59ee3aa937 100644
--- a/megamek/data/mechfiles/mechs/3067/Stiletto STO-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Stiletto STO-4A.mtf	
@@ -6,7 +6,7 @@ mul id:5131
 Config:Biped
 techbase:Inner Sphere
 era:3061
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3067/Stiletto STO-4B.mtf b/megamek/data/mechfiles/mechs/3067/Stiletto STO-4B.mtf
index eeab93c3dd7..d52d005a96e 100644
--- a/megamek/data/mechfiles/mechs/3067/Stiletto STO-4B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Stiletto STO-4B.mtf	
@@ -6,7 +6,7 @@ mul id:5132
 Config:Biped
 techbase:Inner Sphere
 era:3063
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3067/Templar TLR1-O (Grayson).mtf b/megamek/data/mechfiles/mechs/3067/Templar TLR1-O (Grayson).mtf
index bd55e58f393..0666c838079 100644
--- a/megamek/data/mechfiles/mechs/3067/Templar TLR1-O (Grayson).mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Templar TLR1-O (Grayson).mtf	
@@ -6,7 +6,7 @@ mul id:5192
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3065
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Templar TLR1-O (Tancred).mtf b/megamek/data/mechfiles/mechs/3067/Templar TLR1-O (Tancred).mtf
index bd49e46f2f5..c147340e605 100644
--- a/megamek/data/mechfiles/mechs/3067/Templar TLR1-O (Tancred).mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Templar TLR1-O (Tancred).mtf	
@@ -6,7 +6,7 @@ mul id:5193
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3067
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Templar TLR1-O.mtf b/megamek/data/mechfiles/mechs/3067/Templar TLR1-O.mtf
index a42ed965c77..e94b924fa0e 100644
--- a/megamek/data/mechfiles/mechs/3067/Templar TLR1-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Templar TLR1-O.mtf	
@@ -6,7 +6,7 @@ mul id:5191
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Templar TLR1-OA.mtf b/megamek/data/mechfiles/mechs/3067/Templar TLR1-OA.mtf
index 3b1c855e4aa..90ac75c1682 100644
--- a/megamek/data/mechfiles/mechs/3067/Templar TLR1-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Templar TLR1-OA.mtf	
@@ -6,7 +6,7 @@ mul id:5195
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Templar TLR1-OB.mtf b/megamek/data/mechfiles/mechs/3067/Templar TLR1-OB.mtf
index 0ffafb15448..6e9ea403aa2 100644
--- a/megamek/data/mechfiles/mechs/3067/Templar TLR1-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Templar TLR1-OB.mtf	
@@ -6,7 +6,7 @@ mul id:5196
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3062
-Source:TRO 3067
+Source:TRO: 3067
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Templar TLR1-OC.mtf b/megamek/data/mechfiles/mechs/3067/Templar TLR1-OC.mtf
index 59a0f759a3d..a0419a1d7cf 100644
--- a/megamek/data/mechfiles/mechs/3067/Templar TLR1-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Templar TLR1-OC.mtf	
@@ -6,7 +6,7 @@ mul id:5197
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3062
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3067/Tessen TSN-1C.mtf b/megamek/data/mechfiles/mechs/3067/Tessen TSN-1C.mtf
index 8245bfe8f80..7da6e69ba39 100644
--- a/megamek/data/mechfiles/mechs/3067/Tessen TSN-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Tessen TSN-1C.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3061
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:50
 Engine:300 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Tessen TSN-C3.mtf b/megamek/data/mechfiles/mechs/3067/Tessen TSN-C3.mtf
index 0fd72e4e5fe..600571a9989 100644
--- a/megamek/data/mechfiles/mechs/3067/Tessen TSN-C3.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Tessen TSN-C3.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3062
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:50
 Engine:300 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Thanatos THS-4S.mtf b/megamek/data/mechfiles/mechs/3067/Thanatos THS-4S.mtf
index 77c317d4f66..6e01477cae3 100644
--- a/megamek/data/mechfiles/mechs/3067/Thanatos THS-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Thanatos THS-4S.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3061
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:75
 Engine:375 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Uziel UZL-2S.mtf b/megamek/data/mechfiles/mechs/3067/Uziel UZL-2S.mtf
index fb7117d237f..62e15cf06bd 100644
--- a/megamek/data/mechfiles/mechs/3067/Uziel UZL-2S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Uziel UZL-2S.mtf	
@@ -6,7 +6,7 @@ mul id:5331
 Config:Biped
 techbase:Inner Sphere
 era:3063
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3067/Uziel UZL-3S.mtf b/megamek/data/mechfiles/mechs/3067/Uziel UZL-3S.mtf
index 2272a0ecac3..0e83267e1aa 100644
--- a/megamek/data/mechfiles/mechs/3067/Uziel UZL-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Uziel UZL-3S.mtf	
@@ -6,7 +6,7 @@ mul id:5332
 Config:Biped
 techbase:Inner Sphere
 era:3065
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3067/Vanquisher VQR-2A.mtf b/megamek/data/mechfiles/mechs/3067/Vanquisher VQR-2A.mtf
index b319c735aa9..4ca63a390ae 100644
--- a/megamek/data/mechfiles/mechs/3067/Vanquisher VQR-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Vanquisher VQR-2A.mtf	
@@ -6,7 +6,7 @@ mul id:5338
 Config:Biped
 techbase:Inner Sphere
 era:3063
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3067/Vanquisher VQR-2B.mtf b/megamek/data/mechfiles/mechs/3067/Vanquisher VQR-2B.mtf
index e0fd641eb8d..5595ecdafa0 100644
--- a/megamek/data/mechfiles/mechs/3067/Vanquisher VQR-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Vanquisher VQR-2B.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3067
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:100
 Engine:300 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/3067/Verfolger VR5-R.mtf b/megamek/data/mechfiles/mechs/3067/Verfolger VR5-R.mtf
index d2310eb8de9..0ebc367829f 100644
--- a/megamek/data/mechfiles/mechs/3067/Verfolger VR5-R.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/Verfolger VR5-R.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3063
 Rules Level:2
-source:TRO 3067
+source:TRO: 3067
 
 Mass:65
 Engine:325 XL Engine
diff --git a/megamek/data/mechfiles/mechs/3067/White Flame WHF-3B.mtf b/megamek/data/mechfiles/mechs/3067/White Flame WHF-3B.mtf
index defb8d3257d..67309df4c51 100644
--- a/megamek/data/mechfiles/mechs/3067/White Flame WHF-3B.mtf	
+++ b/megamek/data/mechfiles/mechs/3067/White Flame WHF-3B.mtf	
@@ -6,7 +6,7 @@ mul id:5404
 Config:Quad
 techbase:Inner Sphere
 era:3065
-source:TRO 3067
+source:TRO: 3067
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-O Invictus.mtf b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-O Invictus.mtf
index b30273af1b3..a44fde03a69 100644
--- a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-O Invictus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-O Invictus.mtf	
@@ -6,7 +6,7 @@ mul id:65
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3069
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OA Dominus.mtf b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OA Dominus.mtf
index 0e8680aad6e..c68c67ef1af 100644
--- a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OA Dominus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OA Dominus.mtf	
@@ -6,7 +6,7 @@ mul id:66
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OB Infernus.mtf b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OB Infernus.mtf
index e547f56a5bc..13fa3b2583d 100644
--- a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OB Infernus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OB Infernus.mtf	
@@ -6,7 +6,7 @@ mul id:67
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OC Comminus.mtf b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OC Comminus.mtf
index 564eac00afb..785859f6fa7 100644
--- a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OC Comminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OC Comminus.mtf	
@@ -6,7 +6,7 @@ mul id:68
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OD Luminos.mtf b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OD Luminos.mtf
index 5ae706c1399..c0716c4d94e 100644
--- a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OD Luminos.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OD Luminos.mtf	
@@ -6,7 +6,7 @@ mul id:69
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OE Eminus.mtf b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OE Eminus.mtf
index fcc5f858bea..cb9b2b07887 100644
--- a/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OE Eminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Archangel C-ANG-OE Eminus.mtf	
@@ -6,7 +6,7 @@ mul id:70
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Atlas II AS7-D-H.mtf b/megamek/data/mechfiles/mechs/3075/Atlas II AS7-D-H.mtf
index 5b3eb2ed384..01b62f455dc 100644
--- a/megamek/data/mechfiles/mechs/3075/Atlas II AS7-D-H.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Atlas II AS7-D-H.mtf	
@@ -6,7 +6,7 @@ mul id:152
 Config:Biped
 techbase:Inner Sphere
 era:2765
-source:TRO 3075 - Star League
+source:TRO: 3075 - Star League
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Atlas II AS7-D-H2.mtf b/megamek/data/mechfiles/mechs/3075/Atlas II AS7-D-H2.mtf
index d2c6d627a8e..9636e18d035 100644
--- a/megamek/data/mechfiles/mechs/3075/Atlas II AS7-D-H2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Atlas II AS7-D-H2.mtf	
@@ -6,7 +6,7 @@ mul id:153
 Config:Biped
 TechBase:Inner Sphere
 Era:2780
-Source:TRO 3075 - Star League
+Source:TRO: 3075 - Star League
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Balius A.mtf b/megamek/data/mechfiles/mechs/3075/Balius A.mtf
index e3a46a86ebc..6c7d7020f87 100644
--- a/megamek/data/mechfiles/mechs/3075/Balius A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Balius A.mtf	
@@ -6,7 +6,7 @@ mul id:211
 Config:Quad Omnimech
 TechBase:Clan
 Era:3075
-Source:TRO 3075 - Jihad
+Source:TRO: 3075 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Balius B.mtf b/megamek/data/mechfiles/mechs/3075/Balius B.mtf
index 1369e9553c1..9d0f474d3cd 100644
--- a/megamek/data/mechfiles/mechs/3075/Balius B.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Balius B.mtf	
@@ -6,7 +6,7 @@ mul id:212
 Config:Quad Omnimech
 TechBase:Clan
 Era:3075
-Source:TRO 3075 - Jihad
+Source:TRO: 3075 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Balius C.mtf b/megamek/data/mechfiles/mechs/3075/Balius C.mtf
index 213bcc0766b..89ea7bc288f 100644
--- a/megamek/data/mechfiles/mechs/3075/Balius C.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Balius C.mtf	
@@ -6,7 +6,7 @@ mul id:213
 Config:Quad Omnimech
 TechBase:Clan
 Era:3075
-Source:TRO 3075 - Jihad
+Source:TRO: 3075 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Balius D.mtf b/megamek/data/mechfiles/mechs/3075/Balius D.mtf
index 0f02a875fbd..56cda8437f3 100644
--- a/megamek/data/mechfiles/mechs/3075/Balius D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Balius D.mtf	
@@ -6,7 +6,7 @@ mul id:214
 Config:Quad Omnimech
 TechBase:Clan
 Era:3075
-Source:TRO 3075 - Jihad
+Source:TRO: 3075 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Balius Prime.mtf b/megamek/data/mechfiles/mechs/3075/Balius Prime.mtf
index 5614ecbfa35..53527375b0c 100644
--- a/megamek/data/mechfiles/mechs/3075/Balius Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Balius Prime.mtf	
@@ -5,7 +5,7 @@ mul id:215
 Config:Quad Omnimech
 techbase:Clan
 era:3075
-source:TRO 3075 - Jihad
+source:TRO: 3075 - Jihad
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-7K.mtf b/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-7K.mtf
index def87827b09..29f8ece2afc 100644
--- a/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-7K.mtf	
@@ -6,7 +6,7 @@ mul id:277
 Config:Biped
 TechBase:Inner Sphere
 Era:2475
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-7NC.mtf b/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-7NC.mtf
index cce7c582f38..478f4bd2011 100644
--- a/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-7NC.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-7NC.mtf	
@@ -6,7 +6,7 @@ mul id:278
 Config:Biped
 TechBase:Inner Sphere
 Era:2480
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-8D.mtf b/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-8D.mtf
index e9cbad9dc03..044a4a7e579 100644
--- a/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-8D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/BattleAxe BKX-8D.mtf	
@@ -6,7 +6,7 @@ mul id:279
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gb.mtf b/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gb.mtf
index de1d36e9d48..220bad75859 100644
--- a/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gb.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gb.mtf	
@@ -6,7 +6,7 @@ mul id:285
 Config:Biped
 TechBase:Inner Sphere
 Era:2760
-Source:TRO 3075 - Star League
+Source:TRO: 3075 - Star League
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gbc.mtf b/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gbc.mtf
index 3d0e369af38..82f0880148a 100644
--- a/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gbc.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gbc.mtf	
@@ -6,7 +6,7 @@ mul id:286
 Config:Biped
 TechBase:Inner Sphere
 Era:2763
-Source:TRO 3075 - Star League
+Source:TRO: 3075 - Star League
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gc.mtf b/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gc.mtf
index e77feec764a..ef0b3e7c6fd 100644
--- a/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gc.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/BattleMaster BLR-1Gc.mtf	
@@ -6,7 +6,7 @@ mul id:287
 Config:Biped
 TechBase:Inner Sphere
 Era:2763
-Source:TRO 3075 - Star League
+Source:TRO: 3075 - Star League
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/Bear Cub 2.mtf b/megamek/data/mechfiles/mechs/3075/Bear Cub 2.mtf
index f808b62a3ab..b9297a834da 100644
--- a/megamek/data/mechfiles/mechs/3075/Bear Cub 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Bear Cub 2.mtf	
@@ -6,7 +6,7 @@ mul id:315
 Config:Biped
 TechBase:Clan
 Era:3070
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Bear Cub 3.mtf b/megamek/data/mechfiles/mechs/3075/Bear Cub 3.mtf
index 6145c1abe82..babab4c7c13 100644
--- a/megamek/data/mechfiles/mechs/3075/Bear Cub 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Bear Cub 3.mtf	
@@ -6,7 +6,7 @@ mul id:316
 Config:Biped
 TechBase:Clan
 Era:3071
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Bear Cub.mtf b/megamek/data/mechfiles/mechs/3075/Bear Cub.mtf
index 4e0f5f1c164..6c3b9aba07c 100644
--- a/megamek/data/mechfiles/mechs/3075/Bear Cub.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Bear Cub.mtf	
@@ -6,7 +6,7 @@ mul id:314
 Config:Biped
 TechBase:Clan
 Era:3068
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Crab CRB-27b.mtf b/megamek/data/mechfiles/mechs/3075/Crab CRB-27b.mtf
index 1d82f4df4f6..5cc088220ac 100644
--- a/megamek/data/mechfiles/mechs/3075/Crab CRB-27b.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Crab CRB-27b.mtf	
@@ -6,7 +6,7 @@ mul id:717
 Config:Biped
 TechBase:Inner Sphere
 Era:2719
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Crimson Hawk 2.mtf b/megamek/data/mechfiles/mechs/3075/Crimson Hawk 2.mtf
index f38f1efb89f..78607ffa6fc 100644
--- a/megamek/data/mechfiles/mechs/3075/Crimson Hawk 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Crimson Hawk 2.mtf	
@@ -6,7 +6,7 @@ mul id:722
 Config:Biped
 TechBase:Clan
 Era:3073
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Crimson Hawk 3.mtf b/megamek/data/mechfiles/mechs/3075/Crimson Hawk 3.mtf
index 0b38c5d9c38..fca48e86cde 100644
--- a/megamek/data/mechfiles/mechs/3075/Crimson Hawk 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Crimson Hawk 3.mtf	
@@ -6,7 +6,7 @@ mul id:723
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Crimson Hawk.mtf b/megamek/data/mechfiles/mechs/3075/Crimson Hawk.mtf
index 0e92f9a0240..3e47a06ec15 100644
--- a/megamek/data/mechfiles/mechs/3075/Crimson Hawk.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Crimson Hawk.mtf	
@@ -6,7 +6,7 @@ mul id:721
 Config:Biped
 TechBase:Clan
 Era:3071
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Crossbow CRS-6B.mtf b/megamek/data/mechfiles/mechs/3075/Crossbow CRS-6B.mtf
index 1d62dfb19c2..f66c2d834fc 100644
--- a/megamek/data/mechfiles/mechs/3075/Crossbow CRS-6B.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Crossbow CRS-6B.mtf	
@@ -6,7 +6,7 @@ mul id:733
 Config:Biped
 techbase:Inner Sphere
 era:2473
-source:TRO 3075
+source:TRO: 3075
 rules level:1
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Crossbow CRS-6C.mtf b/megamek/data/mechfiles/mechs/3075/Crossbow CRS-6C.mtf
index e380dfafe2d..0b04c5774f9 100644
--- a/megamek/data/mechfiles/mechs/3075/Crossbow CRS-6C.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Crossbow CRS-6C.mtf	
@@ -6,7 +6,7 @@ mul id:734
 Config:Biped
 TechBase:Inner Sphere
 Era:2481
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Crossbow CRS-9A.mtf b/megamek/data/mechfiles/mechs/3075/Crossbow CRS-9A.mtf
index 1f56700f0db..d36d5868bec 100644
--- a/megamek/data/mechfiles/mechs/3075/Crossbow CRS-9A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Crossbow CRS-9A.mtf	
@@ -6,7 +6,7 @@ mul id:735
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Crusader CRD-2R.mtf b/megamek/data/mechfiles/mechs/3075/Crusader CRD-2R.mtf
index 7c7ab877753..6120ffcdd42 100644
--- a/megamek/data/mechfiles/mechs/3075/Crusader CRD-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Crusader CRD-2R.mtf	
@@ -6,7 +6,7 @@ mul id:748
 Config:Biped
 techbase:Inner Sphere
 era:2649
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Cygnus 2.mtf b/megamek/data/mechfiles/mechs/3075/Cygnus 2.mtf
index badd8647e24..8570e8337f9 100644
--- a/megamek/data/mechfiles/mechs/3075/Cygnus 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Cygnus 2.mtf	
@@ -6,7 +6,7 @@ mul id:782
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3075/Cygnus 3.mtf b/megamek/data/mechfiles/mechs/3075/Cygnus 3.mtf
index f56d3151c13..7ff03cb74eb 100644
--- a/megamek/data/mechfiles/mechs/3075/Cygnus 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Cygnus 3.mtf	
@@ -6,7 +6,7 @@ mul id:783
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3075/Cygnus.mtf b/megamek/data/mechfiles/mechs/3075/Cygnus.mtf
index 882946ae4e3..3f26588a6a5 100644
--- a/megamek/data/mechfiles/mechs/3075/Cygnus.mtf
+++ b/megamek/data/mechfiles/mechs/3075/Cygnus.mtf
@@ -6,7 +6,7 @@ mul id:781
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3075/Defiance DFN-3C.mtf b/megamek/data/mechfiles/mechs/3075/Defiance DFN-3C.mtf
index 5207f17369e..1a72e34fe60 100644
--- a/megamek/data/mechfiles/mechs/3075/Defiance DFN-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Defiance DFN-3C.mtf	
@@ -6,7 +6,7 @@ mul id:849
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Defiance DFN-3S.mtf b/megamek/data/mechfiles/mechs/3075/Defiance DFN-3S.mtf
index 3ab9fb66bdc..edc038b1053 100644
--- a/megamek/data/mechfiles/mechs/3075/Defiance DFN-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Defiance DFN-3S.mtf	
@@ -6,7 +6,7 @@ mul id:850
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Defiance DFN-3T.mtf b/megamek/data/mechfiles/mechs/3075/Defiance DFN-3T.mtf
index 168ad02686e..b146a84777f 100644
--- a/megamek/data/mechfiles/mechs/3075/Defiance DFN-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Defiance DFN-3T.mtf	
@@ -6,7 +6,7 @@ mul id:851
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/DemolitionMech WI-DM.mtf b/megamek/data/mechfiles/mechs/3075/DemolitionMech WI-DM.mtf
index a630dd89e91..b30c9b8e84c 100644
--- a/megamek/data/mechfiles/mechs/3075/DemolitionMech WI-DM.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/DemolitionMech WI-DM.mtf	
@@ -6,7 +6,7 @@ mul id:868
 Config:Biped
 TechBase:Inner Sphere
 Era:2513
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/DemolitionMech WI-DM2.mtf b/megamek/data/mechfiles/mechs/3075/DemolitionMech WI-DM2.mtf
index 3644067d17c..4199c010baf 100644
--- a/megamek/data/mechfiles/mechs/3075/DemolitionMech WI-DM2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/DemolitionMech WI-DM2.mtf	
@@ -6,7 +6,7 @@ mul id:869
 Config:Biped
 TechBase:Inner Sphere
 Era:2514
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-O Invictus.mtf b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-O Invictus.mtf
index f06852a0d84..ac5749fdf92 100644
--- a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-O Invictus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-O Invictus.mtf	
@@ -6,7 +6,7 @@ mul id:885
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OA Dominus.mtf b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OA Dominus.mtf
index 9719672ab08..b1a5b192216 100644
--- a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OA Dominus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OA Dominus.mtf	
@@ -6,7 +6,7 @@ mul id:886
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3069
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OB Infernus.mtf b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OB Infernus.mtf
index 4a72cccae78..a74f6514663 100644
--- a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OB Infernus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OB Infernus.mtf	
@@ -6,7 +6,7 @@ mul id:887
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OC Comminus.mtf b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OC Comminus.mtf
index b6a0cea08ca..193d52ff385 100644
--- a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OC Comminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OC Comminus.mtf	
@@ -6,7 +6,7 @@ mul id:888
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OD Luminos.mtf b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OD Luminos.mtf
index bd1f65a53a7..8adb9b09383 100644
--- a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OD Luminos.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OD Luminos.mtf	
@@ -6,7 +6,7 @@ mul id:889
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OE Eminus.mtf b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OE Eminus.mtf
index 314120b19d5..0ab8fae105a 100644
--- a/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OE Eminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Deva C-DVA-OE Eminus.mtf	
@@ -6,7 +6,7 @@ mul id:890
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Excalibur EXC-B2b.mtf b/megamek/data/mechfiles/mechs/3075/Excalibur EXC-B2b.mtf
index 0aa1510e041..ef472ea9d53 100644
--- a/megamek/data/mechfiles/mechs/3075/Excalibur EXC-B2b.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Excalibur EXC-B2b.mtf	
@@ -6,7 +6,7 @@ mul id:999
 Config:Biped
 TechBase:Inner Sphere
 Era:2735
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-35A.mtf b/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-35A.mtf
index 4b0e1412ef0..3b48e845449 100644
--- a/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-35A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-35A.mtf	
@@ -6,7 +6,7 @@ mul id:1008
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-45A.mtf b/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-45A.mtf
index d6143e85fd2..79379f1a634 100644
--- a/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-45A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-45A.mtf	
@@ -6,7 +6,7 @@ mul id:1009
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-45B.mtf b/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-45B.mtf
index acda59efed7..0c9f1889b2b 100644
--- a/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-45B.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-45B.mtf	
@@ -6,7 +6,7 @@ mul id:1010
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-4A.mtf b/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-4A.mtf
index 25006ebfa5b..f118921c034 100644
--- a/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Eyleuka EYL-4A.mtf	
@@ -6,7 +6,7 @@ mul id:1011
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Firebee FRB-2E.mtf b/megamek/data/mechfiles/mechs/3075/Firebee FRB-2E.mtf
index bec4c41e8d5..2d63bf5375a 100644
--- a/megamek/data/mechfiles/mechs/3075/Firebee FRB-2E.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Firebee FRB-2E.mtf	
@@ -6,7 +6,7 @@ mul id:1079
 Config:Biped
 TechBase:Inner Sphere
 Era:2524
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Firebee FRB-3E.mtf b/megamek/data/mechfiles/mechs/3075/Firebee FRB-3E.mtf
index 30242fbab69..e1227560da1 100644
--- a/megamek/data/mechfiles/mechs/3075/Firebee FRB-3E.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Firebee FRB-3E.mtf	
@@ -6,7 +6,7 @@ mul id:1080
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Galahad GLH-1D.mtf b/megamek/data/mechfiles/mechs/3075/Galahad GLH-1D.mtf
index aec3210d9be..1225767b960 100644
--- a/megamek/data/mechfiles/mechs/3075/Galahad GLH-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Galahad GLH-1D.mtf	
@@ -6,7 +6,7 @@ mul id:1167
 Config:Biped
 TechBase:Inner Sphere
 Era:2570
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Galahad GLH-2D.mtf b/megamek/data/mechfiles/mechs/3075/Galahad GLH-2D.mtf
index 6e512e2975e..f9c53e45bde 100644
--- a/megamek/data/mechfiles/mechs/3075/Galahad GLH-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Galahad GLH-2D.mtf	
@@ -6,7 +6,7 @@ mul id:1168
 Config:Biped
 techbase:Inner Sphere
 era:2594
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Galahad GLH-3D.mtf b/megamek/data/mechfiles/mechs/3075/Galahad GLH-3D.mtf
index c886253a15d..3da3e772f47 100644
--- a/megamek/data/mechfiles/mechs/3075/Galahad GLH-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Galahad GLH-3D.mtf	
@@ -6,7 +6,7 @@ mul id:1169
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Gladiator GLD-2R.mtf b/megamek/data/mechfiles/mechs/3075/Gladiator GLD-2R.mtf
index 6bd31826e8f..9c093c8f1c9 100644
--- a/megamek/data/mechfiles/mechs/3075/Gladiator GLD-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Gladiator GLD-2R.mtf	
@@ -6,7 +6,7 @@ mul id:1199
 Config:Biped
 techbase:Inner Sphere
 era:2487
-source:TRO 3075 - Age of War
+source:TRO: 3075 - Age of War
 rules level:1
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Gladiator GLD-3R.mtf b/megamek/data/mechfiles/mechs/3075/Gladiator GLD-3R.mtf
index 4ce85abebf0..3d3a4e49d87 100644
--- a/megamek/data/mechfiles/mechs/3075/Gladiator GLD-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Gladiator GLD-3R.mtf	
@@ -6,7 +6,7 @@ mul id:1200
 Config:Biped
 TechBase:Inner Sphere
 Era:2490
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Gladiator GLD-4R.mtf b/megamek/data/mechfiles/mechs/3075/Gladiator GLD-4R.mtf
index d7a9c1df58b..23210f8b9cc 100644
--- a/megamek/data/mechfiles/mechs/3075/Gladiator GLD-4R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Gladiator GLD-4R.mtf	
@@ -6,7 +6,7 @@ mul id:1201
 Config:Biped
 TechBase:Inner Sphere
 Era:2495
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Gladiator GLD-5R.mtf b/megamek/data/mechfiles/mechs/3075/Gladiator GLD-5R.mtf
index c47dfee9f69..0c463326b70 100644
--- a/megamek/data/mechfiles/mechs/3075/Gladiator GLD-5R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Gladiator GLD-5R.mtf	
@@ -6,7 +6,7 @@ mul id:1202
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Gladiator Keller.mtf b/megamek/data/mechfiles/mechs/3075/Gladiator Keller.mtf
index 3207ab0b812..d99362a5c48 100644
--- a/megamek/data/mechfiles/mechs/3075/Gladiator Keller.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Gladiator Keller.mtf	
@@ -6,6 +6,7 @@ Config:Biped
 techbase:Inner Sphere
 era:3071
 rules level:4
+source:TRO: 3075 - Jihad
 
 mass:55
 engine:220 Light Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-O Invictus.mtf b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-O Invictus.mtf
index 21e262bf9b9..6360943284b 100644
--- a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-O Invictus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-O Invictus.mtf	
@@ -6,7 +6,7 @@ mul id:1320
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-O Tamiel.mtf b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-O Tamiel.mtf
index 74e8cfa4793..ae0a2b346d6 100644
--- a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-O Tamiel.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-O Tamiel.mtf	
@@ -6,7 +6,7 @@ mul id:1319
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OA Dominus.mtf b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OA Dominus.mtf
index e13044389c4..2689e47aae0 100644
--- a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OA Dominus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OA Dominus.mtf	
@@ -6,7 +6,7 @@ mul id:1321
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3069
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OB Infernus.mtf b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OB Infernus.mtf
index 2b700bfffd9..7ddb7945d54 100644
--- a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OB Infernus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OB Infernus.mtf	
@@ -6,7 +6,7 @@ mul id:1322
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3069
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OC Comminus.mtf b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OC Comminus.mtf
index 4f8e969036b..5efd66a2aae 100644
--- a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OC Comminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OC Comminus.mtf	
@@ -6,7 +6,7 @@ mul id:1323
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OD Luminos.mtf b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OD Luminos.mtf
index 25951a5d2cf..5e71a22cf58 100644
--- a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OD Luminos.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OD Luminos.mtf	
@@ -6,7 +6,7 @@ mul id:1324
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OE Eminus.mtf b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OE Eminus.mtf
index 1bc1df52a53..88b2c64cc45 100644
--- a/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OE Eminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Grigori C-GRG-OE Eminus.mtf	
@@ -6,7 +6,7 @@ mul id:1325
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-3D.mtf b/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-3D.mtf
index 8fe070ea581..9d808cdaa54 100644
--- a/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-3D.mtf	
@@ -6,7 +6,7 @@ mul id:1369
 Config:Biped
 TechBase:Inner Sphere
 Era:2475
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-4D.mtf b/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-4D.mtf
index 99055964397..fdea7198a3a 100644
--- a/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-4D.mtf	
@@ -6,7 +6,7 @@ mul id:1370
 Config:Biped
 TechBase:Inner Sphere
 Era:2492
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-5D.mtf b/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-5D.mtf
index 779a4a96377..9c76b48be9a 100644
--- a/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-5D.mtf	
@@ -6,7 +6,7 @@ mul id:1371
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-6D.mtf b/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-6D.mtf
index 3bd9964091e..d1fecb6f793 100644
--- a/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Hammerhands HMH-6D.mtf	
@@ -6,7 +6,7 @@ mul id:1372
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Helepolis HEP-2H.mtf b/megamek/data/mechfiles/mechs/3075/Helepolis HEP-2H.mtf
index 21a778112ce..756968ecd17 100644
--- a/megamek/data/mechfiles/mechs/3075/Helepolis HEP-2H.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Helepolis HEP-2H.mtf	
@@ -5,7 +5,7 @@ mul id:1461
 Config:Biped
 techbase:Inner Sphere
 era:2567
-source:TRO 3075
+source:TRO: 3075
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Helepolis HEP-2X.mtf b/megamek/data/mechfiles/mechs/3075/Helepolis HEP-2X.mtf
index 16b6d12999c..600847d720a 100644
--- a/megamek/data/mechfiles/mechs/3075/Helepolis HEP-2X.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Helepolis HEP-2X.mtf	
@@ -5,7 +5,7 @@ mul id:8471
 Config:Biped
 techbase:Inner Sphere
 era:2488
-source:TRO 3075 - Age of War
+source:TRO: 3075 - Age of War
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Helepolis HEP-3H.mtf b/megamek/data/mechfiles/mechs/3075/Helepolis HEP-3H.mtf
index 7ba79cff13c..fb331d36ebe 100644
--- a/megamek/data/mechfiles/mechs/3075/Helepolis HEP-3H.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Helepolis HEP-3H.mtf	
@@ -6,7 +6,7 @@ mul id:1462
 Config:Biped
 TechBase:Inner Sphere
 Era:2625
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Helepolis HEP-4H.mtf b/megamek/data/mechfiles/mechs/3075/Helepolis HEP-4H.mtf
index c2c5884aebc..d62803f9065 100644
--- a/megamek/data/mechfiles/mechs/3075/Helepolis HEP-4H.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Helepolis HEP-4H.mtf	
@@ -6,7 +6,7 @@ mul id:1463
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Highlander HGN-732b.mtf b/megamek/data/mechfiles/mechs/3075/Highlander HGN-732b.mtf
index e118e8b57d4..7a51b6f9fcc 100644
--- a/megamek/data/mechfiles/mechs/3075/Highlander HGN-732b.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Highlander HGN-732b.mtf	
@@ -6,7 +6,7 @@ mul id:1516
 Config:Biped
 TechBase:Inner Sphere
 Era:2598
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3075/Hussar HSR-200-Db.mtf b/megamek/data/mechfiles/mechs/3075/Hussar HSR-200-Db.mtf
index 21b5a03f126..926889c4537 100644
--- a/megamek/data/mechfiles/mechs/3075/Hussar HSR-200-Db.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Hussar HSR-200-Db.mtf	
@@ -6,7 +6,7 @@ mul id:1586
 Config:Biped
 TechBase:Inner Sphere
 Era:2735
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Hyena HYN-4B SalvageMech.mtf b/megamek/data/mechfiles/mechs/3075/Hyena HYN-4B SalvageMech.mtf
index 9c68550b5e0..dc8d6c139e7 100644
--- a/megamek/data/mechfiles/mechs/3075/Hyena HYN-4B SalvageMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Hyena HYN-4B SalvageMech.mtf	
@@ -6,7 +6,7 @@ mul id:4354
 Config:Biped
 techbase:Inner Sphere
 era:3072
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Hyena SalvageMech HYN-4A.mtf b/megamek/data/mechfiles/mechs/3075/Hyena SalvageMech HYN-4A.mtf
index b40785ec27a..935a8ed90da 100644
--- a/megamek/data/mechfiles/mechs/3075/Hyena SalvageMech HYN-4A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Hyena SalvageMech HYN-4A.mtf	
@@ -6,7 +6,7 @@ mul id:1598
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Icarus II ICR-1S.mtf b/megamek/data/mechfiles/mechs/3075/Icarus II ICR-1S.mtf
index 38fa7711758..5afb7e19da3 100644
--- a/megamek/data/mechfiles/mechs/3075/Icarus II ICR-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Icarus II ICR-1S.mtf	
@@ -6,7 +6,7 @@ mul id:1600
 Config:Biped
 TechBase:Inner Sphere
 Era:2518
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3075/Icarus II ICR-2S.mtf b/megamek/data/mechfiles/mechs/3075/Icarus II ICR-2S.mtf
index 673380648b2..e87b7c18627 100644
--- a/megamek/data/mechfiles/mechs/3075/Icarus II ICR-2S.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Icarus II ICR-2S.mtf	
@@ -6,7 +6,7 @@ mul id:1601
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3075/Jabberwocky ConstructionMech JAW-66D.mtf b/megamek/data/mechfiles/mechs/3075/Jabberwocky ConstructionMech JAW-66D.mtf
index d3f5ef6f2b4..6c869ea0ee7 100644
--- a/megamek/data/mechfiles/mechs/3075/Jabberwocky ConstructionMech JAW-66D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Jabberwocky ConstructionMech JAW-66D.mtf	
@@ -6,7 +6,7 @@ mul id:1652
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Jabberwocky DemolitionMech JAW-66C.mtf b/megamek/data/mechfiles/mechs/3075/Jabberwocky DemolitionMech JAW-66C.mtf
index e24b9907a29..9a2aad2584f 100644
--- a/megamek/data/mechfiles/mechs/3075/Jabberwocky DemolitionMech JAW-66C.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Jabberwocky DemolitionMech JAW-66C.mtf	
@@ -6,7 +6,7 @@ mul id:1651
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Jabberwocky EngineerMech JAW-66B.mtf b/megamek/data/mechfiles/mechs/3075/Jabberwocky EngineerMech JAW-66B.mtf
index 11a85c3c4a4..3957936df61 100644
--- a/megamek/data/mechfiles/mechs/3075/Jabberwocky EngineerMech JAW-66B.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Jabberwocky EngineerMech JAW-66B.mtf	
@@ -6,7 +6,7 @@ mul id:1650
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-8T.mtf b/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-8T.mtf
index dde51152734..ba3fee368be 100644
--- a/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-8T.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-8T.mtf	
@@ -6,7 +6,7 @@ mul id:1656
 Config:Biped
 TechBase:Inner Sphere
 Era:2765
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-9R.mtf b/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-9R.mtf
index 8e0ce8a8c90..7f53d91a9f1 100644
--- a/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-9R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-9R.mtf	
@@ -6,7 +6,7 @@ mul id:1657
 Config:Biped
 TechBase:Inner Sphere
 Era:2768
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-9W.mtf b/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-9W.mtf
index 9253b83e2af..4b10e8c29b7 100644
--- a/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-9W.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Jackrabbit JKR-9W.mtf	
@@ -6,7 +6,7 @@ mul id:1658
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Jupiter 2.mtf b/megamek/data/mechfiles/mechs/3075/Jupiter 2.mtf
index 0cb798e46f9..9587672f800 100644
--- a/megamek/data/mechfiles/mechs/3075/Jupiter 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Jupiter 2.mtf	
@@ -6,7 +6,7 @@ mul id:1726
 Config:Biped
 techbase:Clan
 era:3070
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Jupiter 3.mtf b/megamek/data/mechfiles/mechs/3075/Jupiter 3.mtf
index dc5ed0a460e..3a191c7d457 100644
--- a/megamek/data/mechfiles/mechs/3075/Jupiter 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Jupiter 3.mtf	
@@ -6,7 +6,7 @@ mul id:1727
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Jupiter.mtf b/megamek/data/mechfiles/mechs/3075/Jupiter.mtf
index 71da5158392..9488a0aa453 100644
--- a/megamek/data/mechfiles/mechs/3075/Jupiter.mtf
+++ b/megamek/data/mechfiles/mechs/3075/Jupiter.mtf
@@ -6,7 +6,7 @@ mul id:1725
 Config:Biped
 TechBase:Clan
 Era:3068
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/King Crab KGC-000b.mtf b/megamek/data/mechfiles/mechs/3075/King Crab KGC-000b.mtf
index 7168720a5a7..3d461afaa27 100644
--- a/megamek/data/mechfiles/mechs/3075/King Crab KGC-000b.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/King Crab KGC-000b.mtf	
@@ -6,7 +6,7 @@ mul id:1772
 Config:Biped
 TechBase:Inner Sphere
 Era:2743
-Source:TRO 3075 - Star League
+Source:TRO: 3075 - Star League
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Kintaro KTO-19b.mtf b/megamek/data/mechfiles/mechs/3075/Kintaro KTO-19b.mtf
index e74eb998c72..eca4992efea 100644
--- a/megamek/data/mechfiles/mechs/3075/Kintaro KTO-19b.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Kintaro KTO-19b.mtf	
@@ -6,7 +6,7 @@ mul id:1792
 Config:Biped
 TechBase:Inner Sphere
 Era:2731
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Kiso K-3N-KR4.mtf b/megamek/data/mechfiles/mechs/3075/Kiso K-3N-KR4.mtf
index 73cb802382a..3a2991d1409 100644
--- a/megamek/data/mechfiles/mechs/3075/Kiso K-3N-KR4.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Kiso K-3N-KR4.mtf	
@@ -6,7 +6,7 @@ mul id:1802
 Config:Quad
 TechBase:Inner Sphere
 Era:2703
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Kiso K-3N-KR5.mtf b/megamek/data/mechfiles/mechs/3075/Kiso K-3N-KR5.mtf
index fe0a7c4f62e..6216174ea03 100644
--- a/megamek/data/mechfiles/mechs/3075/Kiso K-3N-KR5.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Kiso K-3N-KR5.mtf	
@@ -6,7 +6,7 @@ mul id:1803
 Config:Quad
 TechBase:Inner Sphere
 Era:2703
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Koschei KSC-3I.mtf b/megamek/data/mechfiles/mechs/3075/Koschei KSC-3I.mtf
index 779f2809ee1..ee83325998c 100644
--- a/megamek/data/mechfiles/mechs/3075/Koschei KSC-3I.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Koschei KSC-3I.mtf	
@@ -6,7 +6,7 @@ mul id:1820
 Config:Biped
 TechBase:Inner Sphere
 Era:2504
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Koschei KSC-3L.mtf b/megamek/data/mechfiles/mechs/3075/Koschei KSC-3L.mtf
index 9b81a288ece..f6c6755214c 100644
--- a/megamek/data/mechfiles/mechs/3075/Koschei KSC-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Koschei KSC-3L.mtf	
@@ -6,7 +6,7 @@ mul id:1821
 Config:Biped
 TechBase:Inner Sphere
 Era:2634
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Koschei KSC-4I.mtf b/megamek/data/mechfiles/mechs/3075/Koschei KSC-4I.mtf
index 56cf02eda69..12b47fd0457 100644
--- a/megamek/data/mechfiles/mechs/3075/Koschei KSC-4I.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Koschei KSC-4I.mtf	
@@ -6,7 +6,7 @@ mul id:1822
 Config:Biped
 TechBase:Inner Sphere
 Era:2719
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Koschei KSC-4L.mtf b/megamek/data/mechfiles/mechs/3075/Koschei KSC-4L.mtf
index 3f3c2dd44e3..00d15e8d263 100644
--- a/megamek/data/mechfiles/mechs/3075/Koschei KSC-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Koschei KSC-4L.mtf	
@@ -6,7 +6,7 @@ mul id:1823
 Config:Biped
 TechBase:Inner Sphere
 Era:2723
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Koschei KSC-5I.mtf b/megamek/data/mechfiles/mechs/3075/Koschei KSC-5I.mtf
index 02bc8f039ca..9a0d9fc1b57 100644
--- a/megamek/data/mechfiles/mechs/3075/Koschei KSC-5I.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Koschei KSC-5I.mtf	
@@ -6,7 +6,7 @@ mul id:1824
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Koschei KSC-5MC.mtf b/megamek/data/mechfiles/mechs/3075/Koschei KSC-5MC.mtf
index 92e00cbc41b..01f21d22fdc 100644
--- a/megamek/data/mechfiles/mechs/3075/Koschei KSC-5MC.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Koschei KSC-5MC.mtf	
@@ -6,7 +6,7 @@ mul id:1825
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Koschei KSC-5X.mtf b/megamek/data/mechfiles/mechs/3075/Koschei KSC-5X.mtf
index af5f732d8da..0065e156a66 100644
--- a/megamek/data/mechfiles/mechs/3075/Koschei KSC-5X.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Koschei KSC-5X.mtf	
@@ -6,7 +6,7 @@ mul id:1826
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Kyudo KY2-D-02.mtf b/megamek/data/mechfiles/mechs/3075/Kyudo KY2-D-02.mtf
index 3ab8151fc46..a14488d6db9 100644
--- a/megamek/data/mechfiles/mechs/3075/Kyudo KY2-D-02.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Kyudo KY2-D-02.mtf	
@@ -6,7 +6,7 @@ mul id:1851
 Config:Biped
 TechBase:Inner Sphere
 Era:2625
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Kyudo KY2-D-03.mtf b/megamek/data/mechfiles/mechs/3075/Kyudo KY2-D-03.mtf
index 366b580da89..9ee126d8495 100644
--- a/megamek/data/mechfiles/mechs/3075/Kyudo KY2-D-03.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Kyudo KY2-D-03.mtf	
@@ -6,7 +6,7 @@ mul id:1852
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-1X.mtf b/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-1X.mtf
index 41e20eff353..68ba76a5f7e 100644
--- a/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-1X.mtf	
@@ -6,7 +6,7 @@ mul id:1862
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2D.mtf b/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2D.mtf
index 7d985a13393..1271158c199 100644
--- a/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2D.mtf	
@@ -6,7 +6,7 @@ mul id:1863
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2XA.mtf b/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2XA.mtf
index c5233714459..8852ad40ae9 100644
--- a/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2XA.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2XA.mtf	
@@ -6,7 +6,7 @@ mul id:1865
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2XU.mtf b/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2XU.mtf
index e3d3773791e..bcd75abd52f 100644
--- a/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2XU.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Legionnaire LGN-2XU.mtf	
@@ -6,7 +6,7 @@ mul id:1866
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Lumberjack LM1A.mtf b/megamek/data/mechfiles/mechs/3075/Lumberjack LM1A.mtf
index 39bc0125b72..2bcdbe8b976 100644
--- a/megamek/data/mechfiles/mechs/3075/Lumberjack LM1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Lumberjack LM1A.mtf	
@@ -6,7 +6,7 @@ mul id:4545
 Config:Biped
 TechBase:Inner Sphere
 Era:2355
-Source:RS 3075
+Source:RS 3075 - Age of War
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Lumberjack LM4C.mtf b/megamek/data/mechfiles/mechs/3075/Lumberjack LM4C.mtf
index 802960befe1..aac70d198f3 100644
--- a/megamek/data/mechfiles/mechs/3075/Lumberjack LM4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Lumberjack LM4C.mtf	
@@ -6,7 +6,7 @@ mul id:1960
 Config:Biped
 TechBase:Inner Sphere
 Era:2489
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Lumberjack LM4P.mtf b/megamek/data/mechfiles/mechs/3075/Lumberjack LM4P.mtf
index 9ffddda0be1..e5d695fc60d 100644
--- a/megamek/data/mechfiles/mechs/3075/Lumberjack LM4P.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Lumberjack LM4P.mtf	
@@ -6,7 +6,7 @@ mul id:1961
 Config:Biped
 TechBase:Inner Sphere
 Era:2811
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Mackie MSK-6S.mtf b/megamek/data/mechfiles/mechs/3075/Mackie MSK-6S.mtf
index b188fc3ab4f..c72303de17c 100644
--- a/megamek/data/mechfiles/mechs/3075/Mackie MSK-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Mackie MSK-6S.mtf	
@@ -5,7 +5,7 @@ mul id:1973
 Config:Biped
 techbase:Inner Sphere
 era:2439
-source:TRO 3075 - Age of War
+source:TRO: 3075 - Age of War
 rules level:4
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Mackie MSK-7A.mtf b/megamek/data/mechfiles/mechs/3075/Mackie MSK-7A.mtf
index b6bc3c94337..0b223acc405 100644
--- a/megamek/data/mechfiles/mechs/3075/Mackie MSK-7A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Mackie MSK-7A.mtf	
@@ -6,7 +6,7 @@ mul id:4556
 Config:Biped
 techbase:Inner Sphere
 era:2488
-source:RS 3075U
+source:RS 3075U - Age of War
 rules level:1
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Mackie MSK-8B.mtf b/megamek/data/mechfiles/mechs/3075/Mackie MSK-8B.mtf
index 5a25abb1e14..2825cc97729 100644
--- a/megamek/data/mechfiles/mechs/3075/Mackie MSK-8B.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Mackie MSK-8B.mtf	
@@ -6,7 +6,7 @@ mul id:1974
 Config:Biped
 TechBase:Inner Sphere
 Era:2576
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Mackie MSK-9H.mtf b/megamek/data/mechfiles/mechs/3075/Mackie MSK-9H.mtf
index aec25e72c10..af5a56fea6c 100644
--- a/megamek/data/mechfiles/mechs/3075/Mackie MSK-9H.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Mackie MSK-9H.mtf	
@@ -5,7 +5,7 @@ mul id:1975
 Config:Biped
 techbase:Inner Sphere
 era:2576
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Malak C-MK-O Invictus.mtf b/megamek/data/mechfiles/mechs/3075/Malak C-MK-O Invictus.mtf
index c67c8b9c6b3..371e2154742 100644
--- a/megamek/data/mechfiles/mechs/3075/Malak C-MK-O Invictus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Malak C-MK-O Invictus.mtf	
@@ -6,7 +6,7 @@ mul id:1994
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3069
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OA Dominus.mtf b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OA Dominus.mtf
index 218b7c4012c..252d66c88e1 100644
--- a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OA Dominus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OA Dominus.mtf	
@@ -6,7 +6,7 @@ mul id:1995
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OB Infernus.mtf b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OB Infernus.mtf
index 186db37dff2..bde76160646 100644
--- a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OB Infernus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OB Infernus.mtf	
@@ -6,7 +6,7 @@ mul id:1996
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OC Comminus.mtf b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OC Comminus.mtf
index 1354c3f979b..638d3411f52 100644
--- a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OC Comminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OC Comminus.mtf	
@@ -6,7 +6,7 @@ mul id:1997
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OD Luminos.mtf b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OD Luminos.mtf
index 15c5193b0d7..5a376bea7ed 100644
--- a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OD Luminos.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OD Luminos.mtf	
@@ -6,7 +6,7 @@ mul id:1998
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OE Eminus.mtf b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OE Eminus.mtf
index d53d60b2479..e482365ee85 100644
--- a/megamek/data/mechfiles/mechs/3075/Malak C-MK-OE Eminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Malak C-MK-OE Eminus.mtf	
@@ -6,7 +6,7 @@ mul id:1999
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Marauder MAD-1R.mtf b/megamek/data/mechfiles/mechs/3075/Marauder MAD-1R.mtf
index a9752cd249a..1302fdc9b22 100644
--- a/megamek/data/mechfiles/mechs/3075/Marauder MAD-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Marauder MAD-1R.mtf	
@@ -6,7 +6,7 @@ mul id:2033
 Config:Biped
 TechBase:Inner Sphere
 Era:2612
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Marauder MAD-2R.mtf b/megamek/data/mechfiles/mechs/3075/Marauder MAD-2R.mtf
index ec97270efc0..acb1e19a09d 100644
--- a/megamek/data/mechfiles/mechs/3075/Marauder MAD-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Marauder MAD-2R.mtf	
@@ -6,7 +6,7 @@ mul id:2034
 Config:Biped
 TechBase:Inner Sphere
 Era:2760
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Mongoose II MON-266.mtf b/megamek/data/mechfiles/mechs/3075/Mongoose II MON-266.mtf
index 9411ad92e8e..a2e9ed61ec3 100644
--- a/megamek/data/mechfiles/mechs/3075/Mongoose II MON-266.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Mongoose II MON-266.mtf	
@@ -6,7 +6,7 @@ mul id:2216
 Config:Biped
 techbase:Inner Sphere
 era:3073
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3075/Mongoose II MON-267.mtf b/megamek/data/mechfiles/mechs/3075/Mongoose II MON-267.mtf
index 7f3916b97a0..6c77c90d0bd 100644
--- a/megamek/data/mechfiles/mechs/3075/Mongoose II MON-267.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Mongoose II MON-267.mtf	
@@ -6,7 +6,7 @@ mul id:2217
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3075/Mongoose II MON-268.mtf b/megamek/data/mechfiles/mechs/3075/Mongoose II MON-268.mtf
index ee62f99b1fe..40d39a3c739 100644
--- a/megamek/data/mechfiles/mechs/3075/Mongoose II MON-268.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Mongoose II MON-268.mtf	
@@ -6,7 +6,7 @@ mul id:2218
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3075/Mongoose MON-66b.mtf b/megamek/data/mechfiles/mechs/3075/Mongoose MON-66b.mtf
index 7ee362a0a92..7cb626f3dc2 100644
--- a/megamek/data/mechfiles/mechs/3075/Mongoose MON-66b.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Mongoose MON-66b.mtf	
@@ -6,7 +6,7 @@ mul id:2209
 Config:Biped
 TechBase:Inner Sphere
 Era:2740
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3075/Ocelot 2.mtf b/megamek/data/mechfiles/mechs/3075/Ocelot 2.mtf
index 697c29a72cc..8fe1e746975 100644
--- a/megamek/data/mechfiles/mechs/3075/Ocelot 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ocelot 2.mtf	
@@ -6,7 +6,7 @@ mul id:2314
 Config:Biped
 TechBase:Clan
 Era:3070
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Ocelot 3.mtf b/megamek/data/mechfiles/mechs/3075/Ocelot 3.mtf
index 13f8d869b45..222581aec2d 100644
--- a/megamek/data/mechfiles/mechs/3075/Ocelot 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ocelot 3.mtf	
@@ -6,7 +6,7 @@ mul id:2315
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Ocelot.mtf b/megamek/data/mechfiles/mechs/3075/Ocelot.mtf
index d8fe1fa604e..9a76c30da7f 100644
--- a/megamek/data/mechfiles/mechs/3075/Ocelot.mtf
+++ b/megamek/data/mechfiles/mechs/3075/Ocelot.mtf
@@ -6,7 +6,7 @@ mul id:2313
 Config:Biped
 TechBase:Clan
 Era:3067
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Ostroc OSR-2Cb.mtf b/megamek/data/mechfiles/mechs/3075/Ostroc OSR-2Cb.mtf
index 1902506a4b5..94b552d87eb 100644
--- a/megamek/data/mechfiles/mechs/3075/Ostroc OSR-2Cb.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ostroc OSR-2Cb.mtf	
@@ -6,7 +6,7 @@ mul id:2350
 Config:Biped
 TechBase:Inner Sphere
 Era:2729
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3075/Ostscout OTT-7Jb.mtf b/megamek/data/mechfiles/mechs/3075/Ostscout OTT-7Jb.mtf
index 46077f46180..a33a4a2cb8e 100644
--- a/megamek/data/mechfiles/mechs/3075/Ostscout OTT-7Jb.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ostscout OTT-7Jb.mtf	
@@ -6,7 +6,7 @@ mul id:2367
 Config:Biped
 TechBase:Inner Sphere
 Era:2600
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Pariah A.mtf b/megamek/data/mechfiles/mechs/3075/Pariah A.mtf
index 2c86a05181b..0fa728539c7 100644
--- a/megamek/data/mechfiles/mechs/3075/Pariah A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Pariah A.mtf	
@@ -6,7 +6,7 @@ mul id:5019
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:TRO 3075- Jihad
+Source:TRO: 3075- Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Pariah B.mtf b/megamek/data/mechfiles/mechs/3075/Pariah B.mtf
index 111a47f9e56..5bb2d0091ee 100644
--- a/megamek/data/mechfiles/mechs/3075/Pariah B.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Pariah B.mtf	
@@ -6,7 +6,7 @@ mul id:5020
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:TRO 3075- Jihad
+Source:TRO: 3075- Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Pariah C.mtf b/megamek/data/mechfiles/mechs/3075/Pariah C.mtf
index 56b8c39a1a6..78d054d9fcc 100644
--- a/megamek/data/mechfiles/mechs/3075/Pariah C.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Pariah C.mtf	
@@ -6,7 +6,7 @@ mul id:5021
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:TRO 3075- Jihad
+Source:TRO: 3075- Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Pariah D.mtf b/megamek/data/mechfiles/mechs/3075/Pariah D.mtf
index ef067bec4a1..19faacbf7bd 100644
--- a/megamek/data/mechfiles/mechs/3075/Pariah D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Pariah D.mtf	
@@ -6,7 +6,7 @@ mul id:5022
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:TRO 3075- Jihad
+Source:TRO: 3075- Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Pariah Prime.mtf b/megamek/data/mechfiles/mechs/3075/Pariah Prime.mtf
index 3a0212ddaf3..6ae9349c5cd 100644
--- a/megamek/data/mechfiles/mechs/3075/Pariah Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Pariah Prime.mtf	
@@ -6,7 +6,7 @@ mul id:5024
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:TRO 3075- Jihad
+Source:TRO: 3075- Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Patriot PKM-2C.mtf b/megamek/data/mechfiles/mechs/3075/Patriot PKM-2C.mtf
index 0dc98d3fe27..84fc94dc69d 100644
--- a/megamek/data/mechfiles/mechs/3075/Patriot PKM-2C.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Patriot PKM-2C.mtf	
@@ -6,7 +6,7 @@ mul id:2447
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3075U - Jihad
+Source:TRO: 3075U - Jihad
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Patriot PKM-2D.mtf b/megamek/data/mechfiles/mechs/3075/Patriot PKM-2D.mtf
index dc1bbc53c8c..e86a641c0b0 100644
--- a/megamek/data/mechfiles/mechs/3075/Patriot PKM-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Patriot PKM-2D.mtf	
@@ -6,7 +6,7 @@ mul id:2448
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075 - Jihad
+Source:TRO: 3075 - Jihad
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Patriot PKM-2E.mtf b/megamek/data/mechfiles/mechs/3075/Patriot PKM-2E.mtf
index ca5753a95c8..f402af0aaf1 100644
--- a/megamek/data/mechfiles/mechs/3075/Patriot PKM-2E.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Patriot PKM-2E.mtf	
@@ -6,7 +6,7 @@ mul id:2449
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3075-Jihad
+Source:TRO: 3075-Jihad
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Patron LoaderMech.mtf b/megamek/data/mechfiles/mechs/3075/Patron LoaderMech.mtf
index 03081c78671..5254d13d7fb 100644
--- a/megamek/data/mechfiles/mechs/3075/Patron LoaderMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Patron LoaderMech.mtf	
@@ -6,7 +6,7 @@ mul id:4792
 Config:Biped
 TechBase:Inner Sphere
 Era:2550
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3075/Patron PTN-1 LoaderMech.mtf b/megamek/data/mechfiles/mechs/3075/Patron PTN-1 LoaderMech.mtf
index 27abfe5d057..ea017423e26 100644
--- a/megamek/data/mechfiles/mechs/3075/Patron PTN-1 LoaderMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Patron PTN-1 LoaderMech.mtf	
@@ -6,7 +6,7 @@ mul id:4793
 Config:Biped
 TechBase:Inner Sphere
 Era:2470
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1b.mtf b/megamek/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1b.mtf
index cdd912582c0..dc984344619 100644
--- a/megamek/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1b.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1b.mtf	
@@ -6,7 +6,7 @@ mul id:2492
 Config:Biped
 TechBase:Inner Sphere
 Era:2760
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1c.mtf b/megamek/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1c.mtf
index cf472d22694..c3619619d10 100644
--- a/megamek/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1c.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1c.mtf	
@@ -6,7 +6,7 @@ mul id:2493
 Config:Biped
 TechBase:Inner Sphere
 Era:2765
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Phoenix PX-3R.mtf b/megamek/data/mechfiles/mechs/3075/Phoenix PX-3R.mtf
index db44324fd76..125fea24b06 100644
--- a/megamek/data/mechfiles/mechs/3075/Phoenix PX-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Phoenix PX-3R.mtf	
@@ -6,7 +6,7 @@ mul id:2489
 Config:Biped
 TechBase:Inner Sphere
 Era:2520
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Phoenix PX-4R.mtf b/megamek/data/mechfiles/mechs/3075/Phoenix PX-4R.mtf
index 32234dde08b..8db325deede 100644
--- a/megamek/data/mechfiles/mechs/3075/Phoenix PX-4R.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Phoenix PX-4R.mtf	
@@ -6,7 +6,7 @@ mul id:2490
 Config:Biped
 TechBase:Inner Sphere
 Era:2581
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-O Invictus.mtf b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-O Invictus.mtf
index 0d30d037afd..fdefe4f0e32 100644
--- a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-O Invictus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-O Invictus.mtf	
@@ -6,7 +6,7 @@ mul id:2573
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OA Dominus.mtf b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OA Dominus.mtf
index bc012979729..4cb153037a0 100644
--- a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OA Dominus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OA Dominus.mtf	
@@ -6,7 +6,7 @@ mul id:2574
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OB Infernus.mtf b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OB Infernus.mtf
index 351875eadfa..767bbaa6e60 100644
--- a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OB Infernus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OB Infernus.mtf	
@@ -6,7 +6,7 @@ mul id:2575
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OC Comminus.mtf b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OC Comminus.mtf
index 520de2f233f..4c4b81f0304 100644
--- a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OC Comminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OC Comminus.mtf	
@@ -6,7 +6,7 @@ mul id:2576
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OD Luminos.mtf b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OD Luminos.mtf
index a269753f297..2cb216e3167 100644
--- a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OD Luminos.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OD Luminos.mtf	
@@ -6,7 +6,7 @@ mul id:2577
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OE Eminus.mtf b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OE Eminus.mtf
index 5ccf3ecc12e..b93774437b8 100644
--- a/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OE Eminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Preta C-PRT-OE Eminus.mtf	
@@ -6,7 +6,7 @@ mul id:2578
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Quasit MilitiaMech QUA-51M.mtf b/megamek/data/mechfiles/mechs/3075/Quasit MilitiaMech QUA-51M.mtf
index cff83a6ec8b..43d88713ea9 100644
--- a/megamek/data/mechfiles/mechs/3075/Quasit MilitiaMech QUA-51M.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Quasit MilitiaMech QUA-51M.mtf	
@@ -6,7 +6,7 @@ mul id:2607
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Quasit MilitiaMech QUA-51P.mtf b/megamek/data/mechfiles/mechs/3075/Quasit MilitiaMech QUA-51P.mtf
index bbbb013774c..27c182dc222 100644
--- a/megamek/data/mechfiles/mechs/3075/Quasit MilitiaMech QUA-51P.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Quasit MilitiaMech QUA-51P.mtf	
@@ -6,7 +6,7 @@ mul id:2608
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Quasit Militiamech QUA-51T.mtf b/megamek/data/mechfiles/mechs/3075/Quasit Militiamech QUA-51T.mtf
index ed4c1053e52..f41b8856591 100644
--- a/megamek/data/mechfiles/mechs/3075/Quasit Militiamech QUA-51T.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Quasit Militiamech QUA-51T.mtf	
@@ -6,7 +6,7 @@ mul id:2609
 Config:Biped
 TechBase:Inner Sphere
 Era:2517
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Rifleman II RFL-3N-2.mtf b/megamek/data/mechfiles/mechs/3075/Rifleman II RFL-3N-2.mtf
index 1078b900043..ec200bc6dbe 100644
--- a/megamek/data/mechfiles/mechs/3075/Rifleman II RFL-3N-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Rifleman II RFL-3N-2.mtf	
@@ -6,7 +6,7 @@ mul id:2709
 Config:Biped
 TechBase:Inner Sphere
 Era:2720
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3075/Ryoken II 2.mtf b/megamek/data/mechfiles/mechs/3075/Ryoken II 2.mtf
index 035f371acad..3b6ada2566c 100644
--- a/megamek/data/mechfiles/mechs/3075/Ryoken II 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ryoken II 2.mtf	
@@ -6,7 +6,7 @@ mul id:2759
 Config:Biped
 techbase:Clan
 era:3076
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Ryoken II 3.mtf b/megamek/data/mechfiles/mechs/3075/Ryoken II 3.mtf
index 8ef49f5d77d..2ea51a5ff4a 100644
--- a/megamek/data/mechfiles/mechs/3075/Ryoken II 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ryoken II 3.mtf	
@@ -6,7 +6,7 @@ mul id:2760
 Config:Biped
 techbase:Clan
 era:3076
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Ryoken II.mtf b/megamek/data/mechfiles/mechs/3075/Ryoken II.mtf
index d940cf6dbc8..ccd1980458d 100644
--- a/megamek/data/mechfiles/mechs/3075/Ryoken II.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ryoken II.mtf	
@@ -6,7 +6,7 @@ mul id:2758
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-O Invictus.mtf b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-O Invictus.mtf
index b4133d8d88d..f52d7f0a325 100644
--- a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-O Invictus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-O Invictus.mtf	
@@ -6,7 +6,7 @@ mul id:2869
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3069
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OA Dominus.mtf b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OA Dominus.mtf
index 1355447a450..59d92f1a7f0 100644
--- a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OA Dominus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OA Dominus.mtf	
@@ -6,7 +6,7 @@ mul id:2870
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OB Infernus.mtf b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OB Infernus.mtf
index 195bc842be1..931605024ee 100644
--- a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OB Infernus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OB Infernus.mtf	
@@ -6,7 +6,7 @@ mul id:2871
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OC Comminus.mtf b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OC Comminus.mtf
index 212e3ae30d7..eb88ba4a428 100644
--- a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OC Comminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OC Comminus.mtf	
@@ -6,7 +6,7 @@ mul id:2872
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OD Luminos.mtf b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OD Luminos.mtf
index ca57e258a26..b7aa62dcf9f 100644
--- a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OD Luminos.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OD Luminos.mtf	
@@ -6,7 +6,7 @@ mul id:2873
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OE Eminus.mtf b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OE Eminus.mtf
index bfed7dca09d..0be9ad779ad 100644
--- a/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OE Eminus.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Seraph C-SRP-OE Eminus.mtf	
@@ -6,7 +6,7 @@ mul id:2874
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:3
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3075/Sun Cobra.mtf b/megamek/data/mechfiles/mechs/3075/Sun Cobra.mtf
index 1c220c24754..946af33030d 100644
--- a/megamek/data/mechfiles/mechs/3075/Sun Cobra.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Sun Cobra.mtf	
@@ -6,7 +6,7 @@ mul id:3122
 Config:Biped
 TechBase:Clan
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Thug THG-11Eb.mtf b/megamek/data/mechfiles/mechs/3075/Thug THG-11Eb.mtf
index c6dc1fce3ca..96f979c2890 100644
--- a/megamek/data/mechfiles/mechs/3075/Thug THG-11Eb.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Thug THG-11Eb.mtf	
@@ -6,7 +6,7 @@ mul id:3206
 Config:Biped
 TechBase:Inner Sphere
 Era:2760
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3075/Titan II TI-2P.mtf b/megamek/data/mechfiles/mechs/3075/Titan II TI-2P.mtf
index 92fca55b5a6..7af374e4bae 100644
--- a/megamek/data/mechfiles/mechs/3075/Titan II TI-2P.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Titan II TI-2P.mtf	
@@ -6,7 +6,7 @@ mul id:3258
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Titan II TI-2PA.mtf b/megamek/data/mechfiles/mechs/3075/Titan II TI-2PA.mtf
index 49fc062d3b8..2fec8c81445 100644
--- a/megamek/data/mechfiles/mechs/3075/Titan II TI-2PA.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Titan II TI-2PA.mtf	
@@ -6,7 +6,7 @@ mul id:3259
 Config:Biped
 techbase:Inner Sphere
 era:3076
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Titan TI-1A.mtf b/megamek/data/mechfiles/mechs/3075/Titan TI-1A.mtf
index 6ba46e3df07..03826e3f23b 100644
--- a/megamek/data/mechfiles/mechs/3075/Titan TI-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Titan TI-1A.mtf	
@@ -6,7 +6,7 @@ mul id:3257
 Config:Biped
 TechBase:Inner Sphere
 Era:2765
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Toro TR-A-6.mtf b/megamek/data/mechfiles/mechs/3075/Toro TR-A-6.mtf
index 9d4c90f007a..1082797b9a4 100644
--- a/megamek/data/mechfiles/mechs/3075/Toro TR-A-6.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Toro TR-A-6.mtf	
@@ -6,7 +6,7 @@ mul id:3277
 Config:Biped
 TechBase:Inner Sphere
 Era:2548
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Valiant V4-LNT-J3.mtf b/megamek/data/mechfiles/mechs/3075/Valiant V4-LNT-J3.mtf
index 50176bab448..a96df960de3 100644
--- a/megamek/data/mechfiles/mechs/3075/Valiant V4-LNT-J3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Valiant V4-LNT-J3.mtf	
@@ -6,7 +6,7 @@ mul id:3368
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Valiant V4-LNT-K7.mtf b/megamek/data/mechfiles/mechs/3075/Valiant V4-LNT-K7.mtf
index 3f0b7e05f4e..1ec3be5f164 100644
--- a/megamek/data/mechfiles/mechs/3075/Valiant V4-LNT-K7.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Valiant V4-LNT-K7.mtf	
@@ -6,7 +6,7 @@ mul id:3369
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Valiant VLN-3T.mtf b/megamek/data/mechfiles/mechs/3075/Valiant VLN-3T.mtf
index c38e2bbc89b..ab2706474c7 100644
--- a/megamek/data/mechfiles/mechs/3075/Valiant VLN-3T.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Valiant VLN-3T.mtf	
@@ -6,7 +6,7 @@ mul id:3371
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3075/Von Rohrs (Hebi) VON 4RH-5.mtf b/megamek/data/mechfiles/mechs/3075/Von Rohrs (Hebi) VON 4RH-5.mtf
index 529337f509c..115b131f849 100644
--- a/megamek/data/mechfiles/mechs/3075/Von Rohrs (Hebi) VON 4RH-5.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Von Rohrs (Hebi) VON 4RH-5.mtf	
@@ -6,7 +6,7 @@ mul id:3455
 Config:Biped
 TechBase:Inner Sphere
 Era:2487
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Von Rohrs (Hebi) VON 4RH-6.mtf b/megamek/data/mechfiles/mechs/3075/Von Rohrs (Hebi) VON 4RH-6.mtf
index 836f5b050cb..e4fc128be1a 100644
--- a/megamek/data/mechfiles/mechs/3075/Von Rohrs (Hebi) VON 4RH-6.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Von Rohrs (Hebi) VON 4RH-6.mtf	
@@ -6,7 +6,7 @@ mul id:3456
 Config:Biped
 TechBase:Inner Sphere
 Era:2510
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3075/Warhammer WHM-6Rb.mtf b/megamek/data/mechfiles/mechs/3075/Warhammer WHM-6Rb.mtf
index 737cd44637b..3b2b72f8f7b 100644
--- a/megamek/data/mechfiles/mechs/3075/Warhammer WHM-6Rb.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Warhammer WHM-6Rb.mtf	
@@ -6,7 +6,7 @@ mul id:3489
 Config:Biped
 TechBase:Inner Sphere
 Era:2599
-Source:TRO 3075 - Star League
+Source:TRO: 3075 - Star League
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3075/Warlord BLR-2D.mtf b/megamek/data/mechfiles/mechs/3075/Warlord BLR-2D.mtf
index 57fa4b5edfc..a797d63baf2 100644
--- a/megamek/data/mechfiles/mechs/3075/Warlord BLR-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Warlord BLR-2D.mtf	
@@ -6,7 +6,7 @@ mul id:3509
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3075/Warlord BLR-2G.mtf b/megamek/data/mechfiles/mechs/3075/Warlord BLR-2G.mtf
index d643115093f..921859ba28e 100644
--- a/megamek/data/mechfiles/mechs/3075/Warlord BLR-2G.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Warlord BLR-2G.mtf	
@@ -6,7 +6,7 @@ mul id:3511
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3075/Wight WGT-1LAWSC.mtf b/megamek/data/mechfiles/mechs/3075/Wight WGT-1LAWSC.mtf
index 65634b1071a..de2cdebef9c 100644
--- a/megamek/data/mechfiles/mechs/3075/Wight WGT-1LAWSC.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Wight WGT-1LAWSC.mtf	
@@ -6,7 +6,7 @@ mul id:3546
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Wight WGT-1LAWSC3.mtf b/megamek/data/mechfiles/mechs/3075/Wight WGT-1LAWSC3.mtf
index cbf3407c126..e83f8b850d2 100644
--- a/megamek/data/mechfiles/mechs/3075/Wight WGT-1LAWSC3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Wight WGT-1LAWSC3.mtf	
@@ -6,7 +6,7 @@ mul id:3547
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Wight WGT-2LAW.mtf b/megamek/data/mechfiles/mechs/3075/Wight WGT-2LAW.mtf
index 74543577104..2a5b7d9f7dc 100644
--- a/megamek/data/mechfiles/mechs/3075/Wight WGT-2LAW.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Wight WGT-2LAW.mtf	
@@ -6,7 +6,7 @@ mul id:3548
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Wight WGT-2LAWC3.mtf b/megamek/data/mechfiles/mechs/3075/Wight WGT-2LAWC3.mtf
index 94a2a7c6225..246598b175a 100644
--- a/megamek/data/mechfiles/mechs/3075/Wight WGT-2LAWC3.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Wight WGT-2LAWC3.mtf	
@@ -6,7 +6,7 @@ mul id:3549
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Wight WGT-2SC.mtf b/megamek/data/mechfiles/mechs/3075/Wight WGT-2SC.mtf
index db5df075bf4..9567a79d486 100644
--- a/megamek/data/mechfiles/mechs/3075/Wight WGT-2SC.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Wight WGT-2SC.mtf	
@@ -6,7 +6,7 @@ mul id:3550
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Wight WGT-3SC.mtf b/megamek/data/mechfiles/mechs/3075/Wight WGT-3SC.mtf
index 0a90e2aa7b8..e8ee366fec0 100644
--- a/megamek/data/mechfiles/mechs/3075/Wight WGT-3SC.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Wight WGT-3SC.mtf	
@@ -6,7 +6,7 @@ mul id:3551
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3075/Wolverine II WVR-7H.mtf b/megamek/data/mechfiles/mechs/3075/Wolverine II WVR-7H.mtf
index 767e95aa9f8..9e81f4578cf 100644
--- a/megamek/data/mechfiles/mechs/3075/Wolverine II WVR-7H.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Wolverine II WVR-7H.mtf	
@@ -6,7 +6,7 @@ mul id:3585
 Config:Biped
 techbase:Inner Sphere
 era:2770
-source:TRO 3075
+source:TRO: 3075
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3075/Wyvern WVE-5Nb.mtf b/megamek/data/mechfiles/mechs/3075/Wyvern WVE-5Nb.mtf
index e82c86207af..4e1221cddac 100644
--- a/megamek/data/mechfiles/mechs/3075/Wyvern WVE-5Nb.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Wyvern WVE-5Nb.mtf	
@@ -6,7 +6,7 @@ mul id:3598
 Config:Biped
 TechBase:Inner Sphere
 Era:2660
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3075/Xanthos XNT-3O.mtf b/megamek/data/mechfiles/mechs/3075/Xanthos XNT-3O.mtf
index 28d7aa10439..c89e24bcde1 100644
--- a/megamek/data/mechfiles/mechs/3075/Xanthos XNT-3O.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Xanthos XNT-3O.mtf	
@@ -6,7 +6,7 @@ mul id:3604
 Config:Quad
 TechBase:Inner Sphere
 Era:2579
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Xanthos XNT-4O.mtf b/megamek/data/mechfiles/mechs/3075/Xanthos XNT-4O.mtf
index d65b0ae7ac7..8544756ae34 100644
--- a/megamek/data/mechfiles/mechs/3075/Xanthos XNT-4O.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Xanthos XNT-4O.mtf	
@@ -6,7 +6,7 @@ mul id:3605
 Config:Quad
 TechBase:Inner Sphere
 Era:3068
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Xanthos XNT-5O.mtf b/megamek/data/mechfiles/mechs/3075/Xanthos XNT-5O.mtf
index ac50057ab86..46edf367a3b 100644
--- a/megamek/data/mechfiles/mechs/3075/Xanthos XNT-5O.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Xanthos XNT-5O.mtf	
@@ -6,7 +6,7 @@ mul id:3606
 Config:Quad
 TechBase:Inner Sphere
 Era:3076
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3075/Ymir BWP-2B.mtf b/megamek/data/mechfiles/mechs/3075/Ymir BWP-2B.mtf
index a0bf0664158..f5f081e9dd3 100644
--- a/megamek/data/mechfiles/mechs/3075/Ymir BWP-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ymir BWP-2B.mtf	
@@ -6,7 +6,7 @@ mul id:3620
 Config:Biped
 TechBase:Inner Sphere
 Era:2475
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3075/Ymir BWP-2E.mtf b/megamek/data/mechfiles/mechs/3075/Ymir BWP-2E.mtf
index b452cf64007..84b05752755 100644
--- a/megamek/data/mechfiles/mechs/3075/Ymir BWP-2E.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ymir BWP-2E.mtf	
@@ -6,7 +6,7 @@ mul id:5429
 Config:Biped
 TechBase:Inner Sphere
 Era:2478
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:1
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3075/Ymir BWP-3A.mtf b/megamek/data/mechfiles/mechs/3075/Ymir BWP-3A.mtf
index 162cbbc8675..957504146f5 100644
--- a/megamek/data/mechfiles/mechs/3075/Ymir BWP-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3075/Ymir BWP-3A.mtf	
@@ -6,7 +6,7 @@ mul id:3622
 Config:Biped
 TechBase:Inner Sphere
 Era:2733
-Source:TRO 3075
+Source:TRO: 3075
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest 2.mtf
index 72cc76c4afd..f82ac252f41 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest 2.mtf	
@@ -6,7 +6,7 @@ mul id:60
 Config:Biped
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest 3.mtf
index c4a616341fe..8f67b7edf1c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest 3.mtf	
@@ -6,7 +6,7 @@ mul id:61
 Config:Biped
 TechBase:Clan
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest.mtf
index eee5fc4b001..8547c024adc 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arbalest.mtf	
@@ -6,7 +6,7 @@ mul id:62
 Config:Biped
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II A.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II A.mtf
index a644605b218..1585a91cde9 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II A.mtf	
@@ -6,7 +6,7 @@ mul id:104
 Config:Biped Omnimech
 techbase:Clan
 era:3085
-source:Dark Age
+source:TRO: 3085 - Early Republic
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II B.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II B.mtf
index 760a0a6ddb3..17ee73ebc1a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II B.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II B.mtf	
@@ -6,7 +6,7 @@ mul id:105
 Config:Biped Omnimech
 TechBase:Clan
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II C.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II C.mtf
index 521c8beb71a..38c8e0d5348 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II C.mtf	
@@ -6,7 +6,7 @@ mul id:106
 Config:Biped Omnimech
 TechBase:Clan
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II Prime.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II Prime.mtf
index 7e2618f4045..00e115868cd 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Arctic Wolf II Prime.mtf	
@@ -6,7 +6,7 @@ mul id:107
 Config:Biped Omnimech
 TechBase:Clan
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-Dr.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-Dr.mtf
index 2153bfde74d..55d711cf8d5 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-Dr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-Dr.mtf	
@@ -6,7 +6,7 @@ mul id:143
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-K2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-K2.mtf
index 31dc8e6fb76..e38dbdcc362 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-K2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-K2.mtf	
@@ -6,7 +6,7 @@ mul id:145
 Config:Biped
 TechBase:Inner Sphere
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-K3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-K3.mtf
index 8bcf40b4ca9..f8e4e6ffc3a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-K3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS7-K3.mtf	
@@ -6,7 +6,7 @@ mul id:146
 Config:Biped
 techbase:Inner Sphere
 era:3083
-source:Dark Age
+source:TRO: 3085 - Early Republic
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS8-D.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS8-D.mtf
index 005114a6162..c8780a71cf1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS8-D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Atlas AS8-D.mtf	
@@ -6,7 +6,7 @@ mul id:151
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XL.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XL.mtf
index 607b231587e..0d0abe4b136 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XL.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XL.mtf	
@@ -6,7 +6,7 @@ mul id:391
 Config:Biped
 TechBase:Inner Sphere
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XS.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XS.mtf
index 63a9c50c2ff..b6af7876406 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XS.mtf	
@@ -6,7 +6,7 @@ mul id:392
 Config:Biped
 TechBase:Inner Sphere
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XX.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XX.mtf
index 883703c3010..ca09447274e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XX.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blade BLD-XX.mtf	
@@ -6,7 +6,7 @@ mul id:393
 Config:Biped
 TechBase:Inner Sphere
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blood Reaper 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blood Reaper 2.mtf
index 460a422d4b6..3f481c0e747 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blood Reaper 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blood Reaper 2.mtf	
@@ -6,7 +6,7 @@ mul id:407
 Config:Biped
 TechBase:Clan
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blood Reaper.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blood Reaper.mtf
index a70be1a775f..b80cd15afbf 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blood Reaper.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Blood Reaper.mtf	
@@ -6,7 +6,7 @@ mul id:408
 Config:Biped
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Brahma BRM-5A.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Brahma BRM-5A.mtf
index 2aadd9c89a3..5ca77361404 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Brahma BRM-5A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Brahma BRM-5A.mtf	
@@ -6,7 +6,7 @@ mul id:426
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Bruin 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Bruin 2.mtf
index e01377b77c6..9d2f596f67b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Bruin 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Bruin 2.mtf	
@@ -6,7 +6,7 @@ mul id:429
 Config:Biped
 TechBase:Clan
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Bruin.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Bruin.mtf
index 75e8f3601ec..37fd278576b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Bruin.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Bruin.mtf	
@@ -6,7 +6,7 @@ mul id:430
 Config:Biped
 TechBase:Clan
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Cuirass CDR-1X.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Cuirass CDR-1X.mtf
index d6b34dc8e1c..18ff9695337 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Cuirass CDR-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Cuirass CDR-1X.mtf	
@@ -6,7 +6,7 @@ mul id:769
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 2.mtf
index 4069c0412e1..4588dd19a14 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 2.mtf	
@@ -6,7 +6,7 @@ mul id:824
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 3.mtf
index e189d34c85f..7b5ad81d807 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 3.mtf	
@@ -6,7 +6,7 @@ mul id:825
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 4.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 4.mtf
index d2de9234dfa..1b337c96cfe 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow 4.mtf	
@@ -6,7 +6,7 @@ mul id:826
 Config:Biped
 TechBase:Clan
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow.mtf
index 65a7b63fcd3..a8387342fd7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dark Crow.mtf	
@@ -6,7 +6,7 @@ mul id:827
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dasher II 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dasher II 2.mtf
index 6b758674e11..b13e9bab751 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dasher II 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dasher II 2.mtf	
@@ -6,7 +6,7 @@ mul id:847
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dasher II.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dasher II.mtf
index b0848105d85..851ccca3092 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dasher II.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Dasher II.mtf	
@@ -6,7 +6,7 @@ mul id:848
 Config:Biped
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos 2.mtf
index 4d4387b153b..e9dc2f8b25a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos 2.mtf	
@@ -6,7 +6,7 @@ mul id:852
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos A.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos A.mtf
index a75e31b1eaa..7930aab4106 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos A.mtf	
@@ -6,7 +6,7 @@ mul id:853
 Config:Biped Omnimech
 TechBase:Clan
 Era:3085
-Source:Civil War
+source:TRO: 3085u - Early Republic 
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos B.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos B.mtf
index 2694c9a09a4..20f4485a8cd 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos B.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos B.mtf	
@@ -6,7 +6,7 @@ mul id:854
 Config:Biped Omnimech
 TechBase:Clan
 Era:3085
-Source:Civil War
+source:TRO: 3085u - Early Republic 
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos C.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos C.mtf
index c99324eb9c7..f7851894e6c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos C.mtf	
@@ -6,7 +6,7 @@ mul id:855
 Config:Biped Omnimech
 TechBase:Clan
 Era:3086
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos Prime.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos Prime.mtf
index 190ce18137b..3305fb297a5 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos Prime.mtf	
@@ -6,7 +6,7 @@ mul id:856
 Config:Biped Omnimech
 TechBase:Clan
 Era:3085
-Source:Civil War
+source:TRO: 3085u - Early Republic
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos S.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos S.mtf
index 43e78b0df12..58447d7f080 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Deimos S.mtf	
@@ -6,7 +6,7 @@ mul id:857
 Config:Biped Omnimech
 TechBase:Clan
 Era:3086
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Diomede D-M3D-3 ConstructionMech.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Diomede D-M3D-3 ConstructionMech.mtf
index 37452611ce0..48d0c3f6b54 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Diomede D-M3D-3 ConstructionMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Diomede D-M3D-3 ConstructionMech.mtf	
@@ -6,7 +6,7 @@ mul id:901
 Config:Biped
 techbase:Inner Sphere
 era:3084
-source:TRO 3085 - Jihad
+source:TRO: 3085 - Jihad
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Diomede D-M3D-4 DemolitionMech.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Diomede D-M3D-4 DemolitionMech.mtf
index a728254f242..39e38408df2 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Diomede D-M3D-4 DemolitionMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Diomede D-M3D-4 DemolitionMech.mtf	
@@ -6,7 +6,7 @@ mul id:902
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-10.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-10.mtf
index 5b15d3e8541..38c506ac9b9 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-10.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-10.mtf	
@@ -6,7 +6,7 @@ mul id:940
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-11.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-11.mtf
index af8182b6768..369bb10c4af 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-11.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-11.mtf	
@@ -6,7 +6,7 @@ mul id:941
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-9.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-9.mtf
index 92c2c83248c..af081083435 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-9.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ebony MEB-9.mtf	
@@ -6,7 +6,7 @@ mul id:942
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eidolon C-EID-001.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eidolon C-EID-001.mtf
index b95f1d11e4e..411599251a3 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eidolon C-EID-001.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eidolon C-EID-001.mtf	
@@ -6,7 +6,7 @@ mul id:943
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-4J.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-4J.mtf
index 90653ee17b5..772d9e38662 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-4J.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-4J.mtf	
@@ -6,7 +6,7 @@ mul id:944
 Config:Biped
 TechBase:Inner Sphere
 Era:2515
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:1
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-7X.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-7X.mtf
index 9b77f5e7122..0d9a49c00c9 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-7X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-7X.mtf	
@@ -6,7 +6,7 @@ mul id:945
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-8X.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-8X.mtf
index 7ed4ce82a72..3d71bb1af55 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-8X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Eisenfaust EFT-8X.mtf	
@@ -6,7 +6,7 @@ mul id:946
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fennec FEC-1CM.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fennec FEC-1CM.mtf
index ddc368e8d80..4a1c470d41c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fennec FEC-1CM.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fennec FEC-1CM.mtf	
@@ -6,7 +6,7 @@ mul id:1036
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fennec FEC-3C.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fennec FEC-3C.mtf
index f33b76d44cb..fab2f3abeac 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fennec FEC-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fennec FEC-3C.mtf	
@@ -6,7 +6,7 @@ mul id:1037
 Config:Biped
 TechBase:Inner Sphere
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge 2.mtf
index 5b802a04f5e..60ef6e10812 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge 2.mtf	
@@ -6,7 +6,7 @@ mul id:1114
 Config:Biped
 TechBase:Clan
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge 3.mtf
index 539e76b8ae3..f4d5f88658b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge 3.mtf	
@@ -6,7 +6,7 @@ mul id:1115
 Config:Biped
 TechBase:Clan
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge A.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge A.mtf
index f46952adc79..37e540e23ab 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge A.mtf	
@@ -6,7 +6,7 @@ mul id:1116
 Config:Biped Omnimech
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge B.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge B.mtf
index a201b227d00..89f0ff06d3a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge B.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge B.mtf	
@@ -6,7 +6,7 @@ mul id:1117
 Config:Biped Omnimech
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge C.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge C.mtf
index 095f2230e33..6be88a9255e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge C.mtf	
@@ -6,7 +6,7 @@ mul id:1118
 Config:Biped Omnimech
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge Prime.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge Prime.mtf
index 9ab08694ff5..a8ba9e2e62e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Flamberge Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1119
 Config:Biped Omnimech
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fwltur FWL-3R SalvageMech.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fwltur FWL-3R SalvageMech.mtf
index e60d79e1a29..defdf9083ad 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fwltur FWL-3R SalvageMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Fwltur FWL-3R SalvageMech.mtf	
@@ -6,7 +6,7 @@ mul id:1162
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Gallant GLT-7-0.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Gallant GLT-7-0.mtf
index daf8bebbf97..da8465c7319 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Gallant GLT-7-0.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Gallant GLT-7-0.mtf	
@@ -6,7 +6,7 @@ mul id:1173
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Gallant GLT-8-0.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Gallant GLT-8-0.mtf
index 5f14756fc7b..f41d81731b5 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Gallant GLT-8-0.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Gallant GLT-8-0.mtf	
@@ -6,7 +6,7 @@ mul id:1174
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ghost GST-10.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ghost GST-10.mtf
index 609e2c46548..28e4030050c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ghost GST-10.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ghost GST-10.mtf	
@@ -6,7 +6,7 @@ mul id:1193
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ghost GST-11.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ghost GST-11.mtf
index 9bce67b5e76..76fa615a78a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ghost GST-11.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ghost GST-11.mtf	
@@ -6,7 +6,7 @@ mul id:1194
 Config:Biped
 TechBase:Inner Sphere
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II 2.mtf
index fd475827f0c..b20b7c86c8d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II 2.mtf	
@@ -6,7 +6,7 @@ mul id:1247
 Config:Biped
 TechBase:Clan
 Era:3086
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:3
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II 3.mtf
index 0da647ee055..db153a6e357 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II 3.mtf	
@@ -5,7 +5,7 @@ mul id:1248
 Config:Biped
 techbase:Clan
 era:3086
-source:Dark Age
+source:TRO: 3085 - Early Republic
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II.mtf
index 083352d8836..0f058d2c4b7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Goshawk II.mtf	
@@ -6,7 +6,7 @@ mul id:1249
 Config:Biped
 TechBase:Clan
 Era:3086
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hatchetman HCT-6M.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hatchetman HCT-6M.mtf
index b29e62e493c..66a51fbe033 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hatchetman HCT-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hatchetman HCT-6M.mtf	
@@ -6,7 +6,7 @@ mul id:1416
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hatchetman HCT-7S.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hatchetman HCT-7S.mtf
index 5f152e94c9c..a72dbf5dd1e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hatchetman HCT-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hatchetman HCT-7S.mtf	
@@ -6,7 +6,7 @@ mul id:1418
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar 2.mtf
index 0031b9f668e..be3ed6c6040 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar 2.mtf	
@@ -6,7 +6,7 @@ mul id:1479
 Config:Biped
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar 3.mtf
index 88dae3de294..8cedfb8f04a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar 3.mtf	
@@ -6,7 +6,7 @@ mul id:1480
 Config:Biped
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar.mtf
index 7bf87aeb0f7..0618fda51f9 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Hellstar.mtf	
@@ -6,7 +6,7 @@ mul id:1481
 Config:Biped
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu A.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu A.mtf
index 73d6634e594..f4ae6be3792 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu A.mtf	
@@ -6,7 +6,7 @@ mul id:1748
 Config:Biped Omnimech
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu B.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu B.mtf
index a1d3c6cfe8a..1962b16dbe0 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu B.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu B.mtf	
@@ -6,7 +6,7 @@ mul id:1749
 Config:Biped Omnimech
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu C.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu C.mtf
index 639b4771c53..bb53672c6e8 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu C.mtf	
@@ -6,7 +6,7 @@ mul id:1750
 Config:Biped Omnimech
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu D.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu D.mtf
index 211824c94ce..78fc8d2d5bd 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu D.mtf	
@@ -6,7 +6,7 @@ mul id:1751
 Config:Biped Omnimech
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu Prime.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu Prime.mtf
index bbae189d8e8..a3e50b3ae7d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Karhu Prime.mtf	
@@ -6,7 +6,7 @@ mul id:1752
 Config:Biped Omnimech
 TechBase:Clan
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma 2.mtf
index b584dcfb3ce..20957b0c1f8 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma 2.mtf	
@@ -6,7 +6,7 @@ mul id:1847
 Config:Biped
 TechBase:Clan
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma 3.mtf
index 5ecd3a9b854..f7ed307897b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma 3.mtf	
@@ -6,7 +6,7 @@ mul id:1848
 Config:Biped
 TechBase:Clan
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma.mtf
index 3848c44093b..47167aa5f31 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Kuma.mtf	
@@ -6,7 +6,7 @@ mul id:1849
 Config:Biped
 TechBase:Clan
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mangonel MNL-3L.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mangonel MNL-3L.mtf
index 62fa97221c3..ed5eefa4452 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mangonel MNL-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mangonel MNL-3L.mtf	
@@ -6,7 +6,7 @@ mul id:2012
 Config:Biped
 TechBase:Inner Sphere
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mangonel MNL-3W.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mangonel MNL-3W.mtf
index 042ede6918c..08fc1ce6703 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mangonel MNL-3W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mangonel MNL-3W.mtf	
@@ -6,7 +6,7 @@ mul id:2013
 Config:Biped
 TechBase:Clan
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mjolnir MLR-B2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mjolnir MLR-B2.mtf
index 56868bed36f..13db86e1d9a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mjolnir MLR-B2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mjolnir MLR-B2.mtf	
@@ -6,7 +6,7 @@ mul id:2194
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mjolnir MLR-BX.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mjolnir MLR-BX.mtf
index fec8cfcf531..9cd5f9506ca 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mjolnir MLR-BX.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Mjolnir MLR-BX.mtf	
@@ -6,7 +6,7 @@ mul id:2195
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan 2.mtf
index 72df889c10c..31199225c6f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan 2.mtf	
@@ -6,7 +6,7 @@ mul id:2229
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan 3.mtf
index 0c202d9ca1b..5abac8584c9 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan 3.mtf	
@@ -6,7 +6,7 @@ mul id:2230
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan.mtf
index aebacfa24a0..8aede99b008 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Morrigan.mtf	
@@ -6,7 +6,7 @@ mul id:2231
 Config:Biped
 TechBase:Clan
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Night Wolf.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Night Wolf.mtf
index 2a8c87c64e8..5ace86c39cf 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Night Wolf.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Night Wolf.mtf	
@@ -6,7 +6,7 @@ mul id:2273
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-80.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-80.mtf
index 89fd162e9aa..b8d6e3dcc14 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-80.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-80.mtf	
@@ -6,7 +6,7 @@ mul id:2307
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-80C.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-80C.mtf
index 35900f499bc..061e07580de 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-80C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-80C.mtf	
@@ -6,7 +6,7 @@ mul id:2308
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-90.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-90.mtf
index a41352e29e5..bf304d4b7c0 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-90.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Nyx NX-90.mtf	
@@ -6,7 +6,7 @@ mul id:2309
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Omen.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Omen.mtf
index 3a41642723e..24c098e004b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Omen.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Omen.mtf	
@@ -6,7 +6,7 @@ mul id:2318
 Config:Biped
 TechBase:Clan
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Onager.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Onager.mtf
index 1066d3d1689..c462780fe26 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Onager.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Onager.mtf	
@@ -6,7 +6,7 @@ mul id:2319
 Config:Biped
 TechBase:Clan
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-15.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-15.mtf
index 885b5815754..41c862688f1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-15.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-15.mtf	
@@ -6,7 +6,7 @@ mul id:2344
 Config:Biped
 TechBase:Inner Sphere
 Era:2738
-Source:Star League
+Source:TRO 3085: Star League
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-25.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-25.mtf
index 51388af80b4..1709acf6bd6 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-25.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-25.mtf	
@@ -6,7 +6,7 @@ mul id:2345
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-26.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-26.mtf
index c3e23cc07cc..a654f2a10a4 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-26.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Osprey OSP-26.mtf	
@@ -6,7 +6,7 @@ mul id:2346
 Config:Biped
 techbase:Inner Sphere
 era:3076
-source:Jihad
+source:TRO: 3085 - Jihad
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-2M.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-2M.mtf
index 6d07e3b52d2..f77c6b8ec3b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-2M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-2M.mtf	
@@ -6,7 +6,7 @@ mul id:4769
 Config:Biped
 TechBase:Inner Sphere
 Era:2470
-Source:XTRO Primitives I - Age of War
+Source:XTR: Primitives I - Age of War
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-2Mb.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-2Mb.mtf
index e81b081b401..4a81b222440 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-2Mb.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-2Mb.mtf	
@@ -6,7 +6,7 @@ mul id:2382
 Config:Biped
 TechBase:Inner Sphere
 Era:2620
-Source:Star League
+Source:TRO 3085: Star League
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-3M.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-3M.mtf
index 4ed54ffcc0c..58c6af0b236 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ostwar OWR-3M.mtf	
@@ -6,7 +6,7 @@ mul id:2383
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II 2.mtf
index 952340302de..1af5cadbf2b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II 2.mtf	
@@ -6,7 +6,7 @@ mul id:2397
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II 3.mtf
index efb108b04c5..1db5ce3989f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II 3.mtf	
@@ -6,7 +6,7 @@ mul id:2398
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II.mtf
index b1b12e34570..d601289be27 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Pack Hunter II.mtf	
@@ -6,7 +6,7 @@ mul id:2396
 Config:Biped
 techbase:Clan
 era:3077
-source:Jihad
+source:TRO: 3085 - Jihad
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-10K2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-10K2.mtf
index a808270cdad..ccbef30e000 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-10K2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-10K2.mtf	
@@ -6,7 +6,7 @@ mul id:2417
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-12K2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-12K2.mtf
index 0c0f246f9d0..17873cd79ae 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-12K2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-12K2.mtf	
@@ -6,7 +6,7 @@ mul id:2420
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-13K.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-13K.mtf
index 855d4531a3e..fabdbf60105 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-13K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Panther PNT-13K.mtf	
@@ -6,7 +6,7 @@ mul id:2421
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Parash 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Parash 2.mtf
index d775c3db06d..1dd1ad514f2 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Parash 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Parash 2.mtf	
@@ -6,7 +6,7 @@ mul id:2427
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Parash.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Parash.mtf
index c033bf2f559..ec260e9f66e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Parash.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Parash.mtf	
@@ -6,7 +6,7 @@ mul id:2428
 Config:Biped
 TechBase:Clan
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Peacekeeper PKP-1A.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Peacekeeper PKP-1A.mtf
index 8886f58b3ea..cad3ea26a2a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Peacekeeper PKP-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Peacekeeper PKP-1A.mtf	
@@ -6,7 +6,7 @@ mul id:2452
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Peacekeeper PKP-1B.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Peacekeeper PKP-1B.mtf
index 051b466ddb7..88235f614f9 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Peacekeeper PKP-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Peacekeeper PKP-1B.mtf	
@@ -6,7 +6,7 @@ mul id:2453
 Config:Biped
 TechBase:Inner Sphere
 Era:3087
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Penthesilea PEN-2H.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Penthesilea PEN-2H.mtf
index 6048fa7a818..0c33b34d5eb 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Penthesilea PEN-2H.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Penthesilea PEN-2H.mtf	
@@ -6,7 +6,7 @@ mul id:2470
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Penthesilea PEN-2MAF.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Penthesilea PEN-2MAF.mtf
index 6c16753da59..ad9bc1d8019 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Penthesilea PEN-2MAF.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Penthesilea PEN-2MAF.mtf	
@@ -6,7 +6,7 @@ mul id:2471
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Prefect PRF-1R.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Prefect PRF-1R.mtf
index 571e2b8ca56..32649d91784 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Prefect PRF-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Prefect PRF-1R.mtf	
@@ -6,7 +6,7 @@ mul id:2569
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Prefect PRF-2R.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Prefect PRF-2R.mtf
index 119f6688b85..c0d9cdadecf 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Prefect PRF-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Prefect PRF-2R.mtf	
@@ -6,7 +6,7 @@ mul id:2571
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-2X.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-2X.mtf
index 5a62e253082..3186711b23e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-2X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-2X.mtf	
@@ -6,7 +6,7 @@ mul id:2657
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-2X1.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-2X1.mtf
index 270c65778e1..486b1aa1733 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-2X1.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-2X1.mtf	
@@ -6,7 +6,7 @@ mul id:2658
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-3X.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-3X.mtf
index 87d7c8c2d63..5bdb750c646 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-3X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-3X.mtf	
@@ -6,7 +6,7 @@ mul id:2659
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-5X.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-5X.mtf
index 1a06491487d..b8ac083cd79 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-5X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Raptor II RPT-5X.mtf	
@@ -6,7 +6,7 @@ mul id:2660
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-1A.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-1A.mtf
index 1b2cb7bfadf..79be6188f8f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-1A.mtf	
@@ -6,7 +6,7 @@ mul id:2740
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-1B.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-1B.mtf
index d6059b90099..8e7814f2083 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-1B.mtf	
@@ -6,7 +6,7 @@ mul id:2741
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:1
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-2.mtf
index e5bde04283b..2a683299e9d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-2.mtf	
@@ -6,7 +6,7 @@ mul id:2742
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-3X.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-3X.mtf
index e890124ec51..d00868aee62 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-3X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Rook NH-3X.mtf	
@@ -6,7 +6,7 @@ mul id:2743
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shadow Cat II 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shadow Cat II 2.mtf
index 8824d69cf0e..bf4399692a8 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shadow Cat II 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shadow Cat II 2.mtf	
@@ -6,7 +6,7 @@ mul id:2893
 Config:Biped
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shadow Cat II.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shadow Cat II.mtf
index e0fc0a155f6..b48a3b01d52 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shadow Cat II.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shadow Cat II.mtf	
@@ -6,7 +6,7 @@ mul id:2894
 Config:Biped
 TechBase:Clan
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shen Yi SHY-3B.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shen Yi SHY-3B.mtf
index 85988bcdba5..69a7a1420b9 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shen Yi SHY-3B.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shen Yi SHY-3B.mtf	
@@ -6,7 +6,7 @@ mul id:2922
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shockwave SKW-2F.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shockwave SKW-2F.mtf
index 572b21ace4d..f709f515d31 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shockwave SKW-2F.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shockwave SKW-2F.mtf	
@@ -6,7 +6,7 @@ mul id:2929
 Config:Biped
 TechBase:Inner Sphere
 Era:3082
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shockwave SKW-4G.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shockwave SKW-4G.mtf
index 5fe1341861e..b852e33908c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shockwave SKW-4G.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Shockwave SKW-4G.mtf	
@@ -6,7 +6,7 @@ mul id:2930
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-181 SurveyMech.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-181 SurveyMech.mtf
index 418ad1cdbb7..cfcaba23450 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-181 SurveyMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-181 SurveyMech.mtf	
@@ -6,7 +6,7 @@ mul id:2982
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-197 SurveyMech.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-197 SurveyMech.mtf
index 697c847e0b4..ad1bd8c0d97 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-197 SurveyMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-197 SurveyMech.mtf	
@@ -6,7 +6,7 @@ mul id:2983
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-198 SurveyMech.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-198 SurveyMech.mtf
index 710350e6974..2c44042f73b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-198 SurveyMech.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sokuryou SKU-198 SurveyMech.mtf	
@@ -6,7 +6,7 @@ mul id:2984
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sphinx 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sphinx 2.mtf
index b7acd8df68b..71f7e2c158d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sphinx 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sphinx 2.mtf	
@@ -6,7 +6,7 @@ mul id:3006
 Config:Biped
 TechBase:Clan
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sphinx.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sphinx.mtf
index 3167fad1c87..7c3ed395f86 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sphinx.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Sphinx.mtf	
@@ -6,7 +6,7 @@ mul id:3007
 Config:Biped
 TechBase:Clan
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8K.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8K.mtf
index b57c3cdf1ba..9bce401eb70 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8K.mtf	
@@ -6,7 +6,7 @@ mul id:3016
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8R.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8R.mtf
index e5d62cc7b21..8c6c09b4029 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8R.mtf	
@@ -6,7 +6,7 @@ mul id:3018
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8X.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8X.mtf
index af5c5d7862c..739256950e4 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Spider SDR-8X.mtf	
@@ -6,7 +6,7 @@ mul id:3019
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Targe TRG-1N.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Targe TRG-1N.mtf
index 7d3ccd9c3ed..741b0554a43 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Targe TRG-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Targe TRG-1N.mtf	
@@ -6,7 +6,7 @@ mul id:3164
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:Republic
+Source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Targe TRG-2N.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Targe TRG-2N.mtf
index 4175b8352cb..0b0e2d89ecd 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Targe TRG-2N.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Targe TRG-2N.mtf	
@@ -6,7 +6,7 @@ mul id:3165
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-A9.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-A9.mtf
index ffbf2a3d8f5..9c088a88b38 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-A9.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-A9.mtf	
@@ -6,7 +6,7 @@ mul id:3217
 Config:Quad
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-C3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-C3.mtf
index c7e6f402144..8c3b9e3a9a8 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-C3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-C3.mtf	
@@ -6,7 +6,7 @@ mul id:3218
 Config:Quad
 TechBase:Inner Sphere
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-L8.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-L8.mtf
index 632583cc9fa..9305f4f5ed4 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-L8.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Thunder Fox TFT-L8.mtf	
@@ -6,7 +6,7 @@ mul id:3219
 Config:Quad
 TechBase:Inner Sphere
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XB.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XB.mtf
index c6bf3d3273a..86efd6310ef 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XB.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XB.mtf	
@@ -6,7 +6,7 @@ mul id:3292
 Config:Quad
 TechBase:Inner Sphere
 Era:3081
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XJ.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XJ.mtf
index 2a8e861ef9c..c2c1c7603a3 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XJ.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XJ.mtf	
@@ -6,7 +6,7 @@ mul id:3293
 Config:Quad
 TechBase:Inner Sphere
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XL.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XL.mtf
index 052c5b41555..072fa2fcfe5 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XL.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Trebaruna TR-XL.mtf	
@@ -6,7 +6,7 @@ mul id:3294
 Config:Quad
 TechBase:Inner Sphere
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 2.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 2.mtf
index c632e6486d1..516af94ef50 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 2.mtf	
@@ -6,7 +6,7 @@ mul id:3316
 Config:Biped
 TechBase:Clan
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 3.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 3.mtf
index 89d1ceb0377..9a81eb1bac2 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 3.mtf	
@@ -6,7 +6,7 @@ mul id:3317
 Config:Biped
 TechBase:Clan
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 4.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 4.mtf
index 3a8993cdad0..1b0f818a3af 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf 4.mtf	
@@ -6,7 +6,7 @@ mul id:3318
 Config:Biped
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf.mtf
index b9f7ac2bbe7..9f4e238f8de 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Tundra Wolf.mtf	
@@ -6,7 +6,7 @@ mul id:3315
 Config:Biped
 TechBase:Clan
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ursus II.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ursus II.mtf
index 6724da18c14..918c884e267 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ursus II.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Ursus II.mtf	
@@ -6,7 +6,7 @@ mul id:3365
 Config:Biped
 techbase:Clan
 era:3078
-source:Jihad
+source:TRO: 3085 - Jihad
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Wolfhound WLF-3M.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Wolfhound WLF-3M.mtf
index 3f99e08e777..1c368bad1e7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Wolfhound WLF-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Wolfhound WLF-3M.mtf	
@@ -6,7 +6,7 @@ mul id:3565
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Yao Lien YOL-4C.mtf b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Yao Lien YOL-4C.mtf
index e8e33f195e6..105eaa31c07 100644
--- a/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Yao Lien YOL-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Cutting Edge/Yao Lien YOL-4C.mtf	
@@ -6,7 +6,7 @@ mul id:3609
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Akuma AKU-2XC.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Akuma AKU-2XC.mtf
index d2a613c0beb..d9d67bb8b46 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Akuma AKU-2XC.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Akuma AKU-2XC.mtf	
@@ -6,7 +6,7 @@ mul id:22
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Albatross ALB-3Ur.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Albatross ALB-3Ur.mtf
index e6fb1ee9dad..0af34484b7e 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Albatross ALB-3Ur.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Albatross ALB-3Ur.mtf	
@@ -6,7 +6,7 @@ mul id:28
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Arctic Fox AF1U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Arctic Fox AF1U.mtf
index 39cf50500f4..88cd99f63be 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Arctic Fox AF1U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Arctic Fox AF1U.mtf	
@@ -6,7 +6,7 @@ mul id:98
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Argus AGS-8DX.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Argus AGS-8DX.mtf
index 9d3a1c11806..15ee47ea9f9 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Argus AGS-8DX.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Argus AGS-8DX.mtf	
@@ -6,7 +6,7 @@ mul id:110
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Avatar AV1-OU.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Avatar AV1-OU.mtf
index e853d16c940..5e142f4bb6f 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Avatar AV1-OU.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Avatar AV1-OU.mtf	
@@ -6,7 +6,7 @@ mul id:171
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Axman AXM-3Sr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Axman AXM-3Sr.mtf
index 73063790cc2..d589530da53 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Axman AXM-3Sr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Axman AXM-3Sr.mtf	
@@ -6,7 +6,7 @@ mul id:187
 Config:Biped
 techbase:Inner Sphere
 era:3069
-source:TRO 3085 - Jihad
+source:TRO: 3085 - Jihad
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Balius U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Balius U.mtf
index ab7b1381cdf..c65c13a54bf 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Balius U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Balius U.mtf	
@@ -6,7 +6,7 @@ mul id:216
 Config:Quad Omnimech
 TechBase:Clan
 Era:3077
-Source:TRO 3085 - Jihad
+Source:TRO: 3085 - Jihad
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Bandersnatch BNDR-01Ar.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Bandersnatch BNDR-01Ar.mtf
index 604878413f9..311db2291b0 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Bandersnatch BNDR-01Ar.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Bandersnatch BNDR-01Ar.mtf	
@@ -6,7 +6,7 @@ mul id:218
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Banshee BNC-3Mr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Banshee BNC-3Mr.mtf
index c0bbabe09e4..4aab498380d 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Banshee BNC-3Mr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Banshee BNC-3Mr.mtf	
@@ -6,7 +6,7 @@ mul id:243
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Beowulf C.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Beowulf C.mtf
index c03144b14ac..7ff4085c28f 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Beowulf C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Beowulf C.mtf	
@@ -6,7 +6,7 @@ mul id:8073
 Config:Biped
 TechBase:Clan
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Black Hawk (Nova) U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Black Hawk (Nova) U.mtf
index 9e01d1bb895..e5d2335f572 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Black Hawk (Nova) U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Black Hawk (Nova) U.mtf	
@@ -6,7 +6,7 @@ mul id:344
 Config:Biped Omnimech
 techbase:Mixed (Clan Chassis)
 era:3077
-source:Jihad
+source:TRO: 3085 - Jihad
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Black Hawk-KU BHKU-OU.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Black Hawk-KU BHKU-OU.mtf
index 15e891bea08..7c8c3d920ea 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Black Hawk-KU BHKU-OU.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Black Hawk-KU BHKU-OU.mtf	
@@ -6,7 +6,7 @@ mul id:353
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Blackjack BJ2-OU.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Blackjack BJ2-OU.mtf
index 5e8184e3ba2..63f9042ac2f 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Blackjack BJ2-OU.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Blackjack BJ2-OU.mtf	
@@ -6,7 +6,7 @@ mul id:386
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3077
-source:TRO 3058 - Jihad
+source:TRO: 3058 - Jihad
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Bushwacker BSW-S2r.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Bushwacker BSW-S2r.mtf
index 3803604c267..d4b35694179 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Bushwacker BSW-S2r.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Bushwacker BSW-S2r.mtf	
@@ -6,7 +6,7 @@ mul id:449
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Catapult CPLT-C5A.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Catapult CPLT-C5A.mtf
index a1fb3179b15..1e5ddebbb4f 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Catapult CPLT-C5A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Catapult CPLT-C5A.mtf	
@@ -6,7 +6,7 @@ mul id:484
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Cauldron-Born (Ebon Jaguar) U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Cauldron-Born (Ebon Jaguar) U.mtf
index d016397f2db..c05cf42487d 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Cauldron-Born (Ebon Jaguar) U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Cauldron-Born (Ebon Jaguar) U.mtf	
@@ -6,7 +6,7 @@ mul id:497
 Config:Biped Omnimech
 TechBase:Clan
 Era:3077
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Centurion CN9-Ar.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Centurion CN9-Ar.mtf
index 49ac3ec4646..f52721bb822 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Centurion CN9-Ar.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Centurion CN9-Ar.mtf	
@@ -6,7 +6,7 @@ mul id:519
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Charger CGR-3Kr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Charger CGR-3Kr.mtf
index 93924830c73..4ccd45c857d 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Charger CGR-3Kr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Charger CGR-3Kr.mtf	
@@ -6,7 +6,7 @@ mul id:566
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:TRO 3085 - Jihad
+Source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Commando COM-2Dr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Commando COM-2Dr.mtf
index 4d1fcfcb6a1..02b85759371 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Commando COM-2Dr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Commando COM-2Dr.mtf	
@@ -6,7 +6,7 @@ mul id:671
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Crossbow U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Crossbow U.mtf
index eff7844198d..0b94a2b43dd 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Crossbow U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Crossbow U.mtf	
@@ -6,7 +6,7 @@ mul id:740
 Config:Biped Omnimech
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-B.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-B.mtf
index f4f6515c046..f8f7552cf43 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-B.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-B.mtf	
@@ -6,7 +6,7 @@ mul id:774
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-C2.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-C2.mtf
index 5d36cb4bef1..7bc5d5610a0 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-C2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-C2.mtf	
@@ -6,7 +6,7 @@ mul id:776
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-C3.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-C3.mtf
index f1f2c4380eb..23228c4f87a 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-C3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Cyclops CP-11-C3.mtf	
@@ -6,7 +6,7 @@ mul id:777
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Daikyu DAI-01r.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Daikyu DAI-01r.mtf
index 4bf7831428c..9869ff99850 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Daikyu DAI-01r.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Daikyu DAI-01r.mtf	
@@ -6,7 +6,7 @@ mul id:799
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Daishi (Dire Wolf) U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Daishi (Dire Wolf) U.mtf
index 843644f2ef2..fca36b4d6b7 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Daishi (Dire Wolf) U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Daishi (Dire Wolf) U.mtf	
@@ -6,7 +6,7 @@ mul id:820
 Config:Biped Omnimech
 techbase:Clan
 era:3077
-source:Jihad
+source:TRO: 3085 - Jihad
 rules level:4
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Dart DRT-6T.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Dart DRT-6T.mtf
index 6b000f871a5..7493f0df2e2 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Dart DRT-6T.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Dart DRT-6T.mtf	
@@ -6,7 +6,7 @@ mul id:831
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Dervish DV-6Mr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Dervish DV-6Mr.mtf
index 688e9d14dc1..f71441a5f2b 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Dervish DV-6Mr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Dervish DV-6Mr.mtf	
@@ -6,7 +6,7 @@ mul id:879
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Deva C-DVA-OU Exanimus.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Deva C-DVA-OU Exanimus.mtf
index 4f89b1fd8d5..41632bed56a 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Deva C-DVA-OU Exanimus.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Deva C-DVA-OU Exanimus.mtf	
@@ -6,7 +6,7 @@ mul id:892
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Dragon DRG-5Nr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Dragon DRG-5Nr.mtf
index 5a1376c59ef..8b2e7ede872 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Dragon DRG-5Nr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Dragon DRG-5Nr.mtf	
@@ -6,7 +6,7 @@ mul id:912
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Dragonfly (Viper) U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Dragonfly (Viper) U.mtf
index a3b5e7d58fc..a70147b671e 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Dragonfly (Viper) U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Dragonfly (Viper) U.mtf	
@@ -6,7 +6,7 @@ mul id:927
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Enfield END-6Sr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Enfield END-6Sr.mtf
index d761d1b2917..0cc4bfda3f1 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Enfield END-6Sr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Enfield END-6Sr.mtf	
@@ -6,7 +6,7 @@ mul id:975
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Enforcer III ENF-6Ma.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Enforcer III ENF-6Ma.mtf
index e95b29e6ae7..69afe8cedad 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Enforcer III ENF-6Ma.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Enforcer III ENF-6Ma.mtf	
@@ -6,7 +6,7 @@ mul id:983
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Enforcer III ENF-7C3BS.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Enforcer III ENF-7C3BS.mtf
index 392f5db2110..4faa15a9b89 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Enforcer III ENF-7C3BS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Enforcer III ENF-7C3BS.mtf	
@@ -6,7 +6,7 @@ mul id:986
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Fafnir FNR-5X.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Fafnir FNR-5X.mtf
index 56786b9aa06..0dd31f4c897 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Fafnir FNR-5X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Fafnir FNR-5X.mtf	
@@ -6,7 +6,7 @@ mul id:1021
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Falconer FLC-9R.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Falconer FLC-9R.mtf
index 5b09067b73d..9be3ad8db33 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Falconer FLC-9R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Falconer FLC-9R.mtf	
@@ -6,7 +6,7 @@ mul id:1034
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Fenris (Ice Ferret) U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Fenris (Ice Ferret) U.mtf
index 5fe1765ee4e..67509f2f8bc 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Fenris (Ice Ferret) U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Fenris (Ice Ferret) U.mtf	
@@ -6,7 +6,7 @@ mul id:1054
 Config:Biped Omnimech
 TechBase:Clan
 Era:3077
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Fireball ALM-10D.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Fireball ALM-10D.mtf
index 1bbab7961a1..8caa597cbce 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Fireball ALM-10D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Fireball ALM-10D.mtf	
@@ -6,7 +6,7 @@ mul id:1074
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Firestarter FS9-OU.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Firestarter FS9-OU.mtf
index c852436cd52..10a4e43df5b 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Firestarter FS9-OU.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Firestarter FS9-OU.mtf	
@@ -6,7 +6,7 @@ mul id:1109
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Gallowglas GAL-2GLSA.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Gallowglas GAL-2GLSA.mtf
index af21328c444..1328a1c2d08 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Gallowglas GAL-2GLSA.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Gallowglas GAL-2GLSA.mtf	
@@ -6,7 +6,7 @@ mul id:1184
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Grand Dragon DRG-7KC.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Grand Dragon DRG-7KC.mtf
index 614d0b079e8..58f352de097 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Grand Dragon DRG-7KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Grand Dragon DRG-7KC.mtf	
@@ -6,7 +6,7 @@ mul id:1262
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Grigori C-GRG-OU Exanimus.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Grigori C-GRG-OU Exanimus.mtf
index 7ec6aa3a870..3befe09ef53 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Grigori C-GRG-OU Exanimus.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Grigori C-GRG-OU Exanimus.mtf	
@@ -6,7 +6,7 @@ mul id:1327
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Gunslinger GUN-2ERDr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Gunslinger GUN-2ERDr.mtf
index 98d3a52255c..64e79775c44 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Gunslinger GUN-2ERDr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Gunslinger GUN-2ERDr.mtf	
@@ -6,7 +6,7 @@ mul id:1350
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-source:TRO:CI - Jihad
+source:TRO:Clan Invasion - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Ha Otoko 3.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Ha Otoko 3.mtf
index 18c2e8d2729..65d26bdde53 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Ha Otoko 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Ha Otoko 3.mtf	
@@ -6,7 +6,7 @@ mul id:1354
 Config:Biped
 TechBase:Clan
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Hammerhands HMH-6E.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Hammerhands HMH-6E.mtf
index 644379ce3f8..0b92cb4643a 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Hammerhands HMH-6E.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Hammerhands HMH-6E.mtf	
@@ -6,7 +6,7 @@ mul id:1373
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Hatamoto-Chi HTM-28Tr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Hatamoto-Chi HTM-28Tr.mtf
index 71fd6a712b5..b03ba69330c 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Hatamoto-Chi HTM-28Tr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Hatamoto-Chi HTM-28Tr.mtf	
@@ -6,7 +6,7 @@ mul id:1402
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Hermes II HER-5Sr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Hermes II HER-5Sr.mtf
index 1092ccb3949..14d23e9b5be 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Hermes II HER-5Sr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Hermes II HER-5Sr.mtf	
@@ -6,7 +6,7 @@ mul id:1503
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Hitman HM-1r.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Hitman HM-1r.mtf
index 39cc24957b9..5ae400d432c 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Hitman HM-1r.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Hitman HM-1r.mtf	
@@ -6,7 +6,7 @@ mul id:1534
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Hunchback IIC 4.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Hunchback IIC 4.mtf
index 9a01791d836..ccf4e638450 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Hunchback IIC 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Hunchback IIC 4.mtf	
@@ -6,7 +6,7 @@ mul id:1571
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/JagerMech JM7-C3BS.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/JagerMech JM7-C3BS.mtf
index 43444ec2ce5..c59fb418b6c 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/JagerMech JM7-C3BS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/JagerMech JM7-C3BS.mtf	
@@ -6,7 +6,7 @@ mul id:1671
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Jenner JR7-C4.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Jenner JR7-C4.mtf
index 54278c8c148..ecc3805b79d 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Jenner JR7-C4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Jenner JR7-C4.mtf	
@@ -6,7 +6,7 @@ mul id:1691
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/King Crab KGC-005r.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/King Crab KGC-005r.mtf
index 68a02ca58cd..d52cebbb45f 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/King Crab KGC-005r.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/King Crab KGC-005r.mtf	
@@ -5,7 +5,7 @@ mul id:1775
 Config:Biped
 techbase:Inner Sphere
 era:3071
-source:TRO 3085 - Jihad
+source:TRO: 3085 - Jihad
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Longbow LGB-8V.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Longbow LGB-8V.mtf
index f1c489b72a2..6c58662af06 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Longbow LGB-8V.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Longbow LGB-8V.mtf	
@@ -6,7 +6,7 @@ mul id:1938
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:3
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Men Shen MS1-OU.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Men Shen MS1-OU.mtf
index 97a19657eb2..c505cbe8625 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Men Shen MS1-OU.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Men Shen MS1-OU.mtf	
@@ -6,7 +6,7 @@ mul id:2167
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Mongoose MON-86.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Mongoose MON-86.mtf
index 84e6b7f9254..ef4bfa9ac7c 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Mongoose MON-86.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Mongoose MON-86.mtf	
@@ -6,7 +6,7 @@ mul id:2215
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Naginata NG-C3Ar.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Naginata NG-C3Ar.mtf
index 5f62e12db0c..4deb70af578 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Naginata NG-C3Ar.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Naginata NG-C3Ar.mtf	
@@ -6,7 +6,7 @@ mul id:2253
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Nightsky NGS-6T.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Nightsky NGS-6T.mtf
index b42e6262394..6d0c412cc8e 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Nightsky NGS-6T.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Nightsky NGS-6T.mtf	
@@ -6,7 +6,7 @@ mul id:2284
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/No-Dachi NDA-2KC.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/No-Dachi NDA-2KC.mtf
index df08e2721fe..37fc51fa21e 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/No-Dachi NDA-2KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/No-Dachi NDA-2KC.mtf	
@@ -6,7 +6,7 @@ mul id:2297
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Piranha 4.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Piranha 4.mtf
index 88bdfe318e1..07951b26c9a 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Piranha 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Piranha 4.mtf	
@@ -6,7 +6,7 @@ mul id:2534
 Config:Biped
 TechBase:Clan
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Preta C-PRT-OU Exanimus.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Preta C-PRT-OU Exanimus.mtf
index 7a965c71198..f8e7b5a6566 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Preta C-PRT-OU Exanimus.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Preta C-PRT-OU Exanimus.mtf	
@@ -6,7 +6,7 @@ mul id:2580
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Quickdraw QKD-5Mr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Quickdraw QKD-5Mr.mtf
index 958606d088f..5cd408eee35 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Quickdraw QKD-5Mr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Quickdraw QKD-5Mr.mtf	
@@ -6,7 +6,7 @@ mul id:2615
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Rakshasa MDG-1Ar.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Rakshasa MDG-1Ar.mtf
index 0f48f6238da..9a1a8edd7d4 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Rakshasa MDG-1Ar.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Rakshasa MDG-1Ar.mtf	
@@ -6,7 +6,7 @@ mul id:2632
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Raptor RTX1-OU.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Raptor RTX1-OU.mtf
index e30f1bc59a8..af936fa7d2a 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Raptor RTX1-OU.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Raptor RTX1-OU.mtf	
@@ -6,7 +6,7 @@ mul id:2656
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3077
-Source:TRO 3085 - Jihad
+Source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Raven RVN-4Lr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Raven RVN-4Lr.mtf
index b28075a92b6..b03651dae94 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Raven RVN-4Lr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Raven RVN-4Lr.mtf	
@@ -6,7 +6,7 @@ mul id:2668
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Snake SNK-2Br.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Snake SNK-2Br.mtf
index f87c9756d4e..72d9c9eadf4 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Snake SNK-2Br.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Snake SNK-2Br.mtf	
@@ -6,7 +6,7 @@ mul id:2977
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Spider SDR-7Kr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Spider SDR-7Kr.mtf
index 169f39a2c95..9983a4c94c3 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Spider SDR-7Kr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Spider SDR-7Kr.mtf	
@@ -6,7 +6,7 @@ mul id:3014
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Stalker STK-7C3BS.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Stalker STK-7C3BS.mtf
index 4829a605e64..bec4add7b26 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Stalker STK-7C3BS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Stalker STK-7C3BS.mtf	
@@ -6,7 +6,7 @@ mul id:3042
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Starslayer STY-3Dr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Starslayer STY-3Dr.mtf
index b40744bb0d6..20a45bc7dd2 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Starslayer STY-3Dr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Starslayer STY-3Dr.mtf	
@@ -6,7 +6,7 @@ mul id:3051
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Talon TLN-6W.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Talon TLN-6W.mtf
index 5ff4b0139fa..7a7bb01a6e2 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Talon TLN-6W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Talon TLN-6W.mtf	
@@ -6,7 +6,7 @@ mul id:3155
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Templar TLR1-OU.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Templar TLR1-OU.mtf
index c0b48135ca2..d06d4ef51c4 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Templar TLR1-OU.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Templar TLR1-OU.mtf	
@@ -6,7 +6,7 @@ mul id:3171
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3078
-source:Jihad
+source:TRO: 3085 - Jihad
 rules level:4
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Tessen TSN-1Cr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Tessen TSN-1Cr.mtf
index ddeb0d3b46c..3039892517b 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Tessen TSN-1Cr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Tessen TSN-1Cr.mtf	
@@ -6,7 +6,7 @@ mul id:3172
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Thor (Summoner) U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Thor (Summoner) U.mtf
index d887c408cb9..3653ccb83f8 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Thor (Summoner) U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Thor (Summoner) U.mtf	
@@ -6,7 +6,7 @@ mul id:3185
 Config:Biped Omnimech
 TechBase:Clan
 Era:3078
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Turkina U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Turkina U.mtf
index 7b40a29f1f0..cfead815e0d 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Turkina U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Turkina U.mtf	
@@ -6,7 +6,7 @@ mul id:3333
 Config:Biped Omnimech
 techbase:Clan
 era:3077
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 rules level:4
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Uller (Kit Fox) U.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Uller (Kit Fox) U.mtf
index 7457aa521bd..15b5f68d312 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Uller (Kit Fox) U.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Uller (Kit Fox) U.mtf	
@@ -6,7 +6,7 @@ mul id:3349
 Config:Biped Omnimech
 TechBase:Clan
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/UrbanMech UM-AIV.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/UrbanMech UM-AIV.mtf
index f99d02ad41d..d52d338e4d7 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/UrbanMech UM-AIV.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/UrbanMech UM-AIV.mtf	
@@ -6,7 +6,7 @@ mul id:3353
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/UrbanMech UM-R80.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/UrbanMech UM-R80.mtf
index 1bb80d61e97..c82fe000d18 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/UrbanMech UM-R80.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/UrbanMech UM-R80.mtf	
@@ -6,7 +6,7 @@ mul id:3360
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Victor VTR-9Ka.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Victor VTR-9Ka.mtf
index c8cee8e12ce..1f86044e4f9 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Victor VTR-9Ka.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Victor VTR-9Ka.mtf	
@@ -6,7 +6,7 @@ mul id:3413
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Victor VTR-Cr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Victor VTR-Cr.mtf
index 53d6b8aaf54..19e1571e0c9 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Victor VTR-Cr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Victor VTR-Cr.mtf	
@@ -6,7 +6,7 @@ mul id:3416
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Vindicator VND-3Lr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Vindicator VND-3Lr.mtf
index 16dc9ce145a..900e08d4482 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Vindicator VND-3Lr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Vindicator VND-3Lr.mtf	
@@ -6,7 +6,7 @@ mul id:3428
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Vulcan VT-5Sr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Vulcan VT-5Sr.mtf
index 9f91eea570c..da787b0ea87 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Vulcan VT-5Sr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Vulcan VT-5Sr.mtf	
@@ -6,7 +6,7 @@ mul id:3463
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/ONN/Warlord BLR-2Dr.mtf b/megamek/data/mechfiles/mechs/3085u/ONN/Warlord BLR-2Dr.mtf
index f5d5eb4ac60..6fb13a86db5 100644
--- a/megamek/data/mechfiles/mechs/3085u/ONN/Warlord BLR-2Dr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/ONN/Warlord BLR-2Dr.mtf	
@@ -6,7 +6,7 @@ mul id:3510
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-6S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-6S.mtf
index e8ce1d58e20..49293bca704 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-6S.mtf	
@@ -6,7 +6,7 @@ mul id:82
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-6W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-6W.mtf
index ddc653fc893..66e0853147e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-6W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-6W.mtf	
@@ -6,7 +6,7 @@ mul id:83
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-7L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-7L.mtf
index 41238096d1f..02597e4ec4d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-7L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-7L.mtf	
@@ -5,7 +5,7 @@ mul id:84
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO CI - Civil War
+source:TRO: CI - Civil War
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-7S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-7S.mtf
index fd976b2f7be..ba69b012ef7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-7S.mtf	
@@ -6,7 +6,7 @@ mul id:85
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-8M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-8M.mtf
index 890e1637cb3..7a1622a40b7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-8M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-8M.mtf	
@@ -6,7 +6,7 @@ mul id:86
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9K.mtf
index 33f54d37585..4ae8221d2cd 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9K.mtf	
@@ -6,7 +6,7 @@ mul id:87
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9M.mtf
index fd386412a37..972cff64e1b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9M.mtf	
@@ -6,7 +6,7 @@ mul id:88
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9W.mtf
index 231088b51b0..15a4fc2d813 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Archer ARC-9W.mtf	
@@ -6,7 +6,7 @@ mul id:89
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-10S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-10S.mtf
index 563d76243be..2ed87fa4900 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-10S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-10S.mtf	
@@ -6,7 +6,7 @@ mul id:280
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO 3085 - Jihad
+Source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-10S2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-10S2.mtf
index de7dd4c60e8..550dc2d8a4f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-10S2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-10S2.mtf	
@@ -6,7 +6,7 @@ mul id:281
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:TRO 3085 - Jihad
+Source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-3M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-3M.mtf
index 2d7303de12a..49c145669ee 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-3M.mtf	
@@ -6,7 +6,7 @@ mul id:291
 Config:Biped
 techbase:Inner Sphere
 era:3049
-source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-3S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-3S.mtf
index 00e8afa2e97..e554af17fec 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-3S.mtf	
@@ -6,7 +6,7 @@ mul id:292
 Config:Biped
 TechBase:Inner Sphere
 Era:3050
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-4L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-4L.mtf
index 0fd348376e0..c548a11e1eb 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-4L.mtf	
@@ -6,7 +6,7 @@ mul id:293
 Config:Biped
 techbase:Inner Sphere
 era:3081
-source:TRO 3085 - Early Republic
+source:TRO: 3085 - Early Republic
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-4S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-4S.mtf
index 292a9534e47..6a7a0bafed8 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-4S.mtf	
@@ -6,7 +6,7 @@ mul id:294
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-5M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-5M.mtf
index e79f83880fd..cb7ba39fdf1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-5M.mtf	
@@ -6,7 +6,7 @@ mul id:297
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-6X.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-6X.mtf
index a09f0a5a162..593d60dc62f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-6X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-6X.mtf	
@@ -6,7 +6,7 @@ mul id:298
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source:TRO 3085 - Early Republic
+Source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-CM.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-CM.mtf
index abe93182b36..7cf60cc7364 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-CM.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-CM.mtf	
@@ -6,7 +6,7 @@ mul id:299
 Config:Biped
 techbase:Inner Sphere
 era:3064
-source:TRO Clan Invasion - Civil War
+source:TRO: Clan Invasion - Civil War
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-K3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-K3.mtf
index 793ffa1de35..046d967e229 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-K3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-K3.mtf	
@@ -6,7 +6,7 @@ mul id:300
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:Source:TRO Clan Invasion - Civil War
+Source:Source:TRO: Clan Invasion - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-K4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-K4.mtf
index d4478bc9d02..a467a43b19b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-K4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/BattleMaster BLR-K4.mtf	
@@ -6,7 +6,7 @@ mul id:301
 Config:Biped
 techbase:Inner Sphere
 era:3073
-source:TRO Clan Invasion - Jihad
+source:TRO: Clan Invasion - Jihad
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-4L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-4L.mtf
index 6729735c77d..bd4a3405d05 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-4L.mtf	
@@ -6,7 +6,7 @@ mul id:757
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-5K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-5K.mtf
index 1eb5fea7dea..6827fb9f37d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-5K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-5K.mtf	
@@ -6,7 +6,7 @@ mul id:758
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-6M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-6M.mtf
index edc5c1869d6..88a2d0ef274 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-6M.mtf	
@@ -6,7 +6,7 @@ mul id:761
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-7L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-7L.mtf
index 4ec98782369..259c7efcccb 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-7L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-7L.mtf	
@@ -6,7 +6,7 @@ mul id:762
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-7W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-7W.mtf
index 0ac0952cc2b..15a01510c82 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-7W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-7W.mtf	
@@ -6,7 +6,7 @@ mul id:763
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-8L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-8L.mtf
index 6dd6a9870c2..e1a13eafc55 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-8L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-8L.mtf	
@@ -6,7 +6,7 @@ mul id:764
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-8S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-8S.mtf
index 1cfcdfbc5ac..b69f727e26a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-8S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Crusader CRD-8S.mtf	
@@ -6,7 +6,7 @@ mul id:765
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-2H.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-2H.mtf
index 0fb3a9e65d3..c23ad1af2a8 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-2H.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-2H.mtf	
@@ -6,7 +6,7 @@ mul id:1230
 Config:Quad
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-3L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-3L.mtf
index 82fb165fa79..dd822616b67 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-3L.mtf	
@@ -6,7 +6,7 @@ mul id:1231
 Config:Quad
 TechBase:Inner Sphere
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-3S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-3S.mtf
index 32d11357fb9..13f0580e077 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-3S.mtf	
@@ -5,7 +5,7 @@ mul id:1233
 Config:Quad
 techbase:Inner Sphere
 era:3066
-source:Civil War
+source:TRO: 3085u - Civil War 
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-4S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-4S.mtf
index 0e4b10c09e7..0903226da82 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-4S.mtf	
@@ -6,7 +6,7 @@ mul id:1234
 Config:Quad
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-5D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-5D.mtf
index f93b11b9390..d5469f2a6d6 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-5D.mtf	
@@ -6,7 +6,7 @@ mul id:1235
 Config:Quad
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-5W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-5W.mtf
index e78aa17ddaf..0a2037e5bc4 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-5W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-5W.mtf	
@@ -6,7 +6,7 @@ mul id:1236
 Config:Quad
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-6H.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-6H.mtf
index 27c4facb535..26836ce295d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-6H.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-6H.mtf	
@@ -6,7 +6,7 @@ mul id:1237
 Config:Quad
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-6M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-6M.mtf
index 6e3475077d5..7df3f1509ee 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Goliath GOL-6M.mtf	
@@ -6,7 +6,7 @@ mul id:1238
 Config:Quad
 TechBase:Inner Sphere
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-1DS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-1DS.mtf
index 0ca9ccd29da..61556407f18 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-1DS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-1DS.mtf	
@@ -6,7 +6,7 @@ mul id:1294
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-3M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-3M.mtf
index a60d4d114c4..1992c2f4a75 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-3M.mtf	
@@ -6,7 +6,7 @@ mul id:1300
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-4N.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-4N.mtf
index 31675b7dc3a..d49a0d9159c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-4N.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-4N.mtf	
@@ -6,7 +6,7 @@ mul id:1301
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-4R.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-4R.mtf
index e75e812b21a..d1267aec21d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-4R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-4R.mtf	
@@ -6,7 +6,7 @@ mul id:1302
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5K.mtf
index b0a8752ff0d..87a90b2d80c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5K.mtf	
@@ -6,7 +6,7 @@ mul id:1303
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5L.mtf
index 01cfc03def1..086ef31fc04 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5L.mtf	
@@ -6,7 +6,7 @@ mul id:1304
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5M.mtf
index c3e87ce486b..d2da3a20f08 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-5M.mtf	
@@ -6,7 +6,7 @@ mul id:1305
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-6CS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-6CS.mtf
index 4dc4f4af86d..4fefce300fc 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-6CS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-6CS.mtf	
@@ -6,7 +6,7 @@ mul id:1306
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-6S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-6S.mtf
index dbc7e8ae68b..16f045282db 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin GRF-6S.mtf	
@@ -6,7 +6,7 @@ mul id:1307
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 3.mtf
index c4b0642ef9e..d7cdda2888e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 3.mtf	
@@ -6,7 +6,7 @@ mul id:1312
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 4.mtf
index b2b21527121..84b4e225f00 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 4.mtf	
@@ -6,7 +6,7 @@ mul id:1313
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 5.mtf
index 5c4c1a1c4e0..508d9f32750 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 5.mtf	
@@ -6,7 +6,7 @@ mul id:1314
 Config:Biped
 TechBase:Clan
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 6.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 6.mtf
index ebe2b47c1d6..6d46a8d7d9e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 6.mtf	
@@ -6,7 +6,7 @@ mul id:1315
 Config:Biped
 TechBase:Clan
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 7.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 7.mtf
index 46649188ad6..5bf1c2e2d50 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 7.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 7.mtf	
@@ -6,7 +6,7 @@ mul id:1316
 Config:Biped
 TechBase:Clan
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 8.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 8.mtf
index 78b7a2dee62..91c2fbacfce 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 8.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Griffin IIC 8.mtf	
@@ -6,7 +6,7 @@ mul id:1317
 Config:Biped
 TechBase:Clan
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 4.mtf
index ded4bf32b5a..e3bd4ddcef5 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 4.mtf	
@@ -6,7 +6,7 @@ mul id:1917
 Config:Biped
 TechBase:Clan
 Era:3064
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 5.mtf
index 9ee94fd6541..6f8b5a478e1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 5.mtf	
@@ -6,7 +6,7 @@ mul id:1918
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 6.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 6.mtf
index 0f5e31edae7..1116eb6c83e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 6.mtf	
@@ -6,7 +6,7 @@ mul id:1919
 Config:Biped
 TechBase:Clan
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 7.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 7.mtf
index f8717c2898f..96710b368ef 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 7.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 7.mtf	
@@ -6,7 +6,7 @@ mul id:1920
 Config:Biped
 TechBase:Clan
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 8.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 8.mtf
index 070cc8930b5..f5feabc7396 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 8.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 8.mtf	
@@ -6,7 +6,7 @@ mul id:1921
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 9.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 9.mtf
index 8200edb4f58..aea1a70e541 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 9.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust IIC 9.mtf	
@@ -6,7 +6,7 @@ mul id:1922
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-1V2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-1V2.mtf
index 09964f0e7f6..1555b60dcfa 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-1V2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-1V2.mtf	
@@ -6,7 +6,7 @@ mul id:1902
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5M.mtf
index a6c7a6ecc2b..e448edafb90 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5M.mtf	
@@ -6,7 +6,7 @@ mul id:1908
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5T.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5T.mtf
index 0aab562087d..b0d23e8f232 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5T.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5T.mtf	
@@ -6,7 +6,7 @@ mul id:1909
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5V.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5V.mtf
index 3f0c8baacb1..a9eb721234b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5V.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5V.mtf	
@@ -6,7 +6,7 @@ mul id:1910
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5W.mtf
index 046691b67a4..274345cd6dc 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5W.mtf	
@@ -6,7 +6,7 @@ mul id:1911
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5W2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5W2.mtf
index 4ba0238a664..0858571d627 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5W2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-5W2.mtf	
@@ -6,7 +6,7 @@ mul id:1912
 Config:Biped
 TechBase:Inner Sphere
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-6M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-6M.mtf
index b2b31d6e3be..1fb0d03cf4f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Locust LCT-6M.mtf	
@@ -6,7 +6,7 @@ mul id:1913
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12C.mtf
index 4c3af619de9..7928f8bc45b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12C.mtf	
@@ -6,7 +6,7 @@ mul id:1931
 Config:Biped
 TechBase:Inner Sphere
 Era:3061
-Source:Civil War
+source:TRO: 3085u - Clan Invasion 
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12R.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12R.mtf
index 8602b3645fc..e203b6e8dab 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-12R.mtf	
@@ -6,7 +6,7 @@ mul id:1932
 Config:Biped
 techbase:Inner Sphere
 era:3082
-source:Dark Age
+source:TRO: 3085 - Early Republic
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13C.mtf
index 676f2a9fcb6..c7d1387eb62 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13C.mtf	
@@ -6,7 +6,7 @@ mul id:1933
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13NAIS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13NAIS.mtf
index d25609fcd32..4072deb6d32 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13NAIS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-13NAIS.mtf	
@@ -6,7 +6,7 @@ mul id:1934
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-14C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-14C.mtf
index 9f0dc018f4b..4b9b54131e6 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-14C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Longbow LGB-14C.mtf	
@@ -6,7 +6,7 @@ mul id:1935
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II C.mtf
index aa2a0c1a898..f7e0b7269b6 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II C.mtf	
@@ -6,7 +6,7 @@ mul id:2054
 Config:Biped
 TechBase:Clan
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-4H.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-4H.mtf
index 98246ca36a4..b95f07b8a0d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-4H.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-4H.mtf	
@@ -6,7 +6,7 @@ mul id:2056
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-5W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-5W.mtf
index fb5d0218f8a..a031802b12d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-5W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-5W.mtf	
@@ -6,7 +6,7 @@ mul id:2062
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-6D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-6D.mtf
index f7bf312ebe7..a599c4049be 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-6D.mtf	
@@ -6,7 +6,7 @@ mul id:2063
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:TRO 3085 - Dark Age
+Source:TRO: 3085 - Dark Age
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-6M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-6M.mtf
index 2efc05af271..5056d364654 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-6M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder II MAD-6M.mtf	
@@ -6,7 +6,7 @@ mul id:2064
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:TRO 3085 - Jihad
+Source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 2.mtf
index 2775df08ab7..47a512daf1a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 2.mtf	
@@ -5,7 +5,7 @@ mul id:2066
 Config:Biped
 techbase:Clan
 era:3063
-source:TRO:CI - Civil War
+source:TRO:Clan Invasion - Civil War
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 3.mtf
index e6904e2fefd..5f150ec799a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 3.mtf	
@@ -6,7 +6,7 @@ mul id:2067
 Config:Biped
 TechBase:Clan
 Era:3064
-Source:TRO:CI - Civil War
+Source:TRO:Clan Invasion - Civil War
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 6.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 6.mtf
index 027729b90db..8525fd908be 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 6.mtf	
@@ -6,7 +6,7 @@ mul id:2070
 Config:Biped
 techbase:Clan
 era:3077
-source:TRO 3085 - Jihad
+source:TRO: 3085 - Jihad
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 7.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 7.mtf
index cacd25e39e8..259dd6b2bb3 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 7.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder IIC 7.mtf	
@@ -6,7 +6,7 @@ mul id:2071
 Config:Biped
 TechBase:Clan
 Era:3081
-Source:TRO 3085 - Dark Age
+Source:TRO: 3085 - Dark Age
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5L.mtf
index df283981ae8..8490e27e5d2 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5L.mtf	
@@ -6,7 +6,7 @@ mul id:2040
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5M.mtf
index 5a0e7f5d867..812c47e693d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5M.mtf	
@@ -6,7 +6,7 @@ mul id:2041
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5R.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5R.mtf
index 516b245e973..969d54cd2b6 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5R.mtf	
@@ -6,7 +6,7 @@ mul id:2042
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5T.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5T.mtf
index 30d90d91547..cdfb2ce38d5 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5T.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-5T.mtf	
@@ -6,7 +6,7 @@ mul id:2044
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-6L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-6L.mtf
index fa7e7ba3909..969d985b114 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-6L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-6L.mtf	
@@ -6,7 +6,7 @@ mul id:2045
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-7D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-7D.mtf
index 672199090d2..dbb5bac0f4b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-7D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-7D.mtf	
@@ -6,7 +6,7 @@ mul id:2046
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9M.mtf
index 36f33bc0d8d..42febcc0425 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9M.mtf	
@@ -6,7 +6,7 @@ mul id:2047
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9M2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9M2.mtf
index 9bc5ac0c4d5..3bc494f5aad 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9M2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9M2.mtf	
@@ -6,7 +6,7 @@ mul id:2048
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9S.mtf
index 886e2a6aa30..4db9c5f8d5c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9S.mtf	
@@ -6,7 +6,7 @@ mul id:2049
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9W.mtf
index d710d4e5ef1..0cda8d12f40 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9W.mtf	
@@ -6,7 +6,7 @@ mul id:2050
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9W2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9W2.mtf
index eadb8f04adf..ccea2a9807f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9W2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Marauder MAD-9W2.mtf	
@@ -6,7 +6,7 @@ mul id:2051
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4C.mtf
index c70b2be2687..a35440bd124 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4C.mtf	
@@ -6,7 +6,7 @@ mul id:2355
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4K.mtf
index c631c763993..4f134595d66 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4K.mtf	
@@ -6,7 +6,7 @@ mul id:2356
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4L.mtf
index e6b907c438b..829e7e084bd 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-4L.mtf	
@@ -6,7 +6,7 @@ mul id:2357
 Config:Biped
 techbase:Inner Sphere
 era:3066
-source:Civil War
+source:TRO: 3085u - Civil War 
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-5C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-5C.mtf
index 7d86483cc5e..39e2302f271 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-5C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-5C.mtf	
@@ -6,7 +6,7 @@ mul id:2358
 Config:Biped
 TechBase:Inner Sphere
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-5W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-5W.mtf
index 0fe0e8e0cf1..2c75fec28ba 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-5W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostroc OSR-5W.mtf	
@@ -6,7 +6,7 @@ mul id:2359
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-10CS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-10CS.mtf
index 9142a41caeb..8e8c69c8282 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-10CS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-10CS.mtf	
@@ -6,7 +6,7 @@ mul id:2364
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-11J.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-11J.mtf
index 210a58ad4f0..7cf62c93985 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-11J.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-11J.mtf	
@@ -6,7 +6,7 @@ mul id:2365
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-7K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-7K.mtf
index 268e4110173..a7245e31a84 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-7K.mtf	
@@ -6,7 +6,7 @@ mul id:2368
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-9CS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-9CS.mtf
index 7a8dbf5fedb..e8c4ca40070 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-9CS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-9CS.mtf	
@@ -6,7 +6,7 @@ mul id:2369
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-9S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-9S.mtf
index 8211179bfba..6aba8d749a4 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-9S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostscout OTT-9S.mtf	
@@ -6,7 +6,7 @@ mul id:2370
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-5D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-5D.mtf
index 53bd278b72a..08522d16ec4 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-5D.mtf	
@@ -6,7 +6,7 @@ mul id:2373
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-6D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-6D.mtf
index ab336e8b1fd..58f7f79151c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-6D.mtf	
@@ -6,7 +6,7 @@ mul id:2375
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-7M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-7M.mtf
index 83e6553576d..0bbdfacb0ca 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-7M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-7M.mtf	
@@ -6,7 +6,7 @@ mul id:2376
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-8D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-8D.mtf
index a3fa158e985..21dc8ae8639 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-8D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-8D.mtf	
@@ -6,7 +6,7 @@ mul id:2377
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-8M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-8M.mtf
index f520ff9e1d3..35deb9cd777 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-8M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-8M.mtf	
@@ -6,7 +6,7 @@ mul id:2378
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-9M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-9M.mtf
index 3e6de64e1b4..60bc57542d1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-9M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-9M.mtf	
@@ -6,7 +6,7 @@ mul id:2379
 Config:Biped
 TechBase:Inner Sphere
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-9R.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-9R.mtf
index 6f36122e55b..c3ee0eefbd9 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-9R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Ostsol OTL-9R.mtf	
@@ -6,7 +6,7 @@ mul id:2380
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 3.mtf
index 9f86e2c53a6..4886f686fe1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 3.mtf	
@@ -6,7 +6,7 @@ mul id:2513
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 4.mtf
index 6d2238acb8c..2168de93e33 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 4.mtf	
@@ -6,7 +6,7 @@ mul id:2514
 Config:Biped
 TechBase:Clan
 Era:3065
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 5.mtf
index c7b0349bef6..76e0953cbb6 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 5.mtf	
@@ -6,7 +6,7 @@ mul id:2515
 Config:Biped
 TechBase:Clan
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 6.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 6.mtf
index 73daad21e5c..2fb22c163ed 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 6.mtf	
@@ -6,7 +6,7 @@ mul id:2516
 Config:Biped
 TechBase:Clan
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 7.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 7.mtf
index a10645e47ee..7707ca2f86b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 7.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 7.mtf	
@@ -6,7 +6,7 @@ mul id:2517
 Config:Biped
 TechBase:Clan
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 8.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 8.mtf
index 822f3bce326..9bdcdfcf49b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 8.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk IIC 8.mtf	
@@ -6,7 +6,7 @@ mul id:2518
 Config:Biped
 TechBase:Clan
 Era:3086
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-2.mtf
index 312d06b5512..7182cf751f7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-2.mtf	
@@ -6,7 +6,7 @@ mul id:2496
 Config:Biped
 TechBase:Inner Sphere
 Era:2599
-Source:Star League
+Source:TRO 3085: Star League
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-3M Masters.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-3M Masters.mtf
index c9d24265ffb..e19263fc008 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-3M Masters.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-3M Masters.mtf	
@@ -6,7 +6,7 @@ mul id:2500
 Config:Biped
 TechBase:Inner Sphere
 Era:3051
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-3PL.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-3PL.mtf
index 4403575cdd2..56fdfc8169c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-3PL.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-3PL.mtf	
@@ -6,7 +6,7 @@ mul id:2501
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-4L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-4L.mtf
index 4b2aea38959..8ccd4363c31 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-4L.mtf	
@@ -6,7 +6,7 @@ mul id:2503
 Config:Biped
 techbase:Inner Sphere
 era:3066
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-4W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-4W.mtf
index 590b8805de5..49c232b28f1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-4W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-4W.mtf	
@@ -6,7 +6,7 @@ mul id:2504
 Config:Biped
 TechBase:Inner Sphere
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-5L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-5L.mtf
index e2ee4c5de47..dc61b58a492 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-5L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-5L.mtf	
@@ -6,7 +6,7 @@ mul id:2505
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-6D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-6D.mtf
index 4455744c2f7..e22873bab68 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-6D.mtf	
@@ -6,7 +6,7 @@ mul id:2506
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7CS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7CS.mtf
index 4fc7393934d..b92942d290e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7CS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7CS.mtf	
@@ -6,7 +6,7 @@ mul id:2507
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7K.mtf
index e60b3ac4e52..36f711021dd 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7K.mtf	
@@ -6,7 +6,7 @@ mul id:2508
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7S.mtf
index 46ed0997aa9..34bd2ed4755 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-7S.mtf	
@@ -6,7 +6,7 @@ mul id:2509
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-8CS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-8CS.mtf
index 3c9e3082425..2ac458645dc 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-8CS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Phoenix Hawk PXH-8CS.mtf	
@@ -6,7 +6,7 @@ mul id:2510
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman C 2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman C 2.mtf
index 8489f0d49c8..bcbfcc9bb59 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman C 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman C 2.mtf	
@@ -6,7 +6,7 @@ mul id:2694
 Config:Biped
 TechBase:Clan
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 2.mtf
index 9dab19c7ec6..73470e45727 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 2.mtf	
@@ -6,7 +6,7 @@ mul id:2711
 Config:Biped
 TechBase:Clan
 Era:2997
-Source:Succession Wars
+Source:TRO 3085: Succession Wars
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 3.mtf
index edf39b30894..6d2290fa839 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 3.mtf	
@@ -6,7 +6,7 @@ mul id:2712
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 4.mtf
index f215d0bb333..5cc2c35f4a7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 4.mtf	
@@ -6,7 +6,7 @@ mul id:2713
 Config:Biped
 TechBase:Clan
 Era:3065
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 5.mtf
index 059e56b4733..685daf34e21 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 5.mtf	
@@ -6,7 +6,7 @@ mul id:2714
 Config:Biped
 TechBase:Clan
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 6.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 6.mtf
index 3e5d44127c6..a3ef34af0ec 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 6.mtf	
@@ -6,7 +6,7 @@ mul id:2715
 Config:Biped
 TechBase:Clan
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 7.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 7.mtf
index 31679e7e3f0..dc20981d0b0 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 7.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 7.mtf	
@@ -6,7 +6,7 @@ mul id:2716
 Config:Biped
 TechBase:Clan
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 8.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 8.mtf
index 62c8a0e4387..f92ca3a5a15 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 8.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC 8.mtf	
@@ -6,7 +6,7 @@ mul id:2717
 Config:Biped
 TechBase:Clan
 Era:3078
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC.mtf
index 769009b1f93..fcfc3662c4e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman IIC.mtf	
@@ -6,7 +6,7 @@ mul id:2710
 Config:Biped
 techbase:Clan
 era:2845
-source:Succession Wars
+Source:TRO 3085: Succession Wars
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-3Cr.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-3Cr.mtf
index 50e288dc9ec..93a40aecfa7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-3Cr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-3Cr.mtf	
@@ -6,7 +6,7 @@ mul id:2696
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Civil War
+source:TRO: 3085u - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-6D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-6D.mtf
index b3df82138b4..b48c7ae86e7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-6D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-6D.mtf	
@@ -6,7 +6,7 @@ mul id:2701
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-6X.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-6X.mtf
index db340ab4fc0..a28c441be63 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-6X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-6X.mtf	
@@ -6,7 +6,7 @@ mul id:2702
 Config:Biped
 TechBase:Inner Sphere
 Era:3063
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-7M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-7M.mtf
index b93bd1592b0..de65a9fd738 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-7M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-7M.mtf	
@@ -6,7 +6,7 @@ mul id:2703
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-7X.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-7X.mtf
index 5dc8e40725a..658af952f4b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-7X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-7X.mtf	
@@ -6,7 +6,7 @@ mul id:2704
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-8D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-8D.mtf
index d69df0f8b4e..3ae2c22c7e1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-8D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-8D.mtf	
@@ -6,7 +6,7 @@ mul id:2705
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-8X.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-8X.mtf
index 151317f6194..7c9352298fc 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-8X.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-8X.mtf	
@@ -6,7 +6,7 @@ mul id:2706
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-9T.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-9T.mtf
index c3b9bc8b563..c215427f40a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-9T.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Rifleman RFL-9T.mtf	
@@ -6,7 +6,7 @@ mul id:2707
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-10M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-10M.mtf
index 8fd99e41012..3175e20cedc 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-10M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-10M.mtf	
@@ -6,7 +6,7 @@ mul id:2833
 Config:Quad
 TechBase:Inner Sphere
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12C.mtf
index a8d40afb1fa..8298645d832 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12C.mtf	
@@ -6,7 +6,7 @@ mul id:2834
 Config:Quad
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12K.mtf
index 7c102e37065..f10ec22bd9b 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12K.mtf	
@@ -6,7 +6,7 @@ mul id:2835
 Config:Quad
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12S.mtf
index 33c88dd0833..1090328146f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Scorpion SCP-12S.mtf	
@@ -6,7 +6,7 @@ mul id:2836
 Config:Quad
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 3.mtf
index efcc8d2aa5e..1a7230bc016 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 3.mtf	
@@ -6,7 +6,7 @@ mul id:2913
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 4.mtf
index 6a18672c5e6..0dbeb08b8b2 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 4.mtf	
@@ -6,7 +6,7 @@ mul id:2914
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:Clan Invasion
+source:TRO: 3085 - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 5.mtf
index 6f24162456c..72d0d0bb0a1 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 5.mtf	
@@ -6,7 +6,7 @@ mul id:2915
 Config:Biped
 TechBase:Clan
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 6.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 6.mtf
index 18f470a4d13..c0f8ad32a7c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 6.mtf	
@@ -6,7 +6,7 @@ mul id:2916
 Config:Biped
 TechBase:Clan
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 7.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 7.mtf
index 3d72efaa4ee..9f0c458ede4 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 7.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 7.mtf	
@@ -6,7 +6,7 @@ mul id:2917
 Config:Biped
 TechBase:Clan
 Era:3080
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 8.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 8.mtf
index 99ed90511f2..ff300033cc6 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 8.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk IIC 8.mtf	
@@ -6,7 +6,7 @@ mul id:2918
 Config:Biped
 TechBase:Clan
 Era:3081
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-11CS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-11CS.mtf
index 2ed316cbaf9..80f99a978ad 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-11CS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-11CS.mtf	
@@ -6,7 +6,7 @@ mul id:2896
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-12C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-12C.mtf
index 33e01aac519..32bcb690571 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-12C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-12C.mtf	
@@ -6,7 +6,7 @@ mul id:2897
 Config:Biped
 TechBase:Inner Sphere
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-3K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-3K.mtf
index d10dc208de4..55fa0a7197c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-3K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-3K.mtf	
@@ -6,7 +6,7 @@ mul id:2904
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-5D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-5D.mtf
index 3ba6c4765d6..f33487cfaaf 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-5D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-5D.mtf	
@@ -6,7 +6,7 @@ mul id:2905
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-7CS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-7CS.mtf
index 3fc69c04246..fb72342b898 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-7CS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-7CS.mtf	
@@ -6,7 +6,7 @@ mul id:2907
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-7M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-7M.mtf
index edf8f407090..691028d3e6e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-7M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-7M.mtf	
@@ -6,7 +6,7 @@ mul id:2908
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-8L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-8L.mtf
index b3b32f0b815..ec2f9ca271f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-8L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-8L.mtf	
@@ -6,7 +6,7 @@ mul id:2909
 Config:Biped
 TechBase:Inner Sphere
 Era:3079
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-9D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-9D.mtf
index 394650fa3a4..7802d97ff50 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-9D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Shadow Hawk SHD-9D.mtf	
@@ -6,7 +6,7 @@ mul id:2910
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-3P.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-3P.mtf
index c19111d1b73..c8e783be48f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-3P.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-3P.mtf	
@@ -6,7 +6,7 @@ mul id:3060
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-5R.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-5R.mtf
index 585d74c77dc..a2f0597ea50 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-5R.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-5R.mtf	
@@ -6,7 +6,7 @@ mul id:3064
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Phoenix - Civil War
+source:TRO: Project Phoenix - Civil War
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-5T.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-5T.mtf
index a0add3a28fd..83ec6d0d5bb 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-5T.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-5T.mtf	
@@ -6,7 +6,7 @@ mul id:3065
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-6L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-6L.mtf
index 9bb159fb5ac..dc04dbdb4f5 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-6L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-6L.mtf	
@@ -6,7 +6,7 @@ mul id:3066
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-6S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-6S.mtf
index 8893c95fe7b..78c1ae644bf 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-6S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-6S.mtf	
@@ -6,7 +6,7 @@ mul id:3067
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-7S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-7S.mtf
index 2e5bc001909..84c80c3e3bb 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Stinger STG-7S.mtf	
@@ -6,7 +6,7 @@ mul id:3068
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-10M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-10M.mtf
index c3ae50f6e2f..93a735b4f6d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-10M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-10M.mtf	
@@ -6,7 +6,7 @@ mul id:3232
 Config:Biped
 TechBase:Inner Sphere
 Era:3082
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-10SE.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-10SE.mtf
index bb54a7d66c6..ecaf97a583d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-10SE.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-10SE.mtf	
@@ -6,7 +6,7 @@ mul id:3235
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-11SE.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-11SE.mtf
index 1d9255133df..5c71de2e27d 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-11SE.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-11SE.mtf	
@@ -6,7 +6,7 @@ mul id:3236
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-17S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-17S.mtf
index b03fd2dc5b3..ca135db09be 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-17S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-17S.mtf	
@@ -6,7 +6,7 @@ mul id:3237
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-60-RLA.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-60-RLA.mtf
index 4f77f07cba8..a1e5f88fbfa 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-60-RLA.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-60-RLA.mtf	
@@ -6,7 +6,7 @@ mul id:3243
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-7SE.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-7SE.mtf
index 01bd8965074..77349404653 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-7SE.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-7SE.mtf	
@@ -6,7 +6,7 @@ mul id:3245
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9M.mtf
index 39dda553162..d0c1a96b1e0 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9M.mtf	
@@ -6,7 +6,7 @@ mul id:3246
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9NAIS.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9NAIS.mtf
index da0777cc409..0888e134c10 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9NAIS.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9NAIS.mtf	
@@ -6,7 +6,7 @@ mul id:3247
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9Nr.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9Nr.mtf
index c2737fc9e06..c1974dc8984 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9Nr.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9Nr.mtf	
@@ -6,7 +6,7 @@ mul id:3248
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9T.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9T.mtf
index 94ebb363876..8b49ecec72f 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9T.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Thunderbolt TDR-9T.mtf	
@@ -6,7 +6,7 @@ mul id:3251
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD1.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD1.mtf
index dd741a5c256..9360e09cd82 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD1.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD1.mtf	
@@ -6,7 +6,7 @@ mul id:3374
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD2.mtf
index 5ea44fa6cc0..d52786766a3 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD2.mtf	
@@ -6,7 +6,7 @@ mul id:3375
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD3.mtf
index 6118fc9d2e0..e7eae5bee64 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD3.mtf	
@@ -6,7 +6,7 @@ mul id:3376
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD4.mtf
index c375f5556e7..4aa3a7b6c1a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QD4.mtf	
@@ -6,7 +6,7 @@ mul id:3377
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QS5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QS5.mtf
index 227a17924aa..82a9e8adcae 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QS5.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QS5.mtf	
@@ -6,7 +6,7 @@ mul id:3379
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QT2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QT2.mtf
index e5a8275ddfa..e78304d9010 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QT2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QT2.mtf	
@@ -6,7 +6,7 @@ mul id:3380
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QW5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QW5.mtf
index aeb88116681..8950db6ce28 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QW5.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Valkyrie VLK-QW5.mtf	
@@ -6,7 +6,7 @@ mul id:3381
 Config:Biped
 TechBase:Inner Sphere
 Era:3072
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 3.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 3.mtf
index d65815e5a26..3c4e30a1b08 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 3.mtf	
@@ -6,7 +6,7 @@ mul id:3502
 Config:Biped
 TechBase:Clan
 Era:3060
-Source:TRO Clan Invasion - Clan Invasion
+Source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 4.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 4.mtf
index 7b23bec14ca..9253f3a5964 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 4.mtf	
@@ -6,7 +6,7 @@ mul id:3503
 Config:Biped
 TechBase:Clan
 Era:3062
-Source:TRO Clan Invasion - Civil War
+Source:TRO: Clan Invasion - Civil War
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 5.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 5.mtf
index 29a002d77ea..cb5ff89ff2c 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 5.mtf	
@@ -6,7 +6,7 @@ mul id:3504
 Config:Biped
 TechBase:Clan
 Era:3070
-Source:RS 3085pp - Jihad
+Source:RS 3085 PP - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 6.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 6.mtf
index 97e70ede410..822cfca98f8 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 6.mtf	
@@ -6,7 +6,7 @@ mul id:3505
 Config:Biped
 TechBase:Clan
 Era:3071
-Source:RS 3085pp - Jihad
+Source:RS 3085 PP - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 7.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 7.mtf
index f4c4df492e2..456fccabe79 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 7.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 7.mtf	
@@ -6,7 +6,7 @@ mul id:3506
 Config:Biped
 TechBase:Clan
 Era:3079
-Source:RS 3085pp - Jihad
+Source:RS 3085 PP - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 8.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 8.mtf
index 72ddcbfcdb2..8a383876356 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 8.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 8.mtf	
@@ -6,7 +6,7 @@ mul id:3507
 Config:Biped
 TechBase:Clan
 Era:3079
-Source:RS 3085pp - Jihad
+Source:RS 3085 PP - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 9.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 9.mtf
index 47018131979..56e4906e772 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 9.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Warhammer IIC 9.mtf	
@@ -6,7 +6,7 @@ mul id:3508
 Config:Biped
 TechBase:Clan
 Era:3086
-Source:RS 3085pp - Early Republic
+Source:RS 3085 PP - Early Republic
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3A.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3A.mtf
index bec532662d0..40f01513271 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3A.mtf	
@@ -6,7 +6,7 @@ mul id:3526
 Config:Biped
 TechBase:Inner Sphere
 Era:3082
-Source:Jihad
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3L.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3L.mtf
index d716fcde2dd..4f801ec8c7a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3L.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3L.mtf	
@@ -6,7 +6,7 @@ mul id:3527
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3S.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3S.mtf
index ad2622010c9..6e09611fd81 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3S.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-3S.mtf	
@@ -6,7 +6,7 @@ mul id:3529
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:TRO Project Pheonix - Civil War
+source:TRO: Project Pheonix - Civil War
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-7MAF.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-7MAF.mtf
index 181dda2de4a..f75e8e63f3e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-7MAF.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-7MAF.mtf	
@@ -6,7 +6,7 @@ mul id:3531
 Config:Biped
 TechBase:Inner Sphere
 Era:3071
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-8T.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-8T.mtf
index 200e7f8cb4b..3de4e4a166a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-8T.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wasp WSP-8T.mtf	
@@ -6,7 +6,7 @@ mul id:3532
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8C.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8C.mtf
index 8b216d74ed0..ec6ce327af7 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8C.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8C.mtf	
@@ -6,7 +6,7 @@ mul id:3577
 Config:Biped
 techbase:Inner Sphere
 era:3067
-source:Civil War
+source:TRO: 3085u - Civil War 
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8D.mtf
index e635eb3470c..b873e02331a 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8D.mtf	
@@ -6,7 +6,7 @@ mul id:3578
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8K.mtf
index 31573f0f010..3514d5866b3 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-8K.mtf	
@@ -6,7 +6,7 @@ mul id:3579
 Config:Biped
 TechBase:Inner Sphere
 Era:3064
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9D.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9D.mtf
index 84aa6565452..427f45656ac 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9D.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9D.mtf	
@@ -6,7 +6,7 @@ mul id:3580
 Config:Biped
 TechBase:Inner Sphere
 Era:3066
-Source:Civil War
+source:TRO: 3085u - Civil War 
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9K.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9K.mtf
index 9baa98a58bd..5528b15f93e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9K.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9K.mtf	
@@ -6,7 +6,7 @@ mul id:3581
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9M.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9M.mtf
index 7d3d1a0415e..b75ae2ff147 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9M.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9M.mtf	
@@ -6,7 +6,7 @@ mul id:3582
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9W.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9W.mtf
index 6c0be05c06e..9260836a53e 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9W.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9W.mtf	
@@ -6,7 +6,7 @@ mul id:3583
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:TRO: 3085 - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9W2.mtf b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9W2.mtf
index 832dae8dc0d..a1955686a43 100644
--- a/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9W2.mtf	
+++ b/megamek/data/mechfiles/mechs/3085u/Phoenix/Wolverine WVR-9W2.mtf	
@@ -6,7 +6,7 @@ mul id:3584
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:Dark Age
+source:TRO: 3085 - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Eyrie (Standard).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Eyrie.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Clans/Eyrie (Standard).mtf
rename to megamek/data/mechfiles/mechs/3145/Clans/Eyrie.mtf
index 2f8fef419e9..140f35d4760 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Eyrie (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Eyrie.mtf
@@ -6,7 +6,7 @@ mul id:6263
 Config:Biped
 TechBase:Clan
 Era:3087
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Gravedigger GDR-1C.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Gravedigger GDR-1C.mtf
index ae001fef830..dd23fde6439 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Gravedigger GDR-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Gravedigger GDR-1C.mtf	
@@ -6,7 +6,7 @@ mul id:6265
 Config:Biped
 TechBase:Inner Sphere
 Era:3102
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Gravedigger GDR-1D.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Gravedigger GDR-1D.mtf
index 805d82a76b1..6c234ea3978 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Gravedigger GDR-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Gravedigger GDR-1D.mtf	
@@ -6,7 +6,7 @@ mul id:6264
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3105
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 2.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 2.mtf
index c9157199225..24675b0795f 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 2.mtf	
@@ -6,7 +6,7 @@ mul id:6267
 Config:Biped
 TechBase:Clan
 Era:3112
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 3.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 3.mtf
index 674a075532d..b1360b58187 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 3.mtf	
@@ -6,7 +6,7 @@ mul id:6268
 Config:Biped
 TechBase:Clan
 Era:3112
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 4.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 4.mtf
index e1e9bfecb1d..9916085e3ab 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon 4.mtf	
@@ -6,7 +6,7 @@ mul id:6269
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3112
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon (Standard).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon (Standard).mtf
rename to megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon.mtf
index fff0be49b9c..ad8cded2456 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Gyrfalcon.mtf
@@ -6,7 +6,7 @@ mul id:6266
 Config:Biped
 TechBase:Clan
 Era:3112
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Kodiak II 2.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Kodiak II 2.mtf
index db083613f1f..b5f7680f807 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Kodiak II 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Kodiak II 2.mtf	
@@ -6,7 +6,7 @@ mul id:6296
 Config:Biped
 TechBase:Clan
 Era:3139
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Kodiak II.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Kodiak II.mtf
index f67b8ac6994..08c6fc0586f 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Kodiak II.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Kodiak II.mtf	
@@ -6,7 +6,7 @@ mul id:6295
 Config:Biped
 techbase:Clan
 era:3095
-source:TRO 3145 The Clans - Early Republic
+source:TRO: 3145 The Clans - Early Republic
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II (Prime).mtf
index a70f67302f6..78d4959c431 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6277
 Config:Biped Omnimech
 TechBase:Clan
 Era:3121
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II A.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II A.mtf
index b0669321c4d..b8ac6a8c69e 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II A.mtf	
@@ -6,7 +6,7 @@ mul id:6278
 Config:Biped Omnimech
 TechBase:Clan
 Era:3121
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II B.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II B.mtf
index 2f2c46aaabd..f7a8ead1938 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Loki (Hellbringer) Mk II B.mtf	
@@ -6,7 +6,7 @@ mul id:6279
 Config:Biped Omnimech
 techbase:Clan
 era:3121
-source:TRO 3145 The Clans - Late Republic
+source:TRO: 3145 The Clans - Late Republic
 rules level:3
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Shrike 2.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Shrike 2.mtf
index e9f524e90f7..a08a435fb21 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Shrike 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Shrike 2.mtf	
@@ -6,7 +6,7 @@ mul id:6293
 Config:Biped
 TechBase:Clan
 Era:3115
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Shrike 3.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Shrike 3.mtf
index 55be5a2a9cc..616450a5292 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Shrike 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Shrike 3.mtf	
@@ -6,7 +6,7 @@ mul id:6294
 Config:Biped
 TechBase:Clan
 Era:3116
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Shrike.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Shrike.mtf
index 0f971aadee1..421e67a58a3 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Shrike.mtf
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Shrike.mtf
@@ -6,7 +6,7 @@ mul id:6292
 Config:Biped
 TechBase:Clan
 Era:3113
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) (Prime).mtf
index 8259995cc26..48dccb9b8e5 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6281
 Config:Biped Omnimech
 TechBase:Clan
 Era:3093
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) A.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) A.mtf
index 6aee0eaabc9..e49fadb4722 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) A.mtf	
@@ -6,7 +6,7 @@ mul id:6282
 Config:Biped Omnimech
 TechBase:Clan
 Era:3093
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) B.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) B.mtf
index 7403909fd1d..be1e96098e9 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) B.mtf	
@@ -6,7 +6,7 @@ mul id:6283
 Config:Biped Omnimech
 TechBase:Clan
 Era:3093
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) C.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) C.mtf
index bdb7185fe3a..d439a11688a 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) C.mtf	
@@ -6,7 +6,7 @@ mul id:6284
 Config:Biped Omnimech
 TechBase:Clan
 Era:3093
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) D.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) D.mtf
index 33a9a8c9713..ec05bdfce12 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Thor Mk II (Grand Summoner) D.mtf	
@@ -6,7 +6,7 @@ mul id:6285
 Config:Biped Omnimech
 TechBase:Clan
 Era:3093
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk (Prime).mtf
index 5278bed9060..c5e5acd449b 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6298
 Config:Biped Omnimech
 techbase:Clan
 era:3063
-source:TRO 3145 The Clans - Civil War
+source:TRO: 3145 The Clans - Civil War
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk A.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk A.mtf
index 9d7831884bf..023b2af0127 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk A.mtf	
@@ -6,7 +6,7 @@ mul id:6299
 Config:Biped Omnimech
 TechBase:Clan
 Era:3063
-Source:TRO 3145 The Clans - Civil War
+Source:TRO: 3145 The Clans - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk B.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk B.mtf
index 6cf655d21a9..f66f0ec5ffd 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk B.mtf	
@@ -6,7 +6,7 @@ mul id:6300
 Config:Biped Omnimech
 TechBase:Clan
 Era:3063
-Source:TRO 3145 The Clans - Civil War
+Source:TRO: 3145 The Clans - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk C.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk C.mtf
index f63dee1ce8b..cefd1465f89 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk C.mtf	
@@ -6,7 +6,7 @@ mul id:6301
 Config:Biped Omnimech
 TechBase:Clan
 Era:3063
-Source:TRO 3145 The Clans - Civil War
+Source:TRO: 3145 The Clans - Civil War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II (Prime).mtf
index 4d1648cec1f..4ca1339c6a7 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6303
 Config:Biped Omnimech
 techbase:Clan
 era:3088
-source:TRO 3145 The Clans - Early Republic
+source:TRO: 3145 The Clans - Early Republic
 rules level:4
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II A.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II A.mtf
index 436fa0ead2b..3c8218594cb 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II A.mtf	
@@ -6,7 +6,7 @@ mul id:6304
 Config:Biped Omnimech
 TechBase:Clan
 Era:3088
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II B.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II B.mtf
index 336844dacb2..0503afc0bde 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II B.mtf	
@@ -6,7 +6,7 @@ mul id:6305
 Config:Biped Omnimech
 TechBase:Clan
 Era:3088
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II C.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II C.mtf
index 57421a2018c..bb2650d3609 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Tomahawk II C.mtf	
@@ -6,7 +6,7 @@ mul id:6306
 Config:Biped Omnimech
 TechBase:Clan
 Era:3088
-Source:TRO 3145 The Clans - Early Republic
+Source:TRO: 3145 The Clans - Early Republic
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III (Prime).mtf
index 94a314a60b5..2bceb47ef57 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6271
 Config:Biped Omnimech
 TechBase:Clan
 Era:3109
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III B.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III B.mtf
index ef1d1dd906e..f6806162ca1 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III B.mtf	
@@ -6,7 +6,7 @@ mul id:6273
 Config:Biped Omnimech
 TechBase:Clan
 Era:3109
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III C.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III C.mtf
index abf6f73d5ce..f1cba101c92 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III C.mtf	
@@ -6,7 +6,7 @@ mul id:6274
 Config:Biped Omnimech
 TechBase:Clan
 Era:3109
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III D.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III D.mtf
index ec6f853bb69..51f9be64da1 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Vulture (Mad Dog) Mk III D.mtf	
@@ -6,7 +6,7 @@ mul id:6275
 Config:Biped Omnimech
 TechBase:Clan
 Era:3109
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Vulture Mk III (Mad Dog Mk III) A.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Vulture Mk III (Mad Dog Mk III) A.mtf
index f2966574cd3..85619f348e6 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Vulture Mk III (Mad Dog Mk III) A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Vulture Mk III (Mad Dog Mk III) A.mtf	
@@ -6,7 +6,7 @@ mul id:6272
 Config:Biped Omnimech
 TechBase:Clan
 Era:3109
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf (Prime).mtf
index 87eda612da6..d53cdff37b8 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6287
 Config:Biped Omnimech
 TechBase:Clan
 Era:3138
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf A.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf A.mtf
index 1f497b793fd..94a3fe25fa1 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf A.mtf	
@@ -6,7 +6,7 @@ mul id:6288
 Config:Biped Omnimech
 TechBase:Clan
 Era:3138
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf B.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf B.mtf
index 4d2b26da971..900c8b0f884 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf B.mtf	
@@ -6,7 +6,7 @@ mul id:6289
 Config:Biped Omnimech
 TechBase:Clan
 Era:3138
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf C.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf C.mtf
index 31e5904cc0d..dd56b4ea101 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf C.mtf	
@@ -6,7 +6,7 @@ mul id:6290
 Config:Biped Omnimech
 TechBase:Clan
 Era:3138
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf H.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf H.mtf
index 678eb25e0eb..167c7ef92fd 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Warwolf H.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Warwolf H.mtf	
@@ -6,7 +6,7 @@ mul id:6291
 Config:Biped Omnimech
 TechBase:Clan
 Era:3138
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen (Prime).mtf
index 4f8aa1579b9..c4847f04242 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6256
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3137
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen A.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen A.mtf
index 951cad5d57f..494a140e068 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen A.mtf	
@@ -6,7 +6,7 @@ mul id:6257
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3137
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen B.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen B.mtf
index 7b2b848b94d..281816dcce9 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen B.mtf	
@@ -6,7 +6,7 @@ mul id:6258
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3137
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen C.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen C.mtf
index 9e67f3c6dce..1e96a35bbad 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen C.mtf	
@@ -6,7 +6,7 @@ mul id:6259
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3137
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen D.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen D.mtf
index 550553aa1d5..dc975aedec4 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen D.mtf	
@@ -6,7 +6,7 @@ mul id:6260
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3137
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen E.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen E.mtf
index 440fe5a06e0..7e3db6232c5 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen E.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen E.mtf	
@@ -6,7 +6,7 @@ mul id:6261
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3137
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen H.mtf b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen H.mtf
index 628477c4c9b..89166b8f2c2 100644
--- a/megamek/data/mechfiles/mechs/3145/Clans/Wulfen H.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Clans/Wulfen H.mtf	
@@ -6,7 +6,7 @@ mul id:6262
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3137
-Source:TRO 3145 The Clans - Dark Ages
+Source:TRO: 3145 The Clans - Dark Ages
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Antlion LK-3D.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Antlion LK-3D.mtf
index 6dd6969df1c..816695dce54 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Antlion LK-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Antlion LK-3D.mtf	
@@ -6,7 +6,7 @@ mul id:6338
 Config:Quad
 TechBase:Mixed (IS Chassis)
 Era:3117
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D2.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D2.mtf
index 1a5939af6c6..af3109a8b6b 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D2.mtf	
@@ -6,7 +6,7 @@ mul id:6359
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3110
-source:TRO 3145 Federated Suns - Late Republic
+source:TRO: 3145 Federated Suns - Late Republic
 rules level:4
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D3.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D3.mtf
index 8e44adb78e8..52b84951679 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Atlas III AS7-D3.mtf	
@@ -6,7 +6,7 @@ mul id:6358
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3137
-source:TRO 3145 Federated Suns - Dark Ages
+source:TRO: 3145 Federated Suns - Dark Ages
 rules level:4
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-2Y.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-2Y.mtf
index d81e1dc12fb..fb2b6a9de85 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-2Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-2Y.mtf	
@@ -6,7 +6,7 @@ mul id:6347
 Config:Biped
 TechBase:Inner Sphere
 Era:3091
-Source:TRO 3145 Federated Suns - Early Republic
+Source:TRO: 3145 Federated Suns - Early Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-3A.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-3A.mtf
index c43cc85678e..1c4af66d89c 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-3A.mtf	
@@ -6,7 +6,7 @@ mul id:6348
 Config:Biped
 TechBase:Inner Sphere
 Era:3095
-Source:TRO 3145 Federated Suns - Early Republic
+Source:TRO: 3145 Federated Suns - Early Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-3B.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-3B.mtf
index 4df00cae1c4..81fe119289d 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-3B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-3B.mtf	
@@ -6,7 +6,7 @@ mul id:6349
 Config:Biped
 TechBase:Inner Sphere
 Era:3100
-Source:TRO 3145 Federated Suns - Early Republic
+Source:TRO: 3145 Federated Suns - Early Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-4D.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-4D.mtf
index daa6130cc5d..18653d8a610 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-4D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-4D.mtf	
@@ -6,7 +6,7 @@ mul id:6350
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3127
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-5H.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-5H.mtf
index 69fc030f8b6..a537244378a 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-5H.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Black Knight BLK-NT-5H.mtf	
@@ -6,7 +6,7 @@ mul id:6351
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3138
-Source:TRO 3145 Federated Suns - Dark Ages
+Source:TRO: 3145 Federated Suns - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-O.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-O.mtf
index 89be6a7f129..6326f334e7d 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-O.mtf	
@@ -6,7 +6,7 @@ mul id:6340
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3111
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OA.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OA.mtf
index 085b02b93cc..a71925229dd 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OA.mtf	
@@ -6,7 +6,7 @@ mul id:6341
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3111
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OB.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OB.mtf
index f8180049bb9..3278314c2d9 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OB.mtf	
@@ -6,7 +6,7 @@ mul id:6342
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3111
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OC.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OC.mtf
index 4d49f4de359..0b3d2fa84a0 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OC.mtf	
@@ -6,7 +6,7 @@ mul id:6343
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3111
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OD.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OD.mtf
index ed4310f4a11..c764cffd486 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OD.mtf	
@@ -6,7 +6,7 @@ mul id:6344
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3111
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OE.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OE.mtf
index a5c36f11225..50bd289a1fc 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Centurion CN11-OE.mtf	
@@ -6,7 +6,7 @@ mul id:6345
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3111
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Gunsmith CH11-NG.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Gunsmith CH11-NG.mtf
index a9eba3c93d8..5820f126972 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Gunsmith CH11-NG.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Gunsmith CH11-NG.mtf	
@@ -6,7 +6,7 @@ mul id:6332
 Config:Biped
 TechBase:Inner Sphere
 Era:3131
-Source:TRO 3145 Federated Suns - Dark Ages
+Source:TRO: 3145 Federated Suns - Dark Ages
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D1.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D1.mtf
index 0e0620e3e28..7623825bf29 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D1.mtf	
@@ -6,7 +6,7 @@ mul id:6333
 Config:Biped
 TechBase:Inner Sphere
 Era:3114
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D2.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D2.mtf
index 4720bd0a065..40f45543f19 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D2.mtf	
@@ -7,7 +7,7 @@ mul id:6334
 Config:Biped
 TechBase:Inner Sphere
 Era:3115
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D3.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D3.mtf
index a54b00a90c1..3d6e647f09d 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Hollander III BZK-D3.mtf	
@@ -6,7 +6,7 @@ mul id:6335
 Config:Biped
 TechBase:Inner Sphere
 Era:3118
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Prey Seeker PY-SR10.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Prey Seeker PY-SR10.mtf
index 7cb364c03b8..aa4ac78f165 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Prey Seeker PY-SR10.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Prey Seeker PY-SR10.mtf	
@@ -5,7 +5,7 @@ mul id:6331
 Config:Biped
 techbase:Inner Sphere
 era:3136
-source:TRO 3145 Federated Suns - Dark Ages
+source:TRO: 3145 Federated Suns - Dark Ages
 rules level:3
 
 mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Scarecrow UCU-F4 Hobbled Scarecrow.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Scarecrow UCU-F4 Hobbled Scarecrow.mtf
index 8deb927b0f1..b8fb6a60bd5 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Scarecrow UCU-F4 Hobbled Scarecrow.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Scarecrow UCU-F4 Hobbled Scarecrow.mtf	
@@ -6,7 +6,7 @@ mul id:6337
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3122
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Scarecrow UCU-F4.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Scarecrow UCU-F4.mtf
index 12ab696713a..416aa106ac1 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Scarecrow UCU-F4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Scarecrow UCU-F4.mtf	
@@ -6,7 +6,7 @@ mul id:6336
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3099
-Source:TRO 3145 Federated Suns - Early Republic
+Source:TRO: 3145 Federated Suns - Early Republic
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-O.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-O.mtf
index 926a7e98ee9..a6742d59ed7 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-O.mtf	
@@ -5,7 +5,7 @@ mul id:6353
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3100
-source:TRO 3145 Federated Suns - Early Republic
+source:TRO: 3145 Federated Suns - Early Republic
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OA.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OA.mtf
index e75573856c8..0631fdc2bd3 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OA.mtf	
@@ -6,7 +6,7 @@ mul id:6354
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3100
-Source:TRO 3145 Federated Suns - Early Republic
+Source:TRO: 3145 Federated Suns - Early Republic
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OB.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OB.mtf
index 658b942f956..a303c407721 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OB.mtf	
@@ -6,7 +6,7 @@ mul id:6355
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3100
-Source:TRO 3145 Federated Suns - Early Republic
+Source:TRO: 3145 Federated Suns - Early Republic
 Rules Level:3
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OC.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OC.mtf
index dbf992e4952..3bf198dfbb0 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OC.mtf	
@@ -6,7 +6,7 @@ mul id:6356
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3120
-Source:TRO 3145 Federated Suns - Late Republic
+Source:TRO: 3145 Federated Suns - Late Republic
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OD.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OD.mtf
index 0fead5535fa..5d8700abfb1 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OD.mtf	
@@ -6,7 +6,7 @@ mul id:6357
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3120
-Source:TRO 3145 Federated Suns - Early Republic
+Source:TRO: 3145 Federated Suns - Early Republic
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/Davion/Vulpes VLP-1D.mtf b/megamek/data/mechfiles/mechs/3145/Davion/Vulpes VLP-1D.mtf
index 5d9ee293a8f..9181e8aff62 100644
--- a/megamek/data/mechfiles/mechs/3145/Davion/Vulpes VLP-1D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Davion/Vulpes VLP-1D.mtf	
@@ -6,7 +6,7 @@ mul id:6346
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3133
-Source:TRO 3145 Federated Suns - Dark Ages
+Source:TRO: 3145 Federated Suns - Dark Ages
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1O.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1O.mtf
index 58894ce1a78..456967977ec 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1O.mtf	
@@ -5,7 +5,7 @@ mul id:6396
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3133
-source:TRO 3145 Draconis Combine - Dark Ages
+source:TRO: 3145 Draconis Combine - Dark Ages
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OA.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OA.mtf
index 27553f50b8b..a514c0c62f2 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OA.mtf	
@@ -6,7 +6,7 @@ mul id:6397
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3133
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OB.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OB.mtf
index 100bcb51268..b5363867b2c 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OB.mtf	
@@ -6,7 +6,7 @@ mul id:6398
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3133
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OC.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OC.mtf
index 79f1e4901e8..0b8fddf7231 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OC.mtf	
@@ -6,7 +6,7 @@ mul id:6399
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3133
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1ON.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1ON.mtf
index d764b1be123..75da101b943 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1ON.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1ON.mtf	
@@ -6,7 +6,7 @@ mul id:6400
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3133
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OR.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OR.mtf
index 7d318fe3614..0a829009f79 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Avalanche AVL-1OR.mtf	
@@ -6,7 +6,7 @@ mul id:6401
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3133
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Dragon II DRG-11K.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Dragon II DRG-11K.mtf
index 91b8a23d3e8..0cd170baba3 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Dragon II DRG-11K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Dragon II DRG-11K.mtf	
@@ -6,7 +6,7 @@ mul id:6414
 Config:Biped
 TechBase:Inner Sphere
 Era:3099
-Source:TRO 3145 Draconis Combine - Early Republic
+Source:TRO: 3145 Draconis Combine - Early Republic
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Dragon II DRG-11R.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Dragon II DRG-11R.mtf
index 024a7941bea..aabb375c75b 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Dragon II DRG-11R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Dragon II DRG-11R.mtf	
@@ -6,7 +6,7 @@ mul id:6415
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3102
-Source:TRO 3145 Draconis Combine - Late Republic
+Source:TRO: 3145 Draconis Combine - Late Republic
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Exhumer EXR-2X.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Exhumer EXR-2X.mtf
index 8700fdc19fe..ce3f94a389f 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Exhumer EXR-2X.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Exhumer EXR-2X.mtf	
@@ -6,7 +6,7 @@ mul id:6410
 Config:Biped
 TechBase:Inner Sphere
 Era:3129
-Source:TRO 3145 Draconis Combine - Late Republic
+Source:TRO: 3145 Draconis Combine - Late Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Exhumer EXR-3P.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Exhumer EXR-3P.mtf
index a62ac46fd62..86d2852489e 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Exhumer EXR-3P.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Exhumer EXR-3P.mtf	
@@ -6,7 +6,7 @@ mul id:6411
 Config:Biped
 TechBase:Inner Sphere
 Era:3131
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Hatamoto-Godai HTM-30Z.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Hatamoto-Godai HTM-30Z.mtf
index 4ebc6f3f47e..2945d4fd87e 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Hatamoto-Godai HTM-30Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Hatamoto-Godai HTM-30Z.mtf	
@@ -5,7 +5,7 @@ mul id:6419
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3140
-source:TRO 3145 Draconis Combine - Dark Ages
+source:TRO: 3145 Draconis Combine - Dark Ages
 rules level:3
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Hatamoto-Suna HTM-30S.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Hatamoto-Suna HTM-30S.mtf
index ba37e5eca58..18756101e64 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Hatamoto-Suna HTM-30S.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Hatamoto-Suna HTM-30S.mtf	
@@ -6,7 +6,7 @@ mul id:6418
 Config:Biped
 TechBase:Inner Sphere
 Era:3138
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Hitotsume Kozo HKZ-1F.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Hitotsume Kozo HKZ-1F.mtf
index d0759103ee9..917302cf0d1 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Hitotsume Kozo HKZ-1F.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Hitotsume Kozo HKZ-1F.mtf	
@@ -6,7 +6,7 @@ mul id:6412
 Config:Biped
 TechBase:Inner Sphere
 Era:3136
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Hitotsume Kozo HKZ-1P.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Hitotsume Kozo HKZ-1P.mtf
index 7ee7bdca3d2..5f5bfaee3cb 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Hitotsume Kozo HKZ-1P.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Hitotsume Kozo HKZ-1P.mtf	
@@ -6,7 +6,7 @@ mul id:6413
 Config:Biped
 TechBase:Inner Sphere
 Era:3136
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Phoenix Hawk L PXH-11K.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Phoenix Hawk L PXH-11K.mtf
index 4e370dbe498..bfbffc17d8d 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Phoenix Hawk L PXH-11K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Phoenix Hawk L PXH-11K.mtf	
@@ -6,7 +6,7 @@ mul id:6390
 Config:Biped
 TechBase:Inner Sphere
 Era:3116
-Source:TRO 3145 Draconis Combine - Late Republic
+Source:TRO: 3145 Draconis Combine - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Phoenix Hawk L PXH-11K2.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Phoenix Hawk L PXH-11K2.mtf
index e008168bfff..2b7d02f064c 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Phoenix Hawk L PXH-11K2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Phoenix Hawk L PXH-11K2.mtf	
@@ -6,7 +6,7 @@ mul id:6391
 Config:Biped
 TechBase:Inner Sphere
 Era:3116
-Source:TRO 3145 Draconis Combine - Late Republic
+Source:TRO: 3145 Draconis Combine - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4K.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4K.mtf
index 54d2bd349bc..fb2923081c1 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4K.mtf	
@@ -6,7 +6,7 @@ mul id:6393
 Config:Biped
 TechBase:Inner Sphere
 Era:3135
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4T.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4T.mtf
index dad005e2e70..4f7d7ad968e 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4T.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4T.mtf	
@@ -6,7 +6,7 @@ mul id:6392
 Config:Biped
 TechBase:Inner Sphere
 Era:3135
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4X.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4X.mtf
index ec678bc597c..0de26f5ff22 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4X.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Rokurokubi RK-4X.mtf	
@@ -6,7 +6,7 @@ mul id:6394
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3136
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Shiro SH-1V.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Shiro SH-1V.mtf
index 2ca077d4e24..ea2820e1478 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Shiro SH-1V.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Shiro SH-1V.mtf	
@@ -6,7 +6,7 @@ mul id:6416
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3135
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Shiro SH-2P.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Shiro SH-2P.mtf
index f60f6f69563..cfac013987a 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Shiro SH-2P.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Shiro SH-2P.mtf	
@@ -6,7 +6,7 @@ mul id:6417
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3135
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-O.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-O.mtf
index 8ecb9262ec9..c2135acdc7d 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-O.mtf	
@@ -6,7 +6,7 @@ mul id:6421
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3101
-source:TRO 3145 Draconis Combine - Late Republic
+source:TRO: 3145 Draconis Combine - Late Republic
 rules level:4
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OA.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OA.mtf
index 77aeea4ad17..f5809a59d9a 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OA.mtf	
@@ -6,7 +6,7 @@ mul id:6422
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3101
-Source:TRO 3145 Draconis Combine - Late Republic
+Source:TRO: 3145 Draconis Combine - Late Republic
 Rules Level:4
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OB.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OB.mtf
index 727c43974b4..a59d72a810d 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OB.mtf	
@@ -6,7 +6,7 @@ mul id:6423
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3101
-Source:TRO 3145 Draconis Combine - Late Republic
+Source:TRO: 3145 Draconis Combine - Late Republic
 Rules Level:4
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OR.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OR.mtf
index 1ff515a4d23..2df85349390 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OR.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Tenshi TN-10-OR.mtf	
@@ -6,7 +6,7 @@ mul id:6424
 Config:Biped Omnimech
 techbase:Mixed (IS Chassis)
 era:3101
-source:TRO 3145 Draconis Combine - Late Republic
+source:TRO: 3145 Draconis Combine - Late Republic
 rules level:4
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo (Prime).mtf
index a82044df46e..a295092e06b 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6402
 Config:Biped Omnimech
 TechBase:Clan
 Era:3135
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo A.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo A.mtf
index 4cccaf38b29..baeeb310e07 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo A.mtf	
@@ -6,7 +6,7 @@ mul id:6404
 Config:Biped Omnimech
 techbase:Clan
 era:3150
-source:TRO 3145 Draconis Combine - Dark Ages
+source:TRO: 3145 Draconis Combine - Dark Ages
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo B.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo B.mtf
index 07ab085123c..68bb62b737b 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo B.mtf	
@@ -6,7 +6,7 @@ mul id:6405
 Config:Biped Omnimech
 techbase:Clan
 era:3150
-source:TRO 3145 Draconis Combine - Dark Ages
+source:TRO: 3145 Draconis Combine - Dark Ages
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo C.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo C.mtf
index e13da71b91b..fd36efabb17 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo C.mtf	
@@ -6,7 +6,7 @@ mul id:6406
 Config:Biped Omnimech
 techbase:Clan
 era:3150
-source:TRO 3145 Draconis Combine - Dark Ages
+source:TRO: 3145 Draconis Combine - Dark Ages
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo-VP (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo-VP (Prime).mtf
index 6c1e13f2e5f..92fbdbca95b 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo-VP (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo-VP (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6408
 Config:Biped Omnimech
 TechBase:Clan
 Era:3134
-Source:TRO 3145 Draconis Combine - Dark Ages
+Source:TRO: 3145 Draconis Combine - Dark Ages
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo-VP A.mtf b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo-VP A.mtf
index aaf63225889..5f87615a783 100644
--- a/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo-VP A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Kurita/Wendigo-VP A.mtf	
@@ -6,7 +6,7 @@ mul id:6409
 Config:Biped Omnimech
 techbase:Clan
 era:3150
-source:TRO 3145 Draconis Combine - Dark Ages
+source:TRO: 3145 Draconis Combine - Dark Ages
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Anubis ABS-5Y.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Anubis ABS-5Y.mtf
index 66cbe6efe42..6c5b62247fb 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Anubis ABS-5Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Anubis ABS-5Y.mtf	
@@ -6,7 +6,7 @@ mul id:6453
 Config:Biped
 TechBase:Inner Sphere
 Era:3121
-Source:TRO 3145 Capellan Confederation - Late Republic
+Source:TRO: 3145 Capellan Confederation - Late Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Anubis ABS-5Z.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Anubis ABS-5Z.mtf
index dab1511cd27..1f5b39f3a1c 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Anubis ABS-5Z.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Anubis ABS-5Z.mtf	
@@ -6,7 +6,7 @@ mul id:6454
 Config:Biped
 TechBase:Inner Sphere
 Era:3124
-Source:TRO 3145 Capellan Confederation - Late Republic
+Source:TRO: 3145 Capellan Confederation - Late Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Calliope CAL-1MAF.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Calliope CAL-1MAF.mtf
index 3acf9b05def..6cd205a793c 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Calliope CAL-1MAF.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Calliope CAL-1MAF.mtf	
@@ -6,7 +6,7 @@ mul id:6457
 Config:Biped
 TechBase:Inner Sphere
 Era:3127
-Source:TRO 3145 Capellan Confederation - Late Republic
+Source:TRO: 3145 Capellan Confederation - Late Republic
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Catapult II CPLT-L7.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Catapult II CPLT-L7.mtf
index 627e8290f18..f09be7aaf2c 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Catapult II CPLT-L7.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Catapult II CPLT-L7.mtf	
@@ -6,7 +6,7 @@ mul id:6464
 Config:Biped
 TechBase:Inner Sphere
 Era:3135
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Catapult II CPLT-L7L.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Catapult II CPLT-L7L.mtf
index da22271953e..2687708237e 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Catapult II CPLT-L7L.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Catapult II CPLT-L7L.mtf	
@@ -6,7 +6,7 @@ mul id:6465
 Config:Biped
 TechBase:Inner Sphere
 Era:3136
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2O.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2O.mtf
index 18f39d99c4f..3e0f2c734b5 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2O.mtf	
@@ -6,7 +6,7 @@ mul id:6450
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3134
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2OA.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2OA.mtf
index c21ba3016bf..ecd248e47d8 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2OA.mtf	
@@ -6,7 +6,7 @@ mul id:6451
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3134
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2OC.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2OC.mtf
index fe8b05e7179..339d73040e2 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Gun GN-2OC.mtf	
@@ -6,7 +6,7 @@ mul id:6452
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3134
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:3
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Lu Wei Bing LN-4B.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Lu Wei Bing LN-4B.mtf
index e02fbdd4130..a1a3e349d90 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Lu Wei Bing LN-4B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Lu Wei Bing LN-4B.mtf	
@@ -6,7 +6,7 @@ mul id:6471
 Config:Biped
 TechBase:Inner Sphere
 Era:3110
-Source:TRO 3145 Capellan Confederation - Late Republic
+Source:TRO: 3145 Capellan Confederation - Late Republic
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Mortis MS-1A.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Mortis MS-1A.mtf
index 66556274157..ba3fc4bf1fd 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Mortis MS-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Mortis MS-1A.mtf	
@@ -6,7 +6,7 @@ mul id:6466
 Config:Biped
 TechBase:Inner Sphere
 Era:3109
-Source:TRO 3145 Capellan Confederation - Late Republic
+Source:TRO: 3145 Capellan Confederation - Late Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Mortis MS-1P.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Mortis MS-1P.mtf
index 72a16cb39a6..900c892a126 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Mortis MS-1P.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Mortis MS-1P.mtf	
@@ -6,7 +6,7 @@ mul id:6467
 Config:Biped
 TechBase:Inner Sphere
 Era:3122
-Source:TRO 3145 Capellan Confederation - Late Republic
+Source:TRO: 3145 Capellan Confederation - Late Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Raven II RVN-5X.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Raven II RVN-5X.mtf
index 64ae5e1330f..aa97def5a2f 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Raven II RVN-5X.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Raven II RVN-5X.mtf	
@@ -6,7 +6,7 @@ mul id:6458
 Config:Biped
 TechBase:Inner Sphere
 Era:3123
-Source:TRO 3145 Capellan Confederation - Late Republic
+Source:TRO: 3145 Capellan Confederation - Late Republic
 Rules Level:3
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N1.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N1.mtf
index 85a948ae57b..794dd2215ab 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N1.mtf	
@@ -6,7 +6,7 @@ mul id:6469
 Config:Biped
 TechBase:Inner Sphere
 Era:3090
-Source:TRO 3145 Capellan Confederation - Early Republic
+Source:TRO: 3145 Capellan Confederation - Early Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N2.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N2.mtf
index 30a5f41dded..ba7ea4f33a0 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N2.mtf	
@@ -6,7 +6,7 @@ mul id:6470
 Config:Biped
 TechBase:Inner Sphere
 Era:3096
-Source:TRO 3145 Capellan Confederation - Early Republic
+Source:TRO: 3145 Capellan Confederation - Early Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N3.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N3.mtf
index 301dc8fb723..c26e74f3d7e 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Tian-Zong TNZ-N3.mtf	
@@ -6,7 +6,7 @@ mul id:6468
 Config:Biped
 TechBase:Inner Sphere
 Era:3140
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-O.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-O.mtf
index 2a301a4072b..c690ea9e190 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-O.mtf	
@@ -6,7 +6,7 @@ mul id:6461
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3142
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-OA.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-OA.mtf
index 063a12e1bb9..02af9706a5c 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-OA.mtf	
@@ -6,7 +6,7 @@ mul id:6462
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3142
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-OB.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-OB.mtf
index 276c6ccb8da..2bc5744b504 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Vandal LI-OB.mtf	
@@ -6,7 +6,7 @@ mul id:6463
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3142
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Yinghuochong YHC-3E.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Yinghuochong YHC-3E.mtf
index fddf9a72624..d615e16bb8f 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Yinghuochong YHC-3E.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Yinghuochong YHC-3E.mtf	
@@ -6,7 +6,7 @@ mul id:6455
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3137
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Liao/Yinghuochong YHC-3Y.mtf b/megamek/data/mechfiles/mechs/3145/Liao/Yinghuochong YHC-3Y.mtf
index 862b18fedf5..1c953052fe9 100644
--- a/megamek/data/mechfiles/mechs/3145/Liao/Yinghuochong YHC-3Y.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Liao/Yinghuochong YHC-3Y.mtf	
@@ -6,7 +6,7 @@ mul id:6456
 Config:Biped
 TechBase:Inner Sphere
 Era:3137
-Source:TRO 3145 Capellan Confederation - Dark Ages
+Source:TRO: 3145 Capellan Confederation - Dark Ages
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Anzu ZU-G60.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Anzu ZU-G60.mtf
index 103ffccca86..202171235d4 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Anzu ZU-G60.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Anzu ZU-G60.mtf	
@@ -6,7 +6,7 @@ mul id:6510
 Config:Biped
 TechBase:Inner Sphere
 Era:3098
-Source:TRO 3145 Free Worlds League - Early Republic
+Source:TRO: 3145 Free Worlds League - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Anzu ZU-J70.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Anzu ZU-J70.mtf
index 6f9abdd6fc4..e2bd4312cfc 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Anzu ZU-J70.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Anzu ZU-J70.mtf	
@@ -6,7 +6,7 @@ mul id:6511
 Config:Biped
 TechBase:Inner Sphere
 Era:3106
-Source:TRO 3145 Free Worlds League - Late Republic
+Source:TRO: 3145 Free Worlds League - Late Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Carronade CRN-7M.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Carronade CRN-7M.mtf
index cab851c8ed0..f3f25f5d129 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Carronade CRN-7M.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Carronade CRN-7M.mtf	
@@ -6,7 +6,7 @@ mul id:6512
 Config:Biped
 TechBase:Inner Sphere
 Era:3102
-Source:TRO 3145 Free Worlds League - Late Republic
+Source:TRO: 3145 Free Worlds League - Late Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Gambit GBT-1G.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Gambit GBT-1G.mtf
index 6dd154d82c0..ed788fe73b1 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Gambit GBT-1G.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Gambit GBT-1G.mtf	
@@ -6,7 +6,7 @@ mul id:6500
 Config:Biped
 TechBase:Inner Sphere
 Era:3136
-Source:TRO 3145 Free Worlds League - Dark Ages
+Source:TRO: 3145 Free Worlds League - Dark Ages
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Gambit GBT-1L.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Gambit GBT-1L.mtf
index 734d4d713f9..69078e0a660 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Gambit GBT-1L.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Gambit GBT-1L.mtf	
@@ -6,7 +6,7 @@ mul id:6501
 Config:Biped
 TechBase:Inner Sphere
 Era:3136
-Source:TRO 3145 Free Worlds League - Dark Ages
+Source:TRO: 3145 Free Worlds League - Dark Ages
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Havoc HVC-P6.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Havoc HVC-P6.mtf
index 7e53cfbf290..a1f04882a12 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Havoc HVC-P6.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Havoc HVC-P6.mtf	
@@ -6,7 +6,7 @@ mul id:6502
 Config:Biped
 TechBase:Inner Sphere
 Era:3112
-Source:TRO 3145 Free Worlds League - Late Republic
+Source:TRO: 3145 Free Worlds League - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Juliano JLN-5A.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Juliano JLN-5A.mtf
index f56faea44e1..b8dc414bc37 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Juliano JLN-5A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Juliano JLN-5A.mtf	
@@ -5,7 +5,7 @@ mul id:6516
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3116
-source:TRO 3145 Free Worlds League - Late Republic
+source:TRO: 3145 Free Worlds League - Late Republic
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Neanderthal NTL-AG.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Neanderthal NTL-AG.mtf
index 3539fb5e75e..974be82d1cc 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Neanderthal NTL-AG.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Neanderthal NTL-AG.mtf	
@@ -6,7 +6,7 @@ mul id:6513
 Config:Biped
 TechBase:Inner Sphere
 Era:3128
-Source:TRO 3145 Free Worlds League - Late Republic
+Source:TRO: 3145 Free Worlds League - Late Republic
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Neanderthal NTL-UG.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Neanderthal NTL-UG.mtf
index 27ea0b668fe..ba7ffdc1945 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Neanderthal NTL-UG.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Neanderthal NTL-UG.mtf	
@@ -6,7 +6,7 @@ mul id:6514
 Config:Biped
 TechBase:Inner Sphere
 Era:3124
-Source:TRO 3145 Free Worlds League - Late Republic
+Source:TRO: 3145 Free Worlds League - Late Republic
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Quasimodo QSM-3D.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Quasimodo QSM-3D.mtf
index 16bd4550b7d..ad1ac0d336c 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Quasimodo QSM-3D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Quasimodo QSM-3D.mtf	
@@ -6,7 +6,7 @@ mul id:6509
 Config:Biped
 TechBase:Inner Sphere
 Era:3140
-Source:TRO 3145 Free Worlds League - Dark Ages
+Source:TRO: 3145 Free Worlds League - Dark Ages
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1O.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1O.mtf
index 66c5342ec14..ebf83c5fcd6 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1O.mtf	
@@ -6,7 +6,7 @@ mul id:6506
 Config:Quad Omnimech
 TechBase:Inner Sphere
 Era:3122
-Source:TRO 3145 Free Worlds League - Late Republic
+Source:TRO: 3145 Free Worlds League - Late Republic
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1OA.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1OA.mtf
index 0efa390c6cf..2281531902d 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1OA.mtf	
@@ -6,7 +6,7 @@ mul id:6507
 Config:Quad Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3122
-Source:TRO 3145 Free Worlds League - Late Republic
+Source:TRO: 3145 Free Worlds League - Late Republic
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1OB.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1OB.mtf
index 52d70d38c2a..ab37ecc4d0c 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Sarath SRTH-1OB.mtf	
@@ -6,7 +6,7 @@ mul id:6508
 Config:Quad Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3122
-Source:TRO 3145 Free Worlds League - Late Republic
+Source:TRO: 3145 Free Worlds League - Late Republic
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Stalker II STK-9A.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Stalker II STK-9A.mtf
index 8ed19079f68..789621cef63 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Stalker II STK-9A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Stalker II STK-9A.mtf	
@@ -6,7 +6,7 @@ mul id:6515
 Config:Biped
 techbase:Inner Sphere
 era:3137
-source:TRO 3145 Free Worlds League - Dark Ages
+source:TRO: 3145 Free Worlds League - Dark Ages
 rules level:4
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Violator VT-U1.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Violator VT-U1.mtf
index c46822397ce..e497425b0c0 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Violator VT-U1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Violator VT-U1.mtf	
@@ -6,7 +6,7 @@ mul id:6503
 Config:Biped
 TechBase:Inner Sphere
 Era:3097
-Source:TRO 3145 Free Worlds League - Early Republic
+Source:TRO: 3145 Free Worlds League - Early Republic
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3145/Marik/Violator VT-U3.mtf b/megamek/data/mechfiles/mechs/3145/Marik/Violator VT-U3.mtf
index e370b7b832d..d123f0818dd 100644
--- a/megamek/data/mechfiles/mechs/3145/Marik/Violator VT-U3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Marik/Violator VT-U3.mtf	
@@ -6,7 +6,7 @@ mul id:6504
 Config:Biped
 TechBase:Inner Sphere
 Era:3098
-Source:TRO 3145 Free Worlds League - Early Republic
+Source:TRO: 3145 Free Worlds League - Early Republic
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 2.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard) 2.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 2.mtf
rename to megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard) 2.mtf
index 4468a3c4ce8..fd35bbeac0c 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard) 2.mtf	
@@ -6,7 +6,7 @@ mul id:6555
 Config:Biped
 TechBase:Clan
 Era:3092
-Source:TRO 3145 Mercenaries - Early Republic
+Source:TRO: 3145 Mercenaries - Early Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 3.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard) 3.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 3.mtf
rename to megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard) 3.mtf
index c567bc605c2..600595373f2 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard) 3.mtf	
@@ -6,7 +6,7 @@ mul id:6556
 Config:Biped
 TechBase:Clan
 Era:3092
-Source:TRO 3145 Mercenaries - Early Republic
+Source:TRO: 3145 Mercenaries - Early Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard).mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Merc/Black Hawk.mtf
rename to megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard).mtf
index 2ce2ec35f9d..4cda3ebedb7 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Black Hawk (Standard).mtf	
@@ -5,7 +5,7 @@ mul id:6554
 Config:Biped
 TechBase:Clan
 Era:3073
-Source:TRO 3145 Mercenaries - Jihad
+Source:TRO: 3145 Mercenaries - Jihad
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Cadaver CVR-A1.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Cadaver CVR-A1.mtf
index 76876898de1..c249e53fc4e 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Cadaver CVR-A1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Cadaver CVR-A1.mtf	
@@ -6,7 +6,7 @@ mul id:6550
 Config:Biped
 TechBase:Inner Sphere
 Era:3094
-Source:TRO 3145 Mercenaries - Early Republic
+Source:TRO: 3145 Mercenaries - Early Republic
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Cadaver CVR-T1.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Cadaver CVR-T1.mtf
index b84ec030a29..6bcd2b87c41 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Cadaver CVR-T1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Cadaver CVR-T1.mtf	
@@ -6,7 +6,7 @@ mul id:6551
 Config:Biped
 TechBase:Inner Sphere
 Era:3097
-Source:TRO 3145 Mercenaries - Early Republic
+Source:TRO: 3145 Mercenaries - Early Republic
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/HawkWolf HWK-4F.mtf b/megamek/data/mechfiles/mechs/3145/Merc/HawkWolf HWK-4F.mtf
index 49969c3084a..bb472eafd8c 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/HawkWolf HWK-4F.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/HawkWolf HWK-4F.mtf	
@@ -6,7 +6,7 @@ mul id:6576
 Config:Biped
 TechBase:Inner Sphere
 Era:3100
-Source:TRO 3145 Mercenaries - Late Republic
+Source:TRO: 3145 Mercenaries - Late Republic
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Hound HD-2F.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Hound HD-2F.mtf
index 884951c13d2..36a83b8b00c 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Hound HD-2F.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Hound HD-2F.mtf	
@@ -6,7 +6,7 @@ mul id:6563
 Config:Biped
 TechBase:Inner Sphere
 Era:3098
-Source:TRO 3145 Mercenaries - Early Republic
+Source:TRO: 3145 Mercenaries - Early Republic
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk 2.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk 2.mtf
index 50522742966..b2b4a7d9f67 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk 2.mtf	
@@ -6,7 +6,7 @@ mul id:6567
 Config:Biped
 TechBase:Clan
 Era:3136
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk 3.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk 3.mtf
index 252b83a52b6..53cc53ecdd3 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk 3.mtf	
@@ -6,7 +6,7 @@ mul id:6568
 Config:Biped
 TechBase:Clan
 Era:3136
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk JHK-03.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk JHK-03.mtf
index f12b156014b..af1d9fa8817 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk JHK-03.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk JHK-03.mtf	
@@ -6,7 +6,7 @@ mul id:6564
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3135
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk JHK-04.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk JHK-04.mtf
index f600c5f3c4d..4ee33e0e2e4 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk JHK-04.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk JHK-04.mtf	
@@ -6,7 +6,7 @@ mul id:6565
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3135
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk (Standard).mtf b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk (Standard).mtf
rename to megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk.mtf
index 984352af9d7..a9914595c8c 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Jade Hawk.mtf	
@@ -6,7 +6,7 @@ mul id:6566
 Config:Biped
 TechBase:Clan
 Era:3136
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 2.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 2.mtf
index c54f9f497c2..dbea088c7d5 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 2.mtf	
@@ -6,7 +6,7 @@ mul id:6548
 Config:Biped
 TechBase:Clan
 Era:3095
-Source:TRO 3145 Mercenaries - Early Republic
+Source:TRO: 3145 Mercenaries - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 3.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 3.mtf
index 335d3e68130..c8ee6dd0665 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard) 3.mtf	
@@ -6,7 +6,7 @@ mul id:6549
 Config:Biped
 TechBase:Clan
 Era:3095
-Source:TRO 3145 Mercenaries - Early Republic
+Source:TRO: 3145 Mercenaries - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard).mtf b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard).mtf
index 7aff523007c..c76c414bfb3 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Koshi (Standard).mtf	
@@ -5,7 +5,7 @@ mul id:6547
 Config:Biped
 TechBase:Clan
 Era:3091
-Source:TRO 3145 Mercenaries - Early Republic
+Source:TRO: 3145 Mercenaries - Early Republic
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV (Prime).mtf b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV (Prime).mtf
index cb5b6caa1d8..448832e3e60 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV (Prime).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV (Prime).mtf	
@@ -6,7 +6,7 @@ mul id:6570
 Config:Biped Omnimech
 TechBase:Clan
 Era:3136
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV A.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV A.mtf
index 24148febb9e..2a0f085a28c 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV A.mtf	
@@ -6,7 +6,7 @@ mul id:6571
 Config:Biped Omnimech
 TechBase:Clan
 Era:3136
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV B.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV B.mtf
index d266d31ae7b..6dca6af3820 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV B.mtf	
@@ -6,7 +6,7 @@ mul id:6572
 Config:Biped Omnimech
 TechBase:Clan
 Era:3136
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV C.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV C.mtf
index 0ad459135ef..a6cc932e774 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV C.mtf	
@@ -6,7 +6,7 @@ mul id:6573
 Config:Biped Omnimech
 TechBase:Clan
 Era:3136
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV PR 2.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV PR 2.mtf
index 96f59292f76..c9b7a328935 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV PR 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV PR 2.mtf	
@@ -6,7 +6,7 @@ mul id:6575
 Config:Biped
 TechBase:Clan
 Era:3131
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV PR.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV PR.mtf
index 78f4aeb5149..55e095be7f3 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV PR.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Mad Cat Mk IV PR.mtf	
@@ -6,7 +6,7 @@ mul id:6574
 Config:Biped
 TechBase:Clan
 Era:3130
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Stalking Spider II.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Stalking Spider II.mtf
index 901268079fd..0369a76f57e 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Stalking Spider II.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Stalking Spider II.mtf	
@@ -6,7 +6,7 @@ mul id:6553
 Config:Quad
 TechBase:Clan
 Era:3110
-Source:TRO 3145 Mercenaries - Late Republic
+Source:TRO: 3145 Mercenaries - Late Republic
 Rules Level:3
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Tiburon (Standard).mtf b/megamek/data/mechfiles/mechs/3145/Merc/Tiburon.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Merc/Tiburon (Standard).mtf
rename to megamek/data/mechfiles/mechs/3145/Merc/Tiburon.mtf
index 4a968e910ae..dfb2d2ba286 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Tiburon (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Tiburon.mtf
@@ -5,7 +5,7 @@ mul id:6552
 Config:Biped
 techbase:Clan
 era:3099
-source:TRO 3145 Mercenaries - Early Republic
+source:TRO: 3145 Mercenaries - Early Republic
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV A.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV A.mtf
index 279de7baa83..3ce4401c5a6 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV A.mtf	
@@ -6,7 +6,7 @@ mul id:6559
 Config:Biped Omnimech
 TechBase:Clan
 Era:3137
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV B.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV B.mtf
index fe59c69be44..d299dc9f9a8 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV B.mtf	
@@ -6,7 +6,7 @@ mul id:6560
 Config:Biped Omnimech
 techbase:Clan
 era:3137
-source:TRO 3145 Mercenaries - Dark Ages
+source:TRO: 3145 Mercenaries - Dark Ages
 rules level:3
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV C.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV C.mtf
index 8d1910c573a..e0694fa7440 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV C.mtf	
@@ -6,7 +6,7 @@ mul id:6561
 Config:Biped Omnimech
 TechBase:Clan
 Era:3137
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV D.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV D.mtf
index f36603caaa7..a9700dd44a9 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV D.mtf	
@@ -6,7 +6,7 @@ mul id:6562
 Config:Biped Omnimech
 TechBase:Clan
 Era:3137
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV Prime.mtf b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV Prime.mtf
index 41712b59830..e692faab1b6 100644
--- a/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Merc/Vulture Mk IV Prime.mtf	
@@ -6,7 +6,7 @@ mul id:6558
 Config:Biped Omnimech
 TechBase:Clan
 Era:3137
-Source:TRO 3145 Mercenaries - Dark Ages
+Source:TRO: 3145 Mercenaries - Dark Ages
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Archer ARC-9KC.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Archer ARC-9KC.mtf
index d225a5912e8..26304fe1d85 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Archer ARC-9KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Archer ARC-9KC.mtf	
@@ -6,7 +6,7 @@ mul id:6875
 Config:Biped
 TechBase:Inner Sphere
 Era:3089
-Source:RS 3145 NTNU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Atlas AS7-K4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Atlas AS7-K4.mtf
index cbbb3f94cfc..f4851e21844 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Atlas AS7-K4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Atlas AS7-K4.mtf	
@@ -6,7 +6,7 @@ mul id:6832
 Config:Biped
 TechBase:Inner Sphere
 Era:3098
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Banshee BNC-9S2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Banshee BNC-9S2.mtf
index c9252a50431..ae846974597 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Banshee BNC-9S2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Banshee BNC-9S2.mtf	
@@ -6,7 +6,7 @@ mul id:6844
 Config:Biped
 TechBase:Inner Sphere
 Era:3109
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Berserker BRZ-D4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Berserker BRZ-D4.mtf
index 0192b5d3428..045f3faba8f 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Berserker BRZ-D4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Berserker BRZ-D4.mtf	
@@ -6,7 +6,7 @@ mul id:6831
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3112
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Blackjack BJ-2r.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Blackjack BJ-2r.mtf
index 3457334f58a..13e6b646472 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Blackjack BJ-2r.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Blackjack BJ-2r.mtf	
@@ -6,7 +6,7 @@ mul id:6914
 Config:Biped
 TechBase:Inner Sphere
 Era:3131
-Source:RS 3145 NT NU - Dark Age
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Blade BLD-7R.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Blade BLD-7R.mtf
index 2a4c0ad62d0..52e9e0c99e4 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Blade BLD-7R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Blade BLD-7R.mtf	
@@ -6,7 +6,7 @@ mul id:6929
 Config:Biped
 TechBase:Inner Sphere
 Era:3094
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Commando COM-8S.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Commando COM-8S.mtf
index 2bca53d7ac2..0b41d93621d 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Commando COM-8S.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Commando COM-8S.mtf	
@@ -6,7 +6,7 @@ mul id:6945
 Config:Biped
 TechBase:Inner Sphere
 Era:3108
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X 2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X 2.mtf
index 28c4c7f0185..851e6efcbf9 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X 2.mtf	
@@ -6,7 +6,7 @@ mul id:6952
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3089
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X 3.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X 3.mtf
index 5acdfe02b06..31696d53217 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X 3.mtf	
@@ -6,7 +6,7 @@ mul id:6953
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3093
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X.mtf
index 2db952ab4ba..23825c2b2f9 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cougar X.mtf	
@@ -6,7 +6,7 @@ mul id:6951
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3132
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Crimson Hawk 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Crimson Hawk 4.mtf
index 18dc220135b..db207beb847 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Crimson Hawk 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Crimson Hawk 4.mtf	
@@ -6,7 +6,7 @@ mul id:6944
 Config:Biped
 TechBase:Clan
 Era:3099
-Source:TRO 3145 NT NU
+Source:TRO: 3145 NT NU
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cuirass CDR-2BC.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cuirass CDR-2BC.mtf
index db6a0278260..241696b3502 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cuirass CDR-2BC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cuirass CDR-2BC.mtf	
@@ -6,7 +6,7 @@ mul id:6922
 Config:Biped
 TechBase:Inner Sphere
 Era:3119
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cuirass CDR-2X.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cuirass CDR-2X.mtf
index 1bb19082fa5..7d4a05ad608 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cuirass CDR-2X.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cuirass CDR-2X.mtf	
@@ -6,7 +6,7 @@ mul id:6921
 Config:Biped
 TechBase:Inner Sphere
 Era:3134
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cygnus 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cygnus 4.mtf
index 3000a3c779e..8068a9efdbc 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Cygnus 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Cygnus 4.mtf	
@@ -6,7 +6,7 @@ mul id:6843
 Config:Biped
 TechBase:Clan
 Era:3090
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Dasher II 3.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Dasher II 3.mtf
index 3088d0b3276..24bee536002 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Dasher II 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Dasher II 3.mtf	
@@ -6,7 +6,7 @@ mul id:6920
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3136
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Dasher II 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Dasher II 4.mtf
index 9a2c56e0ccb..9af3993f790 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Dasher II 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Dasher II 4.mtf	
@@ -6,7 +6,7 @@ mul id:6919
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3136
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Diomede D-M3D-M.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Diomede D-M3D-M.mtf
index 0bf2e5d0328..9436d30bd86 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Diomede D-M3D-M.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Diomede D-M3D-M.mtf	
@@ -6,7 +6,7 @@ mul id:6823
 Config:Biped
 TechBase:Inner Sphere
 Era:3092
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ebony MEB-12.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ebony MEB-12.mtf
index a7b47f46dd1..cc35297dbd0 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ebony MEB-12.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ebony MEB-12.mtf	
@@ -6,7 +6,7 @@ mul id:6942
 Config:Biped
 TechBase:Inner Sphere
 Era:3118
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ebony MEB-13.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ebony MEB-13.mtf
index eaea3d4f995..555082f4bfb 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ebony MEB-13.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ebony MEB-13.mtf	
@@ -6,7 +6,7 @@ mul id:6943
 Config:Biped
 TechBase:Inner Sphere
 Era:3137
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Emperor EMP-8L.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Emperor EMP-8L.mtf
index f43586909f7..58ac9c748d0 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Emperor EMP-8L.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Emperor EMP-8L.mtf	
@@ -6,7 +6,7 @@ mul id:6851
 Config:Biped
 TechBase:Inner Sphere
 Era:3127
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Fennec FEC-5CM.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Fennec FEC-5CM.mtf
index 2dda3e63d35..dcb75aedbf1 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Fennec FEC-5CM.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Fennec FEC-5CM.mtf	
@@ -6,7 +6,7 @@ mul id:6900
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3133
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Flamberge D.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Flamberge D.mtf
index 9b2badbb1f2..84371805b89 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Flamberge D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Flamberge D.mtf	
@@ -6,7 +6,7 @@ mul id:6873
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3115
-Source:Jihad
+Source:TRO: 3145 - Late Republic
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Gallant GLT-10-0.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Gallant GLT-10-0.mtf
index c9bea17ff7c..a360f06312d 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Gallant GLT-10-0.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Gallant GLT-10-0.mtf	
@@ -6,7 +6,7 @@ mul id:6872
 Config:Biped
 TechBase:Inner Sphere
 Era:3130
-Source:RS 3145 NTNU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ghost GST-50.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ghost GST-50.mtf
index 8663c54f67b..44860e2d232 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ghost GST-50.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ghost GST-50.mtf	
@@ -6,7 +6,7 @@ mul id:6907
 Config:Biped
 TechBase:Inner Sphere
 Era:3087
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ghost GST-90.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ghost GST-90.mtf
index 3d6aa26b1fb..5d4b677bac7 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ghost GST-90.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ghost GST-90.mtf	
@@ -6,7 +6,7 @@ mul id:6906
 Config:Biped
 TechBase:Inner Sphere
 Era:3133
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Grand Dragon DRG-10K.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Grand Dragon DRG-10K.mtf
index adc1c1ce60a..15958ae67ed 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Grand Dragon DRG-10K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Grand Dragon DRG-10K.mtf	
@@ -6,7 +6,7 @@ mul id:6889
 Config:Biped
 TechBase:Inner Sphere
 Era:3114
-Source:RS 3145 NTNU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Grand Titan T-IT-N13M.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Grand Titan T-IT-N13M.mtf
index 8fe8d545e8b..e09b2b86493 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Grand Titan T-IT-N13M.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Grand Titan T-IT-N13M.mtf	
@@ -6,7 +6,7 @@ mul id:6830
 Config:Biped
 TechBase:Inner Sphere
 Era:3091
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Javelin JVN-11P.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Javelin JVN-11P.mtf
index f2eeff27179..f3857880786 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Javelin JVN-11P.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Javelin JVN-11P.mtf	
@@ -6,7 +6,7 @@ mul id:6938
 Config:Biped
 TechBase:Inner Sphere
 Era:3101
-Source:RS 3145 NT NU - Early Republic
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Jupiter 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Jupiter 4.mtf
index e84de4809de..964bf2e9cf2 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Jupiter 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Jupiter 4.mtf	
@@ -6,7 +6,7 @@ mul id:6829
 Config:Biped
 TechBase:Clan
 Era:3093
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Koschei KSC-6L.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Koschei KSC-6L.mtf
index 56e76c2c85f..2f4a6c55b80 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Koschei KSC-6L.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Koschei KSC-6L.mtf	
@@ -6,7 +6,7 @@ mul id:6881
 Config:Biped
 TechBase:Inner Sphere
 Era:3105
-Source:RS 3145 NTNU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Kuma 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Kuma 4.mtf
index afd5085acc5..c980bfb10ad 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Kuma 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Kuma 4.mtf	
@@ -6,7 +6,7 @@ mul id:6888
 Config:Biped
 TechBase:Clan
 Era:3141
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Legionnaire LGN-2K.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Legionnaire LGN-2K.mtf
index 2cbffb4fca2..627c5400090 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Legionnaire LGN-2K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Legionnaire LGN-2K.mtf	
@@ -6,7 +6,7 @@ mul id:6905
 Config:Biped
 TechBase:Inner Sphere
 Era:3128
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Locust LCT-5M2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Locust LCT-5M2.mtf
index 0b596309907..fa6b11023eb 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Locust LCT-5M2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Locust LCT-5M2.mtf	
@@ -6,7 +6,7 @@ mul id:6947
 Config:Biped
 TechBase:Inner Sphere
 Era:3087
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Locust LCT-5M3.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Locust LCT-5M3.mtf
index 6a1d93845af..56f6550c2f5 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Locust LCT-5M3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Locust LCT-5M3.mtf	
@@ -6,7 +6,7 @@ mul id:6948
 Config:Biped
 TechBase:Inner Sphere
 Era:3088
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Longbow LGB-14C2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Longbow LGB-14C2.mtf
index d6c1cd398a2..284c285b320 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Longbow LGB-14C2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Longbow LGB-14C2.mtf	
@@ -6,7 +6,7 @@ mul id:6854
 Config:Biped
 techbase:Inner Sphere
 era:3088
-source:RS 3145 NT NU
+source:RS 3145 NTNU
 rules level:3
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 3.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 3.mtf
index 108d8fe6536..0648f5ca03d 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 3.mtf	
@@ -6,7 +6,7 @@ mul id:6896
 Config:Biped
 TechBase:Clan
 Era:3094
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 4.mtf
index abeb4002b8c..5f463070be9 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 4.mtf	
@@ -6,7 +6,7 @@ mul id:6897
 Config:Biped
 TechBase:Clan
 Era:3095
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 5.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 5.mtf
index b92807fa9dd..1abd119e44b 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat III 5.mtf	
@@ -6,7 +6,7 @@ mul id:6898
 Config:Biped
 TechBase:Clan
 Era:3097
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 4.mtf
index c3d0853ce8f..4bbde4bd94b 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 4.mtf	
@@ -6,7 +6,7 @@ mul id:6850
 Config:Biped
 TechBase:Clan
 Era:3090
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 5.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 5.mtf
index 1a2109e4e31..23c612b1176 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 5.mtf	
@@ -6,7 +6,7 @@ mul id:6849
 Config:Biped
 TechBase:Clan
 Era:3109
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 6.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 6.mtf
index ffdd6cfa718..8265f813b3d 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 6.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mad Cat Mk II 6.mtf	
@@ -6,7 +6,7 @@ mul id:6848
 Config:Biped
 TechBase:Clan
 Era:3139
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Maelstrom MTR-7K.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Maelstrom MTR-7K.mtf
index dd31433c82e..10c87389933 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Maelstrom MTR-7K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Maelstrom MTR-7K.mtf	
@@ -6,7 +6,7 @@ mul id:6867
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3112
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mangonel MNL-4S.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mangonel MNL-4S.mtf
index df72a99fd5e..9e51b095864 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Mangonel MNL-4S.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Mangonel MNL-4S.mtf	
@@ -6,7 +6,7 @@ mul id:6871
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3088
-Source:RS 3145  NTNU
+Source:RS 3145 NTNU
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Marauder II MAD-4L.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Marauder II MAD-4L.mtf
index f58ef0508a3..21c9c4dac18 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Marauder II MAD-4L.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Marauder II MAD-4L.mtf	
@@ -6,7 +6,7 @@ mul id:6828
 Config:Biped
 TechBase:Inner Sphere
 Era:3084
-Source:RS 3145 NT NU - Early Republic
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Marauder MAD-9D.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Marauder MAD-9D.mtf
index 8cdbf537637..c47a1990659 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Marauder MAD-9D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Marauder MAD-9D.mtf	
@@ -6,7 +6,7 @@ mul id:6866
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3125
-Source:RS 3145 NY NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Men Shen MS1-OG.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Men Shen MS1-OG.mtf
index 89b18daa079..9cec208e5ca 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Men Shen MS1-OG.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Men Shen MS1-OG.mtf	
@@ -6,7 +6,7 @@ mul id:6894
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3134
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Morrigan 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Morrigan 4.mtf
index 272cae22b36..8c75ef89d99 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Morrigan 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Morrigan 4.mtf	
@@ -6,7 +6,7 @@ mul id:6927
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3111
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Morrigan 5.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Morrigan 5.mtf
index 66303d10223..71d69757697 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Morrigan 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Morrigan 5.mtf	
@@ -6,7 +6,7 @@ mul id:6926
 Config:Biped
 TechBase:Clan
 Era:3124
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/NTNU/Tempest C.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/NTNU/Tempest C.mtf
index ea54811a847..5edb7d2fecb 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/NTNU/Tempest C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/NTNU/Tempest C.mtf	
@@ -5,7 +5,7 @@ mul id:8005
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3150
-source:Dark Age
+source:TRO: 3150 - Dark Age
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Nyx NX-100.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Nyx NX-100.mtf
index 7822712aed7..7abe254e62c 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Nyx NX-100.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Nyx NX-100.mtf	
@@ -6,7 +6,7 @@ mul id:6937
 Config:Biped
 TechBase:Inner Sphere
 Era:3095
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Nyx NX-110.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Nyx NX-110.mtf
index fa2d3e8fc7e..b27a9a132a9 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Nyx NX-110.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Nyx NX-110.mtf	
@@ -6,7 +6,7 @@ mul id:6936
 Config:Biped
 TechBase:Inner Sphere
 Era:3141
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ocelot 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ocelot 4.mtf
index d397b4589a2..cc3a0eb8fde 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ocelot 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ocelot 4.mtf	
@@ -6,7 +6,7 @@ mul id:6925
 Config:Biped
 TechBase:Clan
 Era:3096
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Omen 2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Omen 2.mtf
index ace78bda75d..43256088431 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Omen 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Omen 2.mtf	
@@ -6,7 +6,7 @@ mul id:6853
 Config:Biped
 TechBase:Clan
 Era:3141
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Onager 2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Onager 2.mtf
index bba365d2559..acf82730941 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Onager 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Onager 2.mtf	
@@ -6,7 +6,7 @@ mul id:6847
 Config:Biped
 TechBase:Clan
 Era:3137
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Pack Hunter II 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Pack Hunter II 4.mtf
index 21c04fa1c21..e4dab4a3b05 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Pack Hunter II 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Pack Hunter II 4.mtf	
@@ -6,7 +6,7 @@ mul id:6935
 Config:Biped
 techbase:Clan
 era:3093
-source:RS 3145 NT NU
+source:RS 3145 NTNU
 rules level:4
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Panther PNT-12KC.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Panther PNT-12KC.mtf
index ad0de86b322..4dcd1945cc4 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Panther PNT-12KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Panther PNT-12KC.mtf	
@@ -6,7 +6,7 @@ mul id:6923
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3139
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Peacekeeper PKP-2K.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Peacekeeper PKP-2K.mtf
index 94e0eb5e51d..9d12851aa7d 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Peacekeeper PKP-2K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Peacekeeper PKP-2K.mtf	
@@ -6,7 +6,7 @@ mul id:6836
 Config:Biped
 TechBase:Inner Sphere
 Era:3116
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Prefect PRF-3R.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Prefect PRF-3R.mtf
index 96a2b5764dd..9376adf1b18 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Prefect PRF-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Prefect PRF-3R.mtf	
@@ -6,7 +6,7 @@ mul id:6865
 Config:Biped
 TechBase:Inner Sphere
 Era:3110
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Quickdraw QKD-9M.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Quickdraw QKD-9M.mtf
index e4c6489e438..35319d27f87 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Quickdraw QKD-9M.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Quickdraw QKD-9M.mtf	
@@ -6,7 +6,7 @@ mul id:6887
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Raptor II RPT-2X2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Raptor II RPT-2X2.mtf
index 7e350a6a3fb..1d3244c5145 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Raptor II RPT-2X2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Raptor II RPT-2X2.mtf	
@@ -6,7 +6,7 @@ mul id:6918
 Config:Biped
 TechBase:Inner Sphere
 Era:3109
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Sagittaire SGT-14D.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Sagittaire SGT-14D.mtf
index 16764fdf3fd..267a23be6ae 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Sagittaire SGT-14D.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Sagittaire SGT-14D.mtf	
@@ -6,7 +6,7 @@ mul id:6835
 Config:Biped
 TechBase:Inner Sphere
 Era:3134
-Source:RS 3145 NT NU - Dark Age
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Salamander PPR-7T.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Salamander PPR-7T.mtf
index c835c6ac8b1..99a0a9e0220 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Salamander PPR-7T.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Salamander PPR-7T.mtf	
@@ -6,7 +6,7 @@ mul id:6860
 Config:Biped
 TechBase:Inner Sphere
 Era:3111
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Cat II 3.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Cat II 3.mtf
index 43ed490f796..461e490a680 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Cat II 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Cat II 3.mtf	
@@ -6,7 +6,7 @@ mul id:6886
 Config:Biped
 TechBase:Clan
 Era:3089
-Source:RS 3145 NTNU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Cat II 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Cat II 4.mtf
index dfb41bb881d..833f886c269 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Cat II 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shadow Cat II 4.mtf	
@@ -6,7 +6,7 @@ mul id:6885
 Config:Biped
 TechBase:Clan
 Era:3092
-Source:RS 3145 NTNU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shen Yi SHY-5B.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shen Yi SHY-5B.mtf
index d1580ab7c78..f81689ca4d5 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shen Yi SHY-5B.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shen Yi SHY-5B.mtf	
@@ -6,7 +6,7 @@ mul id:6878
 Config:Biped
 TechBase:Inner Sphere
 Era:3093
-Source:RS 3145 NTNU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shockwave SKW-6H.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shockwave SKW-6H.mtf
index 5bc4c2e1b69..e35eeafcea3 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shockwave SKW-6H.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shockwave SKW-6H.mtf	
@@ -6,7 +6,7 @@ mul id:6903
 Config:Biped
 TechBase:Inner Sphere
 Era:3102
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic - Dark Age
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shockwave SKW-8X.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shockwave SKW-8X.mtf
index 69c09d475ab..ebf5ce5362e 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Shockwave SKW-8X.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Shockwave SKW-8X.mtf	
@@ -6,7 +6,7 @@ mul id:6902
 Config:Biped
 TechBase:Inner Sphere
 Era:3134
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Sphinx 3.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Sphinx 3.mtf
index c79b1620270..e882add6ea7 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Sphinx 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Sphinx 3.mtf	
@@ -6,7 +6,7 @@ mul id:6864
 Config:Biped
 TechBase:Clan
 Era:3091
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Sphinx 4.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Sphinx 4.mtf
index 5d74f0212ac..3c31f45c230 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Sphinx 4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Sphinx 4.mtf	
@@ -6,7 +6,7 @@ mul id:6863
 Config:Biped
 TechBase:Clan
 Era:3091
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Spider SDR-10K.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Spider SDR-10K.mtf
index 75873f122ec..d2475549240 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Spider SDR-10K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Spider SDR-10K.mtf	
@@ -6,7 +6,7 @@ mul id:6934
 Config:Biped
 TechBase:Inner Sphere
 Era:3143
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Spider SDR-8Xr.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Spider SDR-8Xr.mtf
index c7808684466..eb44a56f9ff 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Spider SDR-8Xr.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Spider SDR-8Xr.mtf	
@@ -6,7 +6,7 @@ mul id:6933
 Config:Biped
 TechBase:Inner Sphere
 Era:3103
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Sun Cobra 2.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Sun Cobra 2.mtf
index 67904389e6b..645fdc3cc67 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Sun Cobra 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Sun Cobra 2.mtf	
@@ -6,7 +6,7 @@ mul id:6893
 Config:Biped
 TechBase:Clan
 Era:3093
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Targe TRG-3M.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Targe TRG-3M.mtf
index d3bf8cb8fe1..ad6b692ef98 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Targe TRG-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Targe TRG-3M.mtf	
@@ -6,7 +6,7 @@ mul id:6915
 Config:Biped
 TechBase:Inner Sphere
 Era:3109
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:2
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Thunder Fox TFT-F11.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Thunder Fox TFT-F11.mtf
index 2d7e7318d63..3e2253d1d11 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Thunder Fox TFT-F11.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Thunder Fox TFT-F11.mtf	
@@ -6,7 +6,7 @@ mul id:6892
 Config:Quad
 techbase:Mixed (IS Chassis)
 era:3119
-source:RS 3145 NT NU
+source:RS 3145 NTNU
 rules level:4
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Thunderbolt TDR-10S.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Thunderbolt TDR-10S.mtf
index d93948c0f88..6f00a719314 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Thunderbolt TDR-10S.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Thunderbolt TDR-10S.mtf	
@@ -6,7 +6,7 @@ mul id:6877
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:RS 3145 NYNU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ti Ts'ang TSG-10L.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ti Ts'ang TSG-10L.mtf
index 2fcaeb5c316..37b49ac9939 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Ti Ts'ang TSG-10L.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Ti Ts'ang TSG-10L.mtf	
@@ -6,7 +6,7 @@ mul id:6884
 Config:Biped
 TechBase:Inner Sphere
 Era:3125
-Source:RS 3145 NTNU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Titan TI-1Aj.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Titan TI-1Aj.mtf
index a9fea81e6a9..338d4b52a14 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Titan TI-1Aj.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Titan TI-1Aj.mtf	
@@ -6,7 +6,7 @@ mul id:6827
 Config:Biped
 TechBase:Inner Sphere
 Era:3123
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Titan TI-1Ar.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Titan TI-1Ar.mtf
index 2d70b765402..f788f4c7f83 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Titan TI-1Ar.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Titan TI-1Ar.mtf	
@@ -6,7 +6,7 @@ mul id:6826
 Config:Biped
 TechBase:Inner Sphere
 Era:3123
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Trebaruna TR-XH.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Trebaruna TR-XH.mtf
index 50501f19577..db17c4a307d 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Trebaruna TR-XH.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Trebaruna TR-XH.mtf	
@@ -6,7 +6,7 @@ mul id:6834
 Config:Quad
 TechBase:Inner Sphere
 Era:3115
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Trebuchet TBT-9R.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Trebuchet TBT-9R.mtf
index 250ff29d162..b26eb1e94a4 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Trebuchet TBT-9R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Trebuchet TBT-9R.mtf	
@@ -6,7 +6,7 @@ mul id:6901
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3131
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Dark Age
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Tundra Wolf 5.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Tundra Wolf 5.mtf
index 31f0c654942..f31abf82525 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Tundra Wolf 5.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Tundra Wolf 5.mtf	
@@ -6,7 +6,7 @@ mul id:6862
 Config:Biped
 TechBase:Clan
 Era:3086
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Valkyrie VLK-QD8.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Valkyrie VLK-QD8.mtf
index 6d7ca74f8dc..328a31eac8b 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Valkyrie VLK-QD8.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Valkyrie VLK-QD8.mtf	
@@ -6,7 +6,7 @@ mul id:6930
 Config:Biped
 TechBase:Inner Sphere
 Era:3102
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 10.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 10.mtf
index 256a2476a72..fcb0d04a8e7 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 10.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 10.mtf	
@@ -6,7 +6,7 @@ mul id:6859
 Config:Biped
 TechBase:Clan
 Era:3120
-Source:RS 3145 NT NU - Late Republic 
+Source:RS 3145 NTNU - Late Republic 
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 11.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 11.mtf
index f7104d7891f..fade22f2edf 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 11.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 11.mtf	
@@ -6,7 +6,7 @@ mul id:6858
 Config:Biped
 TechBase:Clan
 Era:3124
-Source:RS 3145 NT NU - Late Republic 
+Source:RS 3145 NTNU - Late Republic 
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 12.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 12.mtf
index e0c596ba1c8..319c8c40659 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 12.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Warhammer IIC 12.mtf	
@@ -6,7 +6,7 @@ mul id:6857
 Config:Biped
 TechBase:Clan
 Era:3130
-Source:RS 3145 NT NU - Late Republic 
+Source:RS 3145 NTNU - Late Republic 
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Wasp WSP-3K.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Wasp WSP-3K.mtf
index d2dd5b5a284..e1a610061e8 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Wasp WSP-3K.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Wasp WSP-3K.mtf	
@@ -6,7 +6,7 @@ mul id:6949
 Config:Biped
 TechBase:Inner Sphere
 Era:3110
-Source:RS 3145 NT NU 
+Source:RS 3145 NTNU - Late Republic 
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Wasp WSP-3P.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Wasp WSP-3P.mtf
index ae5078d8c58..b7cc9b186e9 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Wasp WSP-3P.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Wasp WSP-3P.mtf	
@@ -6,7 +6,7 @@ mul id:6950
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:RS 3145 NT NU 
+Source:RS 3145 NTNU - Early Republic - Early Republic
 Rules Level:2
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Xanthos XNT-6O.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Xanthos XNT-6O.mtf
index 5c0bf45c6e7..2592a4433bb 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Xanthos XNT-6O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Xanthos XNT-6O.mtf	
@@ -6,7 +6,7 @@ mul id:6825
 Config:Quad
 TechBase:Inner Sphere
 Era:3094
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Early Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/NTNU RS/Xanthos XNT-7O.mtf b/megamek/data/mechfiles/mechs/3145/NTNU RS/Xanthos XNT-7O.mtf
index 440121ad6d6..9f5c5f3eee7 100644
--- a/megamek/data/mechfiles/mechs/3145/NTNU RS/Xanthos XNT-7O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/NTNU RS/Xanthos XNT-7O.mtf	
@@ -6,7 +6,7 @@ mul id:6824
 Config:Quad
 TechBase:Mixed (IS Chassis)
 Era:3119
-Source:RS 3145 NT NU
+Source:RS 3145 NTNU - Late Republic
 Rules Level:3
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Aphrodite.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Aphrodite.mtf
index 7f598f50d63..799511a3b0b 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Aphrodite.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Aphrodite.mtf	
@@ -6,7 +6,7 @@ mul id:6688
 Config:Tripod Omnimech
 techbase:Mixed (IS Chassis)
 era:3136
-source:TRO 3145 Republic of the Sphere - Dark Ages
+source:TRO: 3145 Republic of the Sphere - Dark Ages
 rules level:3
 
 mass:135
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hades.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hades.mtf
index 692e56ade07..4448328992e 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hades.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hades.mtf	
@@ -6,7 +6,7 @@ mul id:6687
 Config:Tripod Omnimech
 techbase:Mixed (IS Chassis)
 era:3136
-source:TRO 3145 Republic of the Sphere - Dark Ages
+source:TRO: 3145 Republic of the Sphere - Dark Ages
 rules level:3
 
 mass:135
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hephaestus.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hephaestus.mtf
index ed699d101ed..9898aabeb9f 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hephaestus.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hephaestus.mtf	
@@ -6,7 +6,7 @@ mul id:6689
 Config:Tripod Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3136
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:135
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hera.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hera.mtf
index 5fc28c9a1f5..318d27cc9f2 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hera.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Hera.mtf	
@@ -6,7 +6,7 @@ mul id:6686
 Config:Tripod Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3136
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:135
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Zeus.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Zeus.mtf
index 4eca5b2c845..d3631f6c97f 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Zeus.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Zeus.mtf	
@@ -6,7 +6,7 @@ mul id:6685
 Config:Tripod Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3136
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:135
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-O.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-O.mtf
index 145ffd392ce..22a02b401c1 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-O.mtf	
@@ -6,7 +6,7 @@ mul id:6671
 Config:Quad Omnimech
 TechBase:Inner Sphere
 Era:3138
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OA.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OA.mtf
index 5d1d6022033..09b3c1be38b 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OA.mtf	
@@ -6,7 +6,7 @@ mul id:6704
 Config:Quad Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3138
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OB.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OB.mtf
index 017f5b6fb4d..89449276669 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OB.mtf	
@@ -6,7 +6,7 @@ mul id:6705
 Config:Quad Omnimech
 TechBase:Inner Sphere
 Era:3138
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OC.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OC.mtf
index a36701b9e6d..7a2b30e76ad 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OC.mtf	
@@ -6,7 +6,7 @@ mul id:6706
 Config:Quad Omnimech
 TechBase:Inner Sphere
 Era:3138
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OD.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OD.mtf
index ce32355c0b0..d164ae2e805 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OD.mtf	
@@ -6,7 +6,7 @@ mul id:6707
 Config:Quad Omnimech
 TechBase:Inner Sphere
 Era:3138
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OE.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OE.mtf
index e099b6583d3..6f08d5a9994 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OE.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-03-OE.mtf	
@@ -6,7 +6,7 @@ mul id:6708
 Config:Quad Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3138
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-04-R.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-04-R.mtf
index ee8e082a630..81aceb35990 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-04-R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-04-R.mtf	
@@ -6,7 +6,7 @@ mul id:6709
 Config:Quad
 techbase:Inner Sphere
 era:3138
-source:TRO 3145 Republic of the Sphere - Dark Ages
+source:TRO: 3145 Republic of the Sphere - Dark Ages
 rules level:4
 
 mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-05-X.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-05-X.mtf
index 5ebc348f8e6..83465d15208 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-05-X.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Celerity CLR-05-X.mtf	
@@ -6,7 +6,7 @@ mul id:6710
 Config:Quad
 techbase:Inner Sphere
 era:3138
-source:TRO 3145 Republic of the Sphere - Dark Ages
+source:TRO: 3145 Republic of the Sphere - Dark Ages
 rules level:4
 
 mass:15
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-O.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-O.mtf
index 905d3cf9a0e..9a396b482f2 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-O.mtf	
@@ -6,7 +6,7 @@ mul id:6678
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3121
-Source:TRO 3145 Republic of the Sphere - Late Republic
+Source:TRO: 3145 Republic of the Sphere - Late Republic
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OA.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OA.mtf
index 246db1fbfc0..73a7a996ba7 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OA.mtf	
@@ -6,7 +6,7 @@ mul id:6679
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3121
-Source:Source:TRO 3145 Republic of the Sphere - Late Republic
+Source:Source:TRO: 3145 Republic of the Sphere - Late Republic
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OB.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OB.mtf
index fd9c6270247..2d5cd401ef7 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OB.mtf	
@@ -6,7 +6,7 @@ mul id:6680
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3121
-Source:Source:TRO 3145 Republic of the Sphere - Late Republic
+Source:Source:TRO: 3145 Republic of the Sphere - Late Republic
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OC.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OC.mtf
index 6479f3a172d..1aa1765931b 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OC.mtf	
@@ -6,7 +6,7 @@ mul id:6681
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3121
-Source:Source:TRO 3145 Republic of the Sphere - Late Republic
+Source:Source:TRO: 3145 Republic of the Sphere - Late Republic
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OD.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OD.mtf
index dd2506ffe04..467ce777d72 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OD.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Doloire DLR-OD.mtf	
@@ -6,7 +6,7 @@ mul id:6682
 Config:Biped Omnimech
 TechBase:Mixed (IS Chassis)
 Era:3121
-Source:Source:TRO 3145 Republic of the Sphere - Late Republic
+Source:Source:TRO: 3145 Republic of the Sphere - Late Republic
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-BD.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-BD.mtf
index a31da15b792..3fe7b27720d 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-BD.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-BD.mtf	
@@ -6,7 +6,7 @@ mul id:6672
 Config:Biped
 TechBase:Clan
 Era:3134
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-C.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-C.mtf
index 2170c18b9c8..0319c66bb2e 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-C.mtf	
@@ -6,7 +6,7 @@ mul id:6711
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3135
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-KA Wolpertinger.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-KA Wolpertinger.mtf
index 90420b3bb35..a05a087a8c1 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-KA Wolpertinger.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-KA Wolpertinger.mtf	
@@ -6,7 +6,7 @@ mul id:6713
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3142
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-KA.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-KA.mtf
index 65f3cc3a37c..dd5472bac06 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-KA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Jackalope JLP-KA.mtf	
@@ -6,7 +6,7 @@ mul id:6712
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3135
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Kheper KHP-7R.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Kheper KHP-7R.mtf
index 24f7abc4acc..8548f7c8cb6 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Kheper KHP-7R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Kheper KHP-7R.mtf	
@@ -6,7 +6,7 @@ mul id:6675
 Config:Biped
 TechBase:Inner Sphere
 Era:3135
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-2R.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-2R.mtf
index 4546f752227..e5734375391 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-2R.mtf	
@@ -6,7 +6,7 @@ mul id:6676
 Config:Biped
 TechBase:Inner Sphere
 Era:3126
-Source:TRO 3145 Republic of the Sphere - Late Republic
+Source:TRO: 3145 Republic of the Sphere - Late Republic
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-3C.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-3C.mtf
index 6d53703e0c8..63f1445a168 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-3C.mtf	
@@ -6,7 +6,7 @@ mul id:6722
 Config:Biped
 TechBase:Inner Sphere
 Era:3135
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-3R.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-3R.mtf
index 03225734187..82b0b7f1bc2 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-3R.mtf	
@@ -6,7 +6,7 @@ mul id:6723
 Config:Biped
 TechBase:Inner Sphere
 Era:3135
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-4RC.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-4RC.mtf
index a95445322dc..c5719ad8582 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-4RC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Lament LMT-4RC.mtf	
@@ -6,7 +6,7 @@ mul id:6724
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3137
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XP.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XP.mtf
index 89ba95ea128..dcbfe8178ab 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XP.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XP.mtf	
@@ -6,7 +6,7 @@ mul id:6725
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3139
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XT.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XT.mtf
index ee8bd499543..b2b1859e75b 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XT.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XT.mtf	
@@ -6,7 +6,7 @@ mul id:6683
 Config:Biped
 TechBase:Inner Sphere
 Era:3134
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XV.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XV.mtf
index a0f6078dc20..b4cd0069f82 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XV.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-XV.mtf	
@@ -6,7 +6,7 @@ mul id:6726
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3140
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-YZ.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-YZ.mtf
index fa6e84e9156..2fc51e48951 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-YZ.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Malice MAL-YZ.mtf	
@@ -6,7 +6,7 @@ mul id:6727
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3142
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K1.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K1.mtf
index 394ccd5bfc9..589f90f879f 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K1.mtf	
@@ -6,7 +6,7 @@ mul id:6718
 Config:Biped
 TechBase:Inner Sphere
 Era:3134
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K3.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K3.mtf
index 037542e1636..cc2855bd4ea 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K3.mtf	
@@ -6,7 +6,7 @@ mul id:6674
 Config:Biped
 TechBase:Inner Sphere
 Era:3135
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K4.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K4.mtf
index fb0277a6867..b93b1bf867a 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K4.mtf	
@@ -6,7 +6,7 @@ mul id:6719
 Config:Biped
 TechBase:Inner Sphere
 Era:3136
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K7.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K7.mtf
index 40a5d204ed1..fb75b5f8caa 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K7.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-K7.mtf	
@@ -6,7 +6,7 @@ mul id:6720
 Config:Biped
 TechBase:Inner Sphere
 Era:3136
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-KC.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-KC.mtf
index 740dafbb5be..ceca5152939 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-KC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Night Stalker NSR-KC.mtf	
@@ -6,7 +6,7 @@ mul id:6721
 Config:Biped
 TechBase:Inner Sphere
 Era:3136
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Poseidon PSD-V2.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Poseidon PSD-V2.mtf
index 781177d7279..c98d8cc972c 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Poseidon PSD-V2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Poseidon PSD-V2.mtf	
@@ -6,7 +6,7 @@ mul id:6684
 Config:Tripod Battlemech
 TechBase:Mixed (IS Chassis)
 Era:3136
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:125
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R.mtf
index b1a98b358c4..8d0ebc764df 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R.mtf	
@@ -6,7 +6,7 @@ mul id:6673
 Config:Quad
 TechBase:Inner Sphere
 Era:3139
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R2.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R2.mtf
index 4bc8c9cd078..c1526ba8a76 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R2.mtf	
@@ -6,7 +6,7 @@ mul id:6714
 Config:Quad
 TechBase:Inner Sphere
 Era:3139
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R3.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R3.mtf
index 29c2162a672..255b90d49d9 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R3.mtf	
@@ -6,7 +6,7 @@ mul id:6715
 Config:Quad
 TechBase:Inner Sphere
 Era:3141
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R4.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R4.mtf
index c6e6ad04f08..816232d2ee6 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R4.mtf	
@@ -6,7 +6,7 @@ mul id:6716
 Config:Quad
 TechBase:Inner Sphere
 Era:3142
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R7.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R7.mtf
index d6d54ffb5bc..0620e4f27bd 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R7.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Revenant UBM-2R7.mtf	
@@ -6,7 +6,7 @@ mul id:6717
 Config:Quad
 TechBase:Inner Sphere
 Era:3144
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/3145/Republic/Uraeus UAE-7R.mtf b/megamek/data/mechfiles/mechs/3145/Republic/Uraeus UAE-7R.mtf
index 656cadf481f..8427ec39da6 100644
--- a/megamek/data/mechfiles/mechs/3145/Republic/Uraeus UAE-7R.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Republic/Uraeus UAE-7R.mtf	
@@ -6,7 +6,7 @@ mul id:6677
 Config:Biped
 TechBase:Inner Sphere
 Era:3135
-Source:TRO 3145 Republic of the Sphere - Dark Ages
+Source:TRO: 3145 Republic of the Sphere - Dark Ages
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M2.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M2.mtf
index 6fb9567f213..ef4b61802a9 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M2.mtf	
@@ -6,7 +6,7 @@ mul id:6609
 Config:Biped
 TechBase:Inner Sphere
 Era:3101
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M3.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M3.mtf
index eb458d25308..173339d0dce 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M3.mtf	
@@ -6,7 +6,7 @@ mul id:6610
 Config:Biped
 TechBase:Inner Sphere
 Era:3104
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M4.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M4.mtf
index 5a459608fda..c374a4d1a36 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Firestarter FS9-M4.mtf	
@@ -6,7 +6,7 @@ mul id:6611
 Config:Biped
 TechBase:Inner Sphere
 Era:3109
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1O.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1O.mtf
index a13733f8e01..c83b82a51e3 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1O.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1O.mtf	
@@ -6,7 +6,7 @@ mul id:6621
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3128
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OA.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OA.mtf
index 9e2de6f5a86..0bc3429c423 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OA.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OA.mtf	
@@ -6,7 +6,7 @@ mul id:6622
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3128
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OB.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OB.mtf
index 04d4acd953f..0778876df25 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OB.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OB.mtf	
@@ -6,7 +6,7 @@ mul id:6623
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3128
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OC.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OC.mtf
index f62af31c3b9..ae3a207f713 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OC.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Gauntlet GTL-1OC.mtf	
@@ -6,7 +6,7 @@ mul id:6624
 Config:Biped Omnimech
 TechBase:Inner Sphere
 Era:3128
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Gotterdammerung GTD-20S.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Gotterdammerung GTD-20S.mtf
index 4d2fc765599..d257ed9ae4f 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Gotterdammerung GTD-20S.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Gotterdammerung GTD-20S.mtf	
@@ -5,7 +5,7 @@ mul id:6629
 Config:Biped
 techbase:Inner Sphere
 era:3138
-source:TRO 3145 Lyran Commonwealth - Dark Ages
+source:TRO: 3145 Lyran Commonwealth - Dark Ages
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Jaguar 2.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Jaguar 2.mtf
index 32226c44455..7ce3edce732 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Jaguar 2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Jaguar 2.mtf	
@@ -6,7 +6,7 @@ mul id:6613
 Config:Quad
 TechBase:Clan
 Era:3123
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Jaguar (Standard).mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Jaguar.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Steiner/Jaguar (Standard).mtf
rename to megamek/data/mechfiles/mechs/3145/Steiner/Jaguar.mtf
index ef55855ac59..c824edbbc44 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Jaguar (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Jaguar.mtf
@@ -6,7 +6,7 @@ mul id:6612
 Config:Quad
 TechBase:Clan
 Era:3121
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/King Crab KGC-009.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/King Crab KGC-009.mtf
index 854f9f6a568..bdc8a57480f 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/King Crab KGC-009.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/King Crab KGC-009.mtf	
@@ -6,7 +6,7 @@ mul id:6635
 Config:Biped
 TechBase:Inner Sphere
 Era:3104
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Mongrel MGL-T1.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Mongrel MGL-T1.mtf
index 6cce22ebaf8..d8806ac4a24 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Mongrel MGL-T1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Mongrel MGL-T1.mtf	
@@ -6,7 +6,7 @@ mul id:6618
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3092
-Source:TRO 3145 Lyran Commonwealth - Early Republic
+Source:TRO: 3145 Lyran Commonwealth - Early Republic
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Mongrel MGL-T2.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Mongrel MGL-T2.mtf
index 3a4042d0d58..d713f73ca51 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Mongrel MGL-T2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Mongrel MGL-T2.mtf	
@@ -6,7 +6,7 @@ mul id:6619
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3108
-Source:TRO 3145 Lyran Commonwealth - Early Republic
+Source:TRO: 3145 Lyran Commonwealth - Early Republic
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Scourge SCG-WD1.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Scourge SCG-WD1.mtf
index 375c6bfb9f8..e3e7335b6a5 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Scourge SCG-WD1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Scourge SCG-WD1.mtf	
@@ -6,7 +6,7 @@ mul id:6626
 Config:Biped
 TechBase:Inner Sphere
 Era:3131
-Source:TRO 3145 Lyran Commonwealth - Dark Ages
+Source:TRO: 3145 Lyran Commonwealth - Dark Ages
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Scourge SCG-WF1.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Scourge SCG-WF1.mtf
index 11ee70965fd..ed9933dac50 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Scourge SCG-WF1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Scourge SCG-WF1.mtf	
@@ -6,7 +6,7 @@ mul id:6625
 Config:Biped
 TechBase:Inner Sphere
 Era:3133
-Source:TRO 3145 Lyran Commonwealth - Dark Ages
+Source:TRO: 3145 Lyran Commonwealth - Dark Ages
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R1.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R1.mtf
index 247a436fc34..e4c52c79914 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R1.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R1.mtf	
@@ -6,7 +6,7 @@ mul id:6615
 Config:Biped
 TechBase:Inner Sphere
 Era:3097
-Source:TRO 3145 Lyran Commonwealth - Early Republic
+Source:TRO: 3145 Lyran Commonwealth - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R2.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R2.mtf
index ffaf8fdbd09..6501ab32092 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R2.mtf	
@@ -6,7 +6,7 @@ mul id:6616
 Config:Biped
 TechBase:Inner Sphere
 Era:3098
-Source:TRO 3145 Lyran Commonwealth - Early Republic
+Source:TRO: 3145 Lyran Commonwealth - Early Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R3.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R3.mtf
index cd51a58363b..36b31025927 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R3.mtf	
@@ -6,7 +6,7 @@ mul id:6614
 Config:Biped
 TechBase:Inner Sphere
 Era:3106
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R4.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R4.mtf
index d733d67fd67..0a1816df7e9 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Storm Raider STM-R4.mtf	
@@ -6,7 +6,7 @@ mul id:6617
 Config:Biped
 TechBase:Inner Sphere
 Era:3108
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Ursa URA-2A.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Ursa URA-2A.mtf
index 2d9a4910d3b..a4cd243e737 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Ursa URA-2A.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Ursa URA-2A.mtf	
@@ -6,7 +6,7 @@ mul id:6627
 Config:Quad
 TechBase:Inner Sphere
 Era:3122
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Ursa URA-2C.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Ursa URA-2C.mtf
index 7aa917d63c6..9fd55d793ae 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Ursa URA-2C.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Ursa URA-2C.mtf	
@@ -6,7 +6,7 @@ mul id:6628
 Config:Quad
 TechBase:Clan
 Era:3125
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Viking IIC (Standard).mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Viking IIC.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/3145/Steiner/Viking IIC (Standard).mtf
rename to megamek/data/mechfiles/mechs/3145/Steiner/Viking IIC.mtf
index 4c5d3bec6ca..9159c418f96 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Viking IIC (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Viking IIC.mtf	
@@ -6,7 +6,7 @@ mul id:6634
 Config:Biped
 TechBase:Clan
 Era:3095
-Source:TRO 3145 Lyran Commonwealth - Early Republic
+Source:TRO: 3145 Lyran Commonwealth - Early Republic
 Rules Level:3
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X.mtf
index 1a4cf0c991b..9e86782b1d7 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X.mtf	
@@ -6,7 +6,7 @@ mul id:6631
 Config:Biped
 TechBase:Inner Sphere
 Era:3054
-Source:TRO 3145 Lyran Commonwealth - Clan Invasion
+Source:TRO: 3145 Lyran Commonwealth - Clan Invasion
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X2.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X2.mtf
index 215c7555ff1..f7d18a50148 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X2.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X2.mtf	
@@ -6,7 +6,7 @@ mul id:6632
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:TRO 3145 Lyran Commonwealth - Jihad
+Source:TRO: 3145 Lyran Commonwealth - Jihad
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X3.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X3.mtf
index ed9bba6d5c1..2a62621d971 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X3.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X3.mtf	
@@ -5,7 +5,7 @@ mul id:6633
 Config:Biped
 techbase:Inner Sphere
 era:3089
-source:TRO 3145 Lyran Commonwealth - Early Republic
+source:TRO: 3145 Lyran Commonwealth - Early Republic
 rules level:4
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X4.mtf b/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X4.mtf
index 6866f16c398..3a226bebb9d 100644
--- a/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X4.mtf	
+++ b/megamek/data/mechfiles/mechs/3145/Steiner/Zeus X ZEU-X4.mtf	
@@ -6,7 +6,7 @@ mul id:6630
 Config:Biped
 TechBase:Inner Sphere
 Era:3119
-Source:TRO 3145 Lyran Commonwealth - Late Republic
+Source:TRO: 3145 Lyran Commonwealth - Late Republic
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/3150/Gotterdammerung GTD-20C.mtf b/megamek/data/mechfiles/mechs/3150/Gotterdammerung GTD-20C.mtf
index fd842350c10..3d3cb3fba21 100644
--- a/megamek/data/mechfiles/mechs/3150/Gotterdammerung GTD-20C.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Gotterdammerung GTD-20C.mtf	
@@ -5,7 +5,7 @@ mul id:8061
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3138
-source:TRO 3145 Lyran Commonwealth - Dark Ages
+source:TRO: 3145 Lyran Commonwealth - Dark Ages
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3150/Gotterdammerung GTD-30S.mtf b/megamek/data/mechfiles/mechs/3150/Gotterdammerung GTD-30S.mtf
index a48172961dc..3c7fa415af8 100644
--- a/megamek/data/mechfiles/mechs/3150/Gotterdammerung GTD-30S.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Gotterdammerung GTD-30S.mtf	
@@ -5,7 +5,7 @@ mul id:8062
 Config:Biped
 techbase:Inner Sphere
 era:3138
-source:TRO 3145 Lyran Commonwealth - Dark Ages
+source:TRO: 3145 Lyran Commonwealth - Dark Ages
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/3150/Juliano JLN-5B.mtf b/megamek/data/mechfiles/mechs/3150/Juliano JLN-5B.mtf
index 7001616d595..779600186a1 100644
--- a/megamek/data/mechfiles/mechs/3150/Juliano JLN-5B.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Juliano JLN-5B.mtf	
@@ -5,7 +5,7 @@ mul id:8064
 Config:Biped
 techbase:Inner Sphere
 era:3146
-source:TRO Dark Age - Dark Age
+source:TRO: Dark Age - Dark Age
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3150/Juliano JLN-5C.mtf b/megamek/data/mechfiles/mechs/3150/Juliano JLN-5C.mtf
index 9136038440b..e19a010f051 100644
--- a/megamek/data/mechfiles/mechs/3150/Juliano JLN-5C.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Juliano JLN-5C.mtf	
@@ -5,7 +5,7 @@ mul id:8065
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3146
-source:TRO Dark Age - Dark Age
+source:TRO: Dark Age - Dark Age
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/3150/King Crab KGC-009C.mtf b/megamek/data/mechfiles/mechs/3150/King Crab KGC-009C.mtf
index b19c527df25..1c200f4ed6f 100644
--- a/megamek/data/mechfiles/mechs/3150/King Crab KGC-009C.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/King Crab KGC-009C.mtf	
@@ -5,7 +5,7 @@ mul id:8066
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3143
-source:TRO 3150 - Dark Age
+source:TRO: 3150 - Dark Age
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3150/Kodiak II 3.mtf b/megamek/data/mechfiles/mechs/3150/Kodiak II 3.mtf
index 4d5d581f597..85c38a5f58c 100644
--- a/megamek/data/mechfiles/mechs/3150/Kodiak II 3.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Kodiak II 3.mtf	
@@ -5,7 +5,7 @@ mul id:8067
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:3146
-source:TRO 3150 - Dark Age
+source:TRO: 3150 - Dark Age
 rules level:3
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/3150/Prey Seeker PY-SR20.mtf b/megamek/data/mechfiles/mechs/3150/Prey Seeker PY-SR20.mtf
index b9aa6402782..a4b22b704f4 100644
--- a/megamek/data/mechfiles/mechs/3150/Prey Seeker PY-SR20.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Prey Seeker PY-SR20.mtf	
@@ -6,7 +6,7 @@ mul id:8068
 Config:Biped
 TechBase:Inner Sphere
 Era:3140
-Source:TRO 3150 - Dark Age
+Source:TRO: 3150 - Dark Age
 Rules Level:3
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3150/Prey Seeker PY-SR30.mtf b/megamek/data/mechfiles/mechs/3150/Prey Seeker PY-SR30.mtf
index e54294492e8..b025101c1d2 100644
--- a/megamek/data/mechfiles/mechs/3150/Prey Seeker PY-SR30.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Prey Seeker PY-SR30.mtf	
@@ -6,7 +6,7 @@ mul id:8068
 Config:Biped
 TechBase:Inner Sphere
 Era:3141
-Source:TRO 3150 - Dark Age
+Source:TRO: 3150 - Dark Age
 Rules Level:3
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/3150/Raider JL-3A.mtf b/megamek/data/mechfiles/mechs/3150/Raider JL-3A.mtf
index 2e3059390f5..2eea00c9135 100644
--- a/megamek/data/mechfiles/mechs/3150/Raider JL-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Raider JL-3A.mtf	
@@ -5,7 +5,7 @@ mul id:8070
 Config:Biped
 techbase:Inner Sphere
 era:3138
-source:TRO Dark Age - Dark Age
+source:TRO: Dark Age - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3150/Raider JL-3B.mtf b/megamek/data/mechfiles/mechs/3150/Raider JL-3B.mtf
index 933b32b69ac..e505fe50356 100644
--- a/megamek/data/mechfiles/mechs/3150/Raider JL-3B.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Raider JL-3B.mtf	
@@ -5,7 +5,7 @@ mul id:8071
 Config:Biped
 techbase:Inner Sphere
 era:3138
-source:TRO Dark - Dark Age
+source:TRO: Dark - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3150/Raider Mk II JL-3C.mtf b/megamek/data/mechfiles/mechs/3150/Raider Mk II JL-3C.mtf
index fa3b569c161..27ca53fc9cf 100644
--- a/megamek/data/mechfiles/mechs/3150/Raider Mk II JL-3C.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Raider Mk II JL-3C.mtf	
@@ -5,7 +5,7 @@ mul id:8072
 Config:Biped
 techbase:Inner Sphere
 era:3139
-source:TRO Dark Age - Dark Age
+source:TRO: Dark Age - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/3150/Shrike Black Rose.mtf b/megamek/data/mechfiles/mechs/3150/Shrike Black Rose.mtf
index 8cdb22e354d..15e9e1d24b4 100644
--- a/megamek/data/mechfiles/mechs/3150/Shrike Black Rose.mtf	
+++ b/megamek/data/mechfiles/mechs/3150/Shrike Black Rose.mtf	
@@ -5,7 +5,7 @@ mul id:9215
 Config:Biped
 techbase:Clan
 era:3134
-source:TRO Dark Age - Dark Age
+source:TRO: Dark Age - Dark Age
 rules level:3
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/Arano Restoration/Atlas II AS7-D-HT.mtf b/megamek/data/mechfiles/mechs/Arano Restoration/Atlas II AS7-D-HT.mtf
index 8b7319d6b4c..d02bf0835b9 100644
--- a/megamek/data/mechfiles/mechs/Arano Restoration/Atlas II AS7-D-HT.mtf	
+++ b/megamek/data/mechfiles/mechs/Arano Restoration/Atlas II AS7-D-HT.mtf	
@@ -6,7 +6,7 @@ mul id:7618
 Config:Biped
 techbase:Inner Sphere
 era:2780
-source:Arano Restoration
+source:Arano Restoration - Star League
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/Battlecorps/Orion ON1-K (Kerensky).mtf b/megamek/data/mechfiles/mechs/Battlecorps/Orion ON1-K (Kerensky).mtf
index 238b1617ca7..abb86c7ab76 100644
--- a/megamek/data/mechfiles/mechs/Battlecorps/Orion ON1-K (Kerensky).mtf	
+++ b/megamek/data/mechfiles/mechs/Battlecorps/Orion ON1-K (Kerensky).mtf	
@@ -6,7 +6,7 @@ mul id:2333
 Config:Biped
 TechBase:Inner Sphere
 Era:2753
-Source:TRO 3050U - Star League
+Source:TRO: 3050U - Star League
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Dark Age/Agrotera AGT-1A.mtf b/megamek/data/mechfiles/mechs/Dark Age/Agrotera AGT-1A.mtf
index 37b36ff6819..0271f0aa349 100644
--- a/megamek/data/mechfiles/mechs/Dark Age/Agrotera AGT-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/Dark Age/Agrotera AGT-1A.mtf	
@@ -5,7 +5,7 @@ mul id:6459
 Config:Biped
 techbase:Inner Sphere
 era:3108
-source:TRO 3145 Capellan Confederation - Late Republic
+source:TRO: 3145 Capellan Confederation - Late Republic
 rules level:3
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Dark Age/Atlas AS7-K2 (Jedra).mtf b/megamek/data/mechfiles/mechs/Dark Age/Atlas AS7-K2 (Jedra).mtf
index ead94def4b3..2175ae7007b 100644
--- a/megamek/data/mechfiles/mechs/Dark Age/Atlas AS7-K2 (Jedra).mtf	
+++ b/megamek/data/mechfiles/mechs/Dark Age/Atlas AS7-K2 (Jedra).mtf	
@@ -6,7 +6,7 @@ mul id:5541
 Config:Biped
 TechBase:Inner Sphere
 Era:3082
-Source:DTP Vega
+Source:DATP Vega - Early Republic
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/Dark Age/Mad Cat III (Eve).mtf b/megamek/data/mechfiles/mechs/Dark Age/Mad Cat III (Eve).mtf
index 4d68d5a2ac3..5a1525a4fb6 100644
--- a/megamek/data/mechfiles/mechs/Dark Age/Mad Cat III (Eve).mtf	
+++ b/megamek/data/mechfiles/mechs/Dark Age/Mad Cat III (Eve).mtf	
@@ -6,7 +6,7 @@ mul id:5543
 Config:Biped
 TechBase:Clan
 Era:3086
-Source:DTP Liao
+Source:DATP Liao - Early Republic
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/Dark Age/Pack Hunter II Isis.mtf b/megamek/data/mechfiles/mechs/Dark Age/Pack Hunter II Isis.mtf
index ec43a16058e..9771ce5ca8b 100644
--- a/megamek/data/mechfiles/mechs/Dark Age/Pack Hunter II Isis.mtf	
+++ b/megamek/data/mechfiles/mechs/Dark Age/Pack Hunter II Isis.mtf	
@@ -6,7 +6,7 @@ mul id:5540
 Config:Biped
 TechBase:Clan
 Era:3077
-Source:Jihad
+Source:DATP Vega - Jihad
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/Dark Age/Yu Huang Carson.mtf b/megamek/data/mechfiles/mechs/Dark Age/Yu Huang Carson.mtf
index 1521b917f90..60a21cb8656 100644
--- a/megamek/data/mechfiles/mechs/Dark Age/Yu Huang Carson.mtf	
+++ b/megamek/data/mechfiles/mechs/Dark Age/Yu Huang Carson.mtf	
@@ -6,7 +6,7 @@ mul id:5544
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:DTP Liao
+Source:DATP Liao - Clan Invasion
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/Dossiers/Jason Zaklan/Ti Ts'ang  Jason.mtf b/megamek/data/mechfiles/mechs/Dossiers/Jason Zaklan/Ti Ts'ang  Jason.mtf
index 3e9129b5964..d993adabf97 100644
--- a/megamek/data/mechfiles/mechs/Dossiers/Jason Zaklan/Ti Ts'ang  Jason.mtf	
+++ b/megamek/data/mechfiles/mechs/Dossiers/Jason Zaklan/Ti Ts'ang  Jason.mtf	
@@ -6,7 +6,7 @@ mul id:7395
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:BD: Jason Zaklan - Jihad
+Source:BattleTech Dossiers: Jason Zaklan - Jihad
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Karhu Syngman.mtf b/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Karhu Syngman.mtf
index 9b4d8a2f94b..349a9f4f8c8 100644
--- a/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Karhu Syngman.mtf	
+++ b/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Karhu Syngman.mtf	
@@ -6,7 +6,7 @@ mul id:1747
 Config:Biped Omnimech
 techbase:Mixed (Clan Chassis)
 era:3085
-source:TRO 3085/Lamenkov's Liability - Jihad
+source:TRO: 3085/Lamenkov's Liability - Jihad
 rules level:4
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Osprey OSP-26 Lawrence.mtf b/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Osprey OSP-26 Lawrence.mtf
index 4b9972f4c56..7d220598b1f 100644
--- a/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Osprey OSP-26 Lawrence.mtf	
+++ b/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Osprey OSP-26 Lawrence.mtf	
@@ -6,7 +6,7 @@ mul id:2347
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source:TRO 3085/Lamenkov's Liability - Jihad
+Source:TRO: 3085/Lamenkov's Liability - Jihad
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Prefect PRF-1R Veronica.mtf b/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Prefect PRF-1R Veronica.mtf
index 24a4a26b26c..85ed9ecf9dd 100644
--- a/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Prefect PRF-1R Veronica.mtf	
+++ b/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Prefect PRF-1R Veronica.mtf	
@@ -6,7 +6,7 @@ mul id:2570
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source:TRO 3085/Lamenkov's Liability - Jihad
+Source:TRO: 3085/Lamenkov's Liability - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Thunderbolt TDR-10M Ilyena.mtf b/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Thunderbolt TDR-10M Ilyena.mtf
index 87f89805276..c6a2a63aafc 100644
--- a/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Thunderbolt TDR-10M Ilyena.mtf	
+++ b/megamek/data/mechfiles/mechs/Dossiers/Lamenkov's Liability/Thunderbolt TDR-10M Ilyena.mtf	
@@ -6,7 +6,7 @@ mul id:3233
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source:TRO 3085/Lamenkov's Liability - Jihad
+Source:TRO: 3085/Lamenkov's Liability - Jihad
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/Dossiers/Salazar Tsakalotos/Thunderbolt TDR-10M Salazar.mtf b/megamek/data/mechfiles/mechs/Dossiers/Salazar Tsakalotos/Thunderbolt TDR-10M Salazar.mtf
index 8f4f833942b..b13f30c9c9c 100644
--- a/megamek/data/mechfiles/mechs/Dossiers/Salazar Tsakalotos/Thunderbolt TDR-10M Salazar.mtf	
+++ b/megamek/data/mechfiles/mechs/Dossiers/Salazar Tsakalotos/Thunderbolt TDR-10M Salazar.mtf	
@@ -6,7 +6,7 @@ mul id:3234
 Config:Biped
 TechBase:Inner Sphere
 Era:3085
-Source: TRO 3085/BD Salazar Tsakalotos - Jihad
+Source: TRO: 3085/BD Salazar Tsakalotos - Jihad
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/ER 2750/BattleMaster BLR-1GHE HellSlinger.mtf b/megamek/data/mechfiles/mechs/ER 2750/BattleMaster BLR-1GHE HellSlinger.mtf
index 88a2b7d632f..cb9e8a9cb7a 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/BattleMaster BLR-1GHE HellSlinger.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/BattleMaster BLR-1GHE HellSlinger.mtf	
@@ -5,7 +5,7 @@ mul id:5877
 Config:Biped
 techbase:Inner Sphere
 era:2750
-source:ER 2750 - Star League
+source:Era Report 2750 - Star League
 rules level:3
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/ER 2750/BattleMaster BLR-1Gd.mtf b/megamek/data/mechfiles/mechs/ER 2750/BattleMaster BLR-1Gd.mtf
index 2ff60f77ddd..2591743c7bc 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/BattleMaster BLR-1Gd.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/BattleMaster BLR-1Gd.mtf	
@@ -5,7 +5,7 @@ mul id:5867
 Config:Biped
 techbase:Inner Sphere
 era:2760
-source:ER 2750 - Star League
+source:Era Report 2750 - Star League
 rules level:3
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Crab CRB-27sl.mtf b/megamek/data/mechfiles/mechs/ER 2750/Crab CRB-27sl.mtf
index 860a7233e4b..21a30247c7f 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Crab CRB-27sl.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Crab CRB-27sl.mtf	
@@ -6,7 +6,7 @@ mul id:5873
 Config:Biped
 techbase:Inner Sphere
 era:2719
-source:ER 2750
+source:Era Report 2750 - Star League
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Dervish DV-6Md.mtf b/megamek/data/mechfiles/mechs/ER 2750/Dervish DV-6Md.mtf
index 921d6f3d7dd..01aa18f3986 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Dervish DV-6Md.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Dervish DV-6Md.mtf	
@@ -6,7 +6,7 @@ mul id:5869
 Config:Biped
 TechBase:Inner Sphere
 Era:2750
-Source:ER 2750 - Star League 
+source:Era Report 2750 - Star League 
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Hammerhands HMH-3D Kessem.mtf b/megamek/data/mechfiles/mechs/ER 2750/Hammerhands HMH-3D Kessem.mtf
index 1175a1e6de1..55925639965 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Hammerhands HMH-3D Kessem.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Hammerhands HMH-3D Kessem.mtf	
@@ -6,7 +6,7 @@ mul id:5863
 Config:Biped
 TechBase:Inner Sphere
 Era:2725
-Source:ER 2750
+source:Era Report 2750 - Star League
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Lancelot LNC25-01sl.mtf b/megamek/data/mechfiles/mechs/ER 2750/Lancelot LNC25-01sl.mtf
index 1bb62df4c02..11bb26f057a 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Lancelot LNC25-01sl.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Lancelot LNC25-01sl.mtf	
@@ -6,7 +6,7 @@ mul id:5874
 Config:Biped
 TechBase:Inner Sphere
 Era:2750
-Source:ER 2750
+source:Era Report 2750 - Star League
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Mackie MSK-9HKR Kill Roys Little Buddy.mtf b/megamek/data/mechfiles/mechs/ER 2750/Mackie MSK-9HKR Kill Roys Little Buddy.mtf
index b66c17616f3..7d43aec9b9f 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Mackie MSK-9HKR Kill Roys Little Buddy.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Mackie MSK-9HKR Kill Roys Little Buddy.mtf	
@@ -6,7 +6,7 @@ mul id:5876
 Config:Biped
 TechBase:Inner Sphere
 Era:2750
-Source:Star League
+Source:Era Report 2750: Star League
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Phoenix Hawk PXH-1Kk.mtf b/megamek/data/mechfiles/mechs/ER 2750/Phoenix Hawk PXH-1Kk.mtf
index 2d0b2373c35..45834d06b57 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Phoenix Hawk PXH-1Kk.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Phoenix Hawk PXH-1Kk.mtf	
@@ -6,7 +6,7 @@ mul id:5872
 Config:Biped
 TechBase:Inner Sphere
 Era:2725
-Source:ER 2750
+source:Era Report 2750 - Star League
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Stalker STK-3Fk.mtf b/megamek/data/mechfiles/mechs/ER 2750/Stalker STK-3Fk.mtf
index 31431039f81..8ff30fe0453 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Stalker STK-3Fk.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Stalker STK-3Fk.mtf	
@@ -6,7 +6,7 @@ mul id:5870
 Config:Biped
 techbase:Inner Sphere
 era:2750
-source:ER 2750 - Star League
+source:Era Report 2750 - Star League
 rules level:4
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Thunderbolt TDR-5Sd.mtf b/megamek/data/mechfiles/mechs/ER 2750/Thunderbolt TDR-5Sd.mtf
index 793577dd0b7..79cadbbfb53 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Thunderbolt TDR-5Sd.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Thunderbolt TDR-5Sd.mtf	
@@ -6,7 +6,7 @@ mul id:5868
 Config:Biped
 TechBase:Inner Sphere
 Era:2750
-Source:ER 2750
+source:Era Report 2750 - Star League
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Victor VTR-9B (Shoji).mtf b/megamek/data/mechfiles/mechs/ER 2750/Victor VTR-9B (Shoji).mtf
index a25f8a25893..13cbe3ef64c 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Victor VTR-9B (Shoji).mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Victor VTR-9B (Shoji).mtf	
@@ -6,7 +6,7 @@ mul id:5864
 Config:Biped
 TechBase:Inner Sphere
 Era:2725
-Source:Star League
+Source:Era Report 2750: Star League
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Warhammer WHM-6Rk.mtf b/megamek/data/mechfiles/mechs/ER 2750/Warhammer WHM-6Rk.mtf
index 6598ad06b1a..d84e281e922 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Warhammer WHM-6Rk.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Warhammer WHM-6Rk.mtf	
@@ -6,7 +6,7 @@ mul id:5871
 Config:Biped
 TechBase:Inner Sphere
 Era:2745
-Source:ER 2750 - Star League
+source:Era Report 2750 - Star League
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/ER 2750/Wyvern WVE-5Nsl.mtf b/megamek/data/mechfiles/mechs/ER 2750/Wyvern WVE-5Nsl.mtf
index 26fc6cbd1bd..9178b9ab216 100644
--- a/megamek/data/mechfiles/mechs/ER 2750/Wyvern WVE-5Nsl.mtf	
+++ b/megamek/data/mechfiles/mechs/ER 2750/Wyvern WVE-5Nsl.mtf	
@@ -6,7 +6,7 @@ mul id:5875
 Config:Biped
 TechBase:Inner Sphere
 Era:2750
-Source:ER 2750
+source:Era Report 2750 - Star League
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/Era Digests/Age of War/Hector HOR-1B.mtf b/megamek/data/mechfiles/mechs/Era Digests/Age of War/Hector HOR-1B.mtf
index 0fc3b7a7ce7..d8cddadb100 100644
--- a/megamek/data/mechfiles/mechs/Era Digests/Age of War/Hector HOR-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/Era Digests/Age of War/Hector HOR-1B.mtf	
@@ -6,7 +6,7 @@ mul id:4283
 Config:Biped
 TechBase:Inner Sphere
 Era:2471
-Source:Era Digest: Age of War
+Source:Era Digest:Age of War - Age of War
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/Era Digests/Age of War/Hector HOR-1C.mtf b/megamek/data/mechfiles/mechs/Era Digests/Age of War/Hector HOR-1C.mtf
index 3a4a6a41ac6..8d44ed1423d 100644
--- a/megamek/data/mechfiles/mechs/Era Digests/Age of War/Hector HOR-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/Era Digests/Age of War/Hector HOR-1C.mtf	
@@ -6,7 +6,7 @@ mul id:4284
 Config:Biped
 TechBase:Inner Sphere
 Era:2476
-Source:Era Digest: Age of War
+Source:Era Digest:Age of War - Age of War
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Cave Lion (Standard).mtf b/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Cave Lion.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/Era Digests/Dark Age/Cave Lion (Standard).mtf
rename to megamek/data/mechfiles/mechs/Era Digests/Dark Age/Cave Lion.mtf
index 0e82c960b90..84aa752d062 100644
--- a/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Cave Lion (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Cave Lion.mtf	
@@ -6,7 +6,7 @@ mul id:6954
 Config:Biped
 TechBase:Clan
 Era:3122
-Source:ED: Dark Age
+Source:Era Digest:Dark Age - Dark Age
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Raider JL-1.mtf b/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Raider JL-1.mtf
index a7fc42d8ab0..3035af82642 100644
--- a/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Raider JL-1.mtf	
+++ b/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Raider JL-1.mtf	
@@ -5,7 +5,7 @@ mul id:6955
 Config:Biped
 techbase:Inner Sphere
 era:3134
-source:ED: Dark Age
+source:Era Digest:Dark Age - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Raider Mk II JL-2.mtf b/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Raider Mk II JL-2.mtf
index d2cdb54d1bc..de299f9425a 100644
--- a/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Raider Mk II JL-2.mtf	
+++ b/megamek/data/mechfiles/mechs/Era Digests/Dark Age/Raider Mk II JL-2.mtf	
@@ -5,7 +5,7 @@ mul id:6956
 Config:Biped
 techbase:Inner Sphere
 era:3134
-source:ED: Dark Age
+source:Era Digest:Dark Age - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/ForcePacks/UrbanMech/UrbanMech UM-R27.mtf b/megamek/data/mechfiles/mechs/ForcePacks/UrbanMech/UrbanMech UM-R27.mtf
index 16d59e4a3ea..8147aca7854 100644
--- a/megamek/data/mechfiles/mechs/ForcePacks/UrbanMech/UrbanMech UM-R27.mtf	
+++ b/megamek/data/mechfiles/mechs/ForcePacks/UrbanMech/UrbanMech UM-R27.mtf	
@@ -6,7 +6,7 @@ mul id:9498
 Config:Biped
 techbase:Inner Sphere
 era:3130
-source:Force Pack UrbanMech  - Late Republiic
+source:ForcePack UrbanMech  - Late Republiic
 rules level:3
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Cestus CTS-6Y-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Cestus CTS-6Y-EC.mtf
index d3a73b1c718..a28b7f69c0a 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Cestus CTS-6Y-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Cestus CTS-6Y-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7681
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:2825
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:65
@@ -156,7 +156,7 @@ capabilities:The new generation of Cestus BattleMechs produced in the last decad
 
 deployment:Clan Fire Mandrill refitted their rare Cestuses with prototype ER medium lasers, Improved Large Lasers, and an Improved Gauss Rifle. The Gauss Rifle has four tons of ammunition, and fourteen double heat sinks keep the heat under control. 
 
-history:The CTS-6Y Cestus began production for the Star League Defense Force in 2766. However the original CTS-6X Cestus was produced during 2603. Introduced by General Motors and constructed at their Kathil plant, the Cestus served in the Armed Forces of the Federated Suns after the Fall of the Star League until its factory became a casualty during a Capellan Confederation Armed Forces raid at the beginning of the Second Succession War. The 'Mech was originally designed to carry a heavy energy weapons payload, but because of complications encountered with the heat sinks on the 'Mech, the upgraded Cestus was modified to carry a mix of ballistic and energy weapons. The Cestus was reintroduced by both Blue Shot Weapons and General Motors in the mid-3050s.
+history:The CTS-6Y Cestus began production for the Star League Defense Force in 2766. However the original CTS-6X Cestus was produced during 2603. Introduced by General Motors and constructed at their Kathil plant, the Cestus served in the Armed Forces of the Federated Suns after the Fall of the Star League until its factory became a casualty during a Capellan Confederation Armed Forces raid at the beginning of the Second TRO: Golden Century - Early Succession War. The 'Mech was originally designed to carry a heavy energy weapons payload, but because of complications encountered with the heat sinks on the 'Mech, the upgraded Cestus was modified to carry a mix of ballistic and energy weapons. The Cestus was reintroduced by both Blue Shot Weapons and General Motors in the mid-3050s.
 
 manufacturer:Field Refit
 primaryfactory:Various
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Coyotl A.mtf b/megamek/data/mechfiles/mechs/Golden Century/Coyotl A.mtf
index 71905595009..755094902cd 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Coyotl A.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Coyotl A.mtf	
@@ -7,7 +7,7 @@ Config:Biped Omnimech
 techbase:Clan
 era:2854
 rules level:2
-source:TRO:GC - Early Succession War
+source:TRO: Golden Century - Early Succession War
 
 mass:40
 engine:280 XL (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Coyotl B.mtf b/megamek/data/mechfiles/mechs/Golden Century/Coyotl B.mtf
index 0cbd31be7c0..9eb08a90d25 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Coyotl B.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Coyotl B.mtf	
@@ -6,7 +6,7 @@ mul id:7606
 Config:Biped Omnimech
 techbase:Clan
 era:2854
-source:TRO:GC - Early Succession War
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Coyotl C.mtf b/megamek/data/mechfiles/mechs/Golden Century/Coyotl C.mtf
index 5932d69e00f..034ba091ac8 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Coyotl C.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Coyotl C.mtf	
@@ -6,7 +6,7 @@ mul id:7607
 Config:Biped Omnimech
 techbase:Clan
 era:3145
-source:TRO:GC - Dark Age
+source:TRO: Golden Century - Dark Age
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Coyotl D.mtf b/megamek/data/mechfiles/mechs/Golden Century/Coyotl D.mtf
index 1747d7d9ac1..3e77fb5aae7 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Coyotl D.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Coyotl D.mtf	
@@ -6,7 +6,7 @@ mul id:7608
 Config:Biped Omnimech
 techbase:Clan
 era:3149
-source:TRO:GC - Dark Age
+source:TRO: Golden Century - Dark Age
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Coyotl Prime.mtf b/megamek/data/mechfiles/mechs/Golden Century/Coyotl Prime.mtf
index a3b11a2c951..a9712b9df84 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Coyotl Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Coyotl Prime.mtf	
@@ -5,7 +5,7 @@ mul id:714
 Config:Biped Omnimech
 techbase:Clan
 era:2854
-source:TRO:GC - Early Succession War
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Devastator DVS-2-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Devastator DVS-2-EC.mtf
index 952cd2fa28a..4d86b349f42 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Devastator DVS-2-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Devastator DVS-2-EC.mtf	
@@ -5,7 +5,7 @@ mul id:7686
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:2827
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:3
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Drift Shag.mtf b/megamek/data/mechfiles/mechs/Golden Century/Drift Shag.mtf
index 67b0448162d..b801052f571 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Drift Shag.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Drift Shag.mtf	
@@ -7,6 +7,7 @@ Config:Biped
 techbase:Clan
 era:2827
 rules level:2
+source:TRO: Golden Century - Early Succession War
 
 mass:30
 engine:210 XL (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Emperor EMP-6A-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Emperor EMP-6A-EC.mtf
index 33778c3d049..48aec1a2319 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Emperor EMP-6A-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Emperor EMP-6A-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7685
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2826
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Enfield END-6J-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Enfield END-6J-EC.mtf
index cfbb9c69129..95f13184e83 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Enfield END-6J-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Enfield END-6J-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7679
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:2825
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Excalibur EXC-B2b-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Excalibur EXC-B2b-EC.mtf
index 8366e670e67..015c856277d 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Excalibur EXC-B2b-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Excalibur EXC-B2b-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7683
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:2825
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Exterminator EC EXT-4Db.mtf b/megamek/data/mechfiles/mechs/Golden Century/Exterminator EC EXT-4Db.mtf
index ef00912909e..b46d0d44e8b 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Exterminator EC EXT-4Db.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Exterminator EC EXT-4Db.mtf	
@@ -6,7 +6,7 @@ mul id:7682
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:2819
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:65
@@ -158,7 +158,7 @@ capabilities:The weapons used by the Exterminator are not nearly as unique or hi
 
 deployment:An early Clan Jade Falcon refit of the EXT-4Db trades the medium lasers for prototype ER medium lasers. It was popular for duels and Trials.
 
-history:The Exterminator was outfitted with a special Null-Signature System, heat baffles and, in some cases, a Chameleon Light Polarization Shield. These advanced systems allowed it to easily infiltrate enemy lines. Once the Exterminator breached the enemy's rear, its mission was to find and destroy as much of the enemy's command structure as possible. This mission profile included attacking mobile headquarters, field bases and command level officers. Rather than be part of the standard formation, Exterminators were attached to a regimental or higher headquarters unit, often as a fifth member of the command lance itself, before being assigned to individual units. A regiment was considered lucky to have more than one Exterminator, and it was not unusual for its parent unit to pull all assigned Exterminators and pool them for a specific mission. It was widely believed that the Exterminator had not survived the fighting of the First Succession War as there were lances whose sole mission was to hunt down and destroy this type of 'Mech (coupled with the destruction of General Systems' primary factory on Caph in 2793). In 3007, Kallon Industries (Thermopolis, Free Worlds League), looking for a replacement for their aging Wolverine, recovered blueprints for the Exterminator and immediately modified the design so that it could be built using the technology readily available. The result was a BattleMech not only far less effective than the original, but below the capabilities of even the Wolverine it was meant to replace. Only twenty-five of these Exterminators were produced and none survived past the Fourth Succession War, making the design effectively extinct in the Inner Sphere. Only later was it revealed that the Exterminator still existed in ComStar's private army, the Com Guards, although even here few were of the hyper-advanced stealth models, and while the Exterminator was retained by the Clans its decidedly "dishonorable" method of fighting meant few were used. ComStar continued to produce variants which took advantage of recovered lostech, and the design was used by the Word of Blake during the Jihad.
+history:The Exterminator was outfitted with a special Null-Signature System, heat baffles and, in some cases, a Chameleon Light Polarization Shield. These advanced systems allowed it to easily infiltrate enemy lines. Once the Exterminator breached the enemy's rear, its mission was to find and destroy as much of the enemy's command structure as possible. This mission profile included attacking mobile headquarters, field bases and command level officers. Rather than be part of the standard formation, Exterminators were attached to a regimental or higher headquarters unit, often as a fifth member of the command lance itself, before being assigned to individual units. A regiment was considered lucky to have more than one Exterminator, and it was not unusual for its parent unit to pull all assigned Exterminators and pool them for a specific mission. It was widely believed that the Exterminator had not survived the fighting of the First TRO: Golden Century - Early Succession War as there were lances whose sole mission was to hunt down and destroy this type of 'Mech (coupled with the destruction of General Systems' primary factory on Caph in 2793). In 3007, Kallon Industries (Thermopolis, Free Worlds League), looking for a replacement for their aging Wolverine, recovered blueprints for the Exterminator and immediately modified the design so that it could be built using the technology readily available. The result was a BattleMech not only far less effective than the original, but below the capabilities of even the Wolverine it was meant to replace. Only twenty-five of these Exterminators were produced and none survived past the Fourth TRO: Golden Century - Early Succession War, making the design effectively extinct in the Inner Sphere. Only later was it revealed that the Exterminator still existed in ComStar's private army, the Com Guards, although even here few were of the hyper-advanced stealth models, and while the Exterminator was retained by the Clans its decidedly "dishonorable" method of fighting meant few were used. ComStar continued to produce variants which took advantage of recovered lostech, and the design was used by the Word of Blake during the Jihad.
 
 manufacturer:Field Refit
 primaryfactory:Various
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Fox CS-1.mtf b/megamek/data/mechfiles/mechs/Golden Century/Fox CS-1.mtf
index b7f571dc278..ee7fb27730e 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Fox CS-1.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Fox CS-1.mtf	
@@ -6,7 +6,7 @@ mul id:4182
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2824
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Fox.mtf b/megamek/data/mechfiles/mechs/Golden Century/Fox.mtf
index 4ab4d0cac5f..bf66040cff2 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Fox.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Fox.mtf	
@@ -6,7 +6,7 @@ mul id:7609
 Config:Biped
 techbase:Clan
 era:2835
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Lancelot C 2.mtf b/megamek/data/mechfiles/mechs/Golden Century/Lancelot C 2.mtf
index 67e70e42c02..4211a6afe13 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Lancelot C 2.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Lancelot C 2.mtf	
@@ -6,7 +6,7 @@ mul id:7627
 Config:Biped
 techbase:Clan
 era:2857
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:60
@@ -156,7 +156,7 @@ capabilities: Krupp Technologies attempted to combine the speed of a medium 'Mec
 
 deployment:This variant of the Lancelot C entered service twenty five years after the original. Similar to the original Lancelot, each arm carries an ER Large Laser while an ER PPC is mounted in the right torso. To fight infantry or create smoke, a pair of Flamers is in the center torso. Seventeen heat sinks offset the heat generated by these weapons. The Lancelot C 2 can also sprint at 120km/h thanks to a MASC system.
 
-history:An entirely energy-based armament allowed the Lancelot to operate away from friendly supply lines for extended periods, while the use of a Hermes 360XL engine not only made it faster than any other heavy 'Mech at the time but also allowed for thirteen double heat sinks to be installed. The use of only nine and a half tons of armor was considered light for its tonnage, however this was partially offset by the design's mobility and its subtle curves, presenting a narrower silhouette for the enemy to target. Its advanced Krupp KBC battle computer, long a standard in the industry, offered superior internal system monitoring, such as current armor status and skin temperature, without distracting the pilot during combat. The most exceptional part of the Lancelot was its KBC Starsight Model 3 T&T System, which could track and prioritize hundreds of targets and projectiles at once. This also made the Lancelot superior at shooting down enemy fighters, and by all indications it was replacing the Rifleman as the SLDF's standard anti-aircraft 'Mech before the Amaris Civil War put an end to that plan. Many Lancelots, along with Krupp's factory on Mars, were destroyed during the Civil War, and as the advanced systems which had gone into their construction became lostech these 'Mechs came to the brink of extinction. Luthien Armor Works obtained copies of the design and began production after the Second Succession War, but their LNC25-02 model was greatly reduced in capability, most significantly the loss of its mobility. With only average speed now and enough armor plating to withstand only a few solid hits, pilots derisively began referring to the 'Mech as "the Coffin." Whereas before the fall of the Star League the Lancelot could be found in almost all militaries, by the end of the Succession Wars less than a dozen still-functional original models were in service, many heavily modified due to battle damage, alongside a few hundred 02 models, most of which were in the hands of the Draconis Combine. In the wake of the Clan Invasion and the Battle of Tukayyid, Precentor Martial Anastasius Focht would rebuild the Krupp Stellar factory on Mars to restart production of original model Lancelots for the Com Guards along with other advanced variants. Examples of these 'Mechs would also be used by the Word of Blake in the prosecution of their Jihad.
+history:An entirely energy-based armament allowed the Lancelot to operate away from friendly supply lines for extended periods, while the use of a Hermes 360XL engine not only made it faster than any other heavy 'Mech at the time but also allowed for thirteen double heat sinks to be installed. The use of only nine and a half tons of armor was considered light for its tonnage, however this was partially offset by the design's mobility and its subtle curves, presenting a narrower silhouette for the enemy to target. Its advanced Krupp KBC battle computer, long a standard in the industry, offered superior internal system monitoring, such as current armor status and skin temperature, without distracting the pilot during combat. The most exceptional part of the Lancelot was its KBC Starsight Model 3 T&T System, which could track and prioritize hundreds of targets and projectiles at once. This also made the Lancelot superior at shooting down enemy fighters, and by all indications it was replacing the Rifleman as the SLDF's standard anti-aircraft 'Mech before the Amaris Civil War put an end to that plan. Many Lancelots, along with Krupp's factory on Mars, were destroyed during the Civil War, and as the advanced systems which had gone into their construction became lostech these 'Mechs came to the brink of extinction. Luthien Armor Works obtained copies of the design and began production after the Second TRO: Golden Century - Early Succession War, but their LNC25-02 model was greatly reduced in capability, most significantly the loss of its mobility. With only average speed now and enough armor plating to withstand only a few solid hits, pilots derisively began referring to the 'Mech as "the Coffin." Whereas before the fall of the Star League the Lancelot could be found in almost all militaries, by the end of the TRO: Golden Century - Early Succession War less than a dozen still-functional original models were in service, many heavily modified due to battle damage, alongside a few hundred 02 models, most of which were in the hands of the Draconis Combine. In the wake of the Clan Invasion and the Battle of Tukayyid, Precentor Martial Anastasius Focht would rebuild the Krupp Stellar factory on Mars to restart production of original model Lancelots for the Com Guards along with other advanced variants. Examples of these 'Mechs would also be used by the Word of Blake in the prosecution of their Jihad.
 
 manufacturer:Ashton ’Mech Production Complex	
 primaryfactory:Foster
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Lancelot C.mtf b/megamek/data/mechfiles/mechs/Golden Century/Lancelot C.mtf
index 39a7ca817ad..0c198b48946 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Lancelot C.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Lancelot C.mtf	
@@ -7,7 +7,7 @@ mul id:7626
 Config:Biped
 techbase:Clan
 era:2832
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:60
@@ -155,7 +155,7 @@ capabilities: Krupp Technologies attempted to combine the speed of a medium 'Mec
 
 deployment:Introduced by Kindraa Smythe-Jewel, the all-Clan tech Lancelot C carried three Kolibri Delta Series Large Pulse Lasers into battle as a light 'Mech hunter. Sixteen double heat sinks and nine and a half tons of armor protected the Lancelot C.
 
-history:An entirely energy-based armament allowed the Lancelot to operate away from friendly supply lines for extended periods, while the use of a Hermes 360XL engine not only made it faster than any other heavy 'Mech at the time but also allowed for thirteen double heat sinks to be installed. The use of only nine and a half tons of armor was considered light for its tonnage, however this was partially offset by the design's mobility and its subtle curves, presenting a narrower silhouette for the enemy to target. Its advanced Krupp KBC battle computer, long a standard in the industry, offered superior internal system monitoring, such as current armor status and skin temperature, without distracting the pilot during combat. The most exceptional part of the Lancelot was its KBC Starsight Model 3 T&T System, which could track and prioritize hundreds of targets and projectiles at once. This also made the Lancelot superior at shooting down enemy fighters, and by all indications it was replacing the Rifleman as the SLDF's standard anti-aircraft 'Mech before the Amaris Civil War put an end to that plan. Many Lancelots, along with Krupp's factory on Mars, were destroyed during the Civil War, and as the advanced systems which had gone into their construction became lostech these 'Mechs came to the brink of extinction. Luthien Armor Works obtained copies of the design and began production after the Second Succession War, but their LNC25-02 model was greatly reduced in capability, most significantly the loss of its mobility. With only average speed now and enough armor plating to withstand only a few solid hits, pilots derisively began referring to the 'Mech as "the Coffin." Whereas before the fall of the Star League the Lancelot could be found in almost all militaries, by the end of the Succession Wars less than a dozen still-functional original models were in service, many heavily modified due to battle damage, alongside a few hundred 02 models, most of which were in the hands of the Draconis Combine. In the wake of the Clan Invasion and the Battle of Tukayyid, Precentor Martial Anastasius Focht would rebuild the Krupp Stellar factory on Mars to restart production of original model Lancelots for the Com Guards along with other advanced variants. Examples of these 'Mechs would also be used by the Word of Blake in the prosecution of their Jihad.
+history:An entirely energy-based armament allowed the Lancelot to operate away from friendly supply lines for extended periods, while the use of a Hermes 360XL engine not only made it faster than any other heavy 'Mech at the time but also allowed for thirteen double heat sinks to be installed. The use of only nine and a half tons of armor was considered light for its tonnage, however this was partially offset by the design's mobility and its subtle curves, presenting a narrower silhouette for the enemy to target. Its advanced Krupp KBC battle computer, long a standard in the industry, offered superior internal system monitoring, such as current armor status and skin temperature, without distracting the pilot during combat. The most exceptional part of the Lancelot was its KBC Starsight Model 3 T&T System, which could track and prioritize hundreds of targets and projectiles at once. This also made the Lancelot superior at shooting down enemy fighters, and by all indications it was replacing the Rifleman as the SLDF's standard anti-aircraft 'Mech before the Amaris Civil War put an end to that plan. Many Lancelots, along with Krupp's factory on Mars, were destroyed during the Civil War, and as the advanced systems which had gone into their construction became lostech these 'Mechs came to the brink of extinction. Luthien Armor Works obtained copies of the design and began production after the Second TRO: Golden Century - Early Succession War, but their LNC25-02 model was greatly reduced in capability, most significantly the loss of its mobility. With only average speed now and enough armor plating to withstand only a few solid hits, pilots derisively began referring to the 'Mech as "the Coffin." Whereas before the fall of the Star League the Lancelot could be found in almost all militaries, by the end of the TRO: Golden Century - Early Succession War less than a dozen still-functional original models were in service, many heavily modified due to battle damage, alongside a few hundred 02 models, most of which were in the hands of the Draconis Combine. In the wake of the Clan Invasion and the Battle of Tukayyid, Precentor Martial Anastasius Focht would rebuild the Krupp Stellar factory on Mars to restart production of original model Lancelots for the Com Guards along with other advanced variants. Examples of these 'Mechs would also be used by the Word of Blake in the prosecution of their Jihad.
 
 manufacturer:Ashton ’Mech Production Complex	
 primaryfactory:Foster
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Lupus A.mtf b/megamek/data/mechfiles/mechs/Golden Century/Lupus A.mtf
index 28f77cf4831..59de86b9c93 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Lupus A.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Lupus A.mtf	
@@ -7,6 +7,8 @@ Config:Biped Omnimech
 TechBase:Clan
 Era:2857
 Rules Level:2
+source:TRO: Golden Century - Early Succession War
+
 
 Mass:60
 Engine:300 Fusion (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Lupus B.mtf b/megamek/data/mechfiles/mechs/Golden Century/Lupus B.mtf
index 9085c719c6c..9c8d1c2aea1 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Lupus B.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Lupus B.mtf	
@@ -7,6 +7,7 @@ Config:Biped Omnimech
 TechBase:Clan
 Era:2857
 Rules Level:2
+source:TRO: Golden Century - Early Succession War
 
 Mass:60
 Engine:300 Fusion (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Lupus C.mtf b/megamek/data/mechfiles/mechs/Golden Century/Lupus C.mtf
index f5d45084e8d..bef54f1e844 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Lupus C.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Lupus C.mtf	
@@ -6,7 +6,7 @@ mul id:7628
 Config:Biped Omnimech
 techbase:Clan
 era:3147
-source:Dark Age
+source:TRO: Golden Century - Dark Age
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Lupus D.mtf b/megamek/data/mechfiles/mechs/Golden Century/Lupus D.mtf
index ee0fa467e67..ce475b80080 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Lupus D.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Lupus D.mtf	
@@ -6,7 +6,7 @@ mul id:7629
 Config:Biped Omnimech
 techbase:Clan
 era:3147
-source:Dark Age
+source:TRO: Golden Century - Dark Age
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Lupus Prime.mtf b/megamek/data/mechfiles/mechs/Golden Century/Lupus Prime.mtf
index 9aca22752c2..6ddf5b15831 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Lupus Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Lupus Prime.mtf	
@@ -7,6 +7,7 @@ Config:Biped Omnimech
 TechBase:Clan
 Era:2857
 Rules Level:2
+source:TRO: Golden Century - Early Succession War
 
 Mass:60
 Engine:300 Fusion (Clan) Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Lynx C.mtf b/megamek/data/mechfiles/mechs/Golden Century/Lynx C.mtf
index 6d4b15ee997..dd3adb3905b 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Lynx C.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Lynx C.mtf	
@@ -6,7 +6,7 @@ mul id:7620
 Config:Biped
 techbase:Clan
 era:2848
-source:Succesion Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Masauwu.mtf b/megamek/data/mechfiles/mechs/Golden Century/Masauwu.mtf
index 20e07ff3d62..b91d547f209 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Masauwu.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Masauwu.mtf	
@@ -6,7 +6,7 @@ mul id:7642
 Config:Biped
 techbase:Clan
 era:2832
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Minsk 2.mtf b/megamek/data/mechfiles/mechs/Golden Century/Minsk 2.mtf
index a4da734c5dc..8851e0f0a0c 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Minsk 2.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Minsk 2.mtf	
@@ -6,7 +6,7 @@ mul id:7641
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:3148
-source:Succession Wars
+source:TRO: Golden Century - Dark Age
 rules level:4
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Minsk MNK-101.mtf b/megamek/data/mechfiles/mechs/Golden Century/Minsk MNK-101.mtf
index abb2006f28a..11bdfee6e04 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Minsk MNK-101.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Minsk MNK-101.mtf	
@@ -6,7 +6,7 @@ mul id:4645
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:2830
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Minsk.mtf b/megamek/data/mechfiles/mechs/Golden Century/Minsk.mtf
index 1e62c821a95..f88b9b12bba 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Minsk.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Minsk.mtf	
@@ -6,7 +6,7 @@ mul id:7640
 Config:Biped
 techbase:Clan
 era:2862
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Mongoose C 2.mtf b/megamek/data/mechfiles/mechs/Golden Century/Mongoose C 2.mtf
index 1835b364073..8a0efbecb4c 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Mongoose C 2.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Mongoose C 2.mtf	
@@ -6,7 +6,7 @@ mul id:7604
 Config:Biped
 techbase:Clan
 era:2860
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:25
@@ -155,7 +155,7 @@ capabilities:The Kell/D Chassis around which the Mongoose is built uses Endo Ste
 
 deployment:The Mongoose C 2 served as a testbed for Clan Mongoose's newly-developed Targeting Computer technology, dropping a number of double heat sinks to free up the weight required. The success of this variant would ensure the Smoke Jaguars retained the Targeting Computer for their own use, and the technology would later proliferate among all the Clans.
 
-history:As the 'Mech reached Star League Defense Force units though, it was found that the Beagle Active Probe on the Mongoose gave it extremely good command and control features that endeared it to light 'Mech command lances. Within eight years of its introduction the Mongoose was the standard command 'Mech for all light and recon lances. Due to its advanced electronics the Mongoose was capable of coordinating the maneuverings of an entire company of light 'Mechs and at the same time could engage medium 'Mechs with some success thanks to its weaponry and armoring. Its popularity ensured that the Mongoose had a target on its back after the dissolution of the Star League. The start of the Succession Wars went poorly for the Mongoose when its factory on Ozawa was destroyed in 2837. The loss of the factory meant the 'Mech was already becoming a rarity by the Second Succession War and with many of its components now lostech surviving Mongooses were forced to make-do with inferior spare parts. This was especially true for the Beagle Active Probe, and by the end of the Succession Wars not a single operational Mongoose serving the Great Houses had a functioning example. This trend was reversed with the recovery of the Helm Memory Core and many Mongooses were rebuilt to their former glory. ComStar was also revealed to have kept many Mongooses in their secret storage facilities which they used to outfit the Com Guards. Diplan 'MechYards eventually restarted Mongoose production from their factory on Aix-la-Chapelle and the design would continue to see use for years to come, including during the Jihad.
+history:As the 'Mech reached Star League Defense Force units though, it was found that the Beagle Active Probe on the Mongoose gave it extremely good command and control features that endeared it to light 'Mech command lances. Within eight years of its introduction the Mongoose was the standard command 'Mech for all light and recon lances. Due to its advanced electronics the Mongoose was capable of coordinating the maneuverings of an entire company of light 'Mechs and at the same time could engage medium 'Mechs with some success thanks to its weaponry and armoring. Its popularity ensured that the Mongoose had a target on its back after the dissolution of the Star League. The start of the TRO: Golden Century - Early Succession War went poorly for the Mongoose when its factory on Ozawa was destroyed in 2837. The loss of the factory meant the 'Mech was already becoming a rarity by the Second TRO: Golden Century - Early Succession War and with many of its components now lostech surviving Mongooses were forced to make-do with inferior spare parts. This was especially true for the Beagle Active Probe, and by the end of the TRO: Golden Century - Early Succession War not a single operational Mongoose serving the Great Houses had a functioning example. This trend was reversed with the recovery of the Helm Memory Core and many Mongooses were rebuilt to their former glory. ComStar was also revealed to have kept many Mongooses in their secret storage facilities which they used to outfit the Com Guards. Diplan 'MechYards eventually restarted Mongoose production from their factory on Aix-la-Chapelle and the design would continue to see use for years to come, including during the Jihad.
 
 manufacturer:Cudahy Assembly Plant Delta
 primaryfactory:Circe
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Mongoose C.mtf b/megamek/data/mechfiles/mechs/Golden Century/Mongoose C.mtf
index 5f608b02352..16fb9959507 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Mongoose C.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Mongoose C.mtf	
@@ -6,7 +6,7 @@ mul id:7603
 Config:Biped
 techbase:Clan
 era:2833
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:25
@@ -155,7 +155,7 @@ capabilities:The Kell/D Chassis around which the Mongoose is built uses Endo Ste
 
 deployment:Effectively a Totem 'Mech for Clan Mongoose, the Mongoose C refit was introduced early during the Clans Golden Century. Produced by the Cudahy Assembly Plant Delta on Circe, the Mongoose C was built around Clan-grade Kell/F Endo Steel skeleton, 200-rated XL Engine and four and half tons of Compound H17 Ferro-Fibrous armor, freeing up weight to mount a Series 2b ER Medium Laser in each arm in support of a center-torso mounted Series 6b ER Large Laser and a head-mounted Series 1b ER Small Laser. Still carrying an Active Probe, the Mongoose C mounted only two extra double heat sinks. Following their Trial of Absorption of Clan Mongoose, Clan Smoke Jaguar would consign every last Mongoose C chassis to the scrapheap and history. 
 
-history:As the 'Mech reached Star League Defense Force units though, it was found that the Beagle Active Probe on the Mongoose gave it extremely good command and control features that endeared it to light 'Mech command lances. Within eight years of its introduction the Mongoose was the standard command 'Mech for all light and recon lances. Due to its advanced electronics the Mongoose was capable of coordinating the maneuverings of an entire company of light 'Mechs and at the same time could engage medium 'Mechs with some success thanks to its weaponry and armoring. Its popularity ensured that the Mongoose had a target on its back after the dissolution of the Star League. The start of the Succession Wars went poorly for the Mongoose when its factory on Ozawa was destroyed in 2837. The loss of the factory meant the 'Mech was already becoming a rarity by the Second Succession War and with many of its components now lostech surviving Mongooses were forced to make-do with inferior spare parts. This was especially true for the Beagle Active Probe, and by the end of the Succession Wars not a single operational Mongoose serving the Great Houses had a functioning example. This trend was reversed with the recovery of the Helm Memory Core and many Mongooses were rebuilt to their former glory. ComStar was also revealed to have kept many Mongooses in their secret storage facilities which they used to outfit the Com Guards. Diplan 'MechYards eventually restarted Mongoose production from their factory on Aix-la-Chapelle and the design would continue to see use for years to come, including during the Jihad.
+history:As the 'Mech reached Star League Defense Force units though, it was found that the Beagle Active Probe on the Mongoose gave it extremely good command and control features that endeared it to light 'Mech command lances. Within eight years of its introduction the Mongoose was the standard command 'Mech for all light and recon lances. Due to its advanced electronics the Mongoose was capable of coordinating the maneuverings of an entire company of light 'Mechs and at the same time could engage medium 'Mechs with some success thanks to its weaponry and armoring. Its popularity ensured that the Mongoose had a target on its back after the dissolution of the Star League. The start of the TRO: Golden Century - Early Succession War went poorly for the Mongoose when its factory on Ozawa was destroyed in 2837. The loss of the factory meant the 'Mech was already becoming a rarity by the Second TRO: Golden Century - Early Succession War and with many of its components now lostech surviving Mongooses were forced to make-do with inferior spare parts. This was especially true for the Beagle Active Probe, and by the end of the TRO: Golden Century - Early Succession War not a single operational Mongoose serving the Great Houses had a functioning example. This trend was reversed with the recovery of the Helm Memory Core and many Mongooses were rebuilt to their former glory. ComStar was also revealed to have kept many Mongooses in their secret storage facilities which they used to outfit the Com Guards. Diplan 'MechYards eventually restarted Mongoose production from their factory on Aix-la-Chapelle and the design would continue to see use for years to come, including during the Jihad.
 
 manufacturer:Cudahy Assembly Plant Delta
 primaryfactory:Circe
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Naja KTO-19b-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Naja KTO-19b-EC.mtf
index 00bb3518a81..77ffee636c8 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Naja KTO-19b-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Naja KTO-19b-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7622
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2824
-source:Succession War
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Naja.mtf b/megamek/data/mechfiles/mechs/Golden Century/Naja.mtf
index fc5cecd24e2..0a987182e53 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Naja.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Naja.mtf	
@@ -6,7 +6,7 @@ mul id:7621
 Config:Biped
 techbase:Clan
 era:2826
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Night Hawk NTK-2Q-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Night Hawk NTK-2Q-EC.mtf
index e4be3a2f5a7..5c84a4d1aef 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Night Hawk NTK-2Q-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Night Hawk NTK-2Q-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7676
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2819
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis A.mtf b/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis A.mtf
index 5ef14f6af1f..59a2b957da3 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis A.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis A.mtf	
@@ -6,7 +6,7 @@ mul id:7611
 Config:Biped Omnimech
 techbase:Clan
 era:2921
-source:Succession Wars
+source:TRO: Golden Century - Late Succession War - LosTech
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis B.mtf b/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis B.mtf
index 99109ceb691..e61bf8c594c 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis B.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis B.mtf	
@@ -6,7 +6,7 @@ mul id:7612
 Config:Biped Omnimech
 techbase:Clan
 era:2921
-source:Succession Wars
+source:TRO: Golden Century - Late Succession War - LosTech
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis Prime.mtf b/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis Prime.mtf
index c87404c5ad7..0a598142157 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Omni-Corvis Prime.mtf	
@@ -6,7 +6,7 @@ mul id:7610
 Config:Biped Omnimech
 techbase:Clan
 era:2921
-source:Succession Wars
+source:TRO: Golden Century - Late Succession War - LosTech
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Phoenix Hawk PXH-1-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Phoenix Hawk PXH-1-EC.mtf
index 067ed42236d..4daba4d1b7a 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Phoenix Hawk PXH-1-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Phoenix Hawk PXH-1-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7678
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2819
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Pulverizer PUL-3R.mtf b/megamek/data/mechfiles/mechs/Golden Century/Pulverizer PUL-3R.mtf
index edd01de4be4..edc8417e315 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Pulverizer PUL-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Pulverizer PUL-3R.mtf	
@@ -6,7 +6,7 @@ mul id:7647
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2823
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Pulverizer.mtf b/megamek/data/mechfiles/mechs/Golden Century/Pulverizer.mtf
index 9915064efee..6452d96ae2a 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Pulverizer.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Pulverizer.mtf	
@@ -6,7 +6,7 @@ mul id:7648
 Config:Biped
 techbase:Clan
 era:2845
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Redback.mtf b/megamek/data/mechfiles/mechs/Golden Century/Redback.mtf
index f2f4b9c0dee..6b2827e046a 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Redback.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Redback.mtf	
@@ -6,7 +6,7 @@ mul id:7684
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:2828
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Spartan C.mtf b/megamek/data/mechfiles/mechs/Golden Century/Spartan C.mtf
index c4deb9c4545..30df35189a1 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Spartan C.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Spartan C.mtf	
@@ -7,7 +7,7 @@ mul id:7646
 Config:Biped
 techbase:Clan
 era:2865
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Starslayer STY-2C-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Starslayer STY-2C-EC.mtf
index 7586cba29a5..527833baae6 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Starslayer STY-2C-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Starslayer STY-2C-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7680
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2823
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:50
@@ -157,7 +157,7 @@ capabilities:The Starslayer is built on a lightweight Thor-4 Endo Steel chassis
 
 deployment:An interim design built by the Nova Cats, the BattleMech’s lasers were all swapped for improved or early Clan prototypes to support the new Streak 4 system won from the Star Adders.
 
-history:Though Blue Shot's design won selection in 2765, the Starslayer would also be plagued with technical delays with its tracking system that would delay full production until 2772 and the Amaris Civil War. Despite the SLDF's desperate need for matériel, tensions between General Kerensky and Archon Robert Steiner II would result in Blue Shot delaying SLDF shipments until 2781 due to lack of "up-to-date" shipping information and as a result the Starslayer would be far more common in the LCAF service than the SLDF. By now a thoroughly Lyran Commonwealth design, production of the original 2C Starslayer would cease during the technological decline of the early Succession Wars, with Blue Shot Weaponry resuming with the superior and updated STY-3C model in wake of the Clan Invasion.
+history:Though Blue Shot's design won selection in 2765, the Starslayer would also be plagued with technical delays with its tracking system that would delay full production until 2772 and the Amaris Civil War. Despite the SLDF's desperate need for matériel, tensions between General Kerensky and Archon Robert Steiner II would result in Blue Shot delaying SLDF shipments until 2781 due to lack of "up-to-date" shipping information and as a result the Starslayer would be far more common in the LCAF service than the SLDF. By now a thoroughly Lyran Commonwealth design, production of the original 2C Starslayer would cease during the technological decline of the early TRO: Golden Century - Early Succession War, with Blue Shot Weaponry resuming with the superior and updated STY-3C model in wake of the Clan Invasion.
 
 manufacturer:Brim Ironworks
 primaryfactory:Brim
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Storm Giant 2.mtf b/megamek/data/mechfiles/mechs/Golden Century/Storm Giant 2.mtf
index b90daaa440c..6e7ef42c455 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Storm Giant 2.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Storm Giant 2.mtf	
@@ -6,7 +6,7 @@ mul id:5145
 Config:Biped
 techbase:Clan
 era:2862
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Storm Giant.mtf b/megamek/data/mechfiles/mechs/Golden Century/Storm Giant.mtf
index 07575edbf29..9fd5eea3ad2 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Storm Giant.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Storm Giant.mtf	
@@ -6,7 +6,7 @@ mul id:7649
 Config:Biped
 techbase:Clan
 era:2862
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Sun Bear A.mtf b/megamek/data/mechfiles/mechs/Golden Century/Sun Bear A.mtf
index 902c6e9224a..5d35965b428 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Sun Bear A.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Sun Bear A.mtf	
@@ -6,7 +6,7 @@ mul id:7624
 Config:Biped Omnimech
 techbase:Clan
 era:2966
-source:Succession Wars
+source:TRO: Golden Century - Late Succession War - LosTech
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Sun Bear B.mtf b/megamek/data/mechfiles/mechs/Golden Century/Sun Bear B.mtf
index fe7d9a120f3..166ecdbdda6 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Sun Bear B.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Sun Bear B.mtf	
@@ -6,7 +6,7 @@ mul id:7625
 Config:Biped Omnimech
 techbase:Clan
 era:2966
-source:Succession Wars
+source:TRO: Golden Century - Late Succession War - LosTech
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Sun Bear Prime.mtf b/megamek/data/mechfiles/mechs/Golden Century/Sun Bear Prime.mtf
index 4b74cda0097..24f033dbd5b 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Sun Bear Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Sun Bear Prime.mtf	
@@ -6,7 +6,7 @@ mul id:7623
 Config:Biped Omnimech
 techbase:Clan
 era:2966
-source:Succession Wars
+source:TRO: Golden Century - Late Succession War - LosTech
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Talon TLN-5W-EC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Talon TLN-5W-EC.mtf
index b06dc49f2c2..360a230846d 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Talon TLN-5W-EC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Talon TLN-5W-EC.mtf	
@@ -6,7 +6,7 @@ mul id:7677
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:2823
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Vision Quest 2.mtf b/megamek/data/mechfiles/mechs/Golden Century/Vision Quest 2.mtf
index 8ae724d1a2e..3dd1dfdec88 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Vision Quest 2.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Vision Quest 2.mtf	
@@ -6,7 +6,7 @@ mul id:7639
 Config:Biped
 techbase:Clan
 era:2868
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Vision Quest VQ-1NC.mtf b/megamek/data/mechfiles/mechs/Golden Century/Vision Quest VQ-1NC.mtf
index 0395c8ded4a..a7f384330f5 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Vision Quest VQ-1NC.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Vision Quest VQ-1NC.mtf	
@@ -6,7 +6,7 @@ mul id:5355
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2828
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:4
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Vision Quest.mtf b/megamek/data/mechfiles/mechs/Golden Century/Vision Quest.mtf
index b53d5974607..c94d5f3fe15 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Vision Quest.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Vision Quest.mtf	
@@ -6,7 +6,7 @@ mul id:7638
 Config:Biped
 techbase:Clan
 era:2832
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Wakazashi.mtf b/megamek/data/mechfiles/mechs/Golden Century/Wakazashi.mtf
index 24cb3318403..8b9f9cc1c0f 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Wakazashi.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Wakazashi.mtf	
@@ -3,11 +3,11 @@ Wakazashi
 
 mul id:3475
 
-
 Config:Biped
 TechBase:Clan
 Era:2830
 Rules Level:2
+source:TRO: Golden Century - Early Succession War
 
 Mass:85
 Engine:255 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Woodsman A.mtf b/megamek/data/mechfiles/mechs/Golden Century/Woodsman A.mtf
index 3503fb72ee5..52305c2eb5c 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Woodsman A.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Woodsman A.mtf	
@@ -6,7 +6,7 @@ mul id:3586
 Config:Biped Omnimech
 techbase:Clan
 era:2866
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Woodsman B.mtf b/megamek/data/mechfiles/mechs/Golden Century/Woodsman B.mtf
index f31754af108..71fbb50a4ab 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Woodsman B.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Woodsman B.mtf	
@@ -6,7 +6,7 @@ mul id:7643
 Config:Biped Omnimech
 techbase:Clan
 era:2866
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Woodsman C.mtf b/megamek/data/mechfiles/mechs/Golden Century/Woodsman C.mtf
index 88636e62587..d372028f2e8 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Woodsman C.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Woodsman C.mtf	
@@ -6,7 +6,7 @@ mul id:7644
 Config:Biped Omnimech
 techbase:Clan
 era:3149
-source:Dark Age
+source:TRO: Golden Century - Dark Age
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Woodsman D.mtf b/megamek/data/mechfiles/mechs/Golden Century/Woodsman D.mtf
index aff05684e50..d36085bfbb0 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Woodsman D.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Woodsman D.mtf	
@@ -6,7 +6,7 @@ mul id:7645
 Config:Biped Omnimech
 techbase:Clan
 era:3149
-source:Dark Age
+source:TRO: Golden Century - Dark Age
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/Golden Century/Woodsman Prime.mtf b/megamek/data/mechfiles/mechs/Golden Century/Woodsman Prime.mtf
index f010c12f05a..c0b039f21bd 100644
--- a/megamek/data/mechfiles/mechs/Golden Century/Woodsman Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Golden Century/Woodsman Prime.mtf	
@@ -6,7 +6,7 @@ mul id:3587
 Config:Biped Omnimech
 techbase:Clan
 era:2866
-source:Succession Wars
+source:TRO: Golden Century - Early Succession War
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-01.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-01.mtf
index 0aafd6f608b..0bed6674c6f 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-01.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-01.mtf	
@@ -5,7 +5,7 @@ mul id:6780
 Config:Biped
 techbase:Inner Sphere
 era:2771
-source:Hist LOT II
+Historical:Liberation of Terra II - Star League
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-02.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-02.mtf
index 80874fffd58..91aa807b237 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-02.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-02.mtf	
@@ -6,7 +6,7 @@ mul id:6781
 Config:Biped
 TechBase:Inner Sphere
 Era:2771
-Source:Hist LOT II
+Historical:Liberation of Terra II - Star League
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-03.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-03.mtf
index 0b37c93bee4..bed47c1f3a9 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-03.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-03.mtf	
@@ -6,7 +6,7 @@ mul id:6782
 Config:Biped
 TechBase:Inner Sphere
 Era:2771
-Source:Hist LOT II
+Historical:Liberation of Terra II - Star League
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-04.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-04.mtf
index 76648b8f479..f216990a5ca 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-04.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist LOT II/Dragoon AEM-04.mtf	
@@ -6,7 +6,7 @@ mul id:6783
 Config:Biped
 TechBase:Inner Sphere
 Era:2771
-Source:Hist LOT II
+Historical:Liberation of Terra II - Star League
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-A1.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-A1.mtf
index 60645be913c..30d986652fa 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-A1.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-A1.mtf	
@@ -6,7 +6,7 @@ mul id:3694
 Config:Biped
 TechBase:Inner Sphere
 Era:2573
-Source:Hist:Reunification War
+Source:Historical:Reunification War - Star League
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-D1 Dokkalfar.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-D1 Dokkalfar.mtf
index 0360b17b6b7..9c1d3984c12 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-D1 Dokkalfar.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Alfar AL-D1 Dokkalfar.mtf	
@@ -6,7 +6,7 @@ mul id:3693
 Config:Biped
 TechBase:Inner Sphere
 Era:2573
-Source:Hist:Reunification War
+Source:Historical:Reunification War - Star League
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Talos TLS-1B.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Talos TLS-1B.mtf
index 0c3bdc989bc..c8c7a7cbd69 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Talos TLS-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist Reunification War/Talos TLS-1B.mtf	
@@ -6,7 +6,7 @@ mul id:5175
 Config:Biped
 TechBase:Inner Sphere
 Era:2532
-Source:Hist:Reunification
+Source:Historical:Reunification War - Age of War
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5L.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist Second SW/Thunderbolt TDR-5L.mtf
similarity index 96%
rename from megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5L.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist Second SW/Thunderbolt TDR-5L.mtf
index 9bd080fe414..dfc0810ecfb 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5L.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist Second SW/Thunderbolt TDR-5L.mtf	
@@ -6,7 +6,7 @@ mul id:7762
 Config:Biped
 TechBase:Inner Sphere
 Era:2823
-Source:Hist - 2nd SW
+source:Historical:Second Succession War - Early Succession War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5LS.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist Second SW/Thunderbolt TDR-5LS.mtf
similarity index 96%
rename from megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5LS.mtf
rename to megamek/data/mechfiles/mechs/Historicals/Hist Second SW/Thunderbolt TDR-5LS.mtf
index 415df6cb3a9..485b294ac1b 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist 2nd SW/Thunderbolt TDR-5LS.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist Second SW/Thunderbolt TDR-5LS.mtf	
@@ -6,7 +6,7 @@ mul id:7763
 Config:Biped
 TechBase:Inner Sphere
 Era:2850
-Source:Hist - 2nd SW
+source:Historical:Second Succession War - Early Succession War
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/Historicals/Hist WOTRA/Bakeneko BKN-1K.mtf b/megamek/data/mechfiles/mechs/Historicals/Hist WOTRA/Bakeneko BKN-1K.mtf
index 6efb478ac80..9cc13c027ca 100644
--- a/megamek/data/mechfiles/mechs/Historicals/Hist WOTRA/Bakeneko BKN-1K.mtf	
+++ b/megamek/data/mechfiles/mechs/Historicals/Hist WOTRA/Bakeneko BKN-1K.mtf	
@@ -5,7 +5,7 @@ mul id:6975
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:3100
-source:TRO DA - Early Republic
+source:TRO: DA - Early Republic
 rules level:3
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/ISP3/Arana MilitiaMech ARA-S-1.mtf b/megamek/data/mechfiles/mechs/ISP3/Arana MilitiaMech ARA-S-1.mtf
index 90d948453bc..446de3c8cff 100644
--- a/megamek/data/mechfiles/mechs/ISP3/Arana MilitiaMech ARA-S-1.mtf	
+++ b/megamek/data/mechfiles/mechs/ISP3/Arana MilitiaMech ARA-S-1.mtf	
@@ -6,7 +6,7 @@ mul id:5798
 Config:Quad
 TechBase:Clan
 Era:3087
-Source:ISP3
+Source:Intersteller Players 3 - Early Republic
 Rules Level:3
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/ISP3/Reptar MilitiaMech EPT-C-1.mtf b/megamek/data/mechfiles/mechs/ISP3/Reptar MilitiaMech EPT-C-1.mtf
index a5d64583b06..18233ff0f2e 100644
--- a/megamek/data/mechfiles/mechs/ISP3/Reptar MilitiaMech EPT-C-1.mtf	
+++ b/megamek/data/mechfiles/mechs/ISP3/Reptar MilitiaMech EPT-C-1.mtf	
@@ -6,7 +6,7 @@ mul id:5797
 Config:Biped
 TechBase:Clan
 Era:3086
-Source:ISP 3
+Source:Intersteller Players 3 - Early Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/IrTech/Burrower DTM-1 MiningMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Burrower DTM-1 MiningMech.mtf
index fe098bd1c34..3760b55e253 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Burrower DTM-1 MiningMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Burrower DTM-1 MiningMech.mtf	
@@ -6,7 +6,7 @@ mul id:7874
 Config:Biped
 techbase:Inner Sphere
 era:3115
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:3
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/IrTech/Burrower DTM-1M MiningMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Burrower DTM-1M MiningMech MOD.mtf
index 442ba27e225..15b32e222cd 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Burrower DTM-1M MiningMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Burrower DTM-1M MiningMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7875
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/IrTech/Buster BC XXI-M HaulerMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Buster BC XXI-M HaulerMech MOD.mtf
index d6885939a0e..0169d69c44f 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Buster BC XXI-M HaulerMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Buster BC XXI-M HaulerMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7865
 Config:Biped
 techbase:Inner Sphere
 era:3059
-source:Clan Invasion
+source:TRO: Irregulars - Clan Invasion
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M Karenna.mtf b/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M Karenna.mtf
index 04e45efac54..dbda64c306c 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M Karenna.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M Karenna.mtf	
@@ -6,7 +6,7 @@ mul id:7851
 Config:Biped
 techbase:Inner Sphere
 era:3131
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M-J ConstructionMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M-J ConstructionMech MOD.mtf
index 1efa59d97d9..024d6668a40 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M-J ConstructionMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M-J ConstructionMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7849
 Config:Biped
 techbase:Inner Sphere
 era:3145
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M-JB ConstructionMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M-JB ConstructionMech MOD.mtf
index a652f26cc6a..17294f88cf9 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M-JB ConstructionMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Carbine CON-9M-JB ConstructionMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7850
 Config:Biped
 techbase:Inner Sphere
 era:3145
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H2 MilitiaMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H2 MilitiaMech.mtf
index cf2e6070b9c..819a16018f6 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H2 MilitiaMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H2 MilitiaMech.mtf	
@@ -6,7 +6,7 @@ mul id:7866
 Config:Biped
 techbase:Inner Sphere
 era:3100
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H2H MilitiaMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H2H MilitiaMech.mtf
index ba7fe421a2b..aa1ecd0dc62 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H2H MilitiaMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H2H MilitiaMech.mtf	
@@ -6,7 +6,7 @@ mul id:7867
 Config:Biped
 techbase:Inner Sphere
 era:3100
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H3 MilitiaMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H3 MilitiaMech.mtf
index a4710bfc7bb..a6b07c58a93 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H3 MilitiaMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Centurion CN9-H3 MilitiaMech.mtf	
@@ -6,7 +6,7 @@ mul id:7868
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3100
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:3
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-A LoggerMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-A LoggerMech MOD.mtf
index f32f4501b44..fa41c60e829 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-A LoggerMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-A LoggerMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7852
 Config:Biped
 techbase:Inner Sphere
 era:3131
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-E LoggerMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-E LoggerMech MOD.mtf
index 5db3800747f..068e747d6d8 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-E LoggerMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-E LoggerMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7853
 Config:Biped
 techbase:Inner Sphere
 era:3131
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-L LoggerMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-L LoggerMech MOD.mtf
index 0edbff76e28..62aeb02c1f3 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-L LoggerMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Crosscut ED-X4M-L LoggerMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7854
 Config:Biped
 techbase:Inner Sphere
 era:3131
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Deep Lord MilitiaMech RCL-Z1M-B.mtf b/megamek/data/mechfiles/mechs/IrTech/Deep Lord MilitiaMech RCL-Z1M-B.mtf
index bec06834d93..9b86b13cac9 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Deep Lord MilitiaMech RCL-Z1M-B.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Deep Lord MilitiaMech RCL-Z1M-B.mtf	
@@ -6,7 +6,7 @@ mul id:7830
 Config:Biped
 techbase:Inner Sphere
 era:3118
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:3
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/IrTech/Demeter WLD-1 AgroMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Demeter WLD-1 AgroMech.mtf
index 13728dd1033..4137d745aa9 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Demeter WLD-1 AgroMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Demeter WLD-1 AgroMech.mtf	
@@ -6,7 +6,7 @@ mul id:7855
 Config:Biped
 techbase:Inner Sphere
 era:3130
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Demeter WLD-1-M AgroMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Demeter WLD-1-M AgroMech MOD.mtf
index d33b6de9893..5d8dd40799b 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Demeter WLD-1-M AgroMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Demeter WLD-1-M AgroMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7856
 Config:Biped
 techbase:Inner Sphere
 era:3130
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/DemolitionMech WI-DMM MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/DemolitionMech WI-DMM MOD.mtf
index 1748c5ac537..1f3662db3f9 100644
--- a/megamek/data/mechfiles/mechs/IrTech/DemolitionMech WI-DMM MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/DemolitionMech WI-DMM MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7839
 Config:Biped
 techbase:Inner Sphere
 era:3100
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/IrTech/Dig Lord RCL-4M MiningMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Dig Lord RCL-4M MiningMech MOD.mtf
index e06e328a0e0..552cbb1425f 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Dig Lord RCL-4M MiningMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Dig Lord RCL-4M MiningMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:5542
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/IrTech/Dig Lord RCL-4M-B MiningMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Dig Lord RCL-4M-B MiningMech MOD.mtf
index 77d9b245622..a8a2acae642 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Dig Lord RCL-4M-B MiningMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Dig Lord RCL-4M-B MiningMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7829
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-1.mtf b/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-1.mtf
index b7f4d58b08c..3c1a2f5c065 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-1.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-1.mtf	
@@ -6,7 +6,7 @@ mul id:7840
 Config:Biped
 techbase:Inner Sphere
 era:3080
-source:Jihad
+source:TRO: Irregulars - Jihad
 rules level:3
 
 mass:10
diff --git a/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-2.mtf b/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-2.mtf
index 79bf6e92520..4ce1c609d2e 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-2.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-2.mtf	
@@ -6,7 +6,7 @@ mul id:7841
 Config:Biped
 techbase:Inner Sphere
 era:3081
-source:Jihad
+source:TRO: Irregulars - Early Republic
 rules level:3
 
 mass:10
diff --git a/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-3.mtf b/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-3.mtf
index 0150cfc820a..a009c022028 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-3.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-3.mtf	
@@ -6,7 +6,7 @@ mul id:7842
 Config:Biped
 techbase:Inner Sphere
 era:3081
-source:Jihad
+source:TRO: Irregulars - Early Republic
 rules level:3
 
 mass:10
diff --git a/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-3M.mtf b/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-3M.mtf
index 3d1ab0bd33d..5fd116d9414 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-3M.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Exo Haulermech HMX-3M.mtf	
@@ -6,7 +6,7 @@ mul id:7843
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:3
 
 mass:10
diff --git a/megamek/data/mechfiles/mechs/IrTech/Firebee WI-WAM MilitiaMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Firebee WI-WAM MilitiaMech.mtf
index 3bcf9e90ce2..b015595d207 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Firebee WI-WAM MilitiaMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Firebee WI-WAM MilitiaMech.mtf	
@@ -6,7 +6,7 @@ mul id:7838
 Config:Biped
 techbase:Inner Sphere
 era:3130
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/IrTech/Ground Pounder DVM-2 MiningMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Ground Pounder DVM-2 MiningMech.mtf
index 8a464c1630a..ff79fea3ad6 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Ground Pounder DVM-2 MiningMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Ground Pounder DVM-2 MiningMech.mtf	
@@ -6,7 +6,7 @@ mul id:7872
 Config:Biped
 techbase:Inner Sphere
 era:3125
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/IrTech/Ground Pounder DVM-2M MiningMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Ground Pounder DVM-2M MiningMech MOD.mtf
index 901e3479523..4cce4a507bf 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Ground Pounder DVM-2M MiningMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Ground Pounder DVM-2M MiningMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7873
 Config:Biped
 techbase:Inner Sphere
 era:3133
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/IrTech/Guard GS-54 SecurityMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Guard GS-54 SecurityMech.mtf
index 21c4a46f352..de201cda2e2 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Guard GS-54 SecurityMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Guard GS-54 SecurityMech.mtf	
@@ -6,7 +6,7 @@ mul id:4253
 Config:Quad
 techbase:Inner Sphere
 era:2914
-source:TRO IrTech-Succession Wars
+source:TRO: IrTech-Succession Wars
 rules level:2
 
 mass:15
diff --git a/megamek/data/mechfiles/mechs/IrTech/Gulon C SolahmaMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Gulon C SolahmaMech.mtf
index 9552fe566cc..febe2f169df 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Gulon C SolahmaMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Gulon C SolahmaMech.mtf	
@@ -6,7 +6,7 @@ mul id:7846
 Config:Biped
 techbase:Clan
 era:3145
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/IrTech/Gulon GLN-1A MiningMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Gulon GLN-1A MiningMech.mtf
index 2ecbc481000..124ede8665a 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Gulon GLN-1A MiningMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Gulon GLN-1A MiningMech.mtf	
@@ -6,7 +6,7 @@ mul id:7844
 Config:Biped
 techbase:Inner Sphere
 era:3000
-source:Succession Wars
+source:TRO Irregulars: Succession Wars
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/IrTech/Gulon GLN-1B SecurityMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Gulon GLN-1B SecurityMech.mtf
index e90b1293768..dfb47929c8d 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Gulon GLN-1B SecurityMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Gulon GLN-1B SecurityMech.mtf	
@@ -6,7 +6,7 @@ mul id:7845
 Config:Biped
 techbase:Inner Sphere
 era:3000
-source:Succession Wars
+source:TRO Irregulars: Succession Wars
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199 AgroMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199 AgroMech.mtf
index 3acd70c72ce..257904dd493 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199 AgroMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199 AgroMech.mtf	
@@ -6,7 +6,7 @@ mul id:7860
 Config:Biped
 techbase:Inner Sphere
 era:3128
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M AgroMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M AgroMech MOD.mtf
index 121c18857fe..31ba77c2c44 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M AgroMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M AgroMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7861
 Config:Biped
 techbase:Inner Sphere
 era:3130
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-A AgroMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-A AgroMech MOD.mtf
index 00befd1f83c..29155576aad 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-A AgroMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-A AgroMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7862
 Config:Biped
 techbase:Inner Sphere
 era:3130
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-B AgroMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-B AgroMech MOD.mtf
index 231229b1743..913cdad7c5e 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-B AgroMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-B AgroMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7863
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-M AgroMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-M AgroMech MOD.mtf
index 756b0e2dbb6..75077a5fe93 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-M AgroMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Harvester HVR-199M-M AgroMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7864
 Config:Biped
 techbase:Inner Sphere
 era:3134
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/IrTech/Heavy Forester HFL-1 LoggerMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Heavy Forester HFL-1 LoggerMech.mtf
index f37717a8b58..2e1c4b207e0 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Heavy Forester HFL-1 LoggerMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Heavy Forester HFL-1 LoggerMech.mtf	
@@ -6,7 +6,7 @@ mul id:4529
 Config:Quad
 techbase:Inner Sphere
 era:2700
-source:Star League
+source:TRO: Irregulars - Star League
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/IrTech/Heavy Forester HFL-1M LoggerMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Heavy Forester HFL-1M LoggerMech MOD.mtf
index d295c1c1f45..949f7e441f1 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Heavy Forester HFL-1M LoggerMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Heavy Forester HFL-1M LoggerMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7871
 Config:Quad
 techbase:Inner Sphere
 era:3015
-source:Succession Wars
+source:TRO Irregulars: Succession Wars
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/IrTech/Heavy Lifter HCL-1M CargoMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Heavy Lifter HCL-1M CargoMech MOD.mtf
index 2f3dca592e6..5a15450f1fa 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Heavy Lifter HCL-1M CargoMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Heavy Lifter HCL-1M CargoMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7869
 Config:Quad
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/IrTech/Heavy Lifter HCL-1MM MilitiaMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Heavy Lifter HCL-1MM MilitiaMech.mtf
index 5bb1ecb79c8..af7b5004d4b 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Heavy Lifter HCL-1MM MilitiaMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Heavy Lifter HCL-1MM MilitiaMech.mtf	
@@ -6,7 +6,7 @@ mul id:7870
 Config:Quad
 techbase:Inner Sphere
 era:3066
-source:Civil War
+source:TRO: Irregulars - Civil War
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/IrTech/Inquisitor ITW-80 SecurityMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Inquisitor ITW-80 SecurityMech.mtf
index be763318426..e696bbb0cc0 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Inquisitor ITW-80 SecurityMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Inquisitor ITW-80 SecurityMech.mtf	
@@ -6,7 +6,7 @@ mul id:4364
 Config:Biped
 techbase:Inner Sphere
 era:3062
-source:Civil War
+source:TRO: Irregulars - Civil War
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/IrTech/Inquisitor ITW-85 SecurityMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Inquisitor ITW-85 SecurityMech.mtf
index 509d6d6003b..97193074fdf 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Inquisitor ITW-85 SecurityMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Inquisitor ITW-85 SecurityMech.mtf	
@@ -6,7 +6,7 @@ mul id:7825
 Config:Biped
 techbase:Inner Sphere
 era:3120
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:3
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2 MiningMech.mtf b/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2 MiningMech.mtf
index 815f315e344..2ff76802117 100644
--- a/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2 MiningMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2 MiningMech.mtf	
@@ -6,7 +6,7 @@ mul id:4220
 Config:Biped
 techbase:Inner Sphere
 era:2737
-source:Star League
+source:TRO: Irregulars - Star League
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2M MiningMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2M MiningMech MOD.mtf
index 0b333b0ffa5..47228d1adbe 100644
--- a/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2M MiningMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2M MiningMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7827
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2M-B MiningMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2M-B MiningMech MOD.mtf
index 5a58af34bc2..e851dce0581 100644
--- a/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2M-B MiningMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/MuckRaker GMMM-2M-B MiningMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7828
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/IrTech/Opossum OPO-2 SalvageMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Opossum OPO-2 SalvageMech.mtf
index 831baa7483e..8988d6d1446 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Opossum OPO-2 SalvageMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Opossum OPO-2 SalvageMech.mtf	
@@ -6,7 +6,7 @@ mul id:7847
 Config:Biped
 techbase:Inner Sphere
 era:3145
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/IrTech/Opossum OPO-3 SalvageMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/Opossum OPO-3 SalvageMech MOD.mtf
index cc1d0e2459d..d66cb244412 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Opossum OPO-3 SalvageMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Opossum OPO-3 SalvageMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7848
 Config:Biped
 techbase:Inner Sphere
 era:3145
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/IrTech/Pacifier SecurityMech CCU-36.mtf b/megamek/data/mechfiles/mechs/IrTech/Pacifier SecurityMech CCU-36.mtf
index 24718b76a7f..4a26a3db68f 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Pacifier SecurityMech CCU-36.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Pacifier SecurityMech CCU-36.mtf	
@@ -6,7 +6,7 @@ mul id:4780
 Config:Biped
 techbase:Inner Sphere
 era:3031
-source:Succession Wars
+source:TRO Irregulars: Succession Wars
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Pacifier SecurityMech CCU-40.mtf b/megamek/data/mechfiles/mechs/IrTech/Pacifier SecurityMech CCU-40.mtf
index dbf2ea32f33..48e71d6d36a 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Pacifier SecurityMech CCU-40.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Pacifier SecurityMech CCU-40.mtf	
@@ -6,7 +6,7 @@ mul id:7824
 Config:Biped
 techbase:Inner Sphere
 era:3130
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/IrTech/Pompier GM-4P PoliceMech.mtf b/megamek/data/mechfiles/mechs/IrTech/Pompier GM-4P PoliceMech.mtf
index aeb5d7fa070..c3ee7e3e68a 100644
--- a/megamek/data/mechfiles/mechs/IrTech/Pompier GM-4P PoliceMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/Pompier GM-4P PoliceMech.mtf	
@@ -6,7 +6,7 @@ mul id:7837
 Config:Biped
 techbase:Inner Sphere
 era:3085
-source:Jihad
+source:TRO: Irregulars - Early Republic
 rules level:2
 
 mass:15
diff --git a/megamek/data/mechfiles/mechs/IrTech/St. Florian FLN-366 FireMech.mtf b/megamek/data/mechfiles/mechs/IrTech/St. Florian FLN-366 FireMech.mtf
index 9793dd45b33..4e4c3f40309 100644
--- a/megamek/data/mechfiles/mechs/IrTech/St. Florian FLN-366 FireMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/St. Florian FLN-366 FireMech.mtf	
@@ -6,7 +6,7 @@ mul id:5118
 Config:Biped
 techbase:Inner Sphere
 era:3100
-source:Civil War
+source:TRO: 3085u - Early Republic
 rules level:3
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/IrTech/St. Florian FLN-366-M FireMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/St. Florian FLN-366-M FireMech MOD.mtf
index bac81bf7fbe..ed3a61e08d0 100644
--- a/megamek/data/mechfiles/mechs/IrTech/St. Florian FLN-366-M FireMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/St. Florian FLN-366-M FireMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7826
 Config:Biped
 techbase:Inner Sphere
 era:3133
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:3
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CV ConstructionMech.mtf b/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CV ConstructionMech.mtf
index 1429d8deb18..8169fe17b4e 100644
--- a/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CV ConstructionMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CV ConstructionMech.mtf	
@@ -6,7 +6,7 @@ mul id:7857
 Config:Biped
 techbase:Inner Sphere
 era:3094
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CV-M ConstructionMech MOD.mtf b/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CV-M ConstructionMech MOD.mtf
index 17740f2f7a3..037baaaeb3b 100644
--- a/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CV-M ConstructionMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CV-M ConstructionMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:7858
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:TRO: Irregulars - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CVI ConstructionMech.mtf b/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CVI ConstructionMech.mtf
index 471fc79343c..840870f80f9 100644
--- a/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CVI ConstructionMech.mtf	
+++ b/megamek/data/mechfiles/mechs/IrTech/StrongArm SC CVI ConstructionMech.mtf	
@@ -6,7 +6,7 @@ mul id:7859
 Config:Biped
 TechBase:Inner Sphere
 Era:3094
-Source:Dark Age
+source:TRO: Irregulars - Dark Age
 Rules Level:2
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/Iron Wind Metals/Thunderbolt IIC 2.mtf b/megamek/data/mechfiles/mechs/Iron Wind Metals/Thunderbolt IIC 2.mtf
index fbcc91abb31..1bd62d3a01d 100644
--- a/megamek/data/mechfiles/mechs/Iron Wind Metals/Thunderbolt IIC 2.mtf	
+++ b/megamek/data/mechfiles/mechs/Iron Wind Metals/Thunderbolt IIC 2.mtf	
@@ -6,7 +6,7 @@ mul id:5240
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3088
-source:Ice Wind Metals - Early Republic
+source:Iron Wind Metals - Early Republic
 rules level:4
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Jihad Final Reckoning/'Gestalt' D2X-G.mtf b/megamek/data/mechfiles/mechs/Jihad Final Reckoning/'Gestalt' D2X-G.mtf
index 32c32fb94af..78091b437e5 100644
--- a/megamek/data/mechfiles/mechs/Jihad Final Reckoning/'Gestalt' D2X-G.mtf	
+++ b/megamek/data/mechfiles/mechs/Jihad Final Reckoning/'Gestalt' D2X-G.mtf	
@@ -6,7 +6,7 @@ mul id:4209
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:J:Final Reckoning - Jihad
+Source:Jihad:Final Reckoning - Jihad
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/Jihad Final Reckoning/OMEGA SHP-4X.mtf b/megamek/data/mechfiles/mechs/Jihad Final Reckoning/OMEGA SHP-4X.mtf
index e30822529f0..e20da53dc5e 100644
--- a/megamek/data/mechfiles/mechs/Jihad Final Reckoning/OMEGA SHP-4X.mtf	
+++ b/megamek/data/mechfiles/mechs/Jihad Final Reckoning/OMEGA SHP-4X.mtf	
@@ -5,7 +5,7 @@ mul id:4746
 Config:Biped
 techbase:Inner Sphere
 era:3077
-source:JHR - Jihad
+source:Jihad:Final Reckoning - Jihad
 rules level:4
 
 mass:150
diff --git a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM Mk I PHX-HK1.mtf b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM Mk I PHX-HK1.mtf
index 5172153208a..4a3efbcf4b5 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM Mk I PHX-HK1.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM Mk I PHX-HK1.mtf	
@@ -6,7 +6,7 @@ mul id:4824
 Config:LAM
 TechBase:Inner Sphere
 Era:2692
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM Mk I PHX-HK1R.mtf b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM Mk I PHX-HK1R.mtf
index 6c0479600c9..946034be973 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM Mk I PHX-HK1R.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM Mk I PHX-HK1R.mtf	
@@ -6,7 +6,7 @@ mul id:4825
 Config:LAM
 TechBase:Inner Sphere
 Era:2695
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK1RB.mtf b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK1RB.mtf
index 7bcdf59bb57..5b0fb9032da 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK1RB.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK1RB.mtf	
@@ -6,7 +6,7 @@ mul id:4821
 Config:LAM
 TechBase:Inner Sphere
 Era:3077
-Source:TRO3085
+Source:TRO3085 - Jihad
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK2.mtf b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK2.mtf
index d2c5e717bb7..c99db3f1d51 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK2.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK2.mtf	
@@ -6,7 +6,7 @@ mul id:4822
 Config:LAM
 TechBase:Inner Sphere
 Era:2701
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK2M.mtf b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK2M.mtf
index 5f3e9a86256..ba17ed2767e 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK2M.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Phoenix Hawk LAM PHX-HK2M.mtf	
@@ -6,7 +6,7 @@ mul id:4823
 Config:LAM
 TechBase:Inner Sphere
 Era:2953
-Source:TRO3085
+Source:TRO3085 - Late Succession War - LosTech
 Rules Level:3
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/LAMS/Pwwka S-PW-1LAM.mtf b/megamek/data/mechfiles/mechs/LAMS/Pwwka S-PW-1LAM.mtf
index 7ff49c82a2f..898e5c34ba5 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Pwwka S-PW-1LAM.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Pwwka S-PW-1LAM.mtf	
@@ -6,7 +6,7 @@ mul id:4882
 Config:LAM
 techbase:Mixed (IS Chassis)
 era:3078
-source:J:FR
+source:Jihad:Final Reckoning - Jihad
 rules level:4
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Screamer LAM SCR-1X-LAM.mtf b/megamek/data/mechfiles/mechs/LAMS/Screamer LAM SCR-1X-LAM.mtf
index c27e7e93c52..8b9ddd5e8be 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Screamer LAM SCR-1X-LAM.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Screamer LAM SCR-1X-LAM.mtf	
@@ -6,7 +6,7 @@ mul id:7320
 Config:LAM
 techbase:Inner Sphere
 era:2774
-source:XTRO Gunslingers - Star League
+source:XTR: Gunslingers - Star League
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/LAMS/Shadow Hawk LAM SHD-X1.mtf b/megamek/data/mechfiles/mechs/LAMS/Shadow Hawk LAM SHD-X1.mtf
index 7dc75cc00c9..eea0e29a08c 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Shadow Hawk LAM SHD-X1.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Shadow Hawk LAM SHD-X1.mtf	
@@ -6,7 +6,7 @@ mul id:5039
 Config:LAM
 TechBase:Inner Sphere
 Era:2680
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/LAMS/Shadow Hawk LAM SHD-X2.mtf b/megamek/data/mechfiles/mechs/LAMS/Shadow Hawk LAM SHD-X2.mtf
index 3b7117927eb..70f964c2212 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Shadow Hawk LAM SHD-X2.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Shadow Hawk LAM SHD-X2.mtf	
@@ -6,7 +6,7 @@ mul id:5040
 Config:LAM
 TechBase:Inner Sphere
 Era:2684
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/LAMS/Stinger LAM Mk I STG-A1.mtf b/megamek/data/mechfiles/mechs/LAMS/Stinger LAM Mk I STG-A1.mtf
index a396024321e..7d5722ff402 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Stinger LAM Mk I STG-A1.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Stinger LAM Mk I STG-A1.mtf	
@@ -6,7 +6,7 @@ mul id:5140
 Config:LAM
 TechBase:Inner Sphere
 Era:2688
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Stinger LAM STG-A10.mtf b/megamek/data/mechfiles/mechs/LAMS/Stinger LAM STG-A10.mtf
index 63db535dafa..82a0a3f7376 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Stinger LAM STG-A10.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Stinger LAM STG-A10.mtf	
@@ -6,7 +6,7 @@ mul id:5138
 Config:LAM
 TechBase:Inner Sphere
 Era:2927
-Source:TRO3085
+Source:TRO3085 - Late Succession War - LosTech
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Stinger LAM STG-A5.mtf b/megamek/data/mechfiles/mechs/LAMS/Stinger LAM STG-A5.mtf
index 076899735b3..60edf2a8933 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Stinger LAM STG-A5.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Stinger LAM STG-A5.mtf	
@@ -6,7 +6,7 @@ mul id:5139
 Config:LAM
 TechBase:Inner Sphere
 Era:2701
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Waneta S-WN-1LAM.mtf b/megamek/data/mechfiles/mechs/LAMS/Waneta S-WN-1LAM.mtf
index 56ef3e2413f..f9c96caa8e7 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Waneta S-WN-1LAM.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Waneta S-WN-1LAM.mtf	
@@ -6,7 +6,7 @@ mul id:5379
 Config:LAM
 techbase:Mixed (IS Chassis)
 era:3078
-source:J:FR
+source:Jihad:Final Reckoning - Jihad
 rules level:3
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/LAMS/Waneta S-WN-2LAM.mtf b/megamek/data/mechfiles/mechs/LAMS/Waneta S-WN-2LAM.mtf
index b28c3a90e8d..88915f2123b 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Waneta S-WN-2LAM.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Waneta S-WN-2LAM.mtf	
@@ -6,7 +6,7 @@ mul id:5380
 Config:LAM
 techbase:Mixed (IS Chassis)
 era:3078
-source:J:FR
+source:Jihad:Final Reckoning - Jihad
 rules level:4
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100.mtf b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100.mtf
index 3890c03f027..c12808187be 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100.mtf	
@@ -6,7 +6,7 @@ mul id:5392
 Config:LAM
 techbase:Inner Sphere
 era:2690
-source:TRO3085
+source:TRO3085 - Star League
 rules level:3
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100A.mtf b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100A.mtf
index c7b2f2e60df..9096b5a2b59 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100A.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100A.mtf	
@@ -6,7 +6,7 @@ mul id:5393
 Config:LAM
 TechBase:Inner Sphere
 Era:2697
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100b.mtf b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100b.mtf
index dd104ecee33..5ebaf4393ac 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100b.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM Mk I WSP-100b.mtf	
@@ -6,7 +6,7 @@ mul id:5394
 Config:LAM
 TechBase:Inner Sphere
 Era:2703
-Source:TRO3085
+Source:TRO3085 - Star League
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-105.mtf b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-105.mtf
index 690539d6759..326be2baccc 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-105.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-105.mtf	
@@ -6,7 +6,7 @@ mul id:5389
 Config:LAM
 techbase:Inner Sphere
 era:2701
-source:TRO3085
+source:TRO3085 - Star League
 rules level:3
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-105M.mtf b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-105M.mtf
index e3e2d094b04..b1bc54fcced 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-105M.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-105M.mtf	
@@ -6,7 +6,7 @@ mul id:5390
 Config:LAM
 TechBase:Inner Sphere
 Era:3024
-Source:TRO3085
+Source:TRO3085 - Late Succession War - Renaissance
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-110.mtf b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-110.mtf
index 91378ec4833..c93497b7809 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-110.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Wasp LAM WSP-110.mtf	
@@ -6,7 +6,7 @@ mul id:5391
 Config:LAM
 TechBase:Inner Sphere
 Era:3075
-Source:TRO3085
+Source:TRO3085 - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/LAMS/Yurei S-YR-1LAM.mtf b/megamek/data/mechfiles/mechs/LAMS/Yurei S-YR-1LAM.mtf
index befb1f6cc9b..f881a25cb4b 100644
--- a/megamek/data/mechfiles/mechs/LAMS/Yurei S-YR-1LAM.mtf	
+++ b/megamek/data/mechfiles/mechs/LAMS/Yurei S-YR-1LAM.mtf	
@@ -6,7 +6,7 @@ mul id:5431
 Config:LAM
 techbase:Mixed (IS Chassis)
 era:3077
-source:J:FR
+source:Jihad:Final Reckoning - Jihad
 rules level:4
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2 (Militarized).mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2 (Militarized).mtf
index 42d417760ab..e272b133781 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2 (Militarized).mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2 (Militarized).mtf	
@@ -6,7 +6,7 @@ mul id:793
 Config:Quad
 techbase:Inner Sphere
 era:2801
-source:Historical: Operation Klondike
+source:Historical:Operation Klondike - Early Succession War
 rules level:4
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2A Stevedore.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2A Stevedore.mtf
index 9890f26cce8..5f6ef9c75b3 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2A Stevedore.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2A Stevedore.mtf	
@@ -6,7 +6,7 @@ mul id:794
 Config:Quad
 techbase:Inner Sphere
 era:2750
-source:Historical: Operation Klondike
+source:Historical:Operation Klondike - Star League
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2B Navvy.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2B Navvy.mtf
index fbd41e1a9e0..c390595222a 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2B Navvy.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Daedalus GTX2B Navvy.mtf	
@@ -6,7 +6,7 @@ mul id:795
 Config:Quad
 techbase:Inner Sphere
 era:2750
-source:Historical: Operation Klondike
+source:Historical:Operation Klondike - Star League
 rules level:2
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3A.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3A.mtf
index 3b44057951d..3d1053cbb47 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3A.mtf	
@@ -6,7 +6,7 @@ mul id:4172
 Config:Biped
 TechBase:Inner Sphere
 Era:2679
-Source:Op. Klondyke - Star League 
+Source:Historical:Operation Klondike - Star League 
 Rules Level:3
 
 
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP.mtf
index f8e2de514d1..eb27db4da66 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:2801
 Rules Level:2
-Source:Op. Klondyke - Early Succession War 
+Source:Historical:Operation Klondike - Early Succession War 
 
 Mass:30
 Engine:150 XL Engine
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP2.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP2.mtf
index a43a8073ae3..944596950e1 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP2.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP2.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:2801
 Rules Level:2
-Source:Op. Klondyke - Early Succession War
+Source:Historical:Operation Klondike - Early Succession War
 
 Mass:30
 Engine:150 XL Engine
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP3.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP3.mtf
index e02d6cf5fbf..e6ef22e17c7 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP3.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3PP3.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 techbase:Inner Sphere
 era:2801
 rules level:2
-Source:Op. Klondyke - Early Succession War 
+Source:Historical:Operation Klondike - Early Succession War 
 
 mass:30
 engine:150 XL Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3SLE.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3SLE.mtf
index 9f0dd39ce1c..574a1c7b555 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3SLE.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Firefly FFL-3SLE.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:2790
 Rules Level:2
-Source:Op. Klondyke - Early Succession War 
+Source:Historical:Operation Klondike - Early Succession War 
 
 Mass:30
 Engine:150 XL Engine
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Hermes HER-1Sb.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Hermes HER-1Sb.mtf
index e6a8ccf0bcb..5c67a5e5749 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Hermes HER-1Sb.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Hermes HER-1Sb.mtf	
@@ -6,7 +6,7 @@ mul id:1488
 Config:Biped
 TechBase:Inner Sphere
 Era:2740
-Source:Hist:Op Klondike - Star League
+Source:Historical:Operation Klondike - Star League
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Highlander HGN-732 Colleen.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Highlander HGN-732 Colleen.mtf
index a5296dc0fe1..384520246f1 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Highlander HGN-732 Colleen.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Highlander HGN-732 Colleen.mtf	
@@ -6,7 +6,7 @@ mul id:4323
 Config:Biped
 techbase:Inner Sphere
 era:2801
-source:Historical: Operation Klondike - Early Succession Wars
+source:Historical:Operation Klondike - Early Succession War
 rules level:4
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Hoplite HOP-4Bb.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Hoplite HOP-4Bb.mtf
index fcf118835cc..80ee7c2f576 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Hoplite HOP-4Bb.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Hoplite HOP-4Bb.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:2795
 Rules Level:2
-source:Hist Klondike - Early Succession War
+source:Historical:Operation Klondike - Early Succession War
 
 Mass:55
 Engine:220 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Hoplite HOP-4Cb.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Hoplite HOP-4Cb.mtf
index 8ff23eaa186..56433cebace 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Hoplite HOP-4Cb.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Hoplite HOP-4Cb.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:2821
 Rules Level:2
-source:Hist Klondike - Early Succession War
+source:Historical:Operation Klondike - Early Succession War
 
 Mass:55
 Engine:220 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/Operation Klondike/Shogun SHG-2H.mtf b/megamek/data/mechfiles/mechs/Operation Klondike/Shogun SHG-2H.mtf
index 72c7c10d93d..c870effc29c 100644
--- a/megamek/data/mechfiles/mechs/Operation Klondike/Shogun SHG-2H.mtf	
+++ b/megamek/data/mechfiles/mechs/Operation Klondike/Shogun SHG-2H.mtf	
@@ -6,7 +6,7 @@ Config:Biped
 techbase:Inner Sphere
 era:2777
 rules level:2
-Source:Hist:Op. Klondike - Succession Wars
+source:Historical:Operation Klondike - Star League
 
 mass:85
 engine:255 Fusion Engine(IS)
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Beowulf IIC.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Beowulf IIC.mtf
index 7b90ddc739b..592f6cdf1d6 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Beowulf IIC.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Beowulf IIC.mtf	
@@ -6,7 +6,7 @@ mul id:3818
 Config:Biped
 TechBase:Clan
 Era:3084
-Source:TRO:Prototypes
+Source:TRO:Prototypes - Early Republic
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Dola DOL-1A1.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Dola DOL-1A1.mtf
index eca18fee500..9660a62803d 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Dola DOL-1A1.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Dola DOL-1A1.mtf	
@@ -6,7 +6,7 @@ mul id:4086
 Config:Biped
 techbase:Inner Sphere
 era:3082
-source:TRO:Prototypes
+source:TRO:Prototypes - Early Republic
 rules level:4
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Dola DOL-1A2 Yoh Ti Ts'angs.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Dola DOL-1A2 Yoh Ti Ts'angs.mtf
index 1451b18699f..552248ff05c 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Dola DOL-1A2 Yoh Ti Ts'angs.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Dola DOL-1A2 Yoh Ti Ts'angs.mtf	
@@ -6,7 +6,7 @@ mul id:4087
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:TRO:Prototypes
+Source:TRO:Prototypes - Early Republic
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Hunchback HBK-7R.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Hunchback HBK-7R.mtf
index 8ea8384fa4c..9604882f155 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Hunchback HBK-7R.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Hunchback HBK-7R.mtf	
@@ -5,7 +5,7 @@ mul id:4338
 Config:Biped
 techbase:Inner Sphere
 era:3085
-source:TRO:Proto - Early Republic
+source:TRO:Prototypes - Early Republic
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Incubus II.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Incubus II.mtf
index 17a4b6e7395..c4749b577c2 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Incubus II.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Incubus II.mtf	
@@ -6,7 +6,7 @@ mul id:4363
 Config:Biped
 TechBase:Clan
 Era:3085
-Source:TRO:Prototypes
+Source:TRO:Prototypes - Early Republic
 Rules Level:4
 History:Handheld weapons NOT available in MegaMek so none are included.
 
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III 2.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III 2.mtf
index dffbebf1e5e..0a0da2ece47 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III 2.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III 2.mtf	
@@ -6,7 +6,7 @@ mul id:4562
 Config:Biped
 TechBase:Clan
 Era:3089
-Source:Republic
+Source:TRO: Prototypes - Early Republic
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III X.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III X.mtf
index 59a9cc614d7..02abdd0bdc1 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III X.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III X.mtf	
@@ -6,7 +6,7 @@ mul id:4563
 Config:Biped
 TechBase:Clan
 Era:3076
-Source:XTRO Clans - Jihad
+Source:XTR: Clans - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III (Standard).mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III.mtf
similarity index 98%
rename from megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III (Standard).mtf
rename to megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III.mtf
index 01935f0b463..ef12b4676e3 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat III.mtf	
@@ -6,7 +6,7 @@ mul id:4561
 Config:Biped
 TechBase:Clan
 Era:3086
-Source:TRO Prototypes
+Source:TRO: Prototypes
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat Mk II Enhanced.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat Mk II Enhanced.mtf
index 108b5ae8e37..92e42b21fd8 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat Mk II Enhanced.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Mad Cat Mk II Enhanced.mtf	
@@ -5,7 +5,7 @@ mul id:4564
 Config:Biped
 techbase:Clan
 era:3083
-source:TRO Prototypes - Early Republic
+source:TRO: Prototypes - Early Republic
 rules level:3
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Orion ON3-M.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Orion ON3-M.mtf
index e63ce75b20f..c3a8b5bdd80 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Orion ON3-M.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Orion ON3-M.mtf	
@@ -6,7 +6,7 @@ mul id:4761
 Config:Biped
 techbase:Inner Sphere
 era:3083
-source:TRO Prototypes - Early Republic
+source:TRO: Prototypes - Early Republic
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Patron MilitiaMech PTN-2M.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Patron MilitiaMech PTN-2M.mtf
index fabf8e0f815..9115ca71633 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Patron MilitiaMech PTN-2M.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Patron MilitiaMech PTN-2M.mtf	
@@ -6,7 +6,7 @@ mul id:4795
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:TRO:Prototypes
+Source:TRO:Prototypes - Early Republic
 Rules Level:3
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Spindrift Aquatic SecurityMech SDT-1A.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Spindrift Aquatic SecurityMech SDT-1A.mtf
index 365e2052ed8..14f1266ea4b 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Spindrift Aquatic SecurityMech SDT-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Spindrift Aquatic SecurityMech SDT-1A.mtf	
@@ -6,7 +6,7 @@ mul id:5106
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:TRO:Prototypes
+Source:TRO:Prototypes - Early Republic
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/ProtoTypes/Wolf Trap (Tora) WFT-2B.mtf b/megamek/data/mechfiles/mechs/ProtoTypes/Wolf Trap (Tora) WFT-2B.mtf
index b5ada9694c4..4001ba41212 100644
--- a/megamek/data/mechfiles/mechs/ProtoTypes/Wolf Trap (Tora) WFT-2B.mtf	
+++ b/megamek/data/mechfiles/mechs/ProtoTypes/Wolf Trap (Tora) WFT-2B.mtf	
@@ -6,7 +6,7 @@ mul id:5415
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:TRO: Prototypes
+Source:TRO:Prototypes
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Arion (Standard).mtf b/megamek/data/mechfiles/mechs/QuadVees/Arion.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/QuadVees/Arion (Standard).mtf
rename to megamek/data/mechfiles/mechs/QuadVees/Arion.mtf
index 80629391fca..ee269044f94 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Arion (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Arion.mtf
@@ -6,7 +6,7 @@ mul id:6252
 Config:QuadVee
 TechBase:Clan
 Era:3136
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Boreas A.mtf b/megamek/data/mechfiles/mechs/QuadVees/Boreas A.mtf
index 82f919916c6..0966ba009fa 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Boreas A.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Boreas A.mtf	
@@ -6,7 +6,7 @@ mul id:7352
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3132
-Source:XTRO Republic II - Late Republic
+Source:XTR: Republic II - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Boreas B.mtf b/megamek/data/mechfiles/mechs/QuadVees/Boreas B.mtf
index c728dcd22ac..8201475b921 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Boreas B.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Boreas B.mtf	
@@ -6,7 +6,7 @@ mul id:7353
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3132
-Source:XTRO Republic II - Late Republic
+Source:XTR: Republic II - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Boreas C.mtf b/megamek/data/mechfiles/mechs/QuadVees/Boreas C.mtf
index 886c7a02e9c..1be211aef84 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Boreas C.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Boreas C.mtf	
@@ -6,7 +6,7 @@ mul id:7354
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3132
-Source:XTRO Republic II - Late Republic
+Source:XTR: Republic II - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Boreas D.mtf b/megamek/data/mechfiles/mechs/QuadVees/Boreas D.mtf
index 58f7cee817f..048ccfaf145 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Boreas D.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Boreas D.mtf	
@@ -6,7 +6,7 @@ mul id:7355
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3132
-Source:XTRO Republic II - Late Republic
+Source:XTR: Republic II - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Boreas Prime.mtf b/megamek/data/mechfiles/mechs/QuadVees/Boreas Prime.mtf
index 4a6d7fa4e85..641e6af1a5a 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Boreas Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Boreas Prime.mtf	
@@ -5,7 +5,7 @@ mul id:7351
 Config:QuadVee Omnimech
 techbase:Clan
 era:3132
-source:XTRO Republic II - Late Republic
+source:XTR: Republic II - Late Republic
 rules level:3
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Cyllaros (Standard).mtf b/megamek/data/mechfiles/mechs/QuadVees/Cyllaros.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/QuadVees/Cyllaros (Standard).mtf
rename to megamek/data/mechfiles/mechs/QuadVees/Cyllaros.mtf
index 115835927cb..bee727da40f 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Cyllaros (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Cyllaros.mtf
@@ -6,7 +6,7 @@ mul id:6253
 Config:QuadVee
 TechBase:Clan
 Era:3136
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Harpagos (Standard).mtf b/megamek/data/mechfiles/mechs/QuadVees/Harpagos.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/QuadVees/Harpagos (Standard).mtf
rename to megamek/data/mechfiles/mechs/QuadVees/Harpagos.mtf
index d96bf482ec7..5eeab705b4d 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Harpagos (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Harpagos.mtf
@@ -6,7 +6,7 @@ mul id:6254
 Config:QuadVee
 TechBase:Clan
 Era:3136
-Source:TRO 3145 The Clans - Late Republic
+Source:TRO: 3145 The Clans - Late Republic
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Notos A.mtf b/megamek/data/mechfiles/mechs/QuadVees/Notos A.mtf
index 8db877b5e9d..23538dbd466 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Notos A.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Notos A.mtf	
@@ -6,7 +6,7 @@ mul id:7371
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3145
-Source:XTRO Republic III - Late Republic
+Source:XTR: Republic III - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Notos B.mtf b/megamek/data/mechfiles/mechs/QuadVees/Notos B.mtf
index a4c37f262d8..afec26630ae 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Notos B.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Notos B.mtf	
@@ -6,7 +6,7 @@ mul id:7372
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3145
-Source:XTRO Republic III - Late Republic
+Source:XTR: Republic III - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Notos C.mtf b/megamek/data/mechfiles/mechs/QuadVees/Notos C.mtf
index 3cb8894d361..cf1d45e08d0 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Notos C.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Notos C.mtf	
@@ -6,7 +6,7 @@ mul id:7373
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3145
-Source:XTRO Republic III - Late Republic
+Source:XTR: Republic III - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Notos D.mtf b/megamek/data/mechfiles/mechs/QuadVees/Notos D.mtf
index 8e4a2d17e13..69a3eb47bd8 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Notos D.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Notos D.mtf	
@@ -6,7 +6,7 @@ mul id:7374
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3145
-Source:XTRO Republic III - Late Republic
+Source:XTR: Republic III - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/QuadVees/Notos Prime.mtf b/megamek/data/mechfiles/mechs/QuadVees/Notos Prime.mtf
index 975b1049835..6bb352eb2fd 100644
--- a/megamek/data/mechfiles/mechs/QuadVees/Notos Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/QuadVees/Notos Prime.mtf	
@@ -6,7 +6,7 @@ mul id:7370
 Config:QuadVee Omnimech
 TechBase:Clan
 Era:3145
-Source:XTRO Republic III - Late Republic
+Source:XTR: Republic III - Late Republic
 Rules Level:3
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/RS Jihad/Deimos H.mtf b/megamek/data/mechfiles/mechs/RS Jihad/Deimos H.mtf
index 9bc6fa63e81..55f3d6f8118 100644
--- a/megamek/data/mechfiles/mechs/RS Jihad/Deimos H.mtf	
+++ b/megamek/data/mechfiles/mechs/RS Jihad/Deimos H.mtf	
@@ -6,7 +6,7 @@ mul id:9505
 Config:Biped Omnimech
 techbase:Clan
 era:3085
-source:Jihad
+source:TRO:Jihad - Early Republic
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 10/Crucible (Standard).mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 10/Crucible.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 10/Crucible (Standard).mtf
rename to megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 10/Crucible.mtf
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 17/Amarok (Standard).mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 17/Amarok.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 17/Amarok (Standard).mtf
rename to megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 17/Amarok.mtf
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 18/Jenner IIC (Standard).mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 18/Jenner IIC.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 18/Jenner IIC (Standard).mtf
rename to megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 18/Jenner IIC.mtf
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 21/Kontio (Standard).mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 21/Kontio.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 21/Kontio (Standard).mtf
rename to megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 21/Kontio.mtf
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 23/Star Python.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 23/Star Python.mtf
index 55d8ca105dd..91ef70eba3c 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 23/Star Python.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 23/Star Python.mtf	
@@ -6,7 +6,7 @@ mul id:8413
 Config:Biped
 techbase:Clan
 era:3150
-source:Rec Guide:ilClan #23 -
+source:Rec Guide:ilClan #23 - Dark Age
 rules level:3
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon CLN-8V.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon CLN-8V.mtf
index f027128bcd2..2bd78f43611 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon CLN-8V.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon CLN-8V.mtf	
@@ -5,7 +5,7 @@ mul id:9267
 Config:Biped
 techbase:Inner Sphere
 era:3086
-source:RecGuide 25 - Early Republic
+source:Rec Guide:ilClan #25 - Early Republic
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon CLN-9V.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon CLN-9V.mtf
index 392e8c511bc..71fa332431d 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon CLN-9V.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon CLN-9V.mtf	
@@ -5,7 +5,7 @@ mul id:9268
 Config:Biped
 techbase:Inner Sphere
 era:3120
-source:RecGuide 25 - Late Republic
+source:Rec Guide:ilClan #25 - Late Republic
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon TRC-4B.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon TRC-4B.mtf
index fedb611644a..79f715a6937 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon TRC-4B.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon TRC-4B.mtf	
@@ -5,7 +5,7 @@ mul id:546
 Config:Biped
 techbase:Inner Sphere
 era:2510
-source:Rec Guide 25 - Age of War
+source:Rec Guide:ilClan #25 - Age of War
 rules level:1
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon TRC-4C.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon TRC-4C.mtf
index 5336d173a6e..899ee057e7c 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon TRC-4C.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Chameleon TRC-4C.mtf	
@@ -5,7 +5,7 @@ mul id:9405
 Config:Biped
 techbase:Inner Sphere
 era:2820
-source:Rec Guide 25 - Early Succession War
+source:Rec Guide:ilClan #25 - Early Succession War
 rules level:1
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer F.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer F.mtf
index 3e5a9827afd..dedb17092b5 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer F.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer F.mtf	
@@ -5,7 +5,7 @@ mul id:4850
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:Rec Guide 25 - Jihad
+source:Rec Guide:ilClan #25 - Jihad
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer G.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer G.mtf
index 9a8f567ff31..d0dc866ad6f 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer G.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer G.mtf	
@@ -5,7 +5,7 @@ mul id:9261
 Config:Biped Omnimech
 techbase:Clan
 era:3142
-source:Rec Guide 25 - Dark Age
+source:Rec Guide:ilClan #25 - Dark Age
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer I.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer I.mtf
index 6abea0bbd8b..3acf6fc142f 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer I.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer I.mtf	
@@ -5,7 +5,7 @@ mul id:9263
 Config:Biped Omnimech
 techbase:Clan
 era:3142
-source:Rec Guide 25 - Dark Ages
+source:Rec Guide:ilClan #25 - Dark Ages
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer T.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer T.mtf
index 4f56fc79b27..27e2aec45d5 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer T.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer T.mtf	
@@ -5,7 +5,7 @@ mul id:9262
 Config:Biped Omnimech
 techbase:Mixed (Clan Chassis)
 era:3142
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer W.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer W.mtf
index 53187d33fe2..049ccb797bc 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer W.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer W.mtf	
@@ -5,7 +5,7 @@ mul id:9264
 Config:Biped Omnimech
 techbase:Clan
 era:3089
-source:Rec Guide 25 - Early Republic
+source:Rec Guide:ilClan #25 - Early Republic
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer X.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer X.mtf
index 509c92f8ff4..dc728a22c8a 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer X.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Pouncer X.mtf	
@@ -5,7 +5,7 @@ mul id:9265
 Config:Biped Omnimech
 techbase:Mixed (Clan Chassis)
 era:3147
-source:Rec Guide 25 - Clan Invasion
+source:Rec Guide:ilClan #25 - Clan Invasion
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Vindicator VND-7L.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Vindicator VND-7L.mtf
index 0c3bea929f2..ff455dff9a9 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Vindicator VND-7L.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Vindicator VND-7L.mtf	
@@ -5,7 +5,7 @@ mul id:9266
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3147
-source:Rec Guide 25 - Dark Ages
+source:Rec Guide:ilClan #25 - Dark Ages
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Wraith TR5.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Wraith TR5.mtf
index 169ec989e6d..f894356deb5 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Wraith TR5.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 25/Wraith TR5.mtf	
@@ -5,7 +5,7 @@ mul id:9269
 Config:Biped
 techbase:Inner Sphere
 era:3140
-source:Rec Guide 25 - Dark Ages
+source:Rec Guide:ilClan #25 - Dark Ages
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-3M-DC.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-3M-DC.mtf
index 7d0851494d5..325a4a66686 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-3M-DC.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-3M-DC.mtf	
@@ -6,7 +6,7 @@ mul id:3806
 Config:Biped
 techbase:Inner Sphere
 era:3053
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:3
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6C.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6C.mtf
index c77dc17f65d..ef90abc248f 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6C.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6C.mtf	
@@ -6,7 +6,7 @@ mul id:7476
 Config:Biped
 techbase:Inner Sphere
 era:3081
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:3
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6G.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6G.mtf
index f9fcf4e56c1..a250ea8cda6 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6G.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6G.mtf	
@@ -6,7 +6,7 @@ mul id:7475
 Config:Biped
 techbase:Inner Sphere
 era:3088
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6R.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6R.mtf
index 97dcb156960..c4d66b1bb68 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6R.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster BLR-6R.mtf	
@@ -5,7 +5,7 @@ mul id:9404
 Config:Biped
 techbase:Inner Sphere
 era:3104
-source:Rec Guide:ilClan #3- Late Republic
+source:Rec Guide:ilClan #3 - Late Republic
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster C 3.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster C 3.mtf
index d672204c9fa..d7d88037a86 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster C 3.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/BattleMaster C 3.mtf	
@@ -6,7 +6,7 @@ mul id:7477
 Config:Biped
 techbase:Clan
 era:3145
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon A.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon A.mtf
index a4793afdd9b..444868a55bc 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon A.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon A.mtf	
@@ -6,7 +6,7 @@ mul id:7485
 Config:Biped Omnimech
 techbase:Clan
 era:3148
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:3
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon B.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon B.mtf
index a59ecc2ab58..0dffbef21a8 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon B.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon B.mtf	
@@ -6,7 +6,7 @@ mul id:7486
 Config:Biped Omnimech
 techbase:Clan
 era:3148
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:3
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon C.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon C.mtf
index d45d6d31f92..3672f6be0ae 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon C.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon C.mtf	
@@ -6,7 +6,7 @@ mul id:7487
 Config:Biped Omnimech
 techbase:Clan
 era:3148
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:3
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon D.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon D.mtf
index c2827e18b09..bff2ea9e4ba 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon D.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon D.mtf	
@@ -6,7 +6,7 @@ mul id:7488
 Config:Biped Omnimech
 techbase:Clan
 era:3148
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:3
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon Prime.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon Prime.mtf
index 5778c97f9e2..91e63e388d5 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Hierofalcon Prime.mtf	
@@ -6,7 +6,7 @@ mul id:7484
 Config:Biped Omnimech
 techbase:Clan
 era:3148
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:3
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) I.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) I.mtf
index d55adb0ff0f..889b47416ba 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) I.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) I.mtf	
@@ -6,7 +6,7 @@ mul id:7479
 Config:Biped Omnimech
 techbase:Clan
 era:3125
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) K.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) K.mtf
index 11fc64030da..c12669d5630 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) K.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) K.mtf	
@@ -6,7 +6,7 @@ mul id:7481
 Config:Biped Omnimech
 techbase:Clan
 era:3125
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) L.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) L.mtf
index 782b2624bf8..f8a88ffd7ab 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) L.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) L.mtf	
@@ -6,7 +6,7 @@ mul id:7482
 Config:Biped Omnimech
 techbase:Clan
 era:3147
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) S.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) S.mtf
index b299289ca1b..eeafeb70a5c 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) S.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) S.mtf	
@@ -6,7 +6,7 @@ mul id:7483
 Config:Biped Omnimech
 techbase:Clan
 era:3050
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) T.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) T.mtf
index 3a1ec9496be..4f077e331e4 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) T.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Puma (Adder) T.mtf	
@@ -6,7 +6,7 @@ mul id:7478
 Config:Biped Omnimech
 techbase:Clan
 era:3142
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III A.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III A.mtf
index ac55d41afc5..04a74b8fc63 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III A.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III A.mtf	
@@ -6,7 +6,7 @@ mul id:7492
 Config:Biped Omnimech
 techbase:Clan
 era:3111
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III B.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III B.mtf
index 3343dee468f..1cecef5f6d1 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III B.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III B.mtf	
@@ -6,7 +6,7 @@ mul id:7493
 Config:Biped Omnimech
 techbase:Clan
 era:3111
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III C.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III C.mtf
index 25aea0fac13..62e4dba0eaa 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III C.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III C.mtf	
@@ -5,7 +5,7 @@ mul id:7494
 Config:Biped Omnimech
 techbase:Clan
 era:3111
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III Prime.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III Prime.mtf
index 76c6b056f97..8b2403bd345 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Shadow Cat III Prime.mtf	
@@ -6,7 +6,7 @@ mul id:7491
 Config:Biped Omnimech
 techbase:Clan
 era:3111
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) AA.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) AA.mtf
index dff592f4c34..08c3a44e978 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) AA.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) AA.mtf	
@@ -6,7 +6,7 @@ mul id:6876
 Config:Biped Omnimech
 techbase:Clan
 era:3086
-source:Rec Guide:ilClan #3- Early Republic
+source:Rec Guide:ilClan #3 - Early Republic
 rules level:3
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) J.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) J.mtf
index 613f0568e94..98bd0f25fd7 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) J.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) J.mtf	
@@ -6,7 +6,7 @@ mul id:7489
 Config:Biped Omnimech
 techbase:Clan
 era:3148
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) Q.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) Q.mtf
index 75858260136..d1469ed9cf5 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) Q.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) Q.mtf	
@@ -6,7 +6,7 @@ mul id:3184
 Config:Biped Omnimech
 techbase:Clan
 era:3069
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) T.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) T.mtf
index 8d4a24280d8..2419d15958e 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) T.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 3/Thor (Summoner) T.mtf	
@@ -6,7 +6,7 @@ mul id:7490
 Config:Biped Omnimech
 techbase:Clan
 era:3142
-source:Rec Guide:ilClan #3- Dark Age
+source:Rec Guide:ilClan #3 - Dark Age
 rules level:2
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_E.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_E.mtf
index a25e0bf1734..e4d68f7d363 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_E.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_E.mtf	
@@ -6,7 +6,7 @@ mul id:403
 Config:Biped Omnimech
 TechBase:Clan
 Era:3063
-Source:TRO 3060 - Civil War
+Source:TRO: 3060 - Civil War
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_F.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_F.mtf
index efe8e1367a4..3d2d5d1a8e1 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_F.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_F.mtf	
@@ -6,7 +6,7 @@ mul id:404
 Config:Biped Omnimech
 TechBase:Clan
 Era:3071
-Source:TRO 3060 - Jihad
+Source:TRO: 3060 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_G.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_G.mtf
index c8e0c21cea2..36823ad7cc6 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_G.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 32/Star Adder (Blood Asp)_G.mtf	
@@ -6,7 +6,7 @@ mul id:405
 Config:Biped Omnimech
 TechBase:Clan
 Era:3074
-Source:TRO 3060 - Jihad
+Source:TRO: 3060 - Jihad
 Rules Level:2
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 4/Thresher Mk II (Standard).mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 4/Thresher Mk II.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 4/Thresher Mk II (Standard).mtf
rename to megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 4/Thresher Mk II.mtf
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 4/Warhammer IIC (Standard).mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 4/Warhammer IIC.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 4/Warhammer IIC (Standard).mtf
rename to megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 4/Warhammer IIC.mtf
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 5/Hammerhead (Standard).mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 5/Hammerhead.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 5/Hammerhead (Standard).mtf
rename to megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 5/Hammerhead.mtf
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) I.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) I.mtf
index 696836a1928..290b27bd0ce 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) I.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) I.mtf	
@@ -6,7 +6,7 @@ mul id:7557
 Config:Biped Omnimech
 techbase:Clan
 era:3086
-source:Rec Guide:ilClan #7 - 
+source:Rec Guide:ilClan #7 - Early Republic
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) J.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) J.mtf
index 01e1dc247ae..ab3eda2d95d 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) J.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) J.mtf	
@@ -6,7 +6,7 @@ mul id:7558
 Config:Biped Omnimech
 techbase:Clan
 era:3107
-source:Rec Guide:ilClan #7 - 
+source:Rec Guide:ilClan #7 - Late Republic
 rules level:4
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) K.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) K.mtf
index 12a058cc06b..8a273e3fe9e 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) K.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) K.mtf	
@@ -6,7 +6,7 @@ mul id:7559
 Config:Biped Omnimech
 techbase:Clan
 era:3112
-source:Rec Guide:ilClan #7 - 
+source:Rec Guide:ilClan #7 - Late Republic
 rules level:4
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) L.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) L.mtf
index 34333c04168..44a34ee383a 100644
--- a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) L.mtf	
+++ b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 7/Koshi (Mist Lynx) L.mtf	
@@ -6,7 +6,7 @@ mul id:7560
 Config:Biped Omnimech
 techbase:Clan
 era:3124
-source:Rec Guide:ilClan #7 - 
+source:Rec Guide:ilClan #7 - Late Republic
 rules level:4
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 8/Devil (Standard).mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 8/Devil.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 8/Devil (Standard).mtf
rename to megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 8/Devil.mtf
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Hel HL-1.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Hel HL-1.mtf
index 1cbc619e3c0..b1ceb309e08 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Hel HL-1.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Hel HL-1.mtf	
@@ -6,7 +6,7 @@ mul id:8250
 Config:Biped
 techbase:Inner Sphere
 era:3092
-source:Shrapnel 10 - Late Republic
+source:Shrapnel #10 - Late Republic
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Hel HL-2.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Hel HL-2.mtf
index 6073857a9a4..367f1b40eef 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Hel HL-2.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Hel HL-2.mtf	
@@ -6,7 +6,7 @@ mul id:9251
 Config:Biped
 techbase:Inner Sphere
 era:3092
-source:Shrapnel 10 - Late Republic
+source:Shrapnel #10 - Late Republic
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Tiburon 2.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Tiburon 2.mtf
index a15e3e31807..a2248af0d52 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Tiburon 2.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Tiburon 2.mtf	
@@ -5,7 +5,7 @@ mul id:9252
 Config:Biped
 techbase:Clan
 era:3113
-source:Shrapnel 10 - Late Republic
+source:Shrapnel #10 - Late Republic
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Toro TR-B-12.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Toro TR-B-12.mtf
index f106cf13dd5..64a10916738 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Toro TR-B-12.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Toro TR-B-12.mtf	
@@ -5,7 +5,7 @@ mul id:9250
 Config:Biped
 techbase:Inner Sphere
 era:3146
-source:Shrapnel 10 - Dark Ages
+source:Shrapnel #10 - Dark Ages
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Toro TR-B-9.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Toro TR-B-9.mtf
index d46ee67c407..a98bcecc976 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Toro TR-B-9.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 10/Toro TR-B-9.mtf	
@@ -5,7 +5,7 @@ mul id:9249
 Config:Biped
 techbase:Inner Sphere
 era:3108
-source:Shrapnel 10 - Late Republic
+source:Shrapnel #10 - Late Republic
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OG.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OG.mtf
index 0d38cd33d65..4727e38bd3e 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OG.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OG.mtf	
@@ -5,7 +5,7 @@ mul id:9492
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3083
-source:Shrapnel 11 - Early Republic
+source:Shrapnel #11 - Early Republic
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OH.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OH.mtf
index d33d1f9ff09..c5c26831f6f 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OH.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OH.mtf	
@@ -5,7 +5,7 @@ mul id:9493
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3083
-source:Shrapnel 11 - Early Republic
+source:Shrapnel #11 - Early Republic
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OI.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OI.mtf
index 41c616c8067..3c2b1e12470 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OI.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OI.mtf	
@@ -5,7 +5,7 @@ mul id:9494
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3083
-source:Shrapnel 11 - Early Republic
+source:Shrapnel #11 - Early Republic
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OJ.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OJ.mtf
index e0313649fe7..1b4e26342ae 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OJ.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 11/Battle Cobra BTL-C-2OJ.mtf	
@@ -5,7 +5,7 @@ mul id:9495
 Config:Biped Omnimech
 techbase:Inner Sphere
 era:3144
-source:Shrapnel 11 - Dark Age
+source:Shrapnel #11 - Dark Age
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 2/Gyrfalcon 5.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 2/Gyrfalcon 5.mtf
index ef4c96966d1..1a98098f0e1 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 2/Gyrfalcon 5.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 2/Gyrfalcon 5.mtf	
@@ -6,7 +6,7 @@ mul id:7694
 Config:Biped
 techbase:Clan
 era:3133
-source:Shrapnel 2 - Late Republic
+source:Shrapnel #2 - Late Republic
 rules level:3
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 3/Thunder Stallion 4.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 3/Thunder Stallion 4.mtf
index 7bf126ff4f2..ab2acc94091 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 3/Thunder Stallion 4.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 3/Thunder Stallion 4.mtf	
@@ -6,7 +6,7 @@ mul id:7720
 Config:Quad
 techbase:Clan
 era:3138
-source:Shrapnel 3:Dark Age
+source:Shrapnel #3 - Dark Age
 rules level:2
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 4/SuburbanMech UM-R100.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 4/SuburbanMech UM-R100.mtf
index 19ce7a0503f..3684db8479c 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 4/SuburbanMech UM-R100.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 4/SuburbanMech UM-R100.mtf	
@@ -6,7 +6,7 @@ mul id:7929
 Config:Biped
 techbase:Inner Sphere
 era:3045
-source:Shrapnel 4 - Succession Wars
+source:Shrapnel #4 - Succession Wars
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 4/SuburbanMech UM-R90.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 4/SuburbanMech UM-R90.mtf
index 7e78bd0add7..08462bc7ea2 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 4/SuburbanMech UM-R90.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 4/SuburbanMech UM-R90.mtf	
@@ -6,7 +6,7 @@ mul id:7928
 Config:Biped
 techbase:Inner Sphere
 era:3018
-source:Shrapnel 4 - Succession Wars
+source:Shrapnel #4 - Succession Wars
 rules level:1
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 6/Victor C.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 6/Victor C.mtf
index 1c0de92cdf7..8852f298d11 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 6/Victor C.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 6/Victor C.mtf	
@@ -6,7 +6,7 @@ mul id:3403
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:2835
-source:Shrapnel 6 - Succession Wars
+source:Shrapnel #6 - Succession Wars
 rules level:4
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 7/Hatchetman HCT-5DT.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 7/Hatchetman HCT-5DT.mtf
index 82dbef3852c..af74cc16ba3 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 7/Hatchetman HCT-5DT.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 7/Hatchetman HCT-5DT.mtf	
@@ -6,7 +6,7 @@ mul id:8438
 Config:Biped
 techbase:Inner Sphere
 era:3145
-source:Shrapnel 7 - Dark Age
+source:Shrapnel #7 - Dark Age
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Longshot LNG-2 Reskov.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Longshot LNG-2 Reskov.mtf
index a8b80c89e9a..5fd63c84b78 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Longshot LNG-2 Reskov.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Longshot LNG-2 Reskov.mtf	
@@ -5,7 +5,7 @@ mul id:9243
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3084
-source:TRO 3055 - Clan Invasion
+source:TRO: 3055 - Clan Invasion
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake II RSN-1.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake II RSN-1.mtf
index f28c3d49aae..6bfb6dcffd5 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake II RSN-1.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake II RSN-1.mtf	
@@ -5,7 +5,7 @@ mul id:9241
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3150
-source:Shrapnel 9 - Dark Ages
+source:Shrapnel #9 - Dark Ages
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake II RSN-2.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake II RSN-2.mtf
index c39dcc992f6..76cf50da484 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake II RSN-2.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake II RSN-2.mtf	
@@ -5,7 +5,7 @@ RSN-2
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3149
-source:Shrapnel 9 - Dark Ages
+source:Shrapnel #9 - Dark Ages
 rules level:2
 mul id:9242
 
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31.mtf
index cc944e346e8..12921dc2d35 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31.mtf	
@@ -5,7 +5,7 @@ JR7-31
 Config:Biped
 techbase:Inner Sphere
 era:3042
-source:Shrapnel 9 - Late Succession War
+source:Shrapnel #9 - Late Succession War
 rules level:2
 mul id:9238
 
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31P.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31P.mtf
index 20710257190..8bef92f778c 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31P.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31P.mtf	
@@ -5,7 +5,7 @@ JR7-31P
 Config:Biped
 techbase:Inner Sphere
 era:3043
-source:Shrapnel 9 - Late Succession War
+source:Shrapnel #9 - Late Succession War
 rules level:2
 mul id:9239
 
diff --git a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31R Gideon.mtf b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31R Gideon.mtf
index 266180d6db1..c57b8fb61a0 100644
--- a/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31R Gideon.mtf	
+++ b/megamek/data/mechfiles/mechs/Shrapnel/Vol 9/Rattlesnake JR7-31R Gideon.mtf	
@@ -5,7 +5,7 @@ JR7-31R (Gideon)
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3084
-source:Shrapnel 9 - Early Republic
+source:Shrapnel #9 - Early Republic
 rules level:2
 mul id:9240
 
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XV HaulerMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XV HaulerMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XV HaulerMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XV HaulerMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XXI HaulerMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XXI HaulerMech.mtf
similarity index 99%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XXI HaulerMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XXI HaulerMech.mtf
index a295ac99b9f..1dc139d632e 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XXI HaulerMech (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Buster BC XXI HaulerMech.mtf	
@@ -6,7 +6,7 @@ mul id:7220
 Config:Biped
 TechBase:Inner Sphere
 Era:3059
-Source:TRO VA
+Source:TRO: VA
 Rules Level:2
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Carbine CON-8 ConstructionMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Carbine CON-8 ConstructionMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Carbine CON-8 ConstructionMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Carbine CON-8 ConstructionMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Carbine CON-8H HaulerMech.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Carbine CON-8H HaulerMech.mtf
index c64f299ba43..722f4d4e788 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Carbine CON-8H HaulerMech.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Carbine CON-8H HaulerMech.mtf	
@@ -6,7 +6,7 @@ mul id:7162
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:TRO VA - Civil War
+Source:TRO: VA - Civil War
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Chaffee Servicemech BT1.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Chaffee Servicemech BT1.mtf
index 14bb85883ab..92889360ff6 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Chaffee Servicemech BT1.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Chaffee Servicemech BT1.mtf	
@@ -6,7 +6,7 @@ mul id:7151
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:TRO VA - Jihad
+Source:TRO: VA - Jihad
 Rules Level:3
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Dig Lord RCL-4 MiningMech.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Dig Lord RCL-4 MiningMech.mtf
index 0b915128983..df6738e6f3b 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Dig Lord RCL-4 MiningMech.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Dig Lord RCL-4 MiningMech.mtf	
@@ -6,7 +6,7 @@ mul id:4079
 Config:Biped
 techbase:Inner Sphere
 era:3057
-source:TRO VA - Clan Invasion
+source:TRO: VA - Clan Invasion
 rules level:3
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Grommet D90 MilitiaMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Grommet D90 MilitiaMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Grommet D90 MilitiaMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Grommet D90 MilitiaMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Harvester Agromech HVR-99.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Harvester Agromech HVR-99.mtf
index 19eb5b41ddf..04f6b92d2bc 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Harvester Agromech HVR-99.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Harvester Agromech HVR-99.mtf	
@@ -6,7 +6,7 @@ mul id:4264
 Config:Biped
 TechBase:Inner Sphere
 Era:3049
-Source:TRO VA
+Source:TRO: VA
 Rules Level:2
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Harvester Ant KIC-3 Agromech.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Harvester Ant KIC-3 Agromech.mtf
index c1ff5fe88a0..499c1d0b621 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Harvester Ant KIC-3 Agromech.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Harvester Ant KIC-3 Agromech.mtf	
@@ -6,7 +6,7 @@ mul id:4265
 Config:Quad
 TechBase:Inner Sphere
 Era:2650
-Source:TRO VA - Star League
+Source:TRO: VA - Star League
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Heavy Lifter HCL-1 CargoMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Heavy Lifter HCL-1 CargoMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Heavy Lifter HCL-1 CargoMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Heavy Lifter HCL-1 CargoMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Lumberjack LM5M.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Lumberjack LM5M.mtf
index 95a3bf1b05f..13a89065d2b 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Lumberjack LM5M.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Lumberjack LM5M.mtf	
@@ -6,7 +6,7 @@ mul id:7177
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:RS 3075
+Source:RS 3075 - Jihad
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Peacemaker PM6 PoliceMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Peacemaker PM6 PoliceMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Peacemaker PM6 PoliceMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Peacemaker PM6 PoliceMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier Firemech GM-3CD.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier Firemech GM-3CD.mtf
index 155a679a7be..234822cc48c 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier Firemech GM-3CD.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier Firemech GM-3CD.mtf	
@@ -6,7 +6,7 @@ mul id:4843
 Config:Biped
 TechBase:Inner Sphere
 Era:3062
-Source:TRO VA - Civil War
+Source:TRO: VA - Civil War
 Rules Level:3
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier Firemech GM-3HT.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier Firemech GM-3HT.mtf
index 0930110bef3..6402a32e5b2 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier Firemech GM-3HT.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier Firemech GM-3HT.mtf	
@@ -6,7 +6,7 @@ mul id:4844
 Config:Biped
 TechBase:Inner Sphere
 Era:3060
-Source:TRO VA - Clan Invasion
+Source:TRO: VA - Clan Invasion
 Rules Level:3
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier GM-3A.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier GM-3A.mtf
index d5029494862..b716f21587b 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier GM-3A.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Pompier GM-3A.mtf	
@@ -6,7 +6,7 @@ mul id:4842
 Config:Biped
 TechBase:Inner Sphere
 Era:3044
-Source:TRO VA - Late Succession War
+Source:TRO: VA - Late Succession War
 Rules Level:3
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Powerman SC XV HaulerMech.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Powerman SC XV HaulerMech.mtf
index 29524e268cd..12d73b695c1 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Powerman SC XV HaulerMech.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Powerman SC XV HaulerMech.mtf	
@@ -6,7 +6,7 @@ mul id:4852
 Config:Biped
 techbase:Inner Sphere
 era:2895
-source:TRO VA
+source:TRO: VA
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Powerman SC XVI HaulerMech.mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Powerman SC XVI HaulerMech.mtf
index 68d427774a0..a6e71dddfdc 100644
--- a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Powerman SC XVI HaulerMech.mtf	
+++ b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Powerman SC XVI HaulerMech.mtf	
@@ -6,7 +6,7 @@ mul id:4853
 Config:Biped
 techbase:Inner Sphere
 era:3068
-source:TRO VA
+source:TRO: VA
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/ScavengerMech SC-V SalvageMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/ScavengerMech SC-V SalvageMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/ScavengerMech SC-V SalvageMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/ScavengerMech SC-V SalvageMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/ScavengerMech SC-V-M MilitiaMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/ScavengerMech SC-V-M MilitiaMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/ScavengerMech SC-V-M MilitiaMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/ScavengerMech SC-V-M MilitiaMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70 CargoMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70 CargoMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70 CargoMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70 CargoMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70 MilitiaMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70 MilitiaMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70 MilitiaMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70 MilitiaMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70T CargoMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70T CargoMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70T CargoMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Uni ATAE-70T CargoMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TR Vehicle Annex/Vampyr SC-V-1 SalvageMech (Standard).mtf b/megamek/data/mechfiles/mechs/TR Vehicle Annex/Vampyr SC-V-1 SalvageMech.mtf
similarity index 100%
rename from megamek/data/mechfiles/mechs/TR Vehicle Annex/Vampyr SC-V-1 SalvageMech (Standard).mtf
rename to megamek/data/mechfiles/mechs/TR Vehicle Annex/Vampyr SC-V-1 SalvageMech.mtf
diff --git a/megamek/data/mechfiles/mechs/TRO SW/Flea FLE-16.mtf b/megamek/data/mechfiles/mechs/TRO SW/Flea FLE-16.mtf
index d0b6e40f8a8..d2c4368df99 100644
--- a/megamek/data/mechfiles/mechs/TRO SW/Flea FLE-16.mtf	
+++ b/megamek/data/mechfiles/mechs/TRO SW/Flea FLE-16.mtf	
@@ -6,7 +6,7 @@ mul id:7427
 Config:Biped
 TechBase:Inner Sphere
 Era:3032
-Source:TRO Succession Wars - Age of War
+Source:TRO: Succession Wars - Age of War
 Rules Level:1
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Commando COM-1AK.mtf b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Commando COM-1AK.mtf
index 0dbbc05c7fb..b2f5b1d80c3 100644
--- a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Commando COM-1AK.mtf	
+++ b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Commando COM-1AK.mtf	
@@ -6,7 +6,7 @@ mul id:7461
 Config:Biped
 techbase:Inner Sphere
 era:3072
-source:Jihad
+source:ToS Kaumberg - Jihad
 rules level:4
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Copper SecurityMech CPK-65KM.mtf b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Copper SecurityMech CPK-65KM.mtf
index d5f36a85301..ab7586bc593 100644
--- a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Copper SecurityMech CPK-65KM.mtf	
+++ b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Copper SecurityMech CPK-65KM.mtf	
@@ -6,7 +6,7 @@ mul id:7465
 Config:Biped
 techbase:Inner Sphere
 era:3065
-source:Jihad
+source:ToS Kaumberg - Civil War
 rules level:2
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Crosscut ED-X4K LoggerMech.mtf b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Crosscut ED-X4K LoggerMech.mtf
index 0cf60b8f773..8076ea145f8 100644
--- a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Crosscut ED-X4K LoggerMech.mtf	
+++ b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Crosscut ED-X4K LoggerMech.mtf	
@@ -6,7 +6,7 @@ mul id:7466
 Config:Biped
 techbase:Inner Sphere
 era:2786
-source:Jihad
+source:ToS Kaumberg - Early Succession War
 rules level:2
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KC.mtf b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KC.mtf
index 91afd41454c..e4e8ec8e2b9 100644
--- a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KC.mtf	
+++ b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KC.mtf	
@@ -6,7 +6,7 @@ mul id:7467
 Config:Biped
 techbase:Inner Sphere
 era:3065
-source:Jihad
+source:ToS Kaumberg - Civil War
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KL.mtf b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KL.mtf
index 4f32935a354..7b10a105b1a 100644
--- a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KL.mtf	
+++ b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KL.mtf	
@@ -6,7 +6,7 @@ mul id:7468
 Config:Biped
 techbase:Inner Sphere
 era:3070
-source:Jihad
+source:ToS Kaumberg - Jihad
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KR.mtf b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KR.mtf
index bee26030b87..e1cf78fbd9f 100644
--- a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KR.mtf	
+++ b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KR.mtf	
@@ -6,7 +6,7 @@ mul id:7469
 Config:Biped
 techbase:Inner Sphere
 era:3079
-source:Jihad
+source:ToS Kaumberg - Jihad
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KT.mtf b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KT.mtf
index c8ef4e6e1fb..230ce8a5840 100644
--- a/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KT.mtf	
+++ b/megamek/data/mechfiles/mechs/ToS/ToS Kaumberg/Phoenix PX-1KT.mtf	
@@ -6,7 +6,7 @@ mul id:7470
 Config:Biped
 techbase:Inner Sphere
 era:3070
-source:Jihad
+source:ToS Kaumberg - Jihad
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Total Chaos/Awesome AWS-10KM (Cameron).mtf b/megamek/data/mechfiles/mechs/Total Chaos/Awesome AWS-10KM (Cameron).mtf
index 26692577e07..39533ab4f7b 100644
--- a/megamek/data/mechfiles/mechs/Total Chaos/Awesome AWS-10KM (Cameron).mtf	
+++ b/megamek/data/mechfiles/mechs/Total Chaos/Awesome AWS-10KM (Cameron).mtf	
@@ -6,7 +6,7 @@ mul id:7397
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3075
-source:TRO 3050 - Jihad
+source:TRO: 3050 - Jihad
 rules level:3
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Archer ARC-5CS.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Archer ARC-5CS.mtf
index e382a7a07b9..f0249507a2b 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Archer ARC-5CS.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Archer ARC-5CS.mtf	
@@ -6,7 +6,7 @@ mul id:7598
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Black Knight BL-9-KNT.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Black Knight BL-9-KNT.mtf
index 78f751f1cb0..db93f873358 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Black Knight BL-9-KNT.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Black Knight BL-9-KNT.mtf	
@@ -6,7 +6,7 @@ mul id:362
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Gladiator (Executioner) TC.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Gladiator (Executioner) TC.mtf
index 40f450a15cc..d45ffbe8079 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Gladiator (Executioner) TC.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Gladiator (Executioner) TC.mtf	
@@ -6,7 +6,7 @@ mul id:7596
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Loki (Hellbringer) M.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Loki (Hellbringer) M.mtf
index 2ad3e5d37d6..82cc3caac74 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Loki (Hellbringer) M.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Loki (Hellbringer) M.mtf	
@@ -6,7 +6,7 @@ mul id:7594
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-source:TRO Clan Invasion - Clan Invasion
+source:TRO: Clan Invasion - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Mad Cat (Timber Wolf) TC.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Mad Cat (Timber Wolf) TC.mtf
index 90db7a3199d..a4849e4b166 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Mad Cat (Timber Wolf) TC.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Mad Cat (Timber Wolf) TC.mtf	
@@ -6,7 +6,7 @@ mul id:7595
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Marauder MAD-5CS.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Marauder MAD-5CS.mtf
index 2119c8b9b23..024038455ac 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Marauder MAD-5CS.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Marauder MAD-5CS.mtf	
@@ -6,7 +6,7 @@ mul id:7600
 Config:Biped
 techbase:Inner Sphere
 era:3052
-source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 rules level:2
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Phoenix Hawk PXH-1bC.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Phoenix Hawk PXH-1bC.mtf
index 14253750aae..eae92075bd2 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Phoenix Hawk PXH-1bC.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Phoenix Hawk PXH-1bC.mtf	
@@ -6,7 +6,7 @@ mul id:7602
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Puma (Adder) TC.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Puma (Adder) TC.mtf
index 738bdc7b492..ec323f1bda0 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Puma (Adder) TC.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Puma (Adder) TC.mtf	
@@ -6,7 +6,7 @@ mul id:7589
 Config:Biped Omnimech
 techbase:Clan
 era:3052
-source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 rules level:2
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Rifleman RFL-5CS.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Rifleman RFL-5CS.mtf
index dbc9057a592..c4bd72aed39 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Rifleman RFL-5CS.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Rifleman RFL-5CS.mtf	
@@ -6,7 +6,7 @@ mul id:7597
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Ryoken (Stormcrow) Attwater.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Ryoken (Stormcrow) Attwater.mtf
index b47ba69e082..99b34cbe0ce 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Ryoken (Stormcrow) Attwater.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Ryoken (Stormcrow) Attwater.mtf	
@@ -6,7 +6,7 @@ mul id:7591
 Config:Biped Omnimech
 techbase:Clan
 era:3052
-source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 rules level:2
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Ryoken (Stormcrow) TC.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Ryoken (Stormcrow) TC.mtf
index e11d13d8df6..db028e28f2d 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Ryoken (Stormcrow) TC.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Ryoken (Stormcrow) TC.mtf	
@@ -6,7 +6,7 @@ mul id:7592
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Shadow Cat TC.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Shadow Cat TC.mtf
index 7c436570861..73b464485b0 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Shadow Cat TC.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Shadow Cat TC.mtf	
@@ -6,7 +6,7 @@ mul id:7590
 Config:Biped Omnimech
 techbase:Clan
 era:3050
-source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 rules level:2
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Shadow Hawk SHD-2Ht.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Shadow Hawk SHD-2Ht.mtf
index 807794b04f4..169f8268d18 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Shadow Hawk SHD-2Ht.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Shadow Hawk SHD-2Ht.mtf	
@@ -6,7 +6,7 @@ mul id:7737
 Config:Biped
 TechBase:Inner Sphere
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/Tukayyid/Vulture (Mad Dog) S.mtf b/megamek/data/mechfiles/mechs/Tukayyid/Vulture (Mad Dog) S.mtf
index 585c49c94d0..35a3888949e 100644
--- a/megamek/data/mechfiles/mechs/Tukayyid/Vulture (Mad Dog) S.mtf	
+++ b/megamek/data/mechfiles/mechs/Tukayyid/Vulture (Mad Dog) S.mtf	
@@ -6,7 +6,7 @@ mul id:7593
 Config:Biped Omnimech
 TechBase:Clan
 Era:3052
-Source:Clan Invasion
+source:Battle of Tukayyid - Clan Invasion
 Rules Level:2
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Luzerne/Cauldron-Born (Ebon Jaguar) (Samantha).mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Luzerne/Cauldron-Born (Ebon Jaguar) (Samantha).mtf
index 0342ce8b72e..17b93347c72 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Luzerne/Cauldron-Born (Ebon Jaguar) (Samantha).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Luzerne/Cauldron-Born (Ebon Jaguar) (Samantha).mtf	
@@ -6,7 +6,7 @@ mul id:5862
 Config:Biped Omnimech
 TechBase:Clan
 Era:3059
-Source:HTP Luzerne - Clan Invasion
+Source:HTP:Luzerne - Clan Invasion
 Rules Level:2
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Luzerne/Grasshopper (Reynolds).mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Luzerne/Grasshopper (Reynolds).mtf
index ff750b3e0f2..fd1a2f51468 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Luzerne/Grasshopper (Reynolds).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Luzerne/Grasshopper (Reynolds).mtf	
@@ -6,7 +6,7 @@ mul id:5861
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3059
-Source:Star League
+Source:HTP Luzerne - Star League
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP New Dallas/Rampage RMP-4G Benboudaoud.mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP New Dallas/Rampage RMP-4G Benboudaoud.mtf
index 9d17294c538..8a01362dcce 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP New Dallas/Rampage RMP-4G Benboudaoud.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP New Dallas/Rampage RMP-4G Benboudaoud.mtf	
@@ -6,7 +6,7 @@ mul id:6974
 Config:Biped
 TechBase:Inner Sphere
 Era:2766
-Source:HTP New Dallas
+source:HTP:New Dallas - Star League
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP New Dallas/Victor VTR-9B (Kataga).mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP New Dallas/Victor VTR-9B (Kataga).mtf
index 8c38c727ac4..e0d69c5951d 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP New Dallas/Victor VTR-9B (Kataga).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP New Dallas/Victor VTR-9B (Kataga).mtf	
@@ -5,7 +5,7 @@ mul id:6969
 Config:Biped
 techbase:Inner Sphere
 era:2766
-source:HTP New Dallas - Age of War
+source:HTP:New Dallas - Star League
 rules level:2
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Awesome AWS-8Q (Buck).mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Awesome AWS-8Q (Buck).mtf
index a974d537a83..72428a4efbe 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Awesome AWS-8Q (Buck).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Awesome AWS-8Q (Buck).mtf	
@@ -6,7 +6,7 @@ mul id:7311
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:HTP Tortuga
+Source:HTP:Tortuga - Jihad
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-5.mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-5.mtf
index cedc9008712..9ddcb9de3f8 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-5.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-5.mtf	
@@ -6,7 +6,7 @@ mul id:7312
 Config:Biped
 TechBase:Inner Sphere
 Era:3083
-Source:HTP Tortuga
+Source:HTP:Tortuga - Jihad - Early Republic
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR1.mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR1.mtf
index 3ed5e1d73fe..a250951e706 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR1.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR1.mtf	
@@ -6,7 +6,7 @@ mul id:7313
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:HTP Tortuga
+Source:HTP:Tortuga - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR2.mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR2.mtf
index 9198543597c..4942645ce4a 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR2.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR2.mtf	
@@ -6,7 +6,7 @@ mul id:7314
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:HTP Tortuga
+Source:HTP:Tortuga - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR3.mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR3.mtf
index 4b4213f5868..d8666a4f3cb 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR3.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR3.mtf	
@@ -6,7 +6,7 @@ mul id:7315
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:HTP Tortuga
+Source:HTP:Tortuga - Jihad
 Rules Level:3
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR4.mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR4.mtf
index 6051953a416..1fad0fc5379 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR4.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR4.mtf	
@@ -6,7 +6,7 @@ mul id:7316
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:HTP Tortuga
+Source:HTP:Tortuga - Jihad
 Rules Level:2
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR5.mtf b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR5.mtf
index a4c0cde950a..09bb8ef8c67 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR5.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/HTP Tortuga/Brigand LDT-XPR5.mtf	
@@ -6,7 +6,7 @@ mul id:7317
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:HTP Tortuga
+Source:HTP:Tortuga - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/Turning Points/JTP Dieron/Kodiak Cale.mtf b/megamek/data/mechfiles/mechs/Turning Points/JTP Dieron/Kodiak Cale.mtf
index 7e0c9b28941..73118da4c43 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/JTP Dieron/Kodiak Cale.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/JTP Dieron/Kodiak Cale.mtf	
@@ -6,7 +6,7 @@ mul id:1804
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3068
-source:JTP Dieron - Jihad
+source:Jihad Turning Points:Dieron - Jihad
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/Turning Points/JTP Hespersus/Galahad GLH-3D Laodices.mtf b/megamek/data/mechfiles/mechs/Turning Points/JTP Hespersus/Galahad GLH-3D Laodices.mtf
index 84c68ae9366..9a652368783 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/JTP Hespersus/Galahad GLH-3D Laodices.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/JTP Hespersus/Galahad GLH-3D Laodices.mtf	
@@ -6,7 +6,7 @@ mul id:6978
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+Source:Jihad Turning Points:Hespersus - Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/Turning Points/JTP Luthien/Thresher Edward.mtf b/megamek/data/mechfiles/mechs/Turning Points/JTP Luthien/Thresher Edward.mtf
index 44beeae52a1..34d75ddf16e 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/JTP Luthien/Thresher Edward.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/JTP Luthien/Thresher Edward.mtf	
@@ -6,7 +6,7 @@ mul id:3197
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:3058
-source:Jihad Turning Points: Luthien - Civil War
+source:Jihad Turning Points:Luthien - Clan Invasion
 rules level:4
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/Turning Points/JTP Sian/Jinggau JN-G8BX Rush.mtf b/megamek/data/mechfiles/mechs/Turning Points/JTP Sian/Jinggau JN-G8BX Rush.mtf
index 2c90ad61f1f..959bb72fbe4 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/JTP Sian/Jinggau JN-G8BX Rush.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/JTP Sian/Jinggau JN-G8BX Rush.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3070
 Rules Level:4
-Source:JTP:Sian - Jihad
+Source:Jihad Turning Points:Sian - Jihad
 
 Mass:65
 Engine:325 XL Engine
diff --git a/megamek/data/mechfiles/mechs/Turning Points/JTP Tharkad/Dragon Fire DGR-6FC2 (Gregory).mtf b/megamek/data/mechfiles/mechs/Turning Points/JTP Tharkad/Dragon Fire DGR-6FC2 (Gregory).mtf
index c50b2cd49dc..1316489197c 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/JTP Tharkad/Dragon Fire DGR-6FC2 (Gregory).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/JTP Tharkad/Dragon Fire DGR-6FC2 (Gregory).mtf	
@@ -6,7 +6,7 @@ mul id:916
 Config:Biped
 TechBase:Inner Sphere
 Era:3067
-Source:JTP Tharkad
+Source:Jihad Turning Points:Tharkad - Civil War
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Centurion CN9-YLW3 'Yen Lo Wang'.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Centurion CN9-YLW3 'Yen Lo Wang'.mtf
index 0606b1b6c8a..c814c143fef 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Centurion CN9-YLW3 'Yen Lo Wang'.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Centurion CN9-YLW3 'Yen Lo Wang'.mtf	
@@ -6,7 +6,7 @@ mul id:7404
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3101
-Source:OTP Capellan Crusades - Dark Age
+Source:OTP: Capellan Crusades - Late Republic
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Orion IIC 'Burton'.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Orion IIC 'Burton'.mtf
index 2725712c6d8..e2e3c997df7 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Orion IIC 'Burton'.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Orion IIC 'Burton'.mtf	
@@ -6,7 +6,7 @@ mul id:7403
 Config:Biped
 TechBase:Clan
 Era:3105
-Source:OTP Capellan - Dark Age
+Source:OTP: Capellan Crusades - Late Republic
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Tian-Zong TNZ-N3 'Jasminda'.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Tian-Zong TNZ-N3 'Jasminda'.mtf
index 33871dc9cef..daf43a7a175 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Tian-Zong TNZ-N3 'Jasminda'.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Capellan Crusades/Tian-Zong TNZ-N3 'Jasminda'.mtf	
@@ -6,7 +6,7 @@ mul id:7402
 Config:Biped
 TechBase:Inner Sphere
 Era:3140
-Source:OTP Capellan Crusades - Dark Age
+Source:OTP: Capellan Crusades - Dark Age
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Falcon Incursion/BattleMaster BLR-3M (Rogers).mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Falcon Incursion/BattleMaster BLR-3M (Rogers).mtf
index c859f3aec56..6c6fe80f003 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Falcon Incursion/BattleMaster BLR-3M (Rogers).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Falcon Incursion/BattleMaster BLR-3M (Rogers).mtf	
@@ -6,7 +6,7 @@ mul id:3805
 Config:Biped
 TechBase:Inner Sphere
 Era:3057
-Source:OTP:Falcon Incursion - Clan Invasion
+Source:OTP: Falcon Incursion - Clan Invasion
 Rules Level:2
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Marauder MAD-7D (Von Staskov).mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Marauder MAD-7D (Von Staskov).mtf
index 8eba1b469ae..cd727e51ebe 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Marauder MAD-7D (Von Staskov).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Marauder MAD-7D (Von Staskov).mtf	
@@ -6,7 +6,7 @@ mul id:7697
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:Jihad
+Source:OTP: Fronc Reaches - Jihad
 Rules Level:2
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Marshal MHL-6FR.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Marshal MHL-6FR.mtf
index 7f9797d1eee..71561187ccc 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Marshal MHL-6FR.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Marshal MHL-6FR.mtf	
@@ -6,7 +6,7 @@ mul id:7698
 Config:Biped
 TechBase:Inner Sphere
 Era:3086
-Source:Fronc Reachs
+Source:OTP: Fronc Reaches - Early Republic
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Phoenix Hawk PXH-3D (Jiemin).mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Phoenix Hawk PXH-3D (Jiemin).mtf
index 7f61aab5425..0aeb1e43c91 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Phoenix Hawk PXH-3D (Jiemin).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Fronc Reaches/Phoenix Hawk PXH-3D (Jiemin).mtf	
@@ -6,7 +6,7 @@ mul id:7699
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:Fronc Reaches
+Source:OTP: Fronc Reaches - Civil War
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Cazador.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Cazador.mtf
index b1156672e6d..d4573eda7e6 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Cazador.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Cazador.mtf	
@@ -6,7 +6,7 @@ mul id:7881
 Config:Biped
 techbase:Clan
 era:3145
-source:Dark Age
+source:OTP: Hanseatic Crusade - Dark Age
 rules level:3
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Rhino (Standard).mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Rhino.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Rhino (Standard).mtf
rename to megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Rhino.mtf
index 2616f7d4236..c59accef0ad 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Rhino (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Rhino.mtf	
@@ -6,7 +6,7 @@ mul id:7883
 Config:Quad
 techbase:Mixed (Clan Chassis)
 era:3140
-source:Dark Age
+source:OTP: Hanseatic Crusade - Dark Age
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) A.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) A.mtf
index 66ebd316f2b..7aefe8749a5 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) A.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) A.mtf	
@@ -6,7 +6,7 @@ mul id:7879
 Config:Quad Omnimech
 techbase:Clan
 era:3111
-source:OTP: Hanseatic Crusade - Dark Age
+source:OTP: Hanseatic Crusade - Late Republic
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) B.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) B.mtf
index 6b9cfe68a9f..a68bf98cd82 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) B.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) B.mtf	
@@ -6,7 +6,7 @@ mul id:7880
 Config:Quad Omnimech
 techbase:Clan
 era:3111
-source:OTP: Hanseatic Crusade - Dark Age
+source:OTP: Hanseatic Crusade - Late Republic
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) Prime.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) Prime.mtf
index 3f8c86dc3b5..c5d4e6f75c1 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Snow Fox (Omni) Prime.mtf	
@@ -6,7 +6,7 @@ mul id:7878
 Config:Quad Omnimech
 techbase:Clan
 era:3111
-source:OTP: Hanseatic Crusade - Dark Age
+source:OTP: Hanseatic Crusade - Late Republic
 rules level:2
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Surtur SUR-T1.mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Surtur SUR-T1.mtf
index d1892ea7d58..627329ab0ac 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Surtur SUR-T1.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Surtur SUR-T1.mtf	
@@ -6,7 +6,7 @@ mul id:7884
 Config:Biped
 techbase:Inner Sphere
 era:3140
-source:Dark Age
+source:OTP: Hanseatic Crusade - Dark Age
 rules level:3
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Tolva (Standard).mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Tolva.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Tolva (Standard).mtf
rename to megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Tolva.mtf
index 8c7062678a3..69411ae713e 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Tolva (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP Hanseatic Crusade/Tolva.mtf	
@@ -6,7 +6,7 @@ mul id:7882
 Config:Quad
 techbase:Clan
 era:3145
-source:Dark Age
+source:OTP: Hanseatic CrusaDe - Dark Age
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP WidowMaker Absorption/Atlas II AS7-D-H (Kerensky).mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP WidowMaker Absorption/Atlas II AS7-D-H (Kerensky).mtf
index f1435184bf5..bfd4d64e017 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP WidowMaker Absorption/Atlas II AS7-D-H (Kerensky).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP WidowMaker Absorption/Atlas II AS7-D-H (Kerensky).mtf	
@@ -6,7 +6,7 @@ mul id:7310
 Config:Biped
 TechBase:Clan
 Era:2833
-Source:OTP Widowmaker - Star League
+Source:OTP: Widowmaker - Early Succession War
 Rules Level:2
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/Turning Points/OTP WidowMaker Absorption/Highlander HGN-732 (Jorgensson).mtf b/megamek/data/mechfiles/mechs/Turning Points/OTP WidowMaker Absorption/Highlander HGN-732 (Jorgensson).mtf
index 916c71e258d..aeaa5899952 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/OTP WidowMaker Absorption/Highlander HGN-732 (Jorgensson).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/OTP WidowMaker Absorption/Highlander HGN-732 (Jorgensson).mtf	
@@ -6,7 +6,7 @@ mul id:7309
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:2829
-Source:OTP Widowmaker
+Source:OTP: Widowmaker - Early Succession War
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/Turning Points/TP Epsilon Eridani/Lament LMT-2R (Manes).mtf b/megamek/data/mechfiles/mechs/Turning Points/TP Epsilon Eridani/Lament LMT-2R (Manes).mtf
index 85a1ef2f044..9c1c2f2aa40 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/TP Epsilon Eridani/Lament LMT-2R (Manes).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/TP Epsilon Eridani/Lament LMT-2R (Manes).mtf	
@@ -6,7 +6,7 @@ mul id:7400
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3126
-Source:TRO 3145 Republic of the Sphere - Late Republic
+Source:TRO: 3145 Republic of the Sphere - Late Republic
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Jenner JR7-F (Smith).mtf b/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Jenner JR7-F (Smith).mtf
index 4a66bb8d18c..0a36d09fb04 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Jenner JR7-F (Smith).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Jenner JR7-F (Smith).mtf	
@@ -6,7 +6,7 @@ mul id:7796
 Config:Biped
 TechBase:Inner Sphere
 Era:3030
-Source:TRO 3039
+Source:TP Vega - TRO: 3039
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Panther PNT-9ALAG.mtf b/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Panther PNT-9ALAG.mtf
index 470c6d915ea..af0841e7df3 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Panther PNT-9ALAG.mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Panther PNT-9ALAG.mtf	
@@ -6,7 +6,7 @@ mul id:7417
 Config:Biped
 TechBase:Inner Sphere
 Era:2950
-Source:Star League
+Source:TP Vega - Star League
 Rules Level:1
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Vulcan VL-2T (Timms).mtf b/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Vulcan VL-2T (Timms).mtf
index f7c55aab82f..8bcec263b61 100644
--- a/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Vulcan VL-2T (Timms).mtf	
+++ b/megamek/data/mechfiles/mechs/Turning Points/TP Vega 3039/Vulcan VL-2T (Timms).mtf	
@@ -6,7 +6,7 @@ mul id:7797
 Config:Biped
 TechBase:Inner Sphere
 Era:3034
-Source:Star League
+Source:TP Vega - Star League
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus A.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus A.mtf
index 5a4d1d27028..0e5f7f74c04 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus A.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus A.mtf	
@@ -6,7 +6,7 @@ mul id:3929
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad Supplement
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus B.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus B.mtf
index 6b5362ec89a..d163f23ff0a 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus B.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus B.mtf	
@@ -6,7 +6,7 @@ mul id:5638
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad Supplement
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus C.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus C.mtf
index 5180db3ec45..7e467391d79 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus C.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus C.mtf	
@@ -6,7 +6,7 @@ mul id:5639
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad Supplement
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus D.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus D.mtf
index 9a958efd74f..d51fa7f909f 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus D.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus D.mtf	
@@ -6,7 +6,7 @@ mul id:5640
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad Supplement
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus E.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus E.mtf
index d1d8696f805..f1cf726b2a3 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus E.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus E.mtf	
@@ -6,7 +6,7 @@ mul id:5641
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad Supplement
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus Prime.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus Prime.mtf
index ffe32471605..7b19ed8cf02 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus Prime.mtf	
@@ -6,7 +6,7 @@ mul id:3930
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad Supplement
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus U.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus U.mtf
index 81cf97f6921..f6e327179e1 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus U.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Cephalus U.mtf	
@@ -6,7 +6,7 @@ mul id:5642
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad Supplement
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Dragonfly (Viper) Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Dragonfly (Viper) Z.mtf
index 1e4736cbf49..43a1e96f282 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Dragonfly (Viper) Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Dragonfly (Viper) Z.mtf	
@@ -6,7 +6,7 @@ mul id:5644
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Koshi (Mist Lynx) Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Koshi (Mist Lynx) Z.mtf
index dd02dc2182e..64a86c7bb80 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Koshi (Mist Lynx) Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Koshi (Mist Lynx) Z.mtf	
@@ -6,7 +6,7 @@ mul id:5643
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Mad Cat (Timber Wolf) Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Mad Cat (Timber Wolf) Z.mtf
index d4557d57cf0..f488094507a 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Mad Cat (Timber Wolf) Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Mad Cat (Timber Wolf) Z.mtf	
@@ -6,7 +6,7 @@ mul id:5822
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon (Jaguar).mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon (Jaguar).mtf
index fd9144b9b81..1911d340e32 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon (Jaguar).mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon (Jaguar).mtf	
@@ -6,7 +6,7 @@ mul id:5830
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon A.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon A.mtf
index b1ad3f94911..735e0d8f62a 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon A.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon A.mtf	
@@ -6,7 +6,7 @@ mul id:4766
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon B.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon B.mtf
index 525c1a6bfb8..825143a8c06 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon B.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon B.mtf	
@@ -6,7 +6,7 @@ mul id:5823
 Config:Biped Omnimech
 TechBase:Mixed (Clan Chassis)
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon C.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon C.mtf
index 88957595d57..9a5ba469b97 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon C.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon C.mtf	
@@ -6,7 +6,7 @@ mul id:5824
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon D.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon D.mtf
index 6cc8467ea75..b778b9695e6 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon D.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon D.mtf	
@@ -6,7 +6,7 @@ mul id:5825
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon E.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon E.mtf
index 28addce9b98..7d128ddbbc9 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon E.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon E.mtf	
@@ -6,7 +6,7 @@ mul id:5826
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon F.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon F.mtf
index d9641871854..f752e286edf 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon F.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon F.mtf	
@@ -6,7 +6,7 @@ mul id:5827
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon G.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon G.mtf
index 7a2faceddf4..ce3014130ee 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon G.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon G.mtf	
@@ -6,7 +6,7 @@ mul id:5828
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon Prime.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon Prime.mtf
index 137b3b6149f..52316a99ae6 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon Prime.mtf	
@@ -6,7 +6,7 @@ mul id:4767
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon U.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon U.mtf
index 695e0128179..b9793536d25 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon U.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Osteon U.mtf	
@@ -6,7 +6,7 @@ mul id:5829
 Config:Biped Omnimech
 techbase:Clan
 era:3072
-source:WoR - Jihad
+source:Wars of Reaving - Jihad
 rules level:4
 
 mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) A-Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) A-Z.mtf
index 979f5a40ac2..139567ab82c 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) A-Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) A-Z.mtf	
@@ -6,7 +6,7 @@ mul id:5812
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) B-Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) B-Z.mtf
index c5ea1469006..fd1c5f581d4 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) B-Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) B-Z.mtf	
@@ -6,7 +6,7 @@ mul id:5813
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) C-Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) C-Z.mtf
index 32e495af487..e9fd3ac9f3d 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) C-Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) C-Z.mtf	
@@ -6,7 +6,7 @@ mul id:5814
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) D-Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) D-Z.mtf
index 512e55eb801..05269a9604c 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) D-Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) D-Z.mtf	
@@ -6,7 +6,7 @@ mul id:5815
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) E.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) E.mtf
index 3fa689b1862..4834b011e0d 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) E.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) E.mtf	
@@ -6,7 +6,7 @@ mul id:5023
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) F.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) F.mtf
index 795c92df40e..1473de8cfb1 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) F.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) F.mtf	
@@ -6,7 +6,7 @@ mul id:5816
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) US.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) US.mtf
index caaf946ddc3..d29685ee3d8 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) US.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) US.mtf	
@@ -6,7 +6,7 @@ mul id:5817
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) UW.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) UW.mtf
index aa10cb4d1de..ddab56cd0d2 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) UW.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) UW.mtf	
@@ -6,7 +6,7 @@ mul id:5818
 Config:Biped Omnimech
 techbase:Clan
 era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 rules level:4
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) Z.mtf
index 9384422dcbe..3b7689ea26c 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Pariah (Septicemia) Z.mtf	
@@ -6,7 +6,7 @@ mul id:5819
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Ryoken (Stormcrow) Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Ryoken (Stormcrow) Z.mtf
index 9c78e9852d1..4e03b72d3d6 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Ryoken (Stormcrow) Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Ryoken (Stormcrow) Z.mtf	
@@ -6,7 +6,7 @@ mul id:5820
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Savage Coyote Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Savage Coyote Z.mtf
index 9526169388a..a0304f26dee 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Savage Coyote Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Savage Coyote Z.mtf	
@@ -6,7 +6,7 @@ mul id:5831
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Thor (Summoner) Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Thor (Summoner) Z.mtf
index c43ad877433..068c92d2997 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Thor (Summoner) Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Thor (Summoner) Z.mtf	
@@ -6,7 +6,7 @@ mul id:5821
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/WoR Supplemental/Turkina Z.mtf b/megamek/data/mechfiles/mechs/WoR Supplemental/Turkina Z.mtf
index 62e6a042303..476e2e59d78 100644
--- a/megamek/data/mechfiles/mechs/WoR Supplemental/Turkina Z.mtf	
+++ b/megamek/data/mechfiles/mechs/WoR Supplemental/Turkina Z.mtf	
@@ -6,7 +6,7 @@ mul id:5832
 Config:Biped Omnimech
 TechBase:Clan
 Era:3072
-Source:WoR - Jihad
+source:Wars of Reaving - Jihad
 Rules Level:4
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/XTRs/Boondocks/Merlin MLN-SX.mtf b/megamek/data/mechfiles/mechs/XTRs/Boondocks/Merlin MLN-SX.mtf
index 17f58e3aeb8..97624376393 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Boondocks/Merlin MLN-SX.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Boondocks/Merlin MLN-SX.mtf	
@@ -6,7 +6,7 @@ mul id:2181
 Config:Biped
 techbase:Inner Sphere
 era:3075
-source:XTRO Boondocks - Jihad
+source:XTR: Boondocks - Jihad
 rules level:4
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Boondocks/Spindrift Aquatic SecurityMech SDT-1.mtf b/megamek/data/mechfiles/mechs/XTRs/Boondocks/Spindrift Aquatic SecurityMech SDT-1.mtf
index 2b1c5fdb346..56878d801b6 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Boondocks/Spindrift Aquatic SecurityMech SDT-1.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Boondocks/Spindrift Aquatic SecurityMech SDT-1.mtf	
@@ -6,7 +6,7 @@ mul id:3021
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:XTRO Boondocks
+Source:XTR: Boondocks - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Boondoggles/Liberator LIB-4T.mtf b/megamek/data/mechfiles/mechs/XTRs/Boondoggles/Liberator LIB-4T.mtf
index b428e5f9bbf..71324eba5b0 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Boondoggles/Liberator LIB-4T.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Boondoggles/Liberator LIB-4T.mtf	
@@ -5,7 +5,7 @@ mul id:5845
 Config:Biped
 techbase:Inner Sphere
 era:3018
-source:XTR Boondoggles - Succession Wars
+source:XTR: Boondoggles - Late Succession War - LosTech
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Boondoggles/Ostscout IIC (Standard).mtf b/megamek/data/mechfiles/mechs/XTRs/Boondoggles/Ostscout IIC.mtf
similarity index 98%
rename from megamek/data/mechfiles/mechs/XTRs/Boondoggles/Ostscout IIC (Standard).mtf
rename to megamek/data/mechfiles/mechs/XTRs/Boondoggles/Ostscout IIC.mtf
index d19c2539324..99982c31180 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Boondoggles/Ostscout IIC (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Boondoggles/Ostscout IIC.mtf	
@@ -5,7 +5,7 @@ mul id:5844
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:3067
-source:XTRO Boondoggles - Civil War
+source:XTR: Boondoggles - Civil War
 rules level:4
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Aquagladius AQS-5 MAM.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Aquagladius AQS-5 MAM.mtf
index 44fa3d5722e..27c789e2422 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Aquagladius AQS-5 MAM.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Aquagladius AQS-5 MAM.mtf	
@@ -6,7 +6,7 @@ mul id:8108
 Config:Biped
 techbase:Inner Sphere
 era:3090
-source:XTRO Ray
+source:XTR: Caveat Emptor - Early Republic
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Carbine CON-9M-D ConstructionMech MOD.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Carbine CON-9M-D ConstructionMech MOD.mtf
index 340030d420d..6ba190be392 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Carbine CON-9M-D ConstructionMech MOD.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Carbine CON-9M-D ConstructionMech MOD.mtf	
@@ -6,7 +6,7 @@ mul id:8098
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3133
-source:Dark Age
+source:XTR: Caveat Emptor - Dark Age
 rules level:5
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Crosscut IIC SolahmaMech.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Crosscut IIC SolahmaMech.mtf
index eae10626367..6ee279f5b77 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Crosscut IIC SolahmaMech.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Crosscut IIC SolahmaMech.mtf	
@@ -6,7 +6,7 @@ mul id:8099
 Config:Biped
 techbase:Clan
 era:3133
-source:Dark Age
+source:XTR: Caveat Emptor - Dark Age
 rules level:5
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Daedalus DAD-DX.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Daedalus DAD-DX.mtf
index 2dad5051b2b..6e59fd6485d 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Daedalus DAD-DX.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Daedalus DAD-DX.mtf	
@@ -6,7 +6,7 @@ mul id:8105
 Config:Biped
 techbase:Inner Sphere
 era:3097
-source:Dark Age
+source:XTR: Caveat Emptor - Early Republic
 rules level:4
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Gauss-Buster.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Gauss-Buster.mtf
index 495a0abe92a..a26c588f2c3 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Gauss-Buster.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Gauss-Buster.mtf	
@@ -6,7 +6,7 @@ mul id:8100
 Config:Biped
 techbase:Inner Sphere
 era:3090
-source:Jihad
+source:XTR: Caveat Emptor - Early Republic
 rules level:5
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Omni-Marauder A.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Omni-Marauder A.mtf
index ea01aeef697..68cc7c3f1bf 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Omni-Marauder A.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Omni-Marauder A.mtf	
@@ -6,7 +6,7 @@ mul id:8111
 Config:Biped Omnimech
 techbase:Mixed (IS Chassis)
 era:3135
-source:Dark Age
+source:XTR: Caveat Emptor - Dark Age
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Omni-Marauder Prime.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Omni-Marauder Prime.mtf
index 2265b0cd41e..1fa78076dd2 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Omni-Marauder Prime.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Omni-Marauder Prime.mtf	
@@ -6,7 +6,7 @@ mul id:8110
 Config:Biped Omnimech
 techbase:Mixed (IS Chassis)
 era:3135
-source:Dark Age
+source:XTR: Caveat Emptor - Dark Age
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Phoenix Hawk PXH-99.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Phoenix Hawk PXH-99.mtf
index 9929ff5cb76..5599ad89b8c 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Phoenix Hawk PXH-99.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Phoenix Hawk PXH-99.mtf	
@@ -6,7 +6,7 @@ mul id:8106
 Config:Biped
 techbase:Inner Sphere
 era:3134
-source:Dark Age
+source:XTR: Caveat Emptor - Dark Age
 rules level:3
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Porcupine PRC-3N.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Porcupine PRC-3N.mtf
index da9e0b264e1..33890ee1f64 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Porcupine PRC-3N.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Porcupine PRC-3N.mtf	
@@ -6,7 +6,7 @@ mul id:8102
 Config:Biped
 techbase:Inner Sphere
 era:3132
-source:Dark Age
+source:XTR: Caveat Emptor - Dark Age
 rules level:4
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Scourge SCG-WX1.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Scourge SCG-WX1.mtf
index 0175da39d3e..ee3aa771b42 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Scourge SCG-WX1.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Scourge SCG-WX1.mtf	
@@ -6,7 +6,7 @@ mul id:8109
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3132
-source:Dark Age
+source:XTR: Caveat Emptor - Dark Age
 rules level:4
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Valkyrie VLK-QD5.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Valkyrie VLK-QD5.mtf
index 8b7ef60a21c..ceff26991a9 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Valkyrie VLK-QD5.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Valkyrie VLK-QD5.mtf	
@@ -6,7 +6,7 @@ mul id:8104
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3101
-source:Dark Age
+source:XTR: Caveat Emptor - Late Republic
 rules level:3
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Volkh VKH-68.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Volkh VKH-68.mtf
index e729387964b..4cdcbbcda8f 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Volkh VKH-68.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Volkh VKH-68.mtf	
@@ -6,7 +6,7 @@ mul id:8107
 Config:Biped
 techbase:Inner Sphere
 era:3133
-source:Dark Age
+source:XTR: Caveat Emptor - Dark Age
 rules level:3
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Wasp WSP-3X.mtf b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Wasp WSP-3X.mtf
index c94f92507bd..9542e924291 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Wasp WSP-3X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Caveat Emptor/Wasp WSP-3X.mtf	
@@ -6,7 +6,7 @@ mul id:8103
 Config:Biped
 techbase:Inner Sphere
 era:3088
-source:Jihad
+source:XTR: Caveat Emptor - Early Republic
 rules level:4
 
 mass:20
diff --git a/megamek/data/mechfiles/mechs/XTRs/Clans/Cougar-XR.mtf b/megamek/data/mechfiles/mechs/XTRs/Clans/Cougar-XR.mtf
index 2ed29a32cb4..02d610c3e82 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Clans/Cougar-XR.mtf
+++ b/megamek/data/mechfiles/mechs/XTRs/Clans/Cougar-XR.mtf
@@ -6,7 +6,7 @@ mul id:4013
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3071
-Source:XTRO Clans - Jihad
+Source:XTR: Clans - Jihad
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Clans/Ha Otoko-HR.mtf b/megamek/data/mechfiles/mechs/XTRs/Clans/Ha Otoko-HR.mtf
index 5f6c37c4310..13390e1f2b4 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Clans/Ha Otoko-HR.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Clans/Ha Otoko-HR.mtf	
@@ -6,7 +6,7 @@ mul id:4258
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3077
-Source:XTRO Clans - Jihad
+Source:XTR: Clans - Jihad
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/XTRs/Clans/Kraken-XR.mtf b/megamek/data/mechfiles/mechs/XTRs/Clans/Kraken-XR.mtf
index c29e77ea4e3..d35814b0ea8 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Clans/Kraken-XR.mtf
+++ b/megamek/data/mechfiles/mechs/XTRs/Clans/Kraken-XR.mtf
@@ -6,7 +6,7 @@ mul id:4463
 Config:Biped
 TechBase:Clan
 Era:3073
-Source:XTRO Clans - Jihad
+Source:XTR: Clans - Jihad
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/XTRs/Clans/Ursus PR.mtf b/megamek/data/mechfiles/mechs/XTRs/Clans/Ursus PR.mtf
index 72dcdc1b135..002b5fcf44b 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Clans/Ursus PR.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Clans/Ursus PR.mtf	
@@ -6,7 +6,7 @@ mul id:5330
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3074
-Source:XTRO Clans - Jihad
+Source:XTR: Clans - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/ComStar/Beowulf BEO-X-7a.mtf b/megamek/data/mechfiles/mechs/XTRs/ComStar/Beowulf BEO-X-7a.mtf
index 4979b4d64ed..d5c15f30352 100644
--- a/megamek/data/mechfiles/mechs/XTRs/ComStar/Beowulf BEO-X-7a.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/ComStar/Beowulf BEO-X-7a.mtf	
@@ -6,7 +6,7 @@ mul id:5548
 Config:Biped
 TechBase:Inner Sphere
 Era:3068
-Source:XTRO ComStar - Jihad
+Source:XTR: ComStar - Jihad
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/ComStar/Celerity CLR-02-X-D.mtf b/megamek/data/mechfiles/mechs/XTRs/ComStar/Celerity CLR-02-X-D.mtf
index a35338742c8..419e5293880 100644
--- a/megamek/data/mechfiles/mechs/XTRs/ComStar/Celerity CLR-02-X-D.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/ComStar/Celerity CLR-02-X-D.mtf	
@@ -6,7 +6,7 @@ mul id:5553
 Config:Quad
 techbase:Inner Sphere
 era:3052
-source:XTRO ComStar - Clan Invasion
+source:XTR: ComStar - Clan Invasion
 rules level:4
 
 mass:15
diff --git a/megamek/data/mechfiles/mechs/XTRs/ComStar/Exterminator EXT-6CS.mtf b/megamek/data/mechfiles/mechs/XTRs/ComStar/Exterminator EXT-6CS.mtf
index 0e6ac9c09f7..d127b06df9e 100644
--- a/megamek/data/mechfiles/mechs/XTRs/ComStar/Exterminator EXT-6CS.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/ComStar/Exterminator EXT-6CS.mtf	
@@ -6,7 +6,7 @@ mul id:5551
 Config:Biped
 TechBase:Inner Sphere
 Era:3079
-Source:XTRO ComStar - Jihad
+Source:XTR: ComStar - Jihad
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/XTRs/ComStar/Grim Reaper GRM-R (Einar).mtf b/megamek/data/mechfiles/mechs/XTRs/ComStar/Grim Reaper GRM-R (Einar).mtf
index 765c139e137..ca2640558cf 100644
--- a/megamek/data/mechfiles/mechs/XTRs/ComStar/Grim Reaper GRM-R (Einar).mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/ComStar/Grim Reaper GRM-R (Einar).mtf	
@@ -6,7 +6,7 @@ mul id:5550
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3073
-Source:XTRO ComStar - Jihad
+Source:XTR: ComStar - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/ComStar/Highlander HGN-641-X-2.mtf b/megamek/data/mechfiles/mechs/XTRs/ComStar/Highlander HGN-641-X-2.mtf
index bd01d2e58ef..f240f34ab96 100644
--- a/megamek/data/mechfiles/mechs/XTRs/ComStar/Highlander HGN-641-X-2.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/ComStar/Highlander HGN-641-X-2.mtf	
@@ -6,7 +6,7 @@ mul id:5552
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:XTRO ComStar - Jihad
+Source:XTR: ComStar - Jihad
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/XTRs/ComStar/Tessen TSN-X-4.mtf b/megamek/data/mechfiles/mechs/XTRs/ComStar/Tessen TSN-X-4.mtf
index 52d783a768d..b14715f3acc 100644
--- a/megamek/data/mechfiles/mechs/XTRs/ComStar/Tessen TSN-X-4.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/ComStar/Tessen TSN-X-4.mtf	
@@ -6,7 +6,7 @@ mul id:5549
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:XTRO ComStar - Jihad
+Source:XTR: ComStar - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Corporations/Charger CGR-1X1.mtf b/megamek/data/mechfiles/mechs/XTRs/Corporations/Charger CGR-1X1.mtf
index 2d17cd453a6..daab07c620b 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Corporations/Charger CGR-1X1.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Corporations/Charger CGR-1X1.mtf	
@@ -6,7 +6,7 @@ mul id:563
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:Jihad
+source:XTR: Corporations -Jihad
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/XTRs/Corporations/Firestarter FS9-X81.mtf b/megamek/data/mechfiles/mechs/XTRs/Corporations/Firestarter FS9-X81.mtf
index 00fbea3ea6e..6345a4a42b3 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Corporations/Firestarter FS9-X81.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Corporations/Firestarter FS9-X81.mtf	
@@ -6,7 +6,7 @@ mul id:1092
 Config:Biped
 TechBase:Inner Sphere
 Era:3074
-Source:Jihad
+source:XTR: Corporations -Jihad
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Corporations/Hunchback HBK-7X-4.mtf b/megamek/data/mechfiles/mechs/XTRs/Corporations/Hunchback HBK-7X-4.mtf
index e875e49bf50..725f08a1e5b 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Corporations/Hunchback HBK-7X-4.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Corporations/Hunchback HBK-7X-4.mtf	
@@ -6,7 +6,7 @@ mul id:1567
 Config:Biped
 TechBase:Inner Sphere
 Era:3065
-Source:Jihad
+Source:XTR: Corporations - Civil War
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Corporations/Quickdraw QKD-8X.mtf b/megamek/data/mechfiles/mechs/XTRs/Corporations/Quickdraw QKD-8X.mtf
index 6989eed73ad..3b4a9d10763 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Corporations/Quickdraw QKD-8X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Corporations/Quickdraw QKD-8X.mtf	
@@ -6,7 +6,7 @@ mul id:2617
 Config:Biped
 TechBase:Inner Sphere
 Era:3073
-Source:Jihad
+source:XTR: Corporations -Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Davion/Devastator DVS-X10 MUSE EARTH.mtf b/megamek/data/mechfiles/mechs/XTRs/Davion/Devastator DVS-X10 MUSE EARTH.mtf
index 505543b00b1..306f560a046 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Davion/Devastator DVS-X10 MUSE EARTH.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Davion/Devastator DVS-X10 MUSE EARTH.mtf	
@@ -6,7 +6,7 @@ mul id:896
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:Jihad
+source:XTR: Davion -Jihad
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/XTRs/Davion/Enforcer III ENF-7X MUSE COMPACT.mtf b/megamek/data/mechfiles/mechs/XTRs/Davion/Enforcer III ENF-7X MUSE COMPACT.mtf
index d5ee6614ba8..d1c360f73a9 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Davion/Enforcer III ENF-7X MUSE COMPACT.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Davion/Enforcer III ENF-7X MUSE COMPACT.mtf	
@@ -5,7 +5,7 @@ mul id:987
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3074
-source:XTRO Davion - Jihad
+source:XTR: Davion - Jihad
 rules level:3
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Davion/Legionnaire LGN-2X1 MUSE FIRE.mtf b/megamek/data/mechfiles/mechs/XTRs/Davion/Legionnaire LGN-2X1 MUSE FIRE.mtf
index c65308bc42d..432f065326c 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Davion/Legionnaire LGN-2X1 MUSE FIRE.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Davion/Legionnaire LGN-2X1 MUSE FIRE.mtf	
@@ -6,7 +6,7 @@ mul id:1864
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3077
-Source:Jihad
+source:XTR: Davion -Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Davion/Pendragon PDG-1X MUSE RED.mtf b/megamek/data/mechfiles/mechs/XTRs/Davion/Pendragon PDG-1X MUSE RED.mtf
index b312aaaad45..a6b5d6265c1 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Davion/Pendragon PDG-1X MUSE RED.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Davion/Pendragon PDG-1X MUSE RED.mtf	
@@ -5,7 +5,7 @@ mul id:2464
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3072
-source:XTRO:Davion - Jihad
+source:XTR: Davion - Jihad
 rules level:3
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/XTRs/Davion/Rifleman RFL-X3 MUSE WIND.mtf b/megamek/data/mechfiles/mechs/XTRs/Davion/Rifleman RFL-X3 MUSE WIND.mtf
index 82ea66199ee..eb27d2f0f08 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Davion/Rifleman RFL-X3 MUSE WIND.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Davion/Rifleman RFL-X3 MUSE WIND.mtf	
@@ -6,7 +6,7 @@ mul id:2708
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3076
-Source:Jihad
+source:XTR: Davion -Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Gladiators/Crosscut LoggerMech ED-XX Ichabod.mtf b/megamek/data/mechfiles/mechs/XTRs/Gladiators/Crosscut LoggerMech ED-XX Ichabod.mtf
index c35528dd62d..3f3c2eb4e66 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Gladiators/Crosscut LoggerMech ED-XX Ichabod.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Gladiators/Crosscut LoggerMech ED-XX Ichabod.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3075
 Rules Level:4
-Source:XTR Gladiators - Jihad
+Source:XTR: Gladiators - Jihad
 
 Mass:30
 Engine:90 Fusion Engine
diff --git a/megamek/data/mechfiles/mechs/XTRs/Gladiators/Warhammer WHM-X7 The Lich.mtf b/megamek/data/mechfiles/mechs/XTRs/Gladiators/Warhammer WHM-X7 The Lich.mtf
index 02f95312ca9..59d98502e20 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Gladiators/Warhammer WHM-X7 The Lich.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Gladiators/Warhammer WHM-X7 The Lich.mtf	
@@ -6,7 +6,7 @@ mul id:3499
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3077
-Source:XTRO:Gladiators - Jihad
+Source:XTR: Gladiators - Jihad
 Rules Level:4
 
 
@@ -159,7 +159,7 @@ overview:The Warhammer proved to be a very capable 'Mech, and for centuries prac
 
 capabilities:The Warhammer was well-protected with strong armor for its age and weight, and the large number of heat sinks allowed it to "fire and maneuver" without fear. The most common engine arrangement propels the 'Mech to a cruising speed of 43.2 km/h and a top speed of 64.8 km/h, which is quick enough to keep up with most battles. The 'Mech's electronics, albeit antiquated by the 31st Century, were basic and functional, allowing it to assume command tasks when necessary. The targeting mechanism, in particular, made use of an unique Searchlight positioned above the 'Mech's left shoulder. The device could act as a conventional searchlight or immediately connect to the O/P 1500 ARB tracking system, transforming the 'Mech into a capable night fighter.
 
-deployment:Piloted by Francis Indigo, this custom version used Experimental Technology to make a fearsome arena fighter. Using a Hybrid Internal Structure and light ferro-fibrous armor for baseline protection, The Lich also uses Armored Sensors, an Armored Engine and a Heavy-Duty Gyro to stay in the fight a lot longer. The arm-mounted weapons were replaced with Marauder-style weapons pods carrying a Snub-Nose PPC with PPC Capacitor and an ER medium laser. The standard SRM-6 was replaced with a Clan-tech Streak SRM-6 and the medium lasers upgraded to extended-range models. The small lasers were removed, along with the machine guns and their ammunition, while CASE II protected the Streak ammunition. The Lich would prove so successful that it resulted in the creation of the WHD-10CT, a mass-produced factory variant heavily based upon it. This is actually a Frankenmech but has been made in MM has a Warhammer Variant.  The IS in MM won't match the TRO.  Unit included for completeness.
+deployment:Piloted by Francis Indigo, this custom version used Experimental Technology to make a fearsome arena fighter. Using a Hybrid Internal Structure and light ferro-fibrous armor for baseline protection, The Lich also uses Armored Sensors, an Armored Engine and a Heavy-Duty Gyro to stay in the fight a lot longer. The arm-mounted weapons were replaced with Marauder-style weapons pods carrying a Snub-Nose PPC with PPC Capacitor and an ER medium laser. The standard SRM-6 was replaced with a Clan-tech Streak SRM-6 and the medium lasers upgraded to extended-range models. The small lasers were removed, along with the machine guns and their ammunition, while CASE II protected the Streak ammunition. The Lich would prove so successful that it resulted in the creation of the WHD-10CT, a mass-produced factory variant heavily based upon it. This is actually a Frankenmech but has been made in MM has a Warhammer Variant.  The IS in MM won't match the TRO:.  Unit included for completeness.
 
 history:StarCorps Industries introduced the Warhammer BattleMech in 2515 as "a mobile 'Mech with adequate firepower to destroy or severely damage any 'Mech of the same weight class or lower." The Warhammer continued to serve in the forces of the Great Houses throughout the Succession Wars after the Star League's demise. Despite very modest production rates, the large number of Warhammer factories dispersed over both the Inner Sphere and Periphery contributed to its endurance; Ronin Inc. was never able to construct more than five Warhammers per year from their Wallis factory. The recovery of the Helm Memory Core would prompt Inner Sphere manufacturers to create a slew of new Lostech-powered Warhammer versions, while the Periphery continued to produce original models for mercenaries and black marketeers. After the Clan Invasion, StarCorps chose to rehabilitate the ancient 'Mech with the greatest technological advancements, giving it new life. Initially, the business planned to construct only one new variety from its Crofton plant, but when word of the idea spread, other departments within StarCorps became involved and gathered on Crofton for a week-long conference to iron out the details. The conference turned out to be more jubilant than expected, and at the end of the bacchanalian "negotiations," it was determined that four new variations would be built: one for each of the Federated Suns, Capellan, Free Worlds League, and Lyran forces, employing technology unique to each realm. During the FedCom Civil War, some of these new 'Mechs were put through their paces.
 
diff --git a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Exterminator EXT-4DX Caine.mtf b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Exterminator EXT-4DX Caine.mtf
index 02f6bf8976c..c4b5edd3e26 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Exterminator EXT-4DX Caine.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Exterminator EXT-4DX Caine.mtf	
@@ -6,7 +6,7 @@ mul id:7321
 Config:Biped
 TechBase:Inner Sphere
 Era:2754
-Source:XTRO Gunslingers - Star League
+Source:XTR: Gunslingers - Star League
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Mongoose MON-66GX Gunslinger.mtf b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Mongoose MON-66GX Gunslinger.mtf
index db327679ce4..d04b4d1c47a 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Mongoose MON-66GX Gunslinger.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Mongoose MON-66GX Gunslinger.mtf	
@@ -6,7 +6,7 @@ mul id:7318
 Config:Biped
 TechBase:Inner Sphere
 Era:2766
-Source:XTRO Gunslingers - Star League
+Source:XTR: Gunslingers - Star League
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Rifleman III RF2-A.mtf b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Rifleman III RF2-A.mtf
index f07eda935ea..0cba26ea380 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Rifleman III RF2-A.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Rifleman III RF2-A.mtf	
@@ -6,7 +6,7 @@ mul id:7323
 Config:Biped
 TechBase:Inner Sphere
 Era:2776
-Source:XTRO Gunslingers - Star League
+Source:XTR: Gunslingers - Star League
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Thug THG-11ECX (Jose).mtf b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Thug THG-11ECX (Jose).mtf
index 6c6811b55f2..5f0c454ca3c 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Thug THG-11ECX (Jose).mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Thug THG-11ECX (Jose).mtf	
@@ -6,7 +6,7 @@ mul id:7322
 Config:Biped
 TechBase:Inner Sphere
 Era:2772
-Source:XTRO Gunslingers - Star League
+Source:XTR: Gunslingers - Star League
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Wyvern WVE-5UX City.mtf b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Wyvern WVE-5UX City.mtf
index eed81163576..0e14a689514 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Wyvern WVE-5UX City.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Gunslingers/Wyvern WVE-5UX City.mtf	
@@ -6,7 +6,7 @@ mul id:7319
 Config:Biped
 TechBase:Inner Sphere
 Era:2686
-Source:XTRO Gunslingers - Star League
+Source:XTR: Gunslingers - Star League
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Kurita/Banzai BNZ-X.mtf b/megamek/data/mechfiles/mechs/XTRs/Kurita/Banzai BNZ-X.mtf
index 6b98118dbb3..3c7bfaf5403 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Kurita/Banzai BNZ-X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Kurita/Banzai BNZ-X.mtf	
@@ -5,7 +5,7 @@ mul id:251
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3076
-source:XTRO Kurita - Jihad
+source:XTR: Kurita - Jihad
 rules level:4
 
 mass:90
diff --git a/megamek/data/mechfiles/mechs/XTRs/Kurita/Hatamoto-Kaeru HTM-35X.mtf b/megamek/data/mechfiles/mechs/XTRs/Kurita/Hatamoto-Kaeru HTM-35X.mtf
index 2306e539591..b0758b5d14f 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Kurita/Hatamoto-Kaeru HTM-35X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Kurita/Hatamoto-Kaeru HTM-35X.mtf	
@@ -6,7 +6,7 @@ mul id:1406
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:XTRO Kurita - Jihad
+Source:XTR: Kurita - Jihad
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/XTRs/Kurita/Jenner JR10-X.mtf b/megamek/data/mechfiles/mechs/XTRs/Kurita/Jenner JR10-X.mtf
index 50af519122a..5684e7fa735 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Kurita/Jenner JR10-X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Kurita/Jenner JR10-X.mtf	
@@ -5,7 +5,7 @@ mul id:1686
 Config:Biped
 techbase:Inner Sphere
 era:3072
-source:XTRO Kurita - Jihad
+source:XTR: Kurita - Jihad
 rules level:4
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Kurita/No-Dachi NDA-3X.mtf b/megamek/data/mechfiles/mechs/XTRs/Kurita/No-Dachi NDA-3X.mtf
index 25e5da1fd06..f149e0d8f8e 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Kurita/No-Dachi NDA-3X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Kurita/No-Dachi NDA-3X.mtf	
@@ -6,7 +6,7 @@ mul id:2298
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3075
-source:XTRO Kurita - Jihad
+source:XTR: Kurita - Jihad
 rules level:4
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/XTRs/Kurita/Wolf Trap (Tora) WFT-2X 'Bear Trap'.mtf b/megamek/data/mechfiles/mechs/XTRs/Kurita/Wolf Trap (Tora) WFT-2X 'Bear Trap'.mtf
index c67c1a5f93a..b277d24466a 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Kurita/Wolf Trap (Tora) WFT-2X 'Bear Trap'.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Kurita/Wolf Trap (Tora) WFT-2X 'Bear Trap'.mtf	
@@ -6,7 +6,7 @@ mul id:3557
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:XTRO Kurita - Jihad
+Source:XTR: Kurita - Jihad
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Liao/Dola DOL-1A.mtf b/megamek/data/mechfiles/mechs/XTRs/Liao/Dola DOL-1A.mtf
index ce92f188121..d64f09a5e8e 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Liao/Dola DOL-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Liao/Dola DOL-1A.mtf	
@@ -6,7 +6,7 @@ mul id:903
 Config:Biped
 TechBase:Inner Sphere
 Era:3079
-Source:XTRO Liao - Jihad
+Source:XTR: Liao - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Liao/Pillager PLG-4x Anvil.mtf b/megamek/data/mechfiles/mechs/XTRs/Liao/Pillager PLG-4x Anvil.mtf
index c7659ca6b3e..e12be14fc37 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Liao/Pillager PLG-4x Anvil.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Liao/Pillager PLG-4x Anvil.mtf	
@@ -5,7 +5,7 @@ mul id:2526
 Config:Biped
 techbase:Inner Sphere
 era:3077
-source:XTRO Liao - Jihad
+source:XTR: Liao - Jihad
 rules level:3
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/XTRs/Liao/Raven X RVN-3X.mtf b/megamek/data/mechfiles/mechs/XTRs/Liao/Raven X RVN-3X.mtf
index 13c964e4bc3..e244b3a22b8 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Liao/Raven X RVN-3X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Liao/Raven X RVN-3X.mtf	
@@ -6,7 +6,7 @@ mul id:2672
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:XTRO Liao - Jihad
+Source:XTR: Liao - Jihad
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Liao/Ti Ts'ang DDC.mtf b/megamek/data/mechfiles/mechs/XTRs/Liao/Ti Ts'ang DDC.mtf
index a1af1bb99fc..f6c67b98db6 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Liao/Ti Ts'ang DDC.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Liao/Ti Ts'ang DDC.mtf	
@@ -6,7 +6,7 @@ mul id:5242
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:XTRO Liao - Jihad
+Source:XTR: Liao - Jihad
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Liao/Vindicator Dao.mtf b/megamek/data/mechfiles/mechs/XTRs/Liao/Vindicator Dao.mtf
index 153afe0697f..49db843e429 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Liao/Vindicator Dao.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Liao/Vindicator Dao.mtf	
@@ -6,7 +6,7 @@ mul id:3427
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3078
-Source:XTRO Liao - Jihad
+Source:XTR: Liao - Jihad
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Marik/Awesome AWS-11M.mtf b/megamek/data/mechfiles/mechs/XTRs/Marik/Awesome AWS-11M.mtf
index 11f7eed9e1a..2b83d24472e 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Marik/Awesome AWS-11M.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Marik/Awesome AWS-11M.mtf	
@@ -6,7 +6,7 @@ mul id:173
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3079
-Source:XTRO Marik - Jihad
+Source:XTR: Marik - Jihad
 Rules Level:3
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/XTRs/Marik/Hermes II HER-7S.mtf b/megamek/data/mechfiles/mechs/XTRs/Marik/Hermes II HER-7S.mtf
index b862bd06ab1..71b92a7af59 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Marik/Hermes II HER-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Marik/Hermes II HER-7S.mtf	
@@ -6,7 +6,7 @@ mul id:1505
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3077
-Source:XTRO Marik - Jihad
+Source:XTR: Marik - Jihad
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Marik/Jackal JA-KL-1579.mtf b/megamek/data/mechfiles/mechs/XTRs/Marik/Jackal JA-KL-1579.mtf
index 548c69d96c3..e6bf38a3830 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Marik/Jackal JA-KL-1579.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Marik/Jackal JA-KL-1579.mtf	
@@ -6,7 +6,7 @@ mul id:1654
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:XTRO Marik - Jihad
+Source:XTR: Marik - Jihad
 Rules Level:4
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Marik/Orion ON3-MX.mtf b/megamek/data/mechfiles/mechs/XTRs/Marik/Orion ON3-MX.mtf
index d68223d1b40..49f4b228b61 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Marik/Orion ON3-MX.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Marik/Orion ON3-MX.mtf	
@@ -5,7 +5,7 @@ mul id:2339
 Config:Biped
 techbase:Inner Sphere
 era:3075
-source:XTRO Marik - Jihad
+source:XTR: Marik - Jihad
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Marik/Pandarus LFA-1X.mtf b/megamek/data/mechfiles/mechs/XTRs/Marik/Pandarus LFA-1X.mtf
index e2742a6c546..c9ce891c9d3 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Marik/Pandarus LFA-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Marik/Pandarus LFA-1X.mtf	
@@ -6,7 +6,7 @@ mul id:2412
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:XTRO Marik - Jihad
+Source:XTR: Marik - Jihad
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Marik/Sarissa MN1-D.mtf b/megamek/data/mechfiles/mechs/XTRs/Marik/Sarissa MN1-D.mtf
index e17e9d9bf38..87a3f5bd830 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Marik/Sarissa MN1-D.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Marik/Sarissa MN1-D.mtf	
@@ -6,7 +6,7 @@ mul id:2797
 Config:Biped
 TechBase:Inner Sphere
 Era:3080
-Source:XTRO Marik - Jihad
+Source:XTR: Marik - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Mercenaries/Hoplite HOP-4X.mtf b/megamek/data/mechfiles/mechs/XTRs/Mercenaries/Hoplite HOP-4X.mtf
index 0b915d73ae8..939d778ee49 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Mercenaries/Hoplite HOP-4X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Mercenaries/Hoplite HOP-4X.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3075
 Rules Level:3
-source:XTRO Mercs - Jihad
+source:XTR: Mercenaries - Jihad
 
 Mass:55
 Engine:275 Light Engine
diff --git a/megamek/data/mechfiles/mechs/XTRs/Mercenaries/Wolfhound WLF-2X.mtf b/megamek/data/mechfiles/mechs/XTRs/Mercenaries/Wolfhound WLF-2X.mtf
index 7ebda7924bf..206ecc556a8 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Mercenaries/Wolfhound WLF-2X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Mercenaries/Wolfhound WLF-2X.mtf	
@@ -6,7 +6,7 @@ mul id:3564
 Config:Biped
 techbase:Inner Sphere
 era:3072
-source:XTR Mercs - Jihad
+source:XTR: Mercenaries - Jihad
 rules level:3
 Ejection:Full Head Ejection System
 
diff --git a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Black Knight BL-X-KNT 'Red Reaper'.mtf b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Black Knight BL-X-KNT 'Red Reaper'.mtf
index 59c76f13c96..ade302e41b2 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Black Knight BL-X-KNT 'Red Reaper'.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Black Knight BL-X-KNT 'Red Reaper'.mtf	
@@ -6,7 +6,7 @@ mul id:5783
 Config:Biped
 TechBase:Inner Sphere
 Era:3069
-Source:XTRO Most Wanted - Jihad
+Source:XTR: Most Wanted - Jihad
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Fireball ALM-XF.mtf b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Fireball ALM-XF.mtf
index e5ea2d80cac..6a0aa53cb15 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Fireball ALM-XF.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Fireball ALM-XF.mtf	
@@ -6,7 +6,7 @@ mul id:5781
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:XTRO Most Wanted - Jihad
+Source:XTR: Most Wanted - Jihad
 Rules Level:4
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Huron Warrior HUR-WO-RX4.mtf b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Huron Warrior HUR-WO-RX4.mtf
index 187ca6fe1b0..2fdda69c278 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Huron Warrior HUR-WO-RX4.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Huron Warrior HUR-WO-RX4.mtf	
@@ -5,7 +5,7 @@ mul id:5782
 Config:Biped
 techbase:Inner Sphere
 era:3076
-source:XTRO Most Wanted - Jihad
+source:XTR: Most Wanted - Jihad
 rules level:3
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Mauler MAL-4X 'Todesbote'.mtf b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Mauler MAL-4X 'Todesbote'.mtf
index 2ddf402af7a..0be7a47288a 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Mauler MAL-4X 'Todesbote'.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Mauler MAL-4X 'Todesbote'.mtf	
@@ -6,7 +6,7 @@ mul id:5784
 Config:Biped
 TechBase:Inner Sphere
 Era:3070
-Source:XTRO Most Wanted - Jihad
+Source:XTR: Most Wanted - Jihad
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Pompier Firemech GM-FL.mtf b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Pompier Firemech GM-FL.mtf
index 81b665b0f21..8cd3b3c96a9 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Pompier Firemech GM-FL.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Most Wanted/Pompier Firemech GM-FL.mtf	
@@ -6,7 +6,7 @@ mul id:5780
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:XTRO Most Wanted - Jihad
+Source:XTR: Most Wanted - Jihad
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/XTRs/Periphery/Anubis ABS-3MC.mtf b/megamek/data/mechfiles/mechs/XTRs/Periphery/Anubis ABS-3MC.mtf
index da11ccb7886..cccb78b0141 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Periphery/Anubis ABS-3MC.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Periphery/Anubis ABS-3MC.mtf	
@@ -6,7 +6,7 @@ mul id:5562
 Config:Biped
 techbase:Inner Sphere
 era:3081
-source:XTRO Periphery - Jihad
+source:XTR: Periphery - Jihad
 rules level:4
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Periphery/Atlas AS-700 Jurn.mtf b/megamek/data/mechfiles/mechs/XTRs/Periphery/Atlas AS-700 Jurn.mtf
index 996bddb94e0..e2ad5c57efa 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Periphery/Atlas AS-700 Jurn.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Periphery/Atlas AS-700 Jurn.mtf	
@@ -6,7 +6,7 @@ mul id:5564
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:XTRO Periphery - Jihad
+Source:XTR: Periphery - Jihad
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/XTRs/Periphery/Dig Lord RCL-Z1 Armed MiningMech.mtf b/megamek/data/mechfiles/mechs/XTRs/Periphery/Dig Lord RCL-Z1 Armed MiningMech.mtf
index 28fd4112e04..f5df4c46388 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Periphery/Dig Lord RCL-Z1 Armed MiningMech.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Periphery/Dig Lord RCL-Z1 Armed MiningMech.mtf	
@@ -6,7 +6,7 @@ mul id:5565
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:XTRO Periphery - Jihad
+Source:XTR: Periphery - Jihad
 Rules Level:4
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/XTRs/Periphery/Trebuchet TBT-XK7.mtf b/megamek/data/mechfiles/mechs/XTRs/Periphery/Trebuchet TBT-XK7.mtf
index 6e00416131b..f128f596fcc 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Periphery/Trebuchet TBT-XK7.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Periphery/Trebuchet TBT-XK7.mtf	
@@ -6,7 +6,7 @@ mul id:5563
 Config:Biped
 TechBase:Inner Sphere
 Era:3081
-Source:XTRO Periphery - Jihad
+Source:XTR: Periphery - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Phantoms/Chameleon Q-'Mech CLN-7VQ.mtf b/megamek/data/mechfiles/mechs/XTRs/Phantoms/Chameleon Q-'Mech CLN-7VQ.mtf
index 313da2787dc..bb31d37757d 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Phantoms/Chameleon Q-'Mech CLN-7VQ.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Phantoms/Chameleon Q-'Mech CLN-7VQ.mtf	
@@ -6,7 +6,7 @@ mul id:5601
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3071
-Source:XTRO Phantoms - Jihad
+Source:XTR: Phantoms - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Phantoms/Grand Titan Vengeance T-IT-N14R.mtf b/megamek/data/mechfiles/mechs/XTRs/Phantoms/Grand Titan Vengeance T-IT-N14R.mtf
index 214b17d6123..8787b5d92b8 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Phantoms/Grand Titan Vengeance T-IT-N14R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Phantoms/Grand Titan Vengeance T-IT-N14R.mtf	
@@ -6,7 +6,7 @@ mul id:5604
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3075
-source:XTRO Phantoms - Jihad
+source:XTR: Phantoms - Jihad
 rules level:4
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/XTRs/Phantoms/Warlord BLR-2XC.mtf b/megamek/data/mechfiles/mechs/XTRs/Phantoms/Warlord BLR-2XC.mtf
index 6349d5f95ec..6f7c0c1b771 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Phantoms/Warlord BLR-2XC.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Phantoms/Warlord BLR-2XC.mtf	
@@ -6,7 +6,7 @@ mul id:5602
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:XTRO Phantoms - Jihad
+Source:XTR: Phantoms - Jihad
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Phantoms/Wight Dezgra WGT-4NC.mtf b/megamek/data/mechfiles/mechs/XTRs/Phantoms/Wight Dezgra WGT-4NC.mtf
index d7bd41eeccb..a8b4daa5a08 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Phantoms/Wight Dezgra WGT-4NC.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Phantoms/Wight Dezgra WGT-4NC.mtf	
@@ -6,7 +6,7 @@ mul id:5600
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3074
-source:XTRO Phantoms - Jihad
+source:XTR: Phantoms - Jihad
 rules level:4
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Pirates/Dervish DV-8D2 Lightbringer.mtf b/megamek/data/mechfiles/mechs/XTRs/Pirates/Dervish DV-8D2 Lightbringer.mtf
index 7ff44e59e01..8ab6ee157f7 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Pirates/Dervish DV-8D2 Lightbringer.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Pirates/Dervish DV-8D2 Lightbringer.mtf	
@@ -7,7 +7,7 @@ Config:Biped
 TechBase:Inner Sphere
 Era:3071
 Rules Level:4
-Source:XTRO Pirates - Jihad
+Source:XTR: Pirates - Jihad
 
 Mass:55
 Engine:275 XL Engine
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Commando COM-1A.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Commando COM-1A.mtf
index 05281c85fb2..dfa6772fc32 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Commando COM-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Commando COM-1A.mtf	
@@ -6,7 +6,7 @@ mul id:666
 Config:Biped
 TechBase:Inner Sphere
 Era:2463
-Source:XTRO Primitives I - Age of War
+Source:XTR: Primitives I - Age of War
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Helepolis HEP-1H.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Helepolis HEP-1H.mtf
index b8799bed5eb..7a08a465dd4 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Helepolis HEP-1H.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Helepolis HEP-1H.mtf	
@@ -6,7 +6,7 @@ mul id:1460
 Config:Biped
 techbase:Inner Sphere
 era:2460
-source:XTRO Primitives I - Age of War
+source:XTR: Primitives I - Age of War
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Kyudo KY2-D-01.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Kyudo KY2-D-01.mtf
index c197f95ce96..e73dad9b450 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Kyudo KY2-D-01.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Kyudo KY2-D-01.mtf	
@@ -6,7 +6,7 @@ mul id:1850
 Config:Biped
 TechBase:Inner Sphere
 Era:2443
-Source:XTRO Primitives I - Age of War
+Source:XTR: Primitives I - Age of War
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Mackie MSK-5S.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Mackie MSK-5S.mtf
index aa9e7835535..05b5582abb6 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Mackie MSK-5S.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Mackie MSK-5S.mtf	
@@ -5,7 +5,7 @@ mul id:1972
 Config:Biped
 techbase:Inner Sphere
 era:2439
-source:XTRO Primitives I - Age of War
+source:XTR: Primitives I - Age of War
 rules level:4
 
 mass:100
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Shadow Hawk SHD-1R.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Shadow Hawk SHD-1R.mtf
index b14e7c4db37..e0fdd2a4e0a 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives I/Shadow Hawk SHD-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives I/Shadow Hawk SHD-1R.mtf	
@@ -6,7 +6,7 @@ mul id:2898
 Config:Biped
 TechBase:Inner Sphere
 Era:2467
-Source:XTRO Primitives I - Age of War
+Source:XTR: Primitives I - Age of War
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Banshee BNC-1E.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Banshee BNC-1E.mtf
index a0cbd43799d..7478444cb25 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Banshee BNC-1E.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Banshee BNC-1E.mtf	
@@ -5,7 +5,7 @@ mul id:3785
 Config:Biped
 techbase:Inner Sphere
 era:2445
-source:XTRO Primitives II - Age of War
+source:XTR: Primitives II - Age of War
 rules level:4
 
 mass:95
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives II/BattleAxe BKX-1X.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives II/BattleAxe BKX-1X.mtf
index 3a4371f5df6..08326b486ee 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives II/BattleAxe BKX-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives II/BattleAxe BKX-1X.mtf	
@@ -6,7 +6,7 @@ mul id:5584
 Config:Biped
 TechBase:Inner Sphere
 Era:2459
-Source:XTRO Primitives II - Age of War
+Source:XTR: Primitives II - Age of War
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Crossbow CRS-X.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Crossbow CRS-X.mtf
index 9faaf9d7df7..1eb77ea4554 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Crossbow CRS-X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Crossbow CRS-X.mtf	
@@ -6,7 +6,7 @@ mul id:5583
 Config:Biped
 techbase:Inner Sphere
 era:2468
-source:XTRO Primitives II - Age of War
+source:XTR: Primitives II - Age of War
 rules level:4
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Gladiator GLD-1R.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Gladiator GLD-1R.mtf
index c9d5bad71a7..c792d91ce93 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Gladiator GLD-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Gladiator GLD-1R.mtf	
@@ -6,7 +6,7 @@ mul id:1198
 Config:Biped
 TechBase:Inner Sphere
 Era:2468
-Source:XTRO Primitives II - Age of War
+Source:XTR: Primitives II - Age of War
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Icarus ICR-1X.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Icarus ICR-1X.mtf
index 21cbc8c6b49..f07864e4322 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Icarus ICR-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Icarus ICR-1X.mtf	
@@ -5,7 +5,7 @@ mul id:1599
 Config:Biped
 techbase:Inner Sphere
 era:2470
-source:XTRO Primitives II - Age of War
+source:XTR: Primitives II - Age of War
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Wasp WSP-1.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Wasp WSP-1.mtf
index b83f2c766a8..61d4193073d 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives II/Wasp WSP-1.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives II/Wasp WSP-1.mtf	
@@ -6,7 +6,7 @@ mul id:3519
 Config:Biped
 TechBase:Inner Sphere
 Era:2464
-Source:XTRO Primitives II - Age of War
+Source:XTR: Primitives II - Age of War
 Rules Level:4
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Bellerophon BEL-1X.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Bellerophon BEL-1X.mtf
index c24f2562bc1..f85a29c7143 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Bellerophon BEL-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Bellerophon BEL-1X.mtf	
@@ -6,7 +6,7 @@ mul id:3817
 Config:Biped
 TechBase:Inner Sphere
 Era:2442
-Source:XTRO Primitives III - Age of War
+Source:XTR: Primitives III - Age of War
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Dervish DV-1S.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Dervish DV-1S.mtf
index 645403233ec..691eeb37152 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Dervish DV-1S.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Dervish DV-1S.mtf	
@@ -5,7 +5,7 @@ mul id:877
 Config:Biped
 techbase:Inner Sphere
 era:2520
-source:XTRO Primitives III - Age of War
+source:XTR: Primitives III - Age of War
 rules level:3
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Eisenfaust EFT-2.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Eisenfaust EFT-2.mtf
index 8ebe0464a55..a77e29a0c53 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Eisenfaust EFT-2.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Eisenfaust EFT-2.mtf	
@@ -6,7 +6,7 @@ mul id:5618
 Config:Biped
 TechBase:Inner Sphere
 Era:2471
-Source:XTRO Primitives III - Age of War
+Source:XTR: Primitives III - Age of War
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Firebee FRB-1E(WAM-B).mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Firebee FRB-1E(WAM-B).mtf
index 22fddca5b1e..4232646f2c9 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Firebee FRB-1E(WAM-B).mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Firebee FRB-1E(WAM-B).mtf	
@@ -6,7 +6,7 @@ mul id:1078
 Config:Biped
 TechBase:Inner Sphere
 Era:2483
-Source:XTRO Primitives III - Age of War
+Source:XTR: Primitives III - Age of War
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Longbow LGB-0C.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Longbow LGB-0C.mtf
index 94569c17c8d..57c630bc793 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Longbow LGB-0C.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Longbow LGB-0C.mtf	
@@ -6,7 +6,7 @@ mul id:5619
 Config:Biped
 TechBase:Inner Sphere
 Era:2480
-Source:XTRO Primitives III - Age of War
+Source:XTR: Primitives III - Age of War
 Rules Level:4
 
 Mass:85
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Thunderbolt TDR-1C.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Thunderbolt TDR-1C.mtf
index 877c605f001..826ee9d10be 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives III/Thunderbolt TDR-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives III/Thunderbolt TDR-1C.mtf	
@@ -6,7 +6,7 @@ mul id:5237
 Config:Biped
 techbase:Inner Sphere
 era:2491
-source:XTRO Primitives III - Age of War
+source:XTR: Primitives III - Age of War
 rules level:4
 
 mass:65
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Emperor EMP-1A.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Emperor EMP-1A.mtf
index 1c4b2c66900..8f4c4163d24 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Emperor EMP-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Emperor EMP-1A.mtf	
@@ -6,7 +6,7 @@ mul id:7186
 Config:Biped
 TechBase:Inner Sphere
 Era:2442
-Source:XTRO Primitives IV - Age of War
+Source:XTR: Primitives IV - Age of War
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Griffin GRF-1A.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Griffin GRF-1A.mtf
index d36746a5d4d..47a41496191 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Griffin GRF-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Griffin GRF-1A.mtf	
@@ -6,7 +6,7 @@ mul id:7185
 Config:Biped
 TechBase:Inner Sphere
 Era:2465
-Source:XTRO Primitives IV - Age of War
+Source:XTR: Primitives IV - Age of War
 Rules Level:4
 
 Mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Rifleman RFL-1N.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Rifleman RFL-1N.mtf
index fb8c142b919..5b44b3d8c5f 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Rifleman RFL-1N.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Rifleman RFL-1N.mtf	
@@ -6,7 +6,7 @@ mul id:7183
 Config:Biped
 TechBase:Inner Sphere
 Era:2504
-Source:XTRO Primitives IV - Age of War
+Source:XTR: Primitives IV - Age of War
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Rifleman RFL-2N.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Rifleman RFL-2N.mtf
index 2ff7146d9a9..2265ca9c6b9 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Rifleman RFL-2N.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Rifleman RFL-2N.mtf	
@@ -6,7 +6,7 @@ mul id:7184
 Config:Biped
 TechBase:Inner Sphere
 Era:2556
-Source:XTRO Primitives IV - Age of War
+Source:XTR: Primitives IV - Age of War
 Rules Level:1
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Swordsman SWD-1.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Swordsman SWD-1.mtf
index bcc66890830..d319a32dd58 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Swordsman SWD-1.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Swordsman SWD-1.mtf	
@@ -6,7 +6,7 @@ mul id:7181
 Config:Biped
 TechBase:Inner Sphere
 Era:2463
-Source:XTRO Primitives IV - Age of War
+Source:XTR: Primitives IV - Age of War
 Rules Level:4
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Swordsman SWD-2.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Swordsman SWD-2.mtf
index 5ad3f7d74b2..b8038b318f0 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Swordsman SWD-2.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Swordsman SWD-2.mtf	
@@ -6,7 +6,7 @@ mul id:7182
 Config:Biped
 TechBase:Inner Sphere
 Era:2482
-Source:XTRO Primitives IV - Age of War
+Source:XTR: Primitives IV - Age of War
 Rules Level:1
 
 Mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Toro TR-A-1.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Toro TR-A-1.mtf
index a30f096cf17..c4d696c3151 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Toro TR-A-1.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Toro TR-A-1.mtf	
@@ -6,7 +6,7 @@ mul id:3276
 Config:Biped
 techbase:Inner Sphere
 era:2481
-source:XTRO Primitives IV - Age of War
+source:XTR: Primitives IV - Age of War
 rules level:4
 
 mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Xanthos XNT-2O.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Xanthos XNT-2O.mtf
index 436dd51f82d..d4ab9e8839d 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Xanthos XNT-2O.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives IV/Xanthos XNT-2O.mtf	
@@ -6,7 +6,7 @@ mul id:3603
 Config:Quad
 TechBase:Inner Sphere
 Era:2564
-Source:XTRO Primitives IV - Age of War
+Source:XTR: Primitives IV - Age of War
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Archer ARC-1A.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Archer ARC-1A.mtf
index 03a3cd58913..777fcca4904 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Archer ARC-1A.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Archer ARC-1A.mtf	
@@ -6,7 +6,7 @@ mul id:3721
 Config:Biped
 TechBase:Inner Sphere
 Era:2458
-Source:XTRO Primitives V - Age of War
+Source:XTR: Primitives V - Age of War
 Rules Level:4
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Orion ON1-C.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Orion ON1-C.mtf
index 625aa716f53..13ea9af3475 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Orion ON1-C.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Orion ON1-C.mtf	
@@ -5,7 +5,7 @@ mul id:4755
 Config:Biped
 techbase:Inner Sphere
 era:2453
-source:XTRO Primitives V - Age of War
+source:XTR: Primitives V - Age of War
 rules level:3
 
 mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Orion ON1-H.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Orion ON1-H.mtf
index 1c7bbafeab9..d77db1d6ef6 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Orion ON1-H.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Orion ON1-H.mtf	
@@ -6,7 +6,7 @@ mul id:7405
 Config:Biped
 TechBase:Inner Sphere
 Era:2456
-Source:XTRO Primitives V - Age of War
+Source:XTR: Primitives V - Age of War
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Phoenix PX-1R.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Phoenix PX-1R.mtf
index 16851e13c72..1c68dbc0f7e 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Phoenix PX-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Phoenix PX-1R.mtf	
@@ -6,7 +6,7 @@ mul id:2488
 Config:Biped
 TechBase:Inner Sphere
 Era:2474
-Source:XTRO Primitives V - Age of War
+Source:XTR: Primitives V - Age of War
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Trooper TP-1R.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Trooper TP-1R.mtf
index eb5f125d519..4cacdb4a81d 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Trooper TP-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Trooper TP-1R.mtf	
@@ -6,7 +6,7 @@ mul id:7407
 Config:Biped
 TechBase:Inner Sphere
 Era:2475
-Source:XTRO Primitives V - Age of War
+Source:XTR: Primitives V - Age of War
 Rules Level:4
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Wolverine WVR-1R.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Wolverine WVR-1R.mtf
index d5a397a74b6..801cf6f84c0 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Wolverine WVR-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Wolverine WVR-1R.mtf	
@@ -6,7 +6,7 @@ mul id:7406
 Config:Biped
 TechBase:Inner Sphere
 Era:2471
-Source:XTRO Primitives V - Age of War
+Source:XTR: Primitives V - Age of War
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Wolverine WVR-3R.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Wolverine WVR-3R.mtf
index a5c7c73ebd7..22f321c3c74 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Wolverine WVR-3R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Wolverine WVR-3R.mtf	
@@ -6,7 +6,7 @@ mul id:7408
 Config:Biped
 techbase:Inner Sphere
 era:2490
-source:XTRO Primitives V - Age of War
+source:XTR: Primitives V - Age of War
 rules level:4
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Ymir BWP-X1.mtf b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Ymir BWP-X1.mtf
index d6ef86f70c4..da14639f889 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Primitives V/Ymir BWP-X1.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Primitives V/Ymir BWP-X1.mtf	
@@ -6,7 +6,7 @@ mul id:3623
 Config:Biped
 TechBase:Inner Sphere
 Era:2462
-Source:XTRO Primitives V - Age of War
+Source:XTR: Primitives V - Age of War
 Rules Level:4
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic I/Beowulf IIC-PR (Standard).mtf b/megamek/data/mechfiles/mechs/XTRs/Republic I/Beowulf IIC-PR.mtf
similarity index 97%
rename from megamek/data/mechfiles/mechs/XTRs/Republic I/Beowulf IIC-PR (Standard).mtf
rename to megamek/data/mechfiles/mechs/XTRs/Republic I/Beowulf IIC-PR.mtf
index f6252cdf01c..94579de6665 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic I/Beowulf IIC-PR (Standard).mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic I/Beowulf IIC-PR.mtf	
@@ -6,7 +6,7 @@ mul id:7294
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3086
-Source:XTRO Republic I - Early Republic
+Source:XTR: Republic I - Early Republic
 Rules Level:3
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic I/Emerald Harrier (Roadrunner) RD-1R.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic I/Emerald Harrier (Roadrunner) RD-1R.mtf
index b043493ce5d..66b81650542 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic I/Emerald Harrier (Roadrunner) RD-1R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic I/Emerald Harrier (Roadrunner) RD-1R.mtf	
@@ -6,7 +6,7 @@ mul id:7292
 Config:Biped
 TechBase:Clan
 Era:3112
-Source:XTRO Republic I - Late Republic
+Source:XTR: Republic I - Late Republic
 Rules Level:3
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic I/Enforcer III ENF-7D.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic I/Enforcer III ENF-7D.mtf
index 4074ad8bbe6..ee5f96b6b16 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic I/Enforcer III ENF-7D.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic I/Enforcer III ENF-7D.mtf	
@@ -5,7 +5,7 @@ mul id:7296
 Config:Biped
 techbase:Inner Sphere
 era:3104
-source:XTRO Republic I - Late Republic
+source:XTR: Republic I - Late Republic
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic I/Hatchetman HCT-7R.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic I/Hatchetman HCT-7R.mtf
index 9e4fa1ee406..f1c7a77d969 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic I/Hatchetman HCT-7R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic I/Hatchetman HCT-7R.mtf	
@@ -6,7 +6,7 @@ mul id:7295
 Config:Biped
 techbase:Inner Sphere
 era:3114
-source:XTRO Republic I - Late Republic
+source:XTR: Republic I - Late Republic
 rules level:4
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic I/Valiant VLT-3E.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic I/Valiant VLT-3E.mtf
index 0c69b8d142b..497333f47e2 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic I/Valiant VLT-3E.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic I/Valiant VLT-3E.mtf	
@@ -6,7 +6,7 @@ mul id:7293
 Config:Biped
 TechBase:Inner Sphere
 Era:3098
-Source:XTRO Republic I - Early Republic
+Source:XTR: Republic I - Early Republic
 Rules Level:3
 
 Mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Awesome AWS-11R.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Awesome AWS-11R.mtf
index a1629bc9bcf..a0b5fd87b10 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Awesome AWS-11R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Awesome AWS-11R.mtf	
@@ -6,7 +6,7 @@ mul id:7349
 Config:Biped
 TechBase:Inner Sphere
 Era:3133
-Source:XTRO Republic II - Dark Ages  
+Source:XTR: Republic II - Dark Ages  
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Blade BLD-XR.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Blade BLD-XR.mtf
index 1087c271e2a..df5692d43be 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Blade BLD-XR.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Blade BLD-XR.mtf	
@@ -6,7 +6,7 @@ mul id:7345
 Config:Biped
 TechBase:Inner Sphere
 Era:3125
-Source:XTRO Republic II - Late Republic
+Source:XTR: Republic II - Late Republic
 Rules Level:3
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Hatamoto-Ku HTM-27W2.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Hatamoto-Ku HTM-27W2.mtf
index a4265874cf3..5a610f92b33 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Hatamoto-Ku HTM-27W2.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Hatamoto-Ku HTM-27W2.mtf	
@@ -5,7 +5,7 @@ mul id:7350
 Config:Biped
 techbase:Inner Sphere
 era:3115
-source:XTRO Republic II - Late Republic
+source:XTR: Republic II - Late Republic
 rules level:3
 
 mass:80
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Hornet HNT-181.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Hornet HNT-181.mtf
index 83afc62acfe..f3f82df3dc8 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Hornet HNT-181.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Hornet HNT-181.mtf	
@@ -6,7 +6,7 @@ mul id:7396
 Config:Biped
 TechBase:Inner Sphere
 Era:3130
-Source:XTRO Republic II - Late Republic
+Source:XTR: Republic II - Late Republic
 Rules Level:4
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Hornet HNT-182.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Hornet HNT-182.mtf
index fe33de43196..bcdfce5b33b 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Hornet HNT-182.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Hornet HNT-182.mtf	
@@ -6,7 +6,7 @@ mul id:7343
 Config:Biped
 TechBase:Inner Sphere
 Era:3130
-Source:XTRO Republic II - Late Republic
+Source:XTR: Republic II - Late Republic
 Rules Level:4
 
 Mass:20
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Hunchback HBK-7S.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Hunchback HBK-7S.mtf
index 5b92998af50..48d464ae678 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Hunchback HBK-7S.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Hunchback HBK-7S.mtf	
@@ -5,7 +5,7 @@ mul id:7346
 Config:Biped
 techbase:Inner Sphere
 era:3134
-source:XTRO Republic II - Late Republic
+source:XTR: Republic II - Late Republic
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Orca OC-1X.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Orca OC-1X.mtf
index 725c47b7ca2..58a989d3fd7 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Orca OC-1X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Orca OC-1X.mtf	
@@ -6,7 +6,7 @@ mul id:7356
 Config:Biped
 TechBase:Inner Sphere
 Era:3103
-Source:XTRO Republic II - Early Republic  
+Source:XTR: Republic II - Early Republic  
 Rules Level:4
 
 Mass:200
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Penthesilea PEN-3H.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Penthesilea PEN-3H.mtf
index fcc06ddda68..68ce7bf85cc 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Penthesilea PEN-3H.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Penthesilea PEN-3H.mtf	
@@ -6,7 +6,7 @@ mul id:7347
 Config:Biped
 TechBase:Inner Sphere
 Era:3129
-Source:XTRO Republic II - Late Republic
+Source:XTR: Republic II - Late Republic
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/Prefect PRF-1C.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/Prefect PRF-1C.mtf
index d23c1a88a70..40d89926a68 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/Prefect PRF-1C.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/Prefect PRF-1C.mtf	
@@ -6,7 +6,7 @@ mul id:7348
 Config:Biped
 TechBase:Inner Sphere
 Era:3133
-Source:XTRO Republic II - Dark Ages
+Source:XTR: Republic II - Dark Ages
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic II/UrbanMech UM-R93.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic II/UrbanMech UM-R93.mtf
index f7cfb698be4..d0116d3b4ee 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic II/UrbanMech UM-R93.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic II/UrbanMech UM-R93.mtf	
@@ -5,7 +5,7 @@ mul id:9499
 Config:Biped
 techbase:Inner Sphere
 era:3130
-source:XTRO Republic II - Late Republic
+source:XTR: Republic II - Late Republic
 rules level:3
 
 mass:30
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic III/Goshawk II RISC.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic III/Goshawk II RISC.mtf
index b451acd26ce..49b3c167c85 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic III/Goshawk II RISC.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic III/Goshawk II RISC.mtf	
@@ -6,7 +6,7 @@ mul id:7376
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3136
-Source:XTRO Republic III - Dark Age
+Source:XTR: Republic III - Dark Age
 Rules Level:4
 
 Mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic III/Lament LMT-2D.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic III/Lament LMT-2D.mtf
index 724668288e9..1f8adfa8beb 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic III/Lament LMT-2D.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic III/Lament LMT-2D.mtf	
@@ -6,7 +6,7 @@ mul id:7383
 Config:Biped
 TechBase:Inner Sphere
 Era:3147
-Source:XTRO Republic III - Dark Age
+Source:XTR: Republic III - Dark Age
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic III/Lich UABM-2R.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic III/Lich UABM-2R.mtf
index 21f04b30d8a..83f0b88e8af 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic III/Lich UABM-2R.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic III/Lich UABM-2R.mtf	
@@ -6,7 +6,7 @@ mul id:7385
 Config:Quad
 TechBase:Mixed (IS Chassis)
 Era:3140
-Source:XTRO Republic III - Dark Ag
+Source:XTR: Republic III - Dark Ag
 Rules Level:3
 
 Mass:90
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic III/Osprey OSP-36.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic III/Osprey OSP-36.mtf
index 8bcc8730376..651053c03d2 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic III/Osprey OSP-36.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic III/Osprey OSP-36.mtf	
@@ -6,7 +6,7 @@ mul id:7377
 Config:Biped
 TechBase:Inner Sphere
 Era:3139
-Source:XTRO Republic III - Dark Age
+Source:XTR: Republic III - Dark Age
 Rules Level:3
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic III/Parash 3.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic III/Parash 3.mtf
index 115c96d8aad..267e66919d4 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic III/Parash 3.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic III/Parash 3.mtf	
@@ -6,7 +6,7 @@ mul id:7375
 Config:Biped
 TechBase:Mixed (Clan Chassis)
 Era:3083
-Source:XTR Republic III - Jihad
+Source:XTR: Republic III - Jihad
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Republic III/Triskelion TRK-4V.mtf b/megamek/data/mechfiles/mechs/XTRs/Republic III/Triskelion TRK-4V.mtf
index 01df54fa74e..be19d6d4535 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Republic III/Triskelion TRK-4V.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Republic III/Triskelion TRK-4V.mtf	
@@ -6,7 +6,7 @@ mul id:7384
 Config:Tripod
 TechBase:Mixed (IS Chassis)
 Era:3146
-Source:XTRO Republic III - Dark Age
+Source:XTR: Republic III - Dark Age
 Rules Level:3
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Centurion CN9-H.mtf b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Centurion CN9-H.mtf
index 146063bde48..9b4ef348ef3 100644
--- a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Centurion CN9-H.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Centurion CN9-H.mtf	
@@ -6,7 +6,7 @@ mul id:3922
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:XTRO RetroTech - Jihad
+Source:XTR: RetroTech - Jihad
 Rules Level:4
 
 Mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/RetroTech/HawkWolf HWK-3F.mtf b/megamek/data/mechfiles/mechs/XTRs/RetroTech/HawkWolf HWK-3F.mtf
index 2f9ca7870e3..b22b9832596 100644
--- a/megamek/data/mechfiles/mechs/XTRs/RetroTech/HawkWolf HWK-3F.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/RetroTech/HawkWolf HWK-3F.mtf	
@@ -6,7 +6,7 @@ mul id:4273
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:XTRO RetroTech - Jihad
+Source:XTR: RetroTech - Jihad
 Rules Level:4
 
 Mass:80
diff --git a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Pathfinder PFF-2.mtf b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Pathfinder PFF-2.mtf
index 428bc4ecc0f..29fd3c31a8c 100644
--- a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Pathfinder PFF-2.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Pathfinder PFF-2.mtf	
@@ -6,7 +6,7 @@ mul id:4790
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:XTRO RetroTech - Jihad
+Source:XTR: RetroTech - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Pathfinder PFF-2T.mtf b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Pathfinder PFF-2T.mtf
index 902bdbb6c88..6bbcec368fd 100644
--- a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Pathfinder PFF-2T.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Pathfinder PFF-2T.mtf	
@@ -6,7 +6,7 @@ mul id:4791
 Config:Biped
 TechBase:Inner Sphere
 Era:3075
-Source:XTRO RetroTech - Jihad
+Source:XTR: RetroTech - Jihad
 Rules Level:4
 
 Mass:25
diff --git a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Patron MilitiaMech PTN-2.mtf b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Patron MilitiaMech PTN-2.mtf
index b9f1778300a..78961ec04ab 100644
--- a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Patron MilitiaMech PTN-2.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Patron MilitiaMech PTN-2.mtf	
@@ -6,7 +6,7 @@ mul id:4794
 Config:Biped
 TechBase:Inner Sphere
 Era:3076
-Source:XTRO RetroTech - Jihad
+Source:XTR: RetroTech - Jihad
 Rules Level:2
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Rook-X NH-1B.mtf b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Rook-X NH-1B.mtf
index 62dc1d05238..befe1612103 100644
--- a/megamek/data/mechfiles/mechs/XTRs/RetroTech/Rook-X NH-1B.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/RetroTech/Rook-X NH-1B.mtf	
@@ -6,7 +6,7 @@ mul id:4935
 Config:Biped
 TechBase:Inner Sphere
 Era:3077
-Source:XTRO RetroTech - Jihad
+Source:XTR: RetroTech - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Agrotera AGT-UA _Ariel_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Agrotera AGT-UA _Ariel_.mtf
index 9e6f99c803e..1ae0d573915 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Agrotera AGT-UA _Ariel_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Agrotera AGT-UA _Ariel_.mtf	
@@ -6,7 +6,7 @@ mul id:8365
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3137
-source:XTRO: Royal Fantasy
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Buccaneer BCN-6PX _Pan_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Buccaneer BCN-6PX _Pan_.mtf
index 772dae4ad7c..93c3ad6469d 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Buccaneer BCN-6PX _Pan_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Buccaneer BCN-6PX _Pan_.mtf	
@@ -6,7 +6,7 @@ mul id:8379
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3120
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Calliope CAL-1MAFSW _Snow White_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Calliope CAL-1MAFSW _Snow White_.mtf
index 9bbe737341f..3350a76c00b 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Calliope CAL-1MAFSW _Snow White_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Calliope CAL-1MAFSW _Snow White_.mtf	
@@ -6,7 +6,7 @@ mul id:8368
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3127
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Celerity CLR-03OMM _Rajah_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Celerity CLR-03OMM _Rajah_.mtf
index b4834203936..333743c4a0d 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Celerity CLR-03OMM _Rajah_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Celerity CLR-03OMM _Rajah_.mtf	
@@ -6,7 +6,7 @@ mul id:8366
 Config:Quad
 techbase:Mixed (IS Chassis)
 era:3138
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:15
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Clint IIC 2L _Leia_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Clint IIC 2L _Leia_.mtf
index c5ff72a2a05..21bf69ac1dd 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Clint IIC 2L _Leia_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Clint IIC 2L _Leia_.mtf	
@@ -6,7 +6,7 @@ mul id:8369
 Config:Biped
 techbase:Mixed (Clan Chassis)
 era:3125
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Ghost GST-10A _Aurora_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Ghost GST-10A _Aurora_.mtf
index a2bb770c32d..27b9b9ec98d 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Ghost GST-10A _Aurora_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Ghost GST-10A _Aurora_.mtf	
@@ -6,7 +6,7 @@ mul id:8373
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3130
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Gunsmith CH11-NGC _Cinderella_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Gunsmith CH11-NGC _Cinderella_.mtf
index 2895c06a9df..5a04eee7c85 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Gunsmith CH11-NGC _Cinderella_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Gunsmith CH11-NGC _Cinderella_.mtf	
@@ -6,7 +6,7 @@ mul id:8367
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3131
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hitotsume Kozo HKZ-1FM _Mulan_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hitotsume Kozo HKZ-1FM _Mulan_.mtf
index 3cc2e4c9e07..a97433c9f73 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hitotsume Kozo HKZ-1FM _Mulan_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hitotsume Kozo HKZ-1FM _Mulan_.mtf	
@@ -6,7 +6,7 @@ mul id:8380
 Config:Biped
 techbase:Inner Sphere
 era:3136
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hunchback HBK-LGN-Pin _Anastasia_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hunchback HBK-LGN-Pin _Anastasia_.mtf
index f934e8b0b68..ed48fde0bbd 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hunchback HBK-LGN-Pin _Anastasia_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hunchback HBK-LGN-Pin _Anastasia_.mtf	
@@ -6,7 +6,7 @@ mul id:8374
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3100
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hunchback HBK-LGN-Pin _Drizella_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hunchback HBK-LGN-Pin _Drizella_.mtf
index babc9a94324..20ba5135faa 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hunchback HBK-LGN-Pin _Drizella_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Hunchback HBK-LGN-Pin _Drizella_.mtf	
@@ -6,7 +6,7 @@ mul id:8375
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3100
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:2
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Phoenix Hawk PXH-7KJ _Jasmine_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Phoenix Hawk PXH-7KJ _Jasmine_.mtf
index f878d634cb8..a61839953f0 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Phoenix Hawk PXH-7KJ _Jasmine_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Phoenix Hawk PXH-7KJ _Jasmine_.mtf	
@@ -6,7 +6,7 @@ mul id:8372
 Config:Biped
 techbase:Inner Sphere
 era:3125
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Tessen TSN-X4R _Rapunzel_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Tessen TSN-X4R _Rapunzel_.mtf
index 098ed571ad4..ea223038361 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Tessen TSN-X4R _Rapunzel_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Tessen TSN-X4R _Rapunzel_.mtf	
@@ -6,7 +6,7 @@ mul id:8377
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3137
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:4
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Trebuchet TBT-7MM _Merida_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Trebuchet TBT-7MM _Merida_.mtf
index 61d4d6d9a16..de396bcb506 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Trebuchet TBT-7MM _Merida_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Trebuchet TBT-7MM _Merida_.mtf	
@@ -6,7 +6,7 @@ mul id:8378
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3100
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:50
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Vulcan VT-5ML _Aladdin_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Vulcan VT-5ML _Aladdin_.mtf
index 91f0b5f6654..328827d8603 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Vulcan VT-5ML _Aladdin_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Vulcan VT-5ML _Aladdin_.mtf	
@@ -6,7 +6,7 @@ mul id:8370
 Config:Biped
 techbase:Inner Sphere
 era:3143
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:2
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Vulpes VLP-1DX _Beast_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Vulpes VLP-1DX _Beast_.mtf
index c659b4e9940..0faec62913f 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Vulpes VLP-1DX _Beast_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Vulpes VLP-1DX _Beast_.mtf	
@@ -6,7 +6,7 @@ mul id:8382
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3134
-source:TRO 3145 Federated Suns - Dark Ages
+source:TRO: 3145 Federated Suns - Dark Ages
 rules level:3
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Watchman WTC-4MB 'Belle'.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Watchman WTC-4MB 'Belle'.mtf
index 50e80f30285..f722f6d8df1 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Watchman WTC-4MB 'Belle'.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Watchman WTC-4MB 'Belle'.mtf	
@@ -5,7 +5,7 @@ mul id:8371
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3144
-source:XTRO Royal Fantasy - Dark Age - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:40
diff --git a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Wraith TR2-P _Pocahontas_.mtf b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Wraith TR2-P _Pocahontas_.mtf
index 65643541471..a83012e9694 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Wraith TR2-P _Pocahontas_.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Royal Fantasy/Wraith TR2-P _Pocahontas_.mtf	
@@ -6,7 +6,7 @@ mul id:8381
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3130
-source:XTRO Royal Fantasy - Dark Age
+source:XTR: Royal Fantasy - Dark Age
 rules level:3
 
 mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Steiner/Axman AXM-6X.mtf b/megamek/data/mechfiles/mechs/XTRs/Steiner/Axman AXM-6X.mtf
index 37e7d292a67..688f06f24f0 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Steiner/Axman AXM-6X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Steiner/Axman AXM-6X.mtf	
@@ -6,7 +6,7 @@ mul id:3772
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3074
-Source:XTRO Steiner - Jihad
+Source:XTR: Steiner - Jihad
 Rules Level:3
 
 Mass:65
diff --git a/megamek/data/mechfiles/mechs/XTRs/Steiner/Banshee BNC-11X.mtf b/megamek/data/mechfiles/mechs/XTRs/Steiner/Banshee BNC-11X.mtf
index b8bad0dc311..040e0601076 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Steiner/Banshee BNC-11X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Steiner/Banshee BNC-11X.mtf	
@@ -6,7 +6,7 @@ mul id:3784
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3076
-Source:XTRO Steiner - Jihad
+Source:XTR: Steiner - Jihad
 Rules Level:4
 
 Mass:95
diff --git a/megamek/data/mechfiles/mechs/XTRs/Steiner/Barghest BGS-4X.mtf b/megamek/data/mechfiles/mechs/XTRs/Steiner/Barghest BGS-4X.mtf
index a3bd4848c8b..62cb776bfe5 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Steiner/Barghest BGS-4X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Steiner/Barghest BGS-4X.mtf	
@@ -6,7 +6,7 @@ mul id:3791
 Config:Quad
 TechBase:Inner Sphere
 Era:3078
-Source:XTRO Steiner - Jihad
+Source:XTR: Steiner - Jihad
 Rules Level:3
 
 Mass:70
diff --git a/megamek/data/mechfiles/mechs/XTRs/Steiner/Slagmaiden SLG-X.mtf b/megamek/data/mechfiles/mechs/XTRs/Steiner/Slagmaiden SLG-X.mtf
index 7792566447d..72790994927 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Steiner/Slagmaiden SLG-X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Steiner/Slagmaiden SLG-X.mtf	
@@ -6,7 +6,7 @@ mul id:5078
 Config:Biped
 TechBase:Mixed (IS Chassis)
 Era:3076
-Source:XTRO Steiner - Jihad
+Source:XTR: Steiner - Jihad
 Rules Level:4
 
 Mass:55
diff --git a/megamek/data/mechfiles/mechs/XTRs/Steiner/Stealth STH-5X.mtf b/megamek/data/mechfiles/mechs/XTRs/Steiner/Stealth STH-5X.mtf
index 2b06e11f36a..96798b2ddb9 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Steiner/Stealth STH-5X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Steiner/Stealth STH-5X.mtf	
@@ -6,7 +6,7 @@ mul id:5130
 Config:Biped
 techbase:Mixed (IS Chassis)
 era:3076
-source:XTRO Steiner - Jihad
+source:XTR: Steiner - Jihad
 rules level:4
 
 mass:45
diff --git a/megamek/data/mechfiles/mechs/XTRs/Steiner/Stiletto STO-6X.mtf b/megamek/data/mechfiles/mechs/XTRs/Steiner/Stiletto STO-6X.mtf
index fc899715c8f..196e8fd5f04 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Steiner/Stiletto STO-6X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Steiner/Stiletto STO-6X.mtf	
@@ -6,7 +6,7 @@ mul id:5134
 Config:Biped
 TechBase:Inner Sphere
 Era:3078
-Source:XTRO Steiner - Jihad
+Source:XTR: Steiner - Jihad
 Rules Level:4
 
 Mass:35
diff --git a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Cataphract CTF-0X.mtf b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Cataphract CTF-0X.mtf
index a536754e430..9af10140beb 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Cataphract CTF-0X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Cataphract CTF-0X.mtf	
@@ -5,7 +5,7 @@ mul id:5795
 Config:Biped
 techbase:Inner Sphere
 era:3025
-source:XTRO Succession Wars - Succession Wars
+source:XTR: Succession Wars - Succession Wars
 rules level:3
 
 mass:70
diff --git a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Flea FLE-14.mtf b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Flea FLE-14.mtf
index 1515bab4629..0b263da6a1c 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Flea FLE-14.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Flea FLE-14.mtf	
@@ -6,7 +6,7 @@ mul id:5769
 Config:Biped
 TechBase:Inner Sphere
 Era:2519
-Source:XTRO Succession Wars - Age of War
+Source:XTR: Succession Wars - Age of War
 Rules Level:4
 
 Mass:15
diff --git a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Kiso Command Mech K-3N-KRHQ.mtf b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Kiso Command Mech K-3N-KRHQ.mtf
index ba8295f2435..c61aa6be351 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Kiso Command Mech K-3N-KRHQ.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Kiso Command Mech K-3N-KRHQ.mtf	
@@ -6,7 +6,7 @@ mul id:5773
 Config:Quad
 TechBase:Inner Sphere
 Era:2823
-Source:XTRO Succession Wars - Succession Wars
+Source:XTR: Succession Wars - Succession Wars
 Rules Level:4
 
 Mass:100
diff --git a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Marauder MAD-4X.mtf b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Marauder MAD-4X.mtf
index c4726dab6b8..f559acc027c 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Marauder MAD-4X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Marauder MAD-4X.mtf	
@@ -6,7 +6,7 @@ mul id:5768
 Config:Biped
 TechBase:Inner Sphere
 Era:3039
-Source:XTRO Succession Wars
+Source:XTR: Succession Wars - Late Succession War - Renaissance
 Rules Level:4
 
 Mass:75
diff --git a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Super Griffin GRF-2N-X.mtf b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Super Griffin GRF-2N-X.mtf
index 22444d56dd4..36345f66231 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Super Griffin GRF-2N-X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Super Griffin GRF-2N-X.mtf	
@@ -6,7 +6,7 @@ mul id:5771
 Config:Biped
 techbase:Inner Sphere
 era:3020
-source:XTRO Succession Wars
+source:XTR: Succession Wars - Late Succession War - Renaissance
 rules level:4
 
 mass:60
diff --git a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Super Wasp WSP-2A-X.mtf b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Super Wasp WSP-2A-X.mtf
index 461b1891686..5709a185769 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Super Wasp WSP-2A-X.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Super Wasp WSP-2A-X.mtf	
@@ -6,7 +6,7 @@ mul id:5770
 Config:Biped
 techbase:Inner Sphere
 era:3020
-source:XTRO Succession Wars - Succession Wars
+source:XTR: Succession Wars - Succession Wars
 rules level:4
 
 mass:25
diff --git a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Zeus ZEU-6Y.mtf b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Zeus ZEU-6Y.mtf
index ce307d84556..1174a8150e7 100644
--- a/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Zeus ZEU-6Y.mtf	
+++ b/megamek/data/mechfiles/mechs/XTRs/Succession Wars/Zeus ZEU-6Y.mtf	
@@ -6,7 +6,7 @@ mul id:5772
 Config:Biped
 TechBase:Inner Sphere
 Era:2922
-Source:XTRO Succession Wars - Succession Wars
+Source:XTR: Succession Wars - Succession Wars
 Rules Level:2
 
 Mass:80
diff --git a/megamek/data/mechfiles/name_changes.txt b/megamek/data/mechfiles/name_changes.txt
index f5de0a9ba19..9981d833e4c 100644
--- a/megamek/data/mechfiles/name_changes.txt
+++ b/megamek/data/mechfiles/name_changes.txt
@@ -762,9 +762,7 @@ Mobile Long Tom Artillery (Unofficial) (+ Carriage)|Mobile Long Tom Artillery (+
 O-65 'Oppie' Hazardous Materials Recovery Vehicle O-65 HMRV|HMRV (Hazardous Materials Recovery Vehicle) 'Oppie' O-65
 O-66 'Oppie' Hazardous Materials Recovery Vehicle O-66 HMRV|HMRV (Hazardous Materials Recovery Vehicle) 'Oppie' O-66
 Schildkrote Line Tank|Schildkröte Line Tank
-
-
-
+Schildkröte Line Tank (Standard)|Schildkröte Line Tank
 
 #Warships
 Aegis Heavy Cruiser (Clan)|Aegis Heavy Cruiser (2843)
@@ -786,7 +784,8 @@ Essex Destroyer (Clan)|Essex II Destroyer (2862)
 Essex I Destroyer (Standard)|Essex I Destroyer (2351)
 Farragut Battleship (Standard)|Farragut Battleship (2448)
 Fox Corvette (Standard)|Fox Corvette (3057)
-Fredasa Corvette Raider (Standard)|Fredasa Corvette Raider (2962)
+Fredasa Corvette Raider (Standard)|Fredasa (Corvette-Raider) (2962)
+Fredasa Corvette Raider (2962)|Fredasa (Corvette-Raider) (2962)
 Impavido Destroyer (Standard)|Impavido Destroyer (3058)
 Kimagure Pursuit Cruiser (Standard)|Kimagure Pursuit Cruiser (2582)
 Kirishima Cruiser (Standard)|Kirishima Cruiser (3061)
diff --git a/megamek/data/mechfiles/protomechs/3060/Centaur 2.blk b/megamek/data/mechfiles/protomechs/3060/Centaur 2.blk
index 9fe083b8063..ec2cb433814 100644
--- a/megamek/data/mechfiles/protomechs/3060/Centaur 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Centaur 2.blk	
@@ -93,7 +93,7 @@ CLHeavySmallLaser
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Centaur 3.blk b/megamek/data/mechfiles/protomechs/3060/Centaur 3.blk
index 3503af6d016..0fb98f25a04 100644
--- a/megamek/data/mechfiles/protomechs/3060/Centaur 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Centaur 3.blk	
@@ -87,7 +87,7 @@ CLERMediumLaser
 </Legs Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Centaur 4.blk b/megamek/data/mechfiles/protomechs/3060/Centaur 4.blk
index 9fee722b3bf..1a676695851 100644
--- a/megamek/data/mechfiles/protomechs/3060/Centaur 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Centaur 4.blk	
@@ -96,7 +96,7 @@ CLAPGaussRifle
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Centaur.blk b/megamek/data/mechfiles/protomechs/3060/Centaur.blk
index c4ea06dc5f1..ead8b9d1da7 100644
--- a/megamek/data/mechfiles/protomechs/3060/Centaur.blk
+++ b/megamek/data/mechfiles/protomechs/3060/Centaur.blk
@@ -95,7 +95,7 @@ CLERMicroLaser
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Gorgon 2.blk b/megamek/data/mechfiles/protomechs/3060/Gorgon 2.blk
index d4c8aaaf121..b9808bfb922 100644
--- a/megamek/data/mechfiles/protomechs/3060/Gorgon 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Gorgon 2.blk	
@@ -95,7 +95,7 @@ CLMediumPulseLaser
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Gorgon 3.blk b/megamek/data/mechfiles/protomechs/3060/Gorgon 3.blk
index 10f3edf1abd..4eb4e3a2a1b 100644
--- a/megamek/data/mechfiles/protomechs/3060/Gorgon 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Gorgon 3.blk	
@@ -89,7 +89,7 @@ CLSRM4
 </Legs Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Gorgon 4.blk b/megamek/data/mechfiles/protomechs/3060/Gorgon 4.blk
index cd3e5a54c92..0cd6ce99356 100644
--- a/megamek/data/mechfiles/protomechs/3060/Gorgon 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Gorgon 4.blk	
@@ -97,7 +97,7 @@ CLSRM6
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Gorgon.blk b/megamek/data/mechfiles/protomechs/3060/Gorgon.blk
index 322dd4f7d55..4e7b2e8262c 100644
--- a/megamek/data/mechfiles/protomechs/3060/Gorgon.blk
+++ b/megamek/data/mechfiles/protomechs/3060/Gorgon.blk
@@ -93,7 +93,7 @@ CLLRM10
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Harpy 2.blk b/megamek/data/mechfiles/protomechs/3060/Harpy 2.blk
index abd76bcb3b0..5e9bc4fa8e2 100644
--- a/megamek/data/mechfiles/protomechs/3060/Harpy 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Harpy 2.blk	
@@ -90,7 +90,7 @@ CLERMicroLaser
 </Legs Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Harpy 3.blk b/megamek/data/mechfiles/protomechs/3060/Harpy 3.blk
index 268c63a3902..65bb9fe4a18 100644
--- a/megamek/data/mechfiles/protomechs/3060/Harpy 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Harpy 3.blk	
@@ -88,7 +88,7 @@ CLLightMG
 </Legs Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Harpy 4.blk b/megamek/data/mechfiles/protomechs/3060/Harpy 4.blk
index aad4452f91a..78d0210ceab 100644
--- a/megamek/data/mechfiles/protomechs/3060/Harpy 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Harpy 4.blk	
@@ -92,7 +92,7 @@ CLLightMG
 </Legs Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Harpy.blk b/megamek/data/mechfiles/protomechs/3060/Harpy.blk
index d143f4d89a8..0a8571b12ca 100644
--- a/megamek/data/mechfiles/protomechs/3060/Harpy.blk
+++ b/megamek/data/mechfiles/protomechs/3060/Harpy.blk
@@ -132,7 +132,7 @@ TARGETING:Unspecified
 </systemManufacturers>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Hydra 2.blk b/megamek/data/mechfiles/protomechs/3060/Hydra 2.blk
index 96c004f4733..e880c05436e 100644
--- a/megamek/data/mechfiles/protomechs/3060/Hydra 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Hydra 2.blk	
@@ -95,7 +95,7 @@ CLStreakSRM5
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Hydra 3.blk b/megamek/data/mechfiles/protomechs/3060/Hydra 3.blk
index b2f7762217c..540848263b2 100644
--- a/megamek/data/mechfiles/protomechs/3060/Hydra 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Hydra 3.blk	
@@ -93,7 +93,7 @@ CLLRM6
 </Legs Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Hydra 4.blk b/megamek/data/mechfiles/protomechs/3060/Hydra 4.blk
index ce6cf09eb16..1d2484e4207 100644
--- a/megamek/data/mechfiles/protomechs/3060/Hydra 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Hydra 4.blk	
@@ -96,7 +96,7 @@ CLAPGaussRifle
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Hydra.blk b/megamek/data/mechfiles/protomechs/3060/Hydra.blk
index 77aac4d6848..8f4b997c96e 100644
--- a/megamek/data/mechfiles/protomechs/3060/Hydra.blk
+++ b/megamek/data/mechfiles/protomechs/3060/Hydra.blk
@@ -93,7 +93,7 @@ CLStreakSRM3
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Minotaur 2.blk b/megamek/data/mechfiles/protomechs/3060/Minotaur 2.blk
index f6ce6172658..3b1b964c3ce 100644
--- a/megamek/data/mechfiles/protomechs/3060/Minotaur 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Minotaur 2.blk	
@@ -92,7 +92,7 @@ CLLBXAC2
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Minotaur 3.blk b/megamek/data/mechfiles/protomechs/3060/Minotaur 3.blk
index 4b78673187c..814f4e98c43 100644
--- a/megamek/data/mechfiles/protomechs/3060/Minotaur 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Minotaur 3.blk	
@@ -97,7 +97,7 @@ CLLRM12
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Minotaur 4.blk b/megamek/data/mechfiles/protomechs/3060/Minotaur 4.blk
index e621dcf337b..060b3644e1d 100644
--- a/megamek/data/mechfiles/protomechs/3060/Minotaur 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Minotaur 4.blk	
@@ -97,7 +97,7 @@ CLProtoMechAC2
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Minotaur.blk b/megamek/data/mechfiles/protomechs/3060/Minotaur.blk
index 04ca4a37126..89d99fbe159 100644
--- a/megamek/data/mechfiles/protomechs/3060/Minotaur.blk
+++ b/megamek/data/mechfiles/protomechs/3060/Minotaur.blk
@@ -132,7 +132,7 @@ TARGETING:Unspecified
 </systemManufacturers>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Roc 2.blk b/megamek/data/mechfiles/protomechs/3060/Roc 2.blk
index 21918ec4c17..c5b08d19855 100644
--- a/megamek/data/mechfiles/protomechs/3060/Roc 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Roc 2.blk	
@@ -96,7 +96,7 @@ CLHeavyMediumLaser
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Roc 3.blk b/megamek/data/mechfiles/protomechs/3060/Roc 3.blk
index 4f58cafa0ad..0bbcebc439d 100644
--- a/megamek/data/mechfiles/protomechs/3060/Roc 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Roc 3.blk	
@@ -91,7 +91,7 @@ CLMediumPulseLaser
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Roc 4.blk b/megamek/data/mechfiles/protomechs/3060/Roc 4.blk
index c0c929957ba..cacfd6c6077 100644
--- a/megamek/data/mechfiles/protomechs/3060/Roc 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Roc 4.blk	
@@ -98,7 +98,7 @@ CLAPGaussRifle
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Roc.blk b/megamek/data/mechfiles/protomechs/3060/Roc.blk
index c9408ac61c0..d7fa8b407fc 100644
--- a/megamek/data/mechfiles/protomechs/3060/Roc.blk
+++ b/megamek/data/mechfiles/protomechs/3060/Roc.blk
@@ -96,7 +96,7 @@ CLERMediumLaser
 </Main Gun Equipment>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Satyr 2.blk b/megamek/data/mechfiles/protomechs/3060/Satyr 2.blk
index 950fdcae6e5..01f58c2177b 100644
--- a/megamek/data/mechfiles/protomechs/3060/Satyr 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Satyr 2.blk	
@@ -94,7 +94,7 @@ CLMicroPulseLaser
 </Legs Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Satyr 3.blk b/megamek/data/mechfiles/protomechs/3060/Satyr 3.blk
index c4245ab3305..2ee3e18b1b4 100644
--- a/megamek/data/mechfiles/protomechs/3060/Satyr 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Satyr 3.blk	
@@ -93,7 +93,7 @@ CLStreakSRM2
 </Legs Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Satyr 4.blk b/megamek/data/mechfiles/protomechs/3060/Satyr 4.blk
index 82ce12ea8dd..f59d01aad0a 100644
--- a/megamek/data/mechfiles/protomechs/3060/Satyr 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Satyr 4.blk	
@@ -89,7 +89,7 @@ CLLightTAG
 </Legs Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Satyr.blk b/megamek/data/mechfiles/protomechs/3060/Satyr.blk
index ae1f0902041..0dbb3ec2519 100644
--- a/megamek/data/mechfiles/protomechs/3060/Satyr.blk
+++ b/megamek/data/mechfiles/protomechs/3060/Satyr.blk
@@ -88,7 +88,7 @@ CLLightActiveProbe
 </Legs Equipment>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Siren 2.blk b/megamek/data/mechfiles/protomechs/3060/Siren 2.blk
index 1c9740cc164..ee16074e69e 100644
--- a/megamek/data/mechfiles/protomechs/3060/Siren 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Siren 2.blk	
@@ -89,7 +89,7 @@ CLMG
 </Legs Equipment>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Siren 3.blk b/megamek/data/mechfiles/protomechs/3060/Siren 3.blk
index 7d7f899451d..a007b590928 100644
--- a/megamek/data/mechfiles/protomechs/3060/Siren 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Siren 3.blk	
@@ -89,7 +89,7 @@ CLSRM1
 </Legs Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Siren 4.blk b/megamek/data/mechfiles/protomechs/3060/Siren 4.blk
index 8fa721571ab..59d9ea5a817 100644
--- a/megamek/data/mechfiles/protomechs/3060/Siren 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Siren 4.blk	
@@ -88,7 +88,7 @@ CLERMicroLaser
 </Legs Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Siren 5.blk b/megamek/data/mechfiles/protomechs/3060/Siren 5.blk
index 41ab4fbd2b9..a65145f75c4 100644
--- a/megamek/data/mechfiles/protomechs/3060/Siren 5.blk	
+++ b/megamek/data/mechfiles/protomechs/3060/Siren 5.blk	
@@ -88,7 +88,7 @@ CLAPGaussRifle
 </Legs Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3060/Siren.blk b/megamek/data/mechfiles/protomechs/3060/Siren.blk
index 4ff0566d61a..7277854c59c 100644
--- a/megamek/data/mechfiles/protomechs/3060/Siren.blk
+++ b/megamek/data/mechfiles/protomechs/3060/Siren.blk
@@ -89,7 +89,7 @@ CLLightMG
 </Legs Equipment>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Basilisk 2.blk b/megamek/data/mechfiles/protomechs/3075/Basilisk 2.blk
index 6537d440cc7..a4f98ab37aa 100644
--- a/megamek/data/mechfiles/protomechs/3075/Basilisk 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Basilisk 2.blk	
@@ -99,7 +99,7 @@ CLSRM2
 </Main Gun Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Basilisk 3.blk b/megamek/data/mechfiles/protomechs/3075/Basilisk 3.blk
index 16551a2bbe4..fa7d2ec9dd4 100644
--- a/megamek/data/mechfiles/protomechs/3075/Basilisk 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Basilisk 3.blk	
@@ -133,7 +133,7 @@ TARGETING:Unspecified
 </systemManufacturers>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Basilisk.blk b/megamek/data/mechfiles/protomechs/3075/Basilisk.blk
index ef24d967397..c1da912ae5f 100644
--- a/megamek/data/mechfiles/protomechs/3075/Basilisk.blk
+++ b/megamek/data/mechfiles/protomechs/3075/Basilisk.blk
@@ -93,7 +93,7 @@ CLLRM3
 </Main Gun Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Cecerops 2.blk b/megamek/data/mechfiles/protomechs/3075/Cecerops 2.blk
index 024bbe5d086..b16d5fd7ab1 100644
--- a/megamek/data/mechfiles/protomechs/3075/Cecerops 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Cecerops 2.blk	
@@ -88,7 +88,7 @@ CLStreakSRM1
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Cecerops 3.blk b/megamek/data/mechfiles/protomechs/3075/Cecerops 3.blk
index 97477440068..07df1bdca9d 100644
--- a/megamek/data/mechfiles/protomechs/3075/Cecerops 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Cecerops 3.blk	
@@ -88,7 +88,7 @@ CLSRM2
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Cecerops 4.blk b/megamek/data/mechfiles/protomechs/3075/Cecerops 4.blk
index 7c4a4040404..e37b32894d3 100644
--- a/megamek/data/mechfiles/protomechs/3075/Cecerops 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Cecerops 4.blk	
@@ -87,7 +87,7 @@ CLMicroPulseLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Cecerops.blk b/megamek/data/mechfiles/protomechs/3075/Cecerops.blk
index 0558061ad1d..9bfd73d18bf 100644
--- a/megamek/data/mechfiles/protomechs/3075/Cecerops.blk
+++ b/megamek/data/mechfiles/protomechs/3075/Cecerops.blk
@@ -87,7 +87,7 @@ CLERMicroLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Chrysaor 2.blk b/megamek/data/mechfiles/protomechs/3075/Chrysaor 2.blk
index c62493b12db..bef3d291f5b 100644
--- a/megamek/data/mechfiles/protomechs/3075/Chrysaor 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Chrysaor 2.blk	
@@ -93,7 +93,7 @@ CLMicroPulseLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Chrysaor.blk b/megamek/data/mechfiles/protomechs/3075/Chrysaor.blk
index 12b0834cf59..fd3ffa8c61d 100644
--- a/megamek/data/mechfiles/protomechs/3075/Chrysaor.blk
+++ b/megamek/data/mechfiles/protomechs/3075/Chrysaor.blk
@@ -90,7 +90,7 @@ CLERMicroLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Delphyne 2.blk b/megamek/data/mechfiles/protomechs/3075/Delphyne 2.blk
index d372e77742f..3f17d577700 100644
--- a/megamek/data/mechfiles/protomechs/3075/Delphyne 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Delphyne 2.blk	
@@ -96,7 +96,7 @@ CLERMicroLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Delphyne 3.blk b/megamek/data/mechfiles/protomechs/3075/Delphyne 3.blk
index a86a8d14f6d..bf4a801b4ef 100644
--- a/megamek/data/mechfiles/protomechs/3075/Delphyne 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Delphyne 3.blk	
@@ -93,7 +93,7 @@ CLMicroPulseLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Delphyne.blk b/megamek/data/mechfiles/protomechs/3075/Delphyne.blk
index 8b850f17e57..b28aa341608 100644
--- a/megamek/data/mechfiles/protomechs/3075/Delphyne.blk
+++ b/megamek/data/mechfiles/protomechs/3075/Delphyne.blk
@@ -92,7 +92,7 @@ CLMediumPulseLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Erinyes 2.blk b/megamek/data/mechfiles/protomechs/3075/Erinyes 2.blk
index 2e309d26467..84f6f047a3e 100644
--- a/megamek/data/mechfiles/protomechs/3075/Erinyes 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Erinyes 2.blk	
@@ -87,7 +87,7 @@ CLERMicroLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Erinyes 3.blk b/megamek/data/mechfiles/protomechs/3075/Erinyes 3.blk
index 74786510b42..1153db53565 100644
--- a/megamek/data/mechfiles/protomechs/3075/Erinyes 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Erinyes 3.blk	
@@ -88,7 +88,7 @@ CLLightMG
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Erinyes.blk b/megamek/data/mechfiles/protomechs/3075/Erinyes.blk
index c94c2bfa9a1..97c326ee3ed 100644
--- a/megamek/data/mechfiles/protomechs/3075/Erinyes.blk
+++ b/megamek/data/mechfiles/protomechs/3075/Erinyes.blk
@@ -92,7 +92,7 @@ CLSRM1
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Orc 2.blk b/megamek/data/mechfiles/protomechs/3075/Orc 2.blk
index bf96854ab02..dbec1f52874 100644
--- a/megamek/data/mechfiles/protomechs/3075/Orc 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Orc 2.blk	
@@ -92,7 +92,7 @@ CLLRM2
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Orc 3.blk b/megamek/data/mechfiles/protomechs/3075/Orc 3.blk
index e2b70cb626e..2803895d018 100644
--- a/megamek/data/mechfiles/protomechs/3075/Orc 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Orc 3.blk	
@@ -91,7 +91,7 @@ CLSRM1
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Orc 4.blk b/megamek/data/mechfiles/protomechs/3075/Orc 4.blk
index cc5453e0c61..421e37f4fe3 100644
--- a/megamek/data/mechfiles/protomechs/3075/Orc 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Orc 4.blk	
@@ -91,7 +91,7 @@ CLMG
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Orc.blk b/megamek/data/mechfiles/protomechs/3075/Orc.blk
index 6803fbfe9b0..a3521d1734e 100644
--- a/megamek/data/mechfiles/protomechs/3075/Orc.blk
+++ b/megamek/data/mechfiles/protomechs/3075/Orc.blk
@@ -93,7 +93,7 @@ CLSRM1
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Procyon 2.blk b/megamek/data/mechfiles/protomechs/3075/Procyon 2.blk
index 450e5b30cba..c0265c966f9 100644
--- a/megamek/data/mechfiles/protomechs/3075/Procyon 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Procyon 2.blk	
@@ -89,7 +89,7 @@ CLLRM4
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Procyon 3.blk b/megamek/data/mechfiles/protomechs/3075/Procyon 3.blk
index 09b251e5ac3..ad67bd2cc39 100644
--- a/megamek/data/mechfiles/protomechs/3075/Procyon 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Procyon 3.blk	
@@ -89,7 +89,7 @@ CLHeavySmallLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Procyon 4.blk b/megamek/data/mechfiles/protomechs/3075/Procyon 4.blk
index 715ae8f0a1d..8b61870a474 100644
--- a/megamek/data/mechfiles/protomechs/3075/Procyon 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Procyon 4.blk	
@@ -90,7 +90,7 @@ CLMG
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Procyon 5.blk b/megamek/data/mechfiles/protomechs/3075/Procyon 5.blk
index 4b9fdc58d0c..211fa48c2c3 100644
--- a/megamek/data/mechfiles/protomechs/3075/Procyon 5.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Procyon 5.blk	
@@ -94,7 +94,7 @@ CLERSmallLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Procyon.blk b/megamek/data/mechfiles/protomechs/3075/Procyon.blk
index 1e9b34e8ab6..fe92f9060fe 100644
--- a/megamek/data/mechfiles/protomechs/3075/Procyon.blk
+++ b/megamek/data/mechfiles/protomechs/3075/Procyon.blk
@@ -88,7 +88,7 @@ CLERSmallLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Triton 2.blk b/megamek/data/mechfiles/protomechs/3075/Triton 2.blk
index fefc9b15002..0144e5b03b6 100644
--- a/megamek/data/mechfiles/protomechs/3075/Triton 2.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Triton 2.blk	
@@ -99,7 +99,7 @@ CLLRM3
 </Main Gun Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Triton 3.blk b/megamek/data/mechfiles/protomechs/3075/Triton 3.blk
index 59f1a40160b..8865eb5a5e9 100644
--- a/megamek/data/mechfiles/protomechs/3075/Triton 3.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Triton 3.blk	
@@ -95,7 +95,7 @@ CLHeavyMediumLaser
 </Main Gun Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Triton 4.blk b/megamek/data/mechfiles/protomechs/3075/Triton 4.blk
index 1b9115ea2f7..d8267c6efc6 100644
--- a/megamek/data/mechfiles/protomechs/3075/Triton 4.blk	
+++ b/megamek/data/mechfiles/protomechs/3075/Triton 4.blk	
@@ -93,7 +93,7 @@ CLHeavySmallLaser
 </Legs Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3075/Triton.blk b/megamek/data/mechfiles/protomechs/3075/Triton.blk
index 80c112451c3..bfefa83814b 100644
--- a/megamek/data/mechfiles/protomechs/3075/Triton.blk
+++ b/megamek/data/mechfiles/protomechs/3075/Triton.blk
@@ -97,7 +97,7 @@ CLStreakSRM4
 </Main Gun Equipment>
 
 <source>
-TRO 3075 - Civil War
+TRO: 3075 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/3145/HippogriffProtomech.blk b/megamek/data/mechfiles/protomechs/3145/HippogriffProtomech.blk
index a57328f4663..fbbf205d66f 100644
--- a/megamek/data/mechfiles/protomechs/3145/HippogriffProtomech.blk
+++ b/megamek/data/mechfiles/protomechs/3145/HippogriffProtomech.blk
@@ -96,7 +96,7 @@ CLLRM2
 </Legs Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/ProtoTypes/Minotaur-P2.blk b/megamek/data/mechfiles/protomechs/ProtoTypes/Minotaur-P2.blk
index cfc0c6b78f7..b9cda2a5426 100644
--- a/megamek/data/mechfiles/protomechs/ProtoTypes/Minotaur-P2.blk
+++ b/megamek/data/mechfiles/protomechs/ProtoTypes/Minotaur-P2.blk
@@ -95,7 +95,7 @@ CLSRM4
 </Main Gun Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/ProtoTypes/Procyon (Quad).blk b/megamek/data/mechfiles/protomechs/ProtoTypes/Procyon (Quad).blk
index 12ed7e3ea50..ccfb2cf2f97 100644
--- a/megamek/data/mechfiles/protomechs/ProtoTypes/Procyon (Quad).blk	
+++ b/megamek/data/mechfiles/protomechs/ProtoTypes/Procyon (Quad).blk	
@@ -99,7 +99,7 @@ CLSRM2
 </Legs Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/ProtoTypes/Satyr-XP.blk b/megamek/data/mechfiles/protomechs/ProtoTypes/Satyr-XP.blk
index d3b43aa376f..b03a1123269 100644
--- a/megamek/data/mechfiles/protomechs/ProtoTypes/Satyr-XP.blk
+++ b/megamek/data/mechfiles/protomechs/ProtoTypes/Satyr-XP.blk
@@ -97,7 +97,7 @@ CLSRM2
 </Legs Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/ProtoTypes/SvartAlfa Ultra LRM.blk b/megamek/data/mechfiles/protomechs/ProtoTypes/SvartAlfa Ultra LRM.blk
index 08ac3db60e3..34567b879f0 100644
--- a/megamek/data/mechfiles/protomechs/ProtoTypes/SvartAlfa Ultra LRM.blk	
+++ b/megamek/data/mechfiles/protomechs/ProtoTypes/SvartAlfa Ultra LRM.blk	
@@ -94,7 +94,7 @@ CLLRM15
 </Main Gun Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/ProtoTypes/SvartAlfa Ultra.blk b/megamek/data/mechfiles/protomechs/ProtoTypes/SvartAlfa Ultra.blk
index 497e9622bb5..df3fa607e62 100644
--- a/megamek/data/mechfiles/protomechs/ProtoTypes/SvartAlfa Ultra.blk	
+++ b/megamek/data/mechfiles/protomechs/ProtoTypes/SvartAlfa Ultra.blk	
@@ -106,7 +106,7 @@ CLStreakSRM6
 </Main Gun Equipment>
 
 <source>
-TRO Prototypes - Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/WoR/Basilisk ProtoMech (Quad) B.blk b/megamek/data/mechfiles/protomechs/WoR/Basilisk ProtoMech (Quad) B.blk
index 0c953f31f19..fcf903e47cd 100644
--- a/megamek/data/mechfiles/protomechs/WoR/Basilisk ProtoMech (Quad) B.blk	
+++ b/megamek/data/mechfiles/protomechs/WoR/Basilisk ProtoMech (Quad) B.blk	
@@ -105,7 +105,7 @@ ProtoQuadMeleeSystem
 </Legs Equipment>
 
 <source>
-WoRS - Jihad
+Wars of Reaving - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/WoR/Basilisk ProtoMech (Quad).blk b/megamek/data/mechfiles/protomechs/WoR/Basilisk ProtoMech (Quad).blk
index c8b36d96edf..b63430f429d 100644
--- a/megamek/data/mechfiles/protomechs/WoR/Basilisk ProtoMech (Quad).blk	
+++ b/megamek/data/mechfiles/protomechs/WoR/Basilisk ProtoMech (Quad).blk	
@@ -106,7 +106,7 @@ CLEDPArmor
 </Legs Equipment>
 
 <source>
-WoRS - Jihad
+Wars of Reaving - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/WoR/Centaur Z.blk b/megamek/data/mechfiles/protomechs/WoR/Centaur Z.blk
index 9ee00dc2418..126b5e145ed 100644
--- a/megamek/data/mechfiles/protomechs/WoR/Centaur Z.blk	
+++ b/megamek/data/mechfiles/protomechs/WoR/Centaur Z.blk	
@@ -98,7 +98,7 @@ CLERMicroLaser
 </Main Gun Equipment>
 
 <source>
-WoRS - Jihad
+Wars of Reaving - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/WoR/Hobgoblin Ultraheavy ProtoMech 2.blk b/megamek/data/mechfiles/protomechs/WoR/Hobgoblin Ultraheavy ProtoMech 2.blk
index 6f6e98cc434..cfd93c7acc6 100644
--- a/megamek/data/mechfiles/protomechs/WoR/Hobgoblin Ultraheavy ProtoMech 2.blk	
+++ b/megamek/data/mechfiles/protomechs/WoR/Hobgoblin Ultraheavy ProtoMech 2.blk	
@@ -96,7 +96,7 @@ CLAPGaussRifle
 </Legs Equipment>
 
 <source>
-WoRS - Jihad
+Wars of Reaving - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/WoR/Hobgoblin Ultraheavy ProtoMech.blk b/megamek/data/mechfiles/protomechs/WoR/Hobgoblin Ultraheavy ProtoMech.blk
index 4902b8f6556..d3c5bf24d10 100644
--- a/megamek/data/mechfiles/protomechs/WoR/Hobgoblin Ultraheavy ProtoMech.blk	
+++ b/megamek/data/mechfiles/protomechs/WoR/Hobgoblin Ultraheavy ProtoMech.blk	
@@ -102,7 +102,7 @@ Fusillade
 </Main Gun Equipment>
 
 <source>
-WoRS - Jihad
+Wars of Reaving - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/WoR/Minotaur Z.blk b/megamek/data/mechfiles/protomechs/WoR/Minotaur Z.blk
index 4225a6df3bd..309953c880a 100644
--- a/megamek/data/mechfiles/protomechs/WoR/Minotaur Z.blk	
+++ b/megamek/data/mechfiles/protomechs/WoR/Minotaur Z.blk	
@@ -97,7 +97,7 @@ CLImprovedMediumHeavyLaser
 </Legs Equipment>
 
 <source>
-WoRS - Jihad
+Wars of Reaving - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/WoR/Procyon Z.blk b/megamek/data/mechfiles/protomechs/WoR/Procyon Z.blk
index 578121fb794..25150c517ee 100644
--- a/megamek/data/mechfiles/protomechs/WoR/Procyon Z.blk	
+++ b/megamek/data/mechfiles/protomechs/WoR/Procyon Z.blk	
@@ -100,7 +100,7 @@ CLSRM1
 </Legs Equipment>
 
 <source>
-WoRS - Jihad
+Wars of Reaving - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/WoR/Roc Z.blk b/megamek/data/mechfiles/protomechs/WoR/Roc Z.blk
index 7f170b7a05e..13696935dce 100644
--- a/megamek/data/mechfiles/protomechs/WoR/Roc Z.blk	
+++ b/megamek/data/mechfiles/protomechs/WoR/Roc Z.blk	
@@ -102,7 +102,7 @@ CLMediumChemLaser
 </Main Gun Equipment>
 
 <source>
-WoRS - Jihad
+Wars of Reaving - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/protomechs/XTR Clans/Minotaur-XP.blk b/megamek/data/mechfiles/protomechs/XTR Clans/Minotaur-XP.blk
index 5e4f55fe06d..87a962292d8 100644
--- a/megamek/data/mechfiles/protomechs/XTR Clans/Minotaur-XP.blk	
+++ b/megamek/data/mechfiles/protomechs/XTR Clans/Minotaur-XP.blk	
@@ -94,7 +94,7 @@ CLSRM5
 </Main Gun Equipment>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/HBHK/Dragonstar Assault Transport (3060).blk b/megamek/data/mechfiles/smallcraft/HBHK/Dragonstar Assault Transport (3060).blk
index 9c77133f6f6..e8b9af3737d 100644
--- a/megamek/data/mechfiles/smallcraft/HBHK/Dragonstar Assault Transport (3060).blk	
+++ b/megamek/data/mechfiles/smallcraft/HBHK/Dragonstar Assault Transport (3060).blk	
@@ -110,7 +110,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-HB Kurita - Clan Invasion
+HB:House Kurita - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/HBHK/Dragonstar Assault Transport (PT).blk b/megamek/data/mechfiles/smallcraft/HBHK/Dragonstar Assault Transport (PT).blk
index 1a264454891..df47a6b092c 100644
--- a/megamek/data/mechfiles/smallcraft/HBHK/Dragonstar Assault Transport (PT).blk	
+++ b/megamek/data/mechfiles/smallcraft/HBHK/Dragonstar Assault Transport (PT).blk	
@@ -110,7 +110,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-HB Kurita - Star League
+HB:House Kurita - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/HBHL/Mowang Courier.blk b/megamek/data/mechfiles/smallcraft/HBHL/Mowang Courier.blk
index 2ef8bc6de21..a3aec31cbb8 100644
--- a/megamek/data/mechfiles/smallcraft/HBHL/Mowang Courier.blk	
+++ b/megamek/data/mechfiles/smallcraft/HBHL/Mowang Courier.blk	
@@ -103,7 +103,7 @@ cargobay:26.5:1:5
 </structural_integrity>
 
 <source>
-Handbook:Liao - Early Succesion Wars
+HB:House Liao - Early Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/HBHS/LC-100 Astrolux Star Yacht.blk b/megamek/data/mechfiles/smallcraft/HBHS/LC-100 Astrolux Star Yacht.blk
index 688dab78ed2..8336b0d1822 100644
--- a/megamek/data/mechfiles/smallcraft/HBHS/LC-100 Astrolux Star Yacht.blk	
+++ b/megamek/data/mechfiles/smallcraft/HBHS/LC-100 Astrolux Star Yacht.blk	
@@ -102,7 +102,7 @@ cargobay:6.0:1:4
 </structural_integrity>
 
 <source>
-HB: House Steiner
+HB:House Steiner - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/HBMPS/Tigress Close Patrol Craft TIG-15.blk b/megamek/data/mechfiles/smallcraft/HBMPS/Tigress Close Patrol Craft TIG-15.blk
index 61904f85510..e9233bbbbb9 100644
--- a/megamek/data/mechfiles/smallcraft/HBMPS/Tigress Close Patrol Craft TIG-15.blk	
+++ b/megamek/data/mechfiles/smallcraft/HBMPS/Tigress Close Patrol Craft TIG-15.blk	
@@ -113,7 +113,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-HB: MPS - Early Succesion War
+HB:Major Periphery States - Early Succesion War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Ares Assault Craft Mark VII-C.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Ares Assault Craft Mark VII-C.blk
index 06e676cf4d0..323427b8e80 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Ares Assault Craft Mark VII-C.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Ares Assault Craft Mark VII-C.blk	
@@ -104,7 +104,7 @@ CLMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057r - Succession Wars
+TRO: 3057r - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Ares Assault Craft Mark VII.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Ares Assault Craft Mark VII.blk
index f3d97e7658c..4e56c573916 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Ares Assault Craft Mark VII.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Ares Assault Craft Mark VII.blk	
@@ -111,7 +111,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Bus S-7AC.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Bus S-7AC.blk
index 4d9aad08b99..94e0d43bddd 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Bus S-7AC.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Bus S-7AC.blk	
@@ -103,7 +103,7 @@ steeragequarters:15.0:0
 </structural_integrity>
 
 <source>
-TRO 3057R- Star League
+TRO: 3057R- Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Dropshuttle K-1.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Dropshuttle K-1.blk
index b204dda7e40..60dddbf648b 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Dropshuttle K-1.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Dropshuttle K-1.blk	
@@ -110,7 +110,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Dropshuttle K-1C.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Dropshuttle K-1C.blk
index 59595bd9bea..d7e9552802e 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Dropshuttle K-1C.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Dropshuttle K-1C.blk	
@@ -107,7 +107,7 @@ CLMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Early Succession War
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Escape Pod.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Escape Pod.blk
index 8f038889312..6e7750b6b40 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Escape Pod.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Escape Pod.blk	
@@ -141,3 +141,7 @@ cargobay:0.48:0:1
 <escape_pod>
 0
 </escape_pod>
+
+<source>
+TRO: 3057r - Star League
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Life Boat.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Life Boat.blk
index bd343909f6d..272d594ee19 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Life Boat.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Life Boat.blk	
@@ -141,3 +141,7 @@ cargobay:1.85:0:1
 <escape_pod>
 0
 </escape_pod>
+
+<source>
+TRO: 3057r - Star League
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Long-Range Shuttlecraft KR-61.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Long-Range Shuttlecraft KR-61.blk
index a488c6579f5..94f06bf8540 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Long-Range Shuttlecraft KR-61.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Long-Range Shuttlecraft KR-61.blk	
@@ -103,7 +103,7 @@ cargobay:3.5:0:5
 </structural_integrity>
 
 <source>
-TRO 3057 - Star League
+TRO: 3057 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Long-Range Shuttlecraft KR-61C.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Long-Range Shuttlecraft KR-61C.blk
index 9d68024c47a..a6537b15d23 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Long-Range Shuttlecraft KR-61C.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Long-Range Shuttlecraft KR-61C.blk	
@@ -103,7 +103,7 @@ cargobay:14.5:1:5
 </structural_integrity>
 
 <source>
-2850
+TRO: 3057r - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/NL-42 Battle Taxi.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/NL-42 Battle Taxi.blk
index 3d128d5c79c..bfa3826bb4c 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/NL-42 Battle Taxi.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/NL-42 Battle Taxi.blk	
@@ -111,7 +111,7 @@ ISMediumPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057-Clan Invasion
+TRO: 3057-Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/S-7A Bus.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/S-7A Bus.blk
index 9d523642a2b..1da587655d6 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/S-7A Bus.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/S-7A Bus.blk	
@@ -103,7 +103,7 @@ steeragequarters:15.0:0
 </structural_integrity>
 
 <source>
-TRO 3057R- Star League
+TRO: 3057R- Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Shuttle ST-46.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Shuttle ST-46.blk
index e86add74fa8..87df328a5d9 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Shuttle ST-46.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Shuttle ST-46.blk	
@@ -103,7 +103,7 @@ steeragequarters:15.0:0
 </structural_integrity>
 
 <source>
-TRO 3057 - Age of War
+TRO: 3057 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3057r/Shuttle ST-46C.blk b/megamek/data/mechfiles/smallcraft/TRO 3057r/Shuttle ST-46C.blk
index 5a2c3d9d69c..cb412d4724e 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3057r/Shuttle ST-46C.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3057r/Shuttle ST-46C.blk	
@@ -103,7 +103,7 @@ cargobay:13.0:0:5
 </structural_integrity>
 
 <source>
-TRO 3057 - Early Succession War
+TRO: 3057 - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort M1.blk b/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort M1.blk
index 6ae1ed5d5e1..75e74ac6ceb 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort M1.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort M1.blk	
@@ -116,7 +116,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort W1.blk b/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort W1.blk
index 8d625d96a1c..acee37b2823 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort W1.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort W1.blk	
@@ -118,7 +118,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort.blk b/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort.blk
index 0362807e72a..853912fa84e 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3075/Aquarius Escort.blk	
@@ -116,7 +116,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort M1.blk b/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort M1.blk
index 2b0087aa077..925872b241d 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort M1.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort M1.blk	
@@ -120,7 +120,7 @@ ISERSmallLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort W1.blk b/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort W1.blk
index 5d452b92280..ccdec3585ec 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort W1.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort W1.blk	
@@ -121,7 +121,7 @@ ISERSmallLaser
 </structural_integrity>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort.blk b/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort.blk
index 1a19212edcc..3243c25bfe8 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3075/Lyonesse Escort.blk	
@@ -122,7 +122,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3085/Ares Attack Craft Mark IX.blk b/megamek/data/mechfiles/smallcraft/TRO 3085/Ares Attack Craft Mark IX.blk
index f398f299305..364d5a4e96c 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3085/Ares Attack Craft Mark IX.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3085/Ares Attack Craft Mark IX.blk	
@@ -110,7 +110,7 @@ BeagleActiveProbe
 </structural_integrity>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3145/Kurita/Oo-Suzumebachi.blk b/megamek/data/mechfiles/smallcraft/TRO 3145/Kurita/Oo-Suzumebachi.blk
index b35b16a5f8e..b8d3d2aa7bb 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3145/Kurita/Oo-Suzumebachi.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3145/Kurita/Oo-Suzumebachi.blk	
@@ -120,7 +120,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3145/Liao/Zhen Niao.blk b/megamek/data/mechfiles/smallcraft/TRO 3145/Liao/Zhen Niao.blk
index feaaaa03e81..8e14f899c2f 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3145/Liao/Zhen Niao.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3145/Liao/Zhen Niao.blk	
@@ -109,7 +109,7 @@ ISSpaceMineDispenser
 </structural_integrity>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3145/Marik/Caerleon.blk b/megamek/data/mechfiles/smallcraft/TRO 3145/Marik/Caerleon.blk
index 6d394f80575..de1d4ab0175 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3145/Marik/Caerleon.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3145/Marik/Caerleon.blk	
@@ -118,7 +118,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3145/Merc/Condottiere Assault Craft.blk b/megamek/data/mechfiles/smallcraft/TRO 3145/Merc/Condottiere Assault Craft.blk
index 9bc5832e8a4..ab002d90d1f 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3145/Merc/Condottiere Assault Craft.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3145/Merc/Condottiere Assault Craft.blk	
@@ -122,7 +122,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3145/Merc/NL-45 Gunboat.blk b/megamek/data/mechfiles/smallcraft/TRO 3145/Merc/NL-45 Gunboat.blk
index 830d385718a..32bf3948f15 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3145/Merc/NL-45 Gunboat.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3145/Merc/NL-45 Gunboat.blk	
@@ -128,7 +128,7 @@ CLECMSuite
 </structural_integrity>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/TRO 3145/Steiner/Wurger Assault Craft.blk b/megamek/data/mechfiles/smallcraft/TRO 3145/Steiner/Wurger Assault Craft.blk
index 18f6d9783fc..d8cc4f9374b 100644
--- a/megamek/data/mechfiles/smallcraft/TRO 3145/Steiner/Wurger Assault Craft.blk	
+++ b/megamek/data/mechfiles/smallcraft/TRO 3145/Steiner/Wurger Assault Craft.blk	
@@ -135,7 +135,7 @@ ISGuardianECMSuite
 </structural_integrity>
 
 <source>
-TRO 3145 Lyran Commonwealth - Early Republic
+TRO: 3145 Lyran Commonwealth - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/XTRO/Most Wanted/Mowang Courier (Clandestine).blk b/megamek/data/mechfiles/smallcraft/XTRO/Most Wanted/Mowang Courier (Clandestine).blk
index 01959005773..bfb8c13def4 100644
--- a/megamek/data/mechfiles/smallcraft/XTRO/Most Wanted/Mowang Courier (Clandestine).blk	
+++ b/megamek/data/mechfiles/smallcraft/XTRO/Most Wanted/Mowang Courier (Clandestine).blk	
@@ -105,7 +105,7 @@ ISAngelECMSuite
 </structural_integrity>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/XTRO/Pirates/S7-P Scarab.blk b/megamek/data/mechfiles/smallcraft/XTRO/Pirates/S7-P Scarab.blk
index ba3a963f498..e26150faf8d 100644
--- a/megamek/data/mechfiles/smallcraft/XTRO/Pirates/S7-P Scarab.blk	
+++ b/megamek/data/mechfiles/smallcraft/XTRO/Pirates/S7-P Scarab.blk	
@@ -105,7 +105,7 @@ ISBoobyTrap
 </structural_integrity>
 
 <source>
-XTRO:Pirates - Jihad
+XTR: Pirates - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Assault Craft Mk.III.blk b/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Assault Craft Mk.III.blk
index 0a2c79a0757..1b61e396ee1 100644
--- a/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Assault Craft Mk.III.blk	
+++ b/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Assault Craft Mk.III.blk	
@@ -130,7 +130,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <notes>
-Modifed from XTRO to be legal.
+Modifed from XTR: to be legal.
 </notes>
 
 <use>
@@ -146,7 +146,7 @@ Assault Craft
 </width>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Close Assault Landing Craft Mk.II.blk b/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Close Assault Landing Craft Mk.II.blk
index e72393be277..a9ea7b746f6 100644
--- a/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Close Assault Landing Craft Mk.II.blk	
+++ b/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Close Assault Landing Craft Mk.II.blk	
@@ -132,7 +132,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <notes>
-Stat's adjusted from XTRO to be legal.
+Stat's adjusted from XTR: to be legal.
 </notes>
 
 <use>
@@ -148,7 +148,7 @@ Combat Landing Craft
 </width>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Landing Craft Mk I.blk b/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Landing Craft Mk I.blk
index ae9390cd039..ca3eb9d8bc2 100644
--- a/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Landing Craft Mk I.blk	
+++ b/megamek/data/mechfiles/smallcraft/XTRO/Primitives II/Ares Landing Craft Mk I.blk	
@@ -141,7 +141,7 @@ Armed Cargo Transport
 </width>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/XTRO/Primitives IV/Intrepid Assault Craft (2331).blk b/megamek/data/mechfiles/smallcraft/XTRO/Primitives IV/Intrepid Assault Craft (2331).blk
index 73600ac3ba8..d5bd5b3acca 100644
--- a/megamek/data/mechfiles/smallcraft/XTRO/Primitives IV/Intrepid Assault Craft (2331).blk	
+++ b/megamek/data/mechfiles/smallcraft/XTRO/Primitives IV/Intrepid Assault Craft (2331).blk	
@@ -127,7 +127,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <notes>
-Unit is illegal in the XTRO
+Unit is illegal in the XTR:
 </notes>
 
 <use>
@@ -147,7 +147,7 @@ Assault Craft
 </height>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/smallcraft/XTRO/Primitives IV/Intrepid Assault Craft (2478).blk b/megamek/data/mechfiles/smallcraft/XTRO/Primitives IV/Intrepid Assault Craft (2478).blk
index bf05f8b2899..74841f99376 100644
--- a/megamek/data/mechfiles/smallcraft/XTRO/Primitives IV/Intrepid Assault Craft (2478).blk	
+++ b/megamek/data/mechfiles/smallcraft/XTRO/Primitives IV/Intrepid Assault Craft (2478).blk	
@@ -144,7 +144,7 @@ Assault Craft
 </height>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/HB HL/Crucible Station.blk b/megamek/data/mechfiles/spacestation/HB HL/Crucible Station.blk
index ec8216709aa..e6466d8b180 100644
--- a/megamek/data/mechfiles/spacestation/HB HL/Crucible Station.blk	
+++ b/megamek/data/mechfiles/spacestation/HB HL/Crucible Station.blk	
@@ -173,7 +173,7 @@ IS Ammo SRM-6:30
 </structural_integrity>
 
 <source>
-HB:HL - Civil War
+HB:House Liao - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/HB HL/Hong Lung Interdiction Station.blk b/megamek/data/mechfiles/spacestation/HB HL/Hong Lung Interdiction Station.blk
index f3e23c986d5..de737f719b2 100644
--- a/megamek/data/mechfiles/spacestation/HB HL/Hong Lung Interdiction Station.blk	
+++ b/megamek/data/mechfiles/spacestation/HB HL/Hong Lung Interdiction Station.blk	
@@ -193,7 +193,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-HB HL - Late Succession War - Renaissance
+HB:House Liao - Late Succession War - Renaissance
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/HB MPS/Snowden Mining Station Mk1.blk b/megamek/data/mechfiles/spacestation/HB MPS/Snowden Mining Station Mk1.blk
index c6131cb95de..cf5e3ef2d14 100644
--- a/megamek/data/mechfiles/spacestation/HB MPS/Snowden Mining Station Mk1.blk	
+++ b/megamek/data/mechfiles/spacestation/HB MPS/Snowden Mining Station Mk1.blk	
@@ -160,7 +160,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-HB:MPS - Age of War
+HB:Major Periphery States - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/HB MPS/Snowden Mining Station.blk b/megamek/data/mechfiles/spacestation/HB MPS/Snowden Mining Station.blk
index ef311822c5a..dc6fb3cb173 100644
--- a/megamek/data/mechfiles/spacestation/HB MPS/Snowden Mining Station.blk	
+++ b/megamek/data/mechfiles/spacestation/HB MPS/Snowden Mining Station.blk	
@@ -160,7 +160,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-HB:MPS - Age of War
+HB:Major Periphery States - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/Hist LOT I/M-9 SDS Battle Station 'Pavise'.blk b/megamek/data/mechfiles/spacestation/Hist LOT I/M-9 SDS Battle Station 'Pavise'.blk
index 9363233d367..deb8850ae83 100644
--- a/megamek/data/mechfiles/spacestation/Hist LOT I/M-9 SDS Battle Station 'Pavise'.blk	
+++ b/megamek/data/mechfiles/spacestation/Hist LOT I/M-9 SDS Battle Station 'Pavise'.blk	
@@ -797,7 +797,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <notes>
-That's no moon. Remade with current rules, cargo weights adjusted from TRO
+That's no moon. Remade with current rules, cargo weights adjusted from TRO:
 </notes>
 
 <use>
@@ -813,7 +813,7 @@ SDS Command Center
 </width>
 
 <source>
-Hist:LoT1 - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/JHS Terra/Drake SDS Control Station.blk b/megamek/data/mechfiles/spacestation/JHS Terra/Drake SDS Control Station.blk
index b2374757487..3097fddbde5 100644
--- a/megamek/data/mechfiles/spacestation/JHS Terra/Drake SDS Control Station.blk	
+++ b/megamek/data/mechfiles/spacestation/JHS Terra/Drake SDS Control Station.blk	
@@ -211,7 +211,7 @@ DirectTacticalAnalysisSystem:SIZE:18.0
 </structural_integrity>
 
 <source>
-JHS:Terra - Jihad
+Jihad Hot Spots:Terra - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Alliance Space Station (2713).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Alliance Space Station (2713).blk
index 2810e008074..fb3830a02fd 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Alliance Space Station (2713).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Alliance Space Station (2713).blk	
@@ -206,7 +206,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-DJ - Star League
+Dropships & Jumpships - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Alliance Space Station (3061).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Alliance Space Station (3061).blk
index 097f9d00f82..ab00db95b04 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Alliance Space Station (3061).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Alliance Space Station (3061).blk	
@@ -214,7 +214,7 @@ ISERMediumLaser
 </structural_integrity>
 
 <source>
-DJ - Civil War
+Dropships & Jumpships - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (2584).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (2584).blk
index d220ab7d971..848347e51d2 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (2584).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (2584).blk	
@@ -333,7 +333,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-TRO3057r - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (3058).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (3058).blk
index b777a0bea18..284862f5ad6 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (3058).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (3058).blk	
@@ -317,7 +317,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-TRO3057r - Civil War
+TRO: 3057R - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (3091).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (3091).blk
index 9cb0dc9e048..d18ff2ff9c6 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (3091).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Bastion System Defense Station (3091).blk	
@@ -320,7 +320,7 @@ CLERSmallLaser
 </structural_integrity>
 
 <source>
-TRO3057U - Early Republic
+TRO: 3057U - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/BattleSat System Defense Station (3089).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/BattleSat System Defense Station (3089).blk
index 376879c1d33..d63d53da11c 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/BattleSat System Defense Station (3089).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/BattleSat System Defense Station (3089).blk	
@@ -117,7 +117,7 @@ Sub-Capital Laser (SCL/1)
 </structural_integrity>
 
 <source>
-TRO3057U - Early Republic
+TRO: 3057U - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/BattleSat System-Defense Station (3056).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/BattleSat System-Defense Station (3056).blk
index caad937ac9d..d7d4a33d488 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/BattleSat System-Defense Station (3056).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/BattleSat System-Defense Station (3056).blk	
@@ -116,7 +116,7 @@ cargobay:145.5:1:5
 </structural_integrity>
 
 <source>
-TRO3057r - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Capitol System Defense Station (3051).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Capitol System Defense Station (3051).blk
index 15a6a75e410..9fc0b52885a 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Capitol System Defense Station (3051).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Capitol System Defense Station (3051).blk	
@@ -259,7 +259,7 @@ ISArtemisIV
 </structural_integrity>
 
 <source>
-TRO3057r - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Medium Large (2400).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Medium Large (2400).blk
index bab1fc9ae2a..ec43188ed09 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Medium Large (2400).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Medium Large (2400).blk	
@@ -129,7 +129,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Medium Large (2750).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Medium Large (2750).blk
index e4a1c69a847..fcd0c60a7af 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Medium Large (2750).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Medium Large (2750).blk	
@@ -134,7 +134,7 @@ ISSmallPulseLaser
 </structural_integrity>
 
 <source>
-TRO3057r - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Small (2300).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Small (2300).blk
index 89c23fe3fb7..2dbf850923b 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Small (2300).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Factory Small (2300).blk	
@@ -110,7 +110,7 @@ cargobay:1197.0:1:4
 </structural_integrity>
 
 <source>
-TRO3057r -
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat  Small (2400).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat  Small (2400).blk
index f54a7b9ecc0..a5332274465 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat  Small (2400).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat  Small (2400).blk	
@@ -110,7 +110,7 @@ cargobay:46757.0:1:4
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat  Small (2750).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat  Small (2750).blk
index 628f04592b5..731bed4d48c 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat  Small (2750).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat  Small (2750).blk	
@@ -114,7 +114,7 @@ cargobay:46807.5:1:4
 </structural_integrity>
 
 <source>
-TRO3057r
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat Large (2500).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat Large (2500).blk
index 59a909c20ec..ef99fdbf9ba 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat Large (2500).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat Large (2500).blk	
@@ -126,7 +126,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat Large (2750).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat Large (2750).blk
index 7bcad27a77c..fc0b74a9f6e 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat Large (2750).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Habitat Large (2750).blk	
@@ -126,7 +126,7 @@ ISSmallPulseLaser
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (2663).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (2663).blk
index d4675a499e6..7b55406ace4 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (2663).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (2663).blk	
@@ -278,7 +278,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-TRO3057r - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (2942).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (2942).blk
index 3f1267ce93a..2e2436b1538 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (2942).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (2942).blk	
@@ -274,7 +274,7 @@ CLERSmallLaser
 </structural_integrity>
 
 <source>
-TRO3057r - Late Succession War - LosTech
+TRO: 3057R - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (3072).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (3072).blk
index 83a98a85c7f..5cdcf3feeda 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (3072).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Olympus Recharge Station (3072).blk	
@@ -274,7 +274,7 @@ ISLaserAntiMissileSystem
 </structural_integrity>
 
 <source>
-TRO3057r - Jihad
+TRO: 3057R - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Huge (2450).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Huge (2450).blk
index 54e08d2a693..1c6d468cc23 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Huge (2450).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Huge (2450).blk	
@@ -121,7 +121,7 @@ cargobay:127647.5:1:7
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Large (2400).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Large (2400).blk
index cf4b3df655c..50b84a3ed5c 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Large (2400).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Large (2400).blk	
@@ -121,7 +121,7 @@ cargobay:76940.0:1:7
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Medium (2350).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Medium (2350).blk
index 6fbbc98c786..432770a2a76 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Medium (2350).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Medium (2350).blk	
@@ -119,7 +119,7 @@ cargobay:58295.0:1:7
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Small (2200).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Small (2200).blk
index e23d1dba146..72709389ff6 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Small (2200).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/Pressurized Yard - Small (2200).blk	
@@ -118,7 +118,7 @@ cargobay:36430.0:1:7
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Huge (2350).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Huge (2350).blk
index e6992cae1a4..a54ad314d09 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Huge (2350).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Huge (2350).blk	
@@ -121,7 +121,7 @@ cargobay:140147.5:1:7
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Large (2300).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Large (2300).blk
index 1e53e7f2b0f..31bb20afcb1 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Large (2300).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Large (2300).blk	
@@ -121,7 +121,7 @@ cargobay:89440.0:1:7
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Medium (2250).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Medium (2250).blk
index 445a5162719..a7afe2217e3 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Medium (2250).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Medium (2250).blk	
@@ -119,7 +119,7 @@ cargobay:64545.0:1:7
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Small (2100).blk b/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Small (2100).blk
index 2f2c81dc2f4..43784ee9c8a 100644
--- a/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Small (2100).blk	
+++ b/megamek/data/mechfiles/spacestation/TRO 3057R/UnPressurized Yard - Small (2100).blk	
@@ -118,7 +118,7 @@ cargobay:34477.0:1:2
 </structural_integrity>
 
 <source>
-TRO3057r - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/2750 IS Land/Puma Assault Tank PAT-001.blk b/megamek/data/mechfiles/vehicles/2750 IS Land/Puma Assault Tank PAT-001.blk
index d5226da9faa..2c743d0d27e 100644
--- a/megamek/data/mechfiles/vehicles/2750 IS Land/Puma Assault Tank PAT-001.blk	
+++ b/megamek/data/mechfiles/vehicles/2750 IS Land/Puma Assault Tank PAT-001.blk	
@@ -83,7 +83,7 @@ PPC
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/2750 IS Land/Puma Assault Tank PAT-002.blk b/megamek/data/mechfiles/vehicles/2750 IS Land/Puma Assault Tank PAT-002.blk
index 91af55ceac8..d318fba8863 100644
--- a/megamek/data/mechfiles/vehicles/2750 IS Land/Puma Assault Tank PAT-002.blk	
+++ b/megamek/data/mechfiles/vehicles/2750 IS Land/Puma Assault Tank PAT-002.blk	
@@ -83,7 +83,7 @@ PPC
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3025 IS Land/Jeep (Standard).blk b/megamek/data/mechfiles/vehicles/3025 IS Land/Jeep.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/3025 IS Land/Jeep (Standard).blk
rename to megamek/data/mechfiles/vehicles/3025 IS Land/Jeep.blk
diff --git a/megamek/data/mechfiles/vehicles/3025 IS Land/Jet Sled (Standard).blk b/megamek/data/mechfiles/vehicles/3025 IS Land/Jet Sled.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/3025 IS Land/Jet Sled (Standard).blk
rename to megamek/data/mechfiles/vehicles/3025 IS Land/Jet Sled.blk
diff --git a/megamek/data/mechfiles/vehicles/3039u/AC2 Carrier.blk b/megamek/data/mechfiles/vehicles/3039u/AC2 Carrier.blk
index 876efe2bed4..91a01d9146d 100644
--- a/megamek/data/mechfiles/vehicles/3039u/AC2 Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/AC2 Carrier.blk	
@@ -76,7 +76,7 @@ Autocannon/2
 </Rear Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Hover LRM).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Hover LRM).blk
index 7008f1b3744..85203adbb33 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Hover LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Hover LRM).blk	
@@ -69,7 +69,7 @@ LRM 5
 </Rear Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Hover MG).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Hover MG).blk
index abfac3aff04..8fdd5a12eab 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Hover MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Hover MG).blk	
@@ -75,7 +75,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Hover SRM).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Hover SRM).blk
index debff7eb9a1..f5a7469bf05 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Hover SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Hover SRM).blk	
@@ -73,7 +73,7 @@ SRM 2
 </Rear Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Hover Sensors).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Hover Sensors).blk
index 370432dc2ad..7b6bf15133d 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Hover Sensors).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Hover Sensors).blk	
@@ -76,7 +76,7 @@ RemoteSensorDispenser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Hover).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Hover).blk
index a2f0c661c9d..74601962282 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Hover).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Hover).blk	
@@ -78,7 +78,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Tracked LRM).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Tracked LRM).blk
index 5308980a5ff..8de2b64ee7a 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Tracked LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Tracked LRM).blk	
@@ -69,7 +69,7 @@ LRM 5
 </Rear Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Tracked MG).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Tracked MG).blk
index a9d80383289..7b6c0ce084f 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Tracked MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Tracked MG).blk	
@@ -75,7 +75,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Tracked SRM).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Tracked SRM).blk
index f1d0bffa9fc..7ef81c18453 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Tracked SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Tracked SRM).blk	
@@ -73,7 +73,7 @@ SRM 2
 </Rear Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Tracked).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Tracked).blk
index 57a2927cce0..0ed8384732e 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Tracked).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Tracked).blk	
@@ -77,7 +77,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled LRM).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled LRM).blk
index b280e119190..46fff60a161 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled LRM).blk	
@@ -69,7 +69,7 @@ LRM 5
 </Rear Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled MG).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled MG).blk
index 09b1331d2d2..9afea056c5d 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled MG).blk	
@@ -76,7 +76,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled SRM).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled SRM).blk
index a33e4043000..5138812aec5 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled SRM).blk	
@@ -77,7 +77,7 @@ SRM 2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled).blk b/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled).blk
index ab6cb42b683..49ceb296104 100644
--- a/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/APC (Wheeled).blk	
@@ -78,7 +78,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Axel Heavy Tank Mk 1.blk b/megamek/data/mechfiles/vehicles/3039u/Axel Heavy Tank Mk 1.blk
index a95c114fc3a..1c9351aa3dd 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Axel Heavy Tank Mk 1.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Axel Heavy Tank Mk 1.blk	
@@ -113,7 +113,7 @@ Spittal
 </primaryFactory>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Axel Heavy Tank Mk 2.blk b/megamek/data/mechfiles/vehicles/3039u/Axel Heavy Tank Mk 2.blk
index d17aa434d6d..1e2fcb4d5f2 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Axel Heavy Tank Mk 2.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Axel Heavy Tank Mk 2.blk	
@@ -83,7 +83,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
@@ -115,7 +115,7 @@ Spittal
 </primaryFactory>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank (Armor).blk b/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank (Armor).blk
index e950ca1b059..a36dd347e78 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank (Armor).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank (Armor).blk	
@@ -123,7 +123,7 @@ TARGETING:Cirxese Ballista- Check with Cirxese RockeCheck
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank (Flamer).blk b/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank (Flamer).blk
index 26768716d9f..64d5e3b2ac5 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank (Flamer).blk	
@@ -136,7 +136,7 @@ TARGETING:Cirxese Ballista- Check with Cirxese RockeCheck
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank.blk
index f53f864feb4..44a5195f380 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Behemoth Heavy Tank.blk	
@@ -134,7 +134,7 @@ TARGETING:Cirxese Ballista- Check with Cirxese RockeCheck
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank (AC2).blk b/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank (AC2).blk
index 0a7a79fb7f7..5c78d01889b 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank (AC2).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank (AC2).blk	
@@ -80,7 +80,7 @@ Autocannon/2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank (LRM).blk
index e2d566a26a9..9cdb7992cec 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank (LRM).blk	
@@ -81,7 +81,7 @@ LRM 20
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank.blk
index df8ee815d76..8bee2b2dc9c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Bulldog Medium Tank.blk	
@@ -117,7 +117,7 @@ TARGETING:Xilex-2000
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Davion).blk b/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Davion).blk
index 412aad39373..7393b84e4b8 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Davion).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Davion).blk	
@@ -78,7 +78,7 @@ Autocannon/2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Flamer).blk b/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Flamer).blk
index 0599bdbe16d..9f057642246 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Flamer).blk	
@@ -80,7 +80,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Liao).blk b/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Liao).blk
index 405dd864715..fec5c03eecb 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Liao).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank (Liao).blk	
@@ -75,7 +75,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank.blk
index ca41305cb60..b2e9b3f1369 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Condor Heavy Hover Tank.blk	
@@ -77,7 +77,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Coolant Truck (Hover).blk b/megamek/data/mechfiles/vehicles/3039u/Coolant Truck (Hover).blk
index 0d3ccfa20e9..a288545dd36 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Coolant Truck (Hover).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Coolant Truck (Hover).blk	
@@ -83,7 +83,7 @@ Vehicle Flamer
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Coolant Truck (Tracked).blk b/megamek/data/mechfiles/vehicles/3039u/Coolant Truck (Tracked).blk
index 7e1bd32ad82..e046c652ddd 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Coolant Truck (Tracked).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Coolant Truck (Tracked).blk	
@@ -83,7 +83,7 @@ Vehicle Flamer
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Coolant Truck 135-K.blk b/megamek/data/mechfiles/vehicles/3039u/Coolant Truck 135-K.blk
index e1a20b5c649..73d8773b0c6 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Coolant Truck 135-K.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Coolant Truck 135-K.blk	
@@ -83,7 +83,7 @@ Vehicle Flamer
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Defensive).blk b/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Defensive).blk
index 425997cfa4e..664374a5eaa 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Defensive).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Defensive).blk	
@@ -82,7 +82,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Standard Mk. I).blk b/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Standard Mk. I).blk
index b2600fafd7e..f95cea043aa 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Standard Mk. I).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Standard Mk. I).blk	
@@ -116,7 +116,7 @@ TARGETING:Omicron VII
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Standard Mk. II).blk b/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Standard Mk. II).blk
index 3149f20acab..608e438348a 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Standard Mk. II).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Demolisher Heavy Tank (Standard Mk. II).blk	
@@ -77,7 +77,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Devastator Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Devastator Heavy Tank.blk
index aa8d19a7113..8d480011bc8 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Devastator Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Devastator Heavy Tank.blk	
@@ -83,7 +83,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Drillson Heavy Hover Tank (SRM).blk b/megamek/data/mechfiles/vehicles/3039u/Drillson Heavy Hover Tank (SRM).blk
index b67e9ccc151..8cbc75e18da 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Drillson Heavy Hover Tank (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Drillson Heavy Hover Tank (SRM).blk	
@@ -84,7 +84,7 @@ SRM 2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Drillson Heavy Hover Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Drillson Heavy Hover Tank.blk
index 7f9006af5b4..476786bba1d 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Drillson Heavy Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Drillson Heavy Hover Tank.blk	
@@ -80,7 +80,7 @@ Large Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle (Autocannon).blk b/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle (Autocannon).blk
index 847c3b6f09d..a17ee03c254 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle (Autocannon).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle (Autocannon).blk	
@@ -69,7 +69,7 @@ Autocannon/20
 </Rear Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle (Flamer).blk b/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle (Flamer).blk
index 92ba18677e0..cdf6a2d20a1 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle (Flamer).blk	
@@ -77,7 +77,7 @@ Vehicle Flamer
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle.blk b/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle.blk
index 65d3147ed3b..fbf72807432 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Engineering Vehicle.blk	
@@ -73,7 +73,7 @@ Backhoe
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL (Armor) Wild Weasel.blk b/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL (Armor) Wild Weasel.blk
index f7d84c52ad1..80f42b36b6f 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL (Armor) Wild Weasel.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL (Armor) Wild Weasel.blk	
@@ -73,7 +73,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-TRO 3039 - Succession War
+TRO: 3039 - Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL (Cargo).blk b/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL (Cargo).blk
index 49482876bfa..1360518e2ca 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL (Cargo).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL (Cargo).blk	
@@ -75,7 +75,7 @@ cargobay:2.5:1
 </Rotor Equipment>
 
 <source>
-TRO 3039 - Succession War
+TRO: 3039 - Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL.blk b/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL.blk
index 9e3ee374751..42cb89f728c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Ferret Light Scout VTOL.blk	
@@ -77,7 +77,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-TRO 3039 - Succession War
+TRO: 3039 - Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (LRM).blk
index 2ef55c130ad..5ed494fc6bd 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (LRM).blk	
@@ -82,7 +82,7 @@ LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (MG).blk b/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (MG).blk
index 74e05d614cf..60a374c87ca 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (MG).blk	
@@ -89,7 +89,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (SRM).blk b/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (SRM).blk
index b19cc25accf..213d6f0a459 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank (SRM).blk	
@@ -84,7 +84,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank.blk
index a68c171c988..d471253c59d 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Goblin Medium Tank.blk	
@@ -78,7 +78,7 @@ Large Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Harasser Laser Platform.blk b/megamek/data/mechfiles/vehicles/3039u/Harasser Laser Platform.blk
index d121d91814b..8c3ae34cd4a 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Harasser Laser Platform.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Harasser Laser Platform.blk	
@@ -73,7 +73,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (Flamer).blk b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (Flamer).blk
index 2b11ed310a5..6ad3c83a08e 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (Flamer).blk	
@@ -77,7 +77,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (LRM).blk
index 38282ca92f1..3fc4e79b419 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (LRM).blk	
@@ -75,7 +75,7 @@ LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (Mini-Peggy).blk b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (Mini-Peggy).blk
index b5fb72c0e10..fbcdbb11b34 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (Mini-Peggy).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform (Mini-Peggy).blk	
@@ -76,7 +76,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform Leaping Lisa.blk b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform Leaping Lisa.blk
index e270cd08ccd..0a17027c422 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform Leaping Lisa.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform Leaping Lisa.blk	
@@ -88,7 +88,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform.blk b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform.blk
index 2b5704186ea..38369e32250 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Harasser Missile Platform.blk	
@@ -75,7 +75,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (AC10).blk b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (AC10).blk
index b273d4004cd..dc4b2d91639 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (AC10).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (AC10).blk	
@@ -73,7 +73,7 @@ Autocannon/10
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (LRM).blk
index 7d3231e2755..7911cf37201 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (LRM).blk	
@@ -73,7 +73,7 @@ LRM 15
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (Laser).blk b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (Laser).blk
index f35cf81c2c6..9df4eedd3ab 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (Laser).blk	
@@ -71,7 +71,7 @@ Medium Laser
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (SRM).blk b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (SRM).blk
index 3fd58b5af45..37d015d7b0a 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (SRM).blk	
@@ -75,7 +75,7 @@ SRM 6
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (Scout).blk b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (Scout).blk
index 6f2989a1948..1c7848b58d5 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (Scout).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun (Scout).blk	
@@ -78,7 +78,7 @@ Autocannon/20
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun.blk b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun.blk
index f4c5dcfae44..c3e904c7ca3 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hetzer Wheeled Assault Gun.blk	
@@ -72,7 +72,7 @@ Autocannon/20
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone (NapFind).blk b/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone (NapFind).blk
index 31e9489bdca..01256f8296b 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone (NapFind).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone (NapFind).blk	
@@ -24,7 +24,7 @@ Hi-Scout Drone
 </year>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone (PathTrak).blk b/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone (PathTrak).blk
index b4357ed1929..3d265b17718 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone (PathTrak).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone (PathTrak).blk	
@@ -24,7 +24,7 @@ Hi-Scout Drone
 </year>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone Carrier.blk b/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone Carrier.blk
index 1d4c9bfe9ea..3c24cfdd546 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hi-Scout Drone Carrier.blk	
@@ -83,7 +83,7 @@ SRM 2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (Ammo).blk b/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (Ammo).blk
index b4ea2f5a9d7..9d853dcd197 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (Ammo).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (Ammo).blk	
@@ -71,7 +71,7 @@ LRM 20
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (LRM10).blk b/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (LRM10).blk
index 3179059658b..6d097d74869 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (LRM10).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (LRM10).blk	
@@ -79,7 +79,7 @@ Flamer
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (LRM15).blk b/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (LRM15).blk
index 98a5cd55f64..62e5cf7d03c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (LRM15).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank (LRM15).blk	
@@ -77,7 +77,7 @@ Flamer
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank.blk
index 36d63463b65..f89e228f6fe 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Hunter Light Support Tank.blk	
@@ -71,7 +71,7 @@ Flamer
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Armor).blk b/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Armor).blk
index 755566de568..f842566ea47 100644
--- a/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Armor).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Armor).blk	
@@ -78,7 +78,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Fusion).blk b/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Fusion).blk
index bb8a3f0f008..849f683a773 100644
--- a/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Fusion).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Fusion).blk	
@@ -78,7 +78,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Trailer).blk b/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Trailer).blk
index c90ccffb6e5..80cd77bd15f 100644
--- a/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Trailer).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport (Trailer).blk	
@@ -72,7 +72,7 @@ Hitch
 </Rear Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport.blk b/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport.blk
index 4a7da2c9d96..2eeff347e15 100644
--- a/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/J-27 Ordnance Transport.blk	
@@ -29,7 +29,7 @@ J-27 Ordnance Transport
 </year>
 
 <source>
-RS 3039 Unabriged
+RS 3039 Unabriged - Star League
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (Flamer).blk b/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (Flamer).blk
index 58b66bf0f07..c9349bd5dd9 100644
--- a/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (Flamer).blk	
@@ -76,7 +76,7 @@ Vehicle Flamer
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (ICE).blk b/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (ICE).blk
index 8f8b379d9cc..dacb60448c6 100644
--- a/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (ICE).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (ICE).blk	
@@ -75,7 +75,7 @@ SRM 2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (MG).blk b/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (MG).blk
index 33633e8af38..fc647efbaff 100644
--- a/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank (MG).blk	
@@ -77,7 +77,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank.blk b/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank.blk
index 0e8fc180357..ffe8a657a8e 100644
--- a/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/J. Edgar Light Hover Tank.blk	
@@ -115,7 +115,7 @@ TARGETING:RCA Instatrac Mk. II or TracTex Alpha-1
 </systemManufacturers>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/K-27 Ordnance Transport (Killjoy).blk b/megamek/data/mechfiles/vehicles/3039u/K-27 Ordnance Transport (Killjoy).blk
index 0c293ec0408..213d5bce20d 100644
--- a/megamek/data/mechfiles/vehicles/3039u/K-27 Ordnance Transport (Killjoy).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/K-27 Ordnance Transport (Killjoy).blk	
@@ -74,7 +74,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Karnov UR Gunship.blk b/megamek/data/mechfiles/vehicles/3039u/Karnov UR Gunship.blk
index 3a8f0283e80..845621ef02b 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Karnov UR Gunship.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Karnov UR Gunship.blk	
@@ -83,7 +83,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport (AC).blk b/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport (AC).blk
index 479c8156dbb..bd00409b52c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport (AC).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport (AC).blk	
@@ -74,7 +74,7 @@ Autocannon/20
 </Rotor Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport (Artillery).blk b/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport (Artillery).blk
index 8f7bafbe744..f58ef7210cd 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport (Artillery).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport (Artillery).blk	
@@ -73,7 +73,7 @@ ISThumper
 </Rotor Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport.blk b/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport.blk
index 3f48c9c0524..31bf805b8ff 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Karnov UR Transport.blk	
@@ -75,7 +75,7 @@ troopspace:6.0
 </Rotor Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/LRM Carrier.blk b/megamek/data/mechfiles/vehicles/3039u/LRM Carrier.blk
index 0dac9477173..438631350da 100644
--- a/megamek/data/mechfiles/vehicles/3039u/LRM Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/LRM Carrier.blk	
@@ -112,7 +112,7 @@ TARGETING:FireScan with IndirecTrack
 </systemManufacturers>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Laser Carrier.blk b/megamek/data/mechfiles/vehicles/3039u/Laser Carrier.blk
index 549df993910..0fa6373ae19 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Laser Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Laser Carrier.blk	
@@ -75,7 +75,7 @@ Medium Laser
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/MASH Truck (ICE).blk b/megamek/data/mechfiles/vehicles/3039u/MASH Truck (ICE).blk
index b89720d0435..3e186f2d6a9 100644
--- a/megamek/data/mechfiles/vehicles/3039u/MASH Truck (ICE).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/MASH Truck (ICE).blk	
@@ -72,7 +72,7 @@ MASH Operation Theater
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/MASH Truck.blk b/megamek/data/mechfiles/vehicles/3039u/MASH Truck.blk
index 314d5834e06..69378fef223 100644
--- a/megamek/data/mechfiles/vehicles/3039u/MASH Truck.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/MASH Truck.blk	
@@ -78,7 +78,7 @@ Small Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Manticore Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Manticore Heavy Tank.blk
index ca5e79eecca..d29f234df59 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Manticore Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Manticore Heavy Tank.blk	
@@ -115,7 +115,7 @@ TARGETING:TargiTrack 717
 </systemManufacturers>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport (SRM2).blk b/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport (SRM2).blk
index 4d021d6c3d6..47a0c36da73 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport (SRM2).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport (SRM2).blk	
@@ -88,7 +88,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport (SRM4).blk b/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport (SRM4).blk
index 1b42e96145a..f424b4726f8 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport (SRM4).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport (SRM4).blk	
@@ -89,7 +89,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport.blk b/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport.blk
index de725d3b0b7..0dffece72c9 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Maxim Heavy Hover Transport.blk	
@@ -88,7 +88,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE - LL).blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE - LL).blk
index da78384bb2a..ddb05afe53c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE - LL).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE - LL).blk	
@@ -69,7 +69,7 @@ Large Laser
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE - LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE - LRM).blk
index 39fb96e9d3d..34af3da8544 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE - LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE - LRM).blk	
@@ -78,7 +78,7 @@ LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE).blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE).blk
index c7e5b533d62..ac1e28ce780 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (ICE).blk	
@@ -80,7 +80,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (LL).blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (LL).blk
index 15bfebac866..1e834e2282b 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (LL).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (LL).blk	
@@ -73,7 +73,7 @@ Large Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (LRM).blk
index e7dd94b7000..e1e956d806e 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters (LRM).blk	
@@ -74,7 +74,7 @@ LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters.blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters.blk
index d369c5ffb47..38e6eb23fa9 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Headquarters.blk	
@@ -77,7 +77,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom (Ammo Carriage).blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom (Ammo Carriage).blk
index 58d48b165d5..9b62af76716 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom (Ammo Carriage).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom (Ammo Carriage).blk	
@@ -81,7 +81,7 @@ Hitch
 </Rear Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom (Support Carriage).blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom (Support Carriage).blk
index 7024d14795f..1584c954931 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom (Support Carriage).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom (Support Carriage).blk	
@@ -70,7 +70,7 @@ Hitch
 </Rear Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom LT-MOB-25.blk b/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom LT-MOB-25.blk
index 5752360f997..3075e2d5450 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom LT-MOB-25.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Mobile Long Tom LT-MOB-25.blk	
@@ -79,7 +79,7 @@ Hitch
 </Rear Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Monitor Naval Vessel.blk b/megamek/data/mechfiles/vehicles/3039u/Monitor Naval Vessel.blk
index 52774dae645..5728424b380 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Monitor Naval Vessel.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Monitor Naval Vessel.blk	
@@ -88,7 +88,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine (LRT).blk b/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine (LRT).blk
index 97041ccb949..325746143ae 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine (LRT).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine (LRT).blk	
@@ -29,7 +29,7 @@ Neptune Submarine
 </year>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine (SRT).blk b/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine (SRT).blk
index ed278ebb6cb..00b185ea0fe 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine (SRT).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine (SRT).blk	
@@ -29,7 +29,7 @@ Neptune Submarine
 </year>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine.blk b/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine.blk
index c2a5d52f16f..80520cd4adb 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Neptune Submarine.blk	
@@ -29,7 +29,7 @@ Neptune Submarine
 </year>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank (Fusion).blk b/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank (Fusion).blk
index 2e84d0add41..6381c664d9c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank (Fusion).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank (Fusion).blk	
@@ -85,7 +85,7 @@ LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
@@ -124,7 +124,7 @@ TARGETING:GuideRite w/Laser Coordination Link
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank (LRM).blk
index c7fc32a806e..65dbcf29994 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank (LRM).blk	
@@ -81,7 +81,7 @@ LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
@@ -120,7 +120,7 @@ TARGETING:GuideRite w/Laser Coordination Link
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank.blk
index bbbe0939b59..ae8be2cbad8 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Ontos Heavy Tank.blk	
@@ -120,7 +120,7 @@ TARGETING:GuideRite w/Laser Coordination Link
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (ICE).blk b/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (ICE).blk
index 23813ba7dba..5deb70bba61 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (ICE).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (ICE).blk	
@@ -74,7 +74,7 @@ SRM 6
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (ML).blk b/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (ML).blk
index aab52106dd5..edbd847733c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (ML).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (ML).blk	
@@ -72,7 +72,7 @@ SRM 6
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (SRM2).blk b/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (SRM2).blk
index 8c37112be46..4374bb20a6c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (SRM2).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5 (SRM2).blk	
@@ -75,7 +75,7 @@ Flamer
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5.blk b/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5.blk
index 7da666d9a7d..8fc59b7cc12 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Packrat LRPV PKR-T5.blk	
@@ -75,7 +75,7 @@ Flamer
 </Rear Equipment>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank (AC2).blk b/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank (AC2).blk
index 4f27c444836..2d7642c6ed6 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank (AC2).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank (AC2).blk	
@@ -83,7 +83,7 @@ Autocannon/2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank (LRM).blk
index c9f513342a7..3f0659cf836 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank (LRM).blk	
@@ -84,7 +84,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank.blk
index b8dd24848ae..d1b20112f17 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Partisan Heavy Tank.blk	
@@ -80,7 +80,7 @@ Autocannon/5
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Patton Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Patton Tank.blk
index 565291ea8ae..7290fa74142 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Patton Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Patton Tank.blk	
@@ -116,7 +116,7 @@ TARGETING:TharHes Mars5
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Missile).blk b/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Missile).blk
index 9831e977471..280dd6aa83b 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Missile).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Missile).blk	
@@ -76,7 +76,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
@@ -115,5 +115,5 @@ TARGETING:Exeter LongScan with ReconLock
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Sensors).blk b/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Sensors).blk
index fda3f273612..460da59747e 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Sensors).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Sensors).blk	
@@ -77,7 +77,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Unarmed).blk b/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Unarmed).blk
index 42401e073c1..8599148564f 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Unarmed).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank (Unarmed).blk	
@@ -75,7 +75,7 @@ cargobay:12.0:1
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank.blk
index ecdca7b6b21..67283b75d1c 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Pegasus Scout Hover Tank.blk	
@@ -75,7 +75,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle (AC5).blk b/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle (AC5).blk
index fa0cb4bc839..bfbf336933e 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle (AC5).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle (AC5).blk	
@@ -83,7 +83,7 @@ Autocannon/5
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle (Missile).blk b/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle (Missile).blk
index b7b2fb4e52d..de225ca3faf 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle (Missile).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle (Missile).blk	
@@ -79,7 +79,7 @@ LRM 20
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle.blk b/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle.blk
index 18a3c7dc5a8..baee1f0da61 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Pike Support Vehicle.blk	
@@ -82,7 +82,7 @@ Autocannon/2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Rommel Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Rommel Tank.blk
index fdd8b24ebaf..4a2535bea2a 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Rommel Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Rommel Tank.blk	
@@ -114,7 +114,7 @@ TARGETING:TharHes Mars5
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/SRM Carrier.blk b/megamek/data/mechfiles/vehicles/3039u/SRM Carrier.blk
index 990d0c17e6e..c4c7014b582 100644
--- a/megamek/data/mechfiles/vehicles/3039u/SRM Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/SRM Carrier.blk	
@@ -86,7 +86,7 @@ SRM 6
 </tonnage>
 
 <source>
-TRO 3039 - Age of War
+TRO: 3039 - Age of War
 </source>
 
 
diff --git a/megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank (Armor).blk b/megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank (Armor).blk
index dd8fd95ca21..fccfd5ad640 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank (Armor).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank (Armor).blk	
@@ -70,7 +70,7 @@ Autocannon/20
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank.blk
index f5b6e20e9ab..6cdb145b4f8 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Saladin Assault Hover Tank.blk	
@@ -71,7 +71,7 @@ Autocannon/20
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Saracen Medium Hover Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Saracen Medium Hover Tank.blk
index fe54c6d8e59..dc3d4e59d83 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Saracen Medium Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Saracen Medium Hover Tank.blk	
@@ -78,7 +78,7 @@ SRM 2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Savannah Master Hovercraft (SL).blk b/megamek/data/mechfiles/vehicles/3039u/Savannah Master Hovercraft (SL).blk
index d5568baff39..15497b4cb62 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Savannah Master Hovercraft (SL).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Savannah Master Hovercraft (SL).blk	
@@ -69,7 +69,7 @@ Small Laser
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Savannah Master Hovercraft.blk b/megamek/data/mechfiles/vehicles/3039u/Savannah Master Hovercraft.blk
index 26f5c1da98f..26ab17a4451 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Savannah Master Hovercraft.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Savannah Master Hovercraft.blk	
@@ -106,7 +106,7 @@ TARGETING:TharHes Alpha-2a
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Schrek PPC Carrier (Anti-Infantry).blk b/megamek/data/mechfiles/vehicles/3039u/Schrek PPC Carrier (Anti-Infantry).blk
index b4e56442469..57dc72a97c2 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Schrek PPC Carrier (Anti-Infantry).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Schrek PPC Carrier (Anti-Infantry).blk	
@@ -77,7 +77,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Schrek PPC Carrier.blk b/megamek/data/mechfiles/vehicles/3039u/Schrek PPC Carrier.blk
index d0ba148e638..a8ad72ee8e6 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Schrek PPC Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Schrek PPC Carrier.blk	
@@ -74,7 +74,7 @@ PPC
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Scimitar Medium Hover Tank (Missile).blk b/megamek/data/mechfiles/vehicles/3039u/Scimitar Medium Hover Tank (Missile).blk
index 3a1b2af2c34..7dd13b919ef 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Scimitar Medium Hover Tank (Missile).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Scimitar Medium Hover Tank (Missile).blk	
@@ -77,7 +77,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Scimitar Medium Hover Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Scimitar Medium Hover Tank.blk
index 6c70d19cce0..4e9ee83a249 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Scimitar Medium Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Scimitar Medium Hover Tank.blk	
@@ -76,7 +76,7 @@ Autocannon/5
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (LRM).blk
index 38f75653cdd..120246e02c1 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (LRM).blk	
@@ -75,7 +75,7 @@ LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (ML).blk b/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (ML).blk
index c9d60eb4b56..80f653f33b7 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (ML).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (ML).blk	
@@ -79,7 +79,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (SRM).blk b/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (SRM).blk
index 4ba9ea55d98..db07e47c1fd 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank (SRM).blk	
@@ -78,7 +78,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank.blk
index 591615fb7d5..ddd4bc77cc1 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Scorpion Light Tank.blk	
@@ -75,7 +75,7 @@ Autocannon/5
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil (SRM2).blk b/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil (SRM2).blk
index b68939abaab..2a99289cc5a 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil (SRM2).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil (SRM2).blk	
@@ -29,7 +29,7 @@ Sea Skimmer Hydrofoil
 </year>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil (SRM6).blk b/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil (SRM6).blk
index b2252e46f09..90be00d63ff 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil (SRM6).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil (SRM6).blk	
@@ -29,7 +29,7 @@ Sea Skimmer Hydrofoil
 </year>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil.blk b/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil.blk
index 4e96a576d4b..eb4cbef08ed 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Sea Skimmer Hydrofoil.blk	
@@ -29,7 +29,7 @@ Sea Skimmer Hydrofoil
 </year>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank (MG).blk b/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank (MG).blk
index 7308b5a80c6..8644fed040f 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank (MG).blk	
@@ -109,7 +109,7 @@ TARGETING:Targeting System 2.3
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank (SRM).blk b/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank (SRM).blk
index 6a652ad559f..342a1ab7991 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank (SRM).blk	
@@ -108,7 +108,7 @@ TARGETING:Targeting System 2.3
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank.blk
index 6102496aa03..2dc46c23036 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Skulker Wheeled Scout Tank.blk	
@@ -106,7 +106,7 @@ TARGETING:Targeting System 2.3
 </systemManufacturers>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank (LRM).blk
index d84b51a3f31..bc242824003 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank (LRM).blk	
@@ -76,7 +76,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank (SRM).blk b/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank (SRM).blk
index d3c059a3174..6f6e43d7463 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank (SRM).blk	
@@ -78,7 +78,7 @@ SRM 2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank.blk
index 3a3dd12de53..5e0bc7842df 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Striker Light Tank.blk	
@@ -76,7 +76,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE - Cargo).blk b/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE - Cargo).blk
index 4fd44640f4b..f4a7b1d3aef 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE - Cargo).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE - Cargo).blk	
@@ -71,7 +71,7 @@ cargobay:3.0:1
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE - Speed).blk b/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE - Speed).blk
index a8c884d5877..a304e06d769 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE - Speed).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE - Speed).blk	
@@ -71,7 +71,7 @@ cargobay:2.0:1
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE).blk b/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE).blk
index a3786d499e2..a1f7a61d514 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car (ICE).blk	
@@ -68,7 +68,7 @@ Communications Equipment (2 ton)
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car.blk b/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car.blk
index ef021d58a94..6ffa5361648 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Swift Wind Scout Car.blk	
@@ -72,7 +72,7 @@ Communications Equipment (2 ton)
 </Rear Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank (AC2).blk b/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank (AC2).blk
index a48988ba8e5..8d95038bffd 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank (AC2).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank (AC2).blk	
@@ -77,7 +77,7 @@ Autocannon/2
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank (Liao).blk b/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank (Liao).blk
index 394705c7b02..66fd3ac4864 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank (Liao).blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank (Liao).blk	
@@ -76,7 +76,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank.blk b/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank.blk
index f687ecb94b9..e31ecc06ea1 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Vedette Medium Tank.blk	
@@ -114,7 +114,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K100.blk b/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K100.blk
index 6d931a35f81..71823434db9 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K100.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K100.blk	
@@ -79,7 +79,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K65N.blk b/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K65N.blk
index da043e04220..f08c88c8f44 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K65N.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K65N.blk	
@@ -123,7 +123,7 @@ TARGETING:O/P GRNDSTAT 50A
 </systemManufacturers>
 
 <source>
-TRO 3039 - Star League
+TRO: 3039 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K70.blk b/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K70.blk
index aa4da71c1d2..683449b602b 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K70.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Von Luckner Heavy Tank VNL-K70.blk	
@@ -82,7 +82,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Warrior H-7 Attack Helicopter.blk b/megamek/data/mechfiles/vehicles/3039u/Warrior H-7 Attack Helicopter.blk
index 16181da0148..81d283cdce0 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Warrior H-7 Attack Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Warrior H-7 Attack Helicopter.blk	
@@ -113,7 +113,7 @@ TARGETING:N&D Handsfree
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Warrior H-7A Attack Helicopter.blk b/megamek/data/mechfiles/vehicles/3039u/Warrior H-7A Attack Helicopter.blk
index f5597969c92..162b94d93ad 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Warrior H-7A Attack Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Warrior H-7A Attack Helicopter.blk	
@@ -113,7 +113,7 @@ TARGETING:N&D Handsfree
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3039u/Warrior H-7C Attack Helicopter.blk b/megamek/data/mechfiles/vehicles/3039u/Warrior H-7C Attack Helicopter.blk
index 0dc516c8f23..273da22ac13 100644
--- a/megamek/data/mechfiles/vehicles/3039u/Warrior H-7C Attack Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3039u/Warrior H-7C Attack Helicopter.blk	
@@ -114,7 +114,7 @@ TARGETING:N&D Handsfree
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Beagle Hover Scout (C3i).blk b/megamek/data/mechfiles/vehicles/3050U/Beagle Hover Scout (C3i).blk
index 793a56c7039..5068315a1ad 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Beagle Hover Scout (C3i).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Beagle Hover Scout (C3i).blk	
@@ -82,7 +82,7 @@ ISAntiMissileSystem
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Beagle Hover Scout (TAG).blk b/megamek/data/mechfiles/vehicles/3050U/Beagle Hover Scout (TAG).blk
index d0a553ccd11..0a6ac05f798 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Beagle Hover Scout (TAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Beagle Hover Scout (TAG).blk	
@@ -82,7 +82,7 @@ BeagleActiveProbe
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Beagle.blk b/megamek/data/mechfiles/vehicles/3050U/Beagle.blk
index 0049344bb3a..20aa796618d 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Beagle.blk
+++ b/megamek/data/mechfiles/vehicles/3050U/Beagle.blk
@@ -82,7 +82,7 @@ BeagleActiveProbe
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Burke Defense Tank (HPPC).blk b/megamek/data/mechfiles/vehicles/3050U/Burke Defense Tank (HPPC).blk
index d7387c3d191..2a4a2bf12a1 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Burke Defense Tank (HPPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Burke Defense Tank (HPPC).blk	
@@ -85,7 +85,7 @@ Heavy PPC
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Burke Defense Tank.blk b/megamek/data/mechfiles/vehicles/3050U/Burke Defense Tank.blk
index b41eeb3f643..0374d1c1dcf 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Burke Defense Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Burke Defense Tank.blk	
@@ -84,7 +84,7 @@ PPC
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Chaparral (ERML).blk b/megamek/data/mechfiles/vehicles/3050U/Chaparral (ERML).blk
index 107e3b52d37..8c74ae6dd64 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Chaparral (ERML).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Chaparral (ERML).blk	
@@ -75,7 +75,7 @@ SRM 6
 </Rear Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Chaparral (MG).blk b/megamek/data/mechfiles/vehicles/3050U/Chaparral (MG).blk
index 8bb8c3aff73..9f04dbf7edc 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Chaparral (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Chaparral (MG).blk	
@@ -77,7 +77,7 @@ Machine Gun
 </Rear Equipment>
 
 <source>
-TRO 3050 - Civil War
+TRO: 3050 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Chaparral (SRM).blk b/megamek/data/mechfiles/vehicles/3050U/Chaparral (SRM).blk
index 14ba7511b8d..f6b9993dda9 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Chaparral (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Chaparral (SRM).blk	
@@ -83,7 +83,7 @@ SRM 4
 </Rear Equipment>
 
 <source>
-TRO 3050 - Civil War
+TRO: 3050 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Chaparral.blk b/megamek/data/mechfiles/vehicles/3050U/Chaparral.blk
index e25c944e712..7bb1a7fecc1 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Chaparral.blk
+++ b/megamek/data/mechfiles/vehicles/3050U/Chaparral.blk
@@ -75,7 +75,7 @@ SRM 6
 </Rear Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship (ML).blk b/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship (ML).blk
index 33cecf15d9a..5a43bd72807 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship (ML).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship (ML).blk	
@@ -87,7 +87,7 @@ RL10
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship (Plasma).blk b/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship (Plasma).blk
index 093be00b6d4..9db870c193d 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship (Plasma).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship (Plasma).blk	
@@ -82,7 +82,7 @@ ISPlasmaRifle
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship.blk b/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship.blk
index a5fc5537392..2aa2a0cdee7 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Cyrano Gunship.blk	
@@ -81,7 +81,7 @@ BeagleActiveProbe
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Demon Tank (HGR).blk b/megamek/data/mechfiles/vehicles/3050U/Demon Tank (HGR).blk
index 3c3f4ff0f31..c1ad970f3e9 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Demon Tank (HGR).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Demon Tank (HGR).blk	
@@ -93,7 +93,7 @@ ISERMediumLaser
 </Rear Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Demon Tank (Horned Demon).blk b/megamek/data/mechfiles/vehicles/3050U/Demon Tank (Horned Demon).blk
index 229b76c3503..176793211b1 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Demon Tank (Horned Demon).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Demon Tank (Horned Demon).blk	
@@ -79,7 +79,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Demon Tank (PPC).blk b/megamek/data/mechfiles/vehicles/3050U/Demon Tank (PPC).blk
index a69787a0365..3dda6e61d65 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Demon Tank (PPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Demon Tank (PPC).blk	
@@ -81,7 +81,7 @@ PPC
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Demon Tank.blk b/megamek/data/mechfiles/vehicles/3050U/Demon Tank.blk
index 2ee4dd45dcb..719107d5980 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Demon Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Demon Tank.blk	
@@ -80,7 +80,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (C3M).blk b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (C3M).blk
index e88efccfe98..2623b47162d 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (C3M).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (C3M).blk	
@@ -88,7 +88,7 @@ ISRotaryAC5
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (C3S).blk b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (C3S).blk
index 2386356962d..cde9181adf1 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (C3S).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (C3S).blk	
@@ -87,7 +87,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (Fury II).blk b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (Fury II).blk
index 6435be1ae63..2828295645e 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (Fury II).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (Fury II).blk	
@@ -82,7 +82,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (Original).blk b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (Original).blk
index 3003815c5f0..2b232d77aa3 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank (Original).blk	
@@ -81,7 +81,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank.blk b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank.blk
index f69999a6b41..5864e912724 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Fury Command Tank.blk	
@@ -78,7 +78,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft (ERSL).blk b/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft (ERSL).blk
index 3adc6d475b6..40662869415 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft (ERSL).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft (ERSL).blk	
@@ -81,7 +81,7 @@ ISERSmallLaser
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft (TDF).blk b/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft (TDF).blk
index 244847cfff3..fcb22123bb9 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft (TDF).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft (TDF).blk	
@@ -81,7 +81,7 @@ RL10
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft.blk b/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft.blk
index 23326abe3db..3daae0ddd9f 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Gabriel Reconnaissance Hovercraft.blk	
@@ -80,7 +80,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Kanga Medium Hovertank.blk b/megamek/data/mechfiles/vehicles/3050U/Kanga Medium Hovertank.blk
index ebd1c07c1f9..f29eeb6301b 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Kanga Medium Hovertank.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Kanga Medium Hovertank.blk	
@@ -85,7 +85,7 @@ Machine Gun
 </Rear Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (ERML).blk b/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (ERML).blk
index 4f2b024d480..fef253db743 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (ERML).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (ERML).blk	
@@ -84,7 +84,7 @@ ISERMediumLaser
 </Rear Equipment>
 
 <source>
-TRO 3050 - Civil War
+TRO: 3050 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (ERSL).blk b/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (ERSL).blk
index 2c831f9fa46..bf43fd8baf8 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (ERSL).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (ERSL).blk	
@@ -85,7 +85,7 @@ ISERMediumLaser
 </Rear Equipment>
 
 <source>
-TRO 3050 - Civil War
+TRO: 3050 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (RL).blk b/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (RL).blk
index 24825decda0..e7d6f7f4c3c 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (RL).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft (RL).blk	
@@ -85,7 +85,7 @@ ISAntiMissileSystem
 </Rear Equipment>
 
 <source>
-TRO 3050 - Civil War
+TRO: 3050 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft.blk b/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft.blk
index 1683206743b..b1e6470c275 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Lightning Attack Hovercraft.blk	
@@ -79,7 +79,7 @@ ISSRM4OS
 </Rear Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Magi Infantry Support Vehicle (UCSV).blk b/megamek/data/mechfiles/vehicles/3050U/Magi Infantry Support Vehicle (UCSV).blk
index 6df11b5f59b..f9cc232dca5 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Magi Infantry Support Vehicle (UCSV).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Magi Infantry Support Vehicle (UCSV).blk	
@@ -96,7 +96,7 @@ Medium Laser
 </Rear Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Magi Infantry Support Vehicle.blk b/megamek/data/mechfiles/vehicles/3050U/Magi Infantry Support Vehicle.blk
index 9feb8b67b44..2773407a739 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Magi Infantry Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Magi Infantry Support Vehicle.blk	
@@ -82,7 +82,7 @@ Medium Laser
 </Rear Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Marksman Artillery Vehicle (Light PPC).blk b/megamek/data/mechfiles/vehicles/3050U/Marksman Artillery Vehicle (Light PPC).blk
index 8ac067f4ed7..e7d5427f389 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Marksman Artillery Vehicle (Light PPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Marksman Artillery Vehicle (Light PPC).blk	
@@ -89,7 +89,7 @@ Heavy Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Marksman Artillery Vehicle.blk b/megamek/data/mechfiles/vehicles/3050U/Marksman Artillery Vehicle.blk
index 014578c0d51..fcd0a79189a 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Marksman Artillery Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Marksman Artillery Vehicle.blk	
@@ -83,7 +83,7 @@ Large Laser
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Armor).blk b/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Armor).blk
index 2edf7426958..bbec96727c4 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Armor).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Armor).blk	
@@ -76,7 +76,7 @@ Medium Laser
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Succession Wars
+TRO: 3050 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (LAC).blk b/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (LAC).blk
index b08ee20007d..238d027c6ee 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (LAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (LAC).blk	
@@ -82,7 +82,7 @@ ISTAG
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Light PPC).blk b/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Light PPC).blk
index b4317988048..49bed46669d 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Light PPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Light PPC).blk	
@@ -82,7 +82,7 @@ Light PPC
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL.blk
index 87e11146971..70e622095e6 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Nightshade ECM VTOL.blk	
@@ -81,7 +81,7 @@ Medium Laser
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-005.blk b/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-005.blk
index ef71a727f8d..d8256a44a8b 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-005.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-005.blk	
@@ -83,7 +83,7 @@ PPC
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-007.blk b/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-007.blk
index f560d54e029..904d2620191 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-007.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-007.blk	
@@ -102,7 +102,7 @@ Heavy PPC
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-008.blk b/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-008.blk
index 9ff6c33b1fc..995d46a6b80 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-008.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Puma Assault Tank PAT-008.blk	
@@ -105,7 +105,7 @@ ISERPPC
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (Flamer).blk b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (Flamer).blk
index b746f1cdf98..91b405082ac 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (Flamer).blk	
@@ -83,7 +83,7 @@ LRM 20
 </Turret Equipment>
 
 <source>
-TRO 3050 - Succession Wars
+TRO: 3050 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (MG).blk b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (MG).blk
index c9a0a376d8f..1e1d641f51d 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (MG).blk	
@@ -84,7 +84,7 @@ LRM 20
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (ML).blk b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (ML).blk
index fe6a1325c9f..d5dd0177d8a 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (ML).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (ML).blk	
@@ -82,7 +82,7 @@ LRM 20
 </Turret Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (SL).blk b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (SL).blk
index 5dd797ad35e..d486946c873 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (SL).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank (SL).blk	
@@ -91,7 +91,7 @@ LRM 20
 </Turret Equipment>
 
 <source>
-TRO 3050 - Succession Wars
+TRO: 3050 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank.blk b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank.blk
index 6bc1d288cb1..98c1d25dcbd 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Rhino Fire Support Tank.blk	
@@ -80,7 +80,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (ERML).blk b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (ERML).blk
index 947141bafe8..56f2e812431 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (ERML).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (ERML).blk	
@@ -85,7 +85,7 @@ ISERMediumLaser
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Clan Invasion
+TRO: 3050 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (Infantry).blk b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (Infantry).blk
index bfa56a6d902..1fc84aa80d9 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (Infantry).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (Infantry).blk	
@@ -84,7 +84,7 @@ ISSmallPulseLaser
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (LPPC).blk b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (LPPC).blk
index c47cc7c7f3d..55e236e3ba4 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (LPPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (LPPC).blk	
@@ -84,7 +84,7 @@ Light PPC
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Jihad
+TRO: 3050 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (MG).blk b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (MG).blk
index f4e4f344031..62594302412 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (MG).blk	
@@ -86,7 +86,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Clan Invasion
+TRO: 3050 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (SPL).blk b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (SPL).blk
index 9d96bb4c4e8..7760cb9149f 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (SPL).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport (SPL).blk	
@@ -85,7 +85,7 @@ ISSmallPulseLaser
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Clan Invasion
+TRO: 3050 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport.blk b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport.blk
index 65a3ce008c1..c05d9f773e4 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Ripper Infantry Transport.blk	
@@ -85,7 +85,7 @@ Medium Laser
 </Rotor Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Rotunda Scout Vehicle.blk b/megamek/data/mechfiles/vehicles/3050U/Rotunda Scout Vehicle.blk
index 76a6690edba..39232909115 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Rotunda Scout Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Rotunda Scout Vehicle.blk	
@@ -78,7 +78,7 @@ SRM 2
 </Rear Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle (C3i).blk b/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle (C3i).blk
index 7d7b65018bb..9cb983d1903 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle (C3i).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle (C3i).blk	
@@ -80,7 +80,7 @@ ISThumper
 </Rear Equipment>
 
 <source>
-TRO 3050 - Civil War
+TRO: 3050 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle (Clan).blk b/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle (Clan).blk
index f4e7afdc258..ca61597eefd 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle (Clan).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle (Clan).blk	
@@ -85,7 +85,7 @@ CLERMediumLaser
 </Turret Equipment>
 
 <source>
-TRO 3050 - Succession Wars
+TRO: 3050 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle.blk b/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle.blk
index 63875f0220f..e71a0de5639 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Thor Artillery Vehicle.blk	
@@ -85,7 +85,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (C3i).blk b/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (C3i).blk
index 51021ed5964..bae2f5d5ebc 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (C3i).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (C3i).blk	
@@ -88,7 +88,7 @@ ISTAG
 </Turret Equipment>
 
 <source>
-TRO 3050 - Civil War
+TRO: 3050 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (LRM).blk b/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (LRM).blk
index 7c3ebeb20da..1caff31feb9 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (LRM).blk	
@@ -86,7 +86,7 @@ ISERMediumLaser
 </Turret Equipment>
 
 <source>
-TRO 3050 - Civil War
+TRO: 3050 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (SRM2).blk b/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (SRM2).blk
index e80b0ba9f04..c2c739d5160 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (SRM2).blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank (SRM2).blk	
@@ -88,7 +88,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank.blk b/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank.blk
index 6cc05ca42b5..22da4c0731e 100644
--- a/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank.blk	
+++ b/megamek/data/mechfiles/vehicles/3050U/Zephyr Hovertank.blk	
@@ -88,7 +88,7 @@ ISTAG
 </Turret Equipment>
 
 <source>
-TRO 3050 - Star League
+TRO: 3050 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/AC 2 Carrier (LB-X).blk b/megamek/data/mechfiles/vehicles/3058Uu/AC 2 Carrier (LB-X).blk
index 73bcd406026..f4d8009bd91 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/AC 2 Carrier (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/AC 2 Carrier (LB-X).blk	
@@ -64,5 +64,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Alacorn Heavy Tank Mk VII.blk b/megamek/data/mechfiles/vehicles/3058Uu/Alacorn Heavy Tank Mk VII.blk
index 8f4635cdeba..f03267c9d53 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Alacorn Heavy Tank Mk VII.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Alacorn Heavy Tank Mk VII.blk	
@@ -68,5 +68,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC (XL).blk b/megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC (XL).blk
index 50fbfd12456..1a136392e10 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC (XL).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC (XL).blk	
@@ -95,7 +95,7 @@ CLArtemisIV
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC (Standard).blk b/megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC.blk
similarity index 99%
rename from megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC (Standard).blk
rename to megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC.blk
index 0b068f8162b..7efbde0fe16 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Axel Heavy Tank IIC.blk	
@@ -92,7 +92,7 @@ CLArtemisIV
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport A.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport A.blk
index f1e174e7f0b..fcc977b220a 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport A.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport A.blk	
@@ -94,7 +94,7 @@ CLMG:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport B.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport B.blk
index 65d87ae31cc..24900b54514 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport B.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport B.blk	
@@ -87,7 +87,7 @@ CLStreakSRM2:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport C.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport C.blk
index f8e783ac387..b672ceb32d9 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport C.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport C.blk	
@@ -87,7 +87,7 @@ CLERSmallLaser:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport D.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport D.blk
index 14b4970810b..c38e7d96ccb 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport D.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport D.blk	
@@ -86,7 +86,7 @@ CLStreakSRM6:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport E.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport E.blk
index a6a7888506b..770a94cfef6 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport E.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport E.blk	
@@ -88,7 +88,7 @@ CLERSmallLaser:OMNI
 </Turret Equipment>
 
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport F.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport F.blk
index 1095a011fff..8fc46bd6927 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport F.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport F.blk	
@@ -90,7 +90,7 @@ CLAPGaussRifle:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport H.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport H.blk
index 41e5727d059..b03d77c67a2 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport H.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport H.blk	
@@ -88,7 +88,7 @@ CLStreakSRM2:OMNI
 </Turret Equipment>
 
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport Prime.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport Prime.blk
index d5fc5c6e20a..a3f422e253e 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger (C) Tracked Transport Prime.blk	
@@ -87,7 +87,7 @@ CLStreakSRM4:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport A.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport A.blk
index 6b6194d45e3..4a59d232a99 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport A.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport A.blk	
@@ -88,7 +88,7 @@ SRM 2:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport B.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport B.blk
index 42c1a8fab1d..9fd15ccaf57 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport B.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport B.blk	
@@ -86,7 +86,7 @@ SRM 4:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport C.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport C.blk
index 3f0ef8ac782..f9fd62419b7 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport C.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport C.blk	
@@ -86,7 +86,7 @@ LRM 5:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport D.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport D.blk
index 529ab35a1c3..721c346d306 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport D.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport D.blk	
@@ -88,7 +88,7 @@ Medium Laser:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport E.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport E.blk
index 4c31a2892e8..c2daab5fa89 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport E.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport E.blk	
@@ -93,7 +93,7 @@ Small Laser:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport F.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport F.blk
index ace1588bb3c..d397d106009 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport F.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport F.blk	
@@ -85,7 +85,7 @@ ISERMediumLaser:OMNI
 </Turret Equipment>
 
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport G.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport G.blk
index 4a83849cf6b..3d69be32e9b 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport G.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport G.blk	
@@ -86,7 +86,7 @@ SRM 2:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport Prime.blk b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport Prime.blk
index 38dc23d8b3a..16eb27ad4aa 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Badger Tracked Transport Prime.blk	
@@ -88,7 +88,7 @@ Medium Laser:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft A.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft A.blk
index e059a8eb244..8f7ef6a257d 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft A.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft A.blk	
@@ -96,7 +96,7 @@ CLSRM2:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Early Succession War
+TRO: 3058 - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft B.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft B.blk
index b59a89cec0e..cc77296449d 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft B.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft B.blk	
@@ -96,7 +96,7 @@ CLLRM20:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Early Succession War
+TRO: 3058 - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft C.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft C.blk
index 586cae2935b..d1868536f64 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft C.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft C.blk	
@@ -94,7 +94,7 @@ CLMediumPulseLaser:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Early Succession War
+TRO: 3058 - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft D.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft D.blk
index 67a420b8fa1..99eeebdf057 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft D.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft D.blk	
@@ -96,7 +96,7 @@ CLLBXAC2:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Early Succession War
+TRO: 3058 - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft E.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft E.blk
index ca285fa7ba9..a56b8abc77d 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft E.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft E.blk	
@@ -96,7 +96,7 @@ CLATM9:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft F.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft F.blk
index 1e1247a8584..188fed5ed78 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft F.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft F.blk	
@@ -99,7 +99,7 @@ CLAPGaussRifle:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft G.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft G.blk
index 3e31cbf39aa..dbb175e688c 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft G.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft G.blk	
@@ -107,7 +107,7 @@ CLLMGA:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft H.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft H.blk
index 0f747cd2a84..fcb4201ab16 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft H.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft H.blk	
@@ -97,7 +97,7 @@ CLStreakSRM4:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft Prime.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft Prime.blk
index 4dd9d7a7520..c5ff5c101ba 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit (C) Hovercraft Prime.blk	
@@ -96,7 +96,7 @@ CLStreakSRM6:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3058 - Early Succession War
+TRO: 3058 - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft A.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft A.blk
index 859a5b61af5..249ba9824dd 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft A.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft A.blk	
@@ -84,7 +84,7 @@ PPC:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft B.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft B.blk
index 264d7b5f553..659c4f70626 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft B.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft B.blk	
@@ -88,7 +88,7 @@ SRM 4:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft C.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft C.blk
index 85d279159ba..fd5aeed0904 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft C.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft C.blk	
@@ -86,7 +86,7 @@ SRM 6:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft D.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft D.blk
index 32813c9a0e5..cf89d85c394 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft D.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft D.blk	
@@ -87,7 +87,7 @@ LRM 5:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft E.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft E.blk
index 7499c537699..b2a98f0610f 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft E.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft E.blk	
@@ -86,7 +86,7 @@ LRM 10:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft F.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft F.blk
index f519882a5b0..0e2ef5350fd 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft F.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft F.blk	
@@ -85,7 +85,7 @@ Large Laser:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft G.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft G.blk
index 25f6facc7fd..23313fd4e87 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft G.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft G.blk	
@@ -91,7 +91,7 @@ Medium Laser:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft H.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft H.blk
index b8d5178735d..bfade0924c9 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft H.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft H.blk	
@@ -87,7 +87,7 @@ SRM 2:OMNI
 </Turret Equipment>
 
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft I.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft I.blk
index b1551fbf26b..e684f4042ba 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft I.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft I.blk	
@@ -87,7 +87,7 @@ Light PPC:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft Prime.blk b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft Prime.blk
index 3027e67fa51..98c92fa0ea2 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Bandit Hovercraft Prime.blk	
@@ -91,7 +91,7 @@ Medium Laser:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport (SRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport (SRM).blk
index 509453eba85..42cacbf85c4 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport (SRM).blk	
@@ -61,5 +61,5 @@ IS Level 1
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport Black Blizzard.blk b/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport Black Blizzard.blk
index e137b7f3bae..d17c50eeeb9 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport Black Blizzard.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport Black Blizzard.blk	
@@ -62,5 +62,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport.blk b/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport.blk
index 71e04a15721..dde6ec66951 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Blizzard Hover Transport.blk	
@@ -63,5 +63,5 @@ IS Level 1
 Hover
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (LRM).blk
index 6d0e1026c9c..6ed84232169 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (LRM).blk	
@@ -70,5 +70,5 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (PPC 2).blk b/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (PPC 2).blk
index f5e12284d60..9b1da8b380c 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (PPC 2).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (PPC 2).blk	
@@ -65,5 +65,5 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (PPC).blk b/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (PPC).blk
index aafbe910780..46aff69c8fc 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (PPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank (PPC).blk	
@@ -64,5 +64,5 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank.blk
index 5e3cf886738..b8b706237fd 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Brutus Assault Tank.blk	
@@ -68,5 +68,5 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (Infantry).blk b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (Infantry).blk
index 6d73fbddd46..b9bb6334911 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (Infantry).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (Infantry).blk	
@@ -90,7 +90,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (LRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (LRM).blk
index 00f28730ad3..7f649b34503 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (LRM).blk	
@@ -59,5 +59,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (SRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (SRM).blk
index ce6213b10b4..14c5610e2f0 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (SRM).blk	
@@ -62,5 +62,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (TAG).blk b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (TAG).blk
index 4d934b3e35c..b6a8809d3d9 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (TAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter (TAG).blk	
@@ -58,5 +58,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter.blk b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter.blk
index bebf92c5b03..13f7f84ae12 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Cavalry Attack Helicopter.blk	
@@ -64,5 +64,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car (SRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car (SRM).blk
index c53b45a1f68..9d52d19ec1b 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car (SRM).blk	
@@ -61,5 +61,5 @@ IS Level 1
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car (TAG).blk b/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car (TAG).blk
index d5bdcf92654..e4ae82b6586 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car (TAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car (TAG).blk	
@@ -61,5 +61,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car.blk b/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car.blk
index 14564ed7611..2a3fbdd601a 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Centipede Scout Car.blk	
@@ -63,5 +63,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Challenger X MBT.blk b/megamek/data/mechfiles/vehicles/3058Uu/Challenger X MBT.blk
index c02a2a0189f..f914f047c42 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Challenger X MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Challenger X MBT.blk	
@@ -80,5 +80,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Challenger XI MBT.blk b/megamek/data/mechfiles/vehicles/3058Uu/Challenger XI MBT.blk
index e1fa40d643c..936e818a673 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Challenger XI MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Challenger XI MBT.blk	
@@ -66,5 +66,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Challenger XII MBT.blk b/megamek/data/mechfiles/vehicles/3058Uu/Challenger XII MBT.blk
index 93ccff6623b..4498d0f6da6 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Challenger XII MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Challenger XII MBT.blk	
@@ -75,5 +75,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Fulcrum Heavy Hovertank II.blk b/megamek/data/mechfiles/vehicles/3058Uu/Fulcrum Heavy Hovertank II.blk
index d172d0ff63f..b11b5bfcaa0 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Fulcrum Heavy Hovertank II.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Fulcrum Heavy Hovertank II.blk	
@@ -66,5 +66,5 @@ IS
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Fulcrum Heavy Hovertank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Fulcrum Heavy Hovertank.blk
index b298e45ea14..fc7e72c8d2d 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Fulcrum Heavy Hovertank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Fulcrum Heavy Hovertank.blk	
@@ -66,5 +66,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Galleon Light Tank GAL-200.blk b/megamek/data/mechfiles/vehicles/3058Uu/Galleon Light Tank GAL-200.blk
index 0211a421ed1..b231425f0a8 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Galleon Light Tank GAL-200.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Galleon Light Tank GAL-200.blk	
@@ -63,7 +63,7 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-OP Klondyke - Late Succession War
+Historical:Operation Klondike - Late Succession War - LosTech
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Goblin II Infantry Support Vehicle.blk b/megamek/data/mechfiles/vehicles/3058Uu/Goblin II Infantry Support Vehicle.blk
index 4bc19dc5293..01349978149 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Goblin II Infantry Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Goblin II Infantry Support Vehicle.blk	
@@ -70,5 +70,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Goblin Infantry Support Vehicle.blk b/megamek/data/mechfiles/vehicles/3058Uu/Goblin Infantry Support Vehicle.blk
index fc739b98c64..5935fccb960 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Goblin Infantry Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Goblin Infantry Support Vehicle.blk	
@@ -68,5 +68,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Hetzer Wheeled Assault Gun (LB-X).blk b/megamek/data/mechfiles/vehicles/3058Uu/Hetzer Wheeled Assault Gun (LB-X).blk
index a22f4868315..742fc19c6a8 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Hetzer Wheeled Assault Gun (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Hetzer Wheeled Assault Gun (LB-X).blk	
@@ -60,7 +60,7 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-TRO 3039 - Civil War
+TRO: 3039 - Civil War
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (3054 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (3054 Upgrade).blk
index b73f4f86b78..c1ba37823c9 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (3054 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (3054 Upgrade).blk	
@@ -60,5 +60,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (ERLL).blk b/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (ERLL).blk
index 3ad7576f22c..8cbe3f024d7 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (ERLL).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (ERLL).blk	
@@ -60,5 +60,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (LPL).blk b/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (LPL).blk
index 715bc3aeb35..1d085a8516f 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (LPL).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank (LPL).blk	
@@ -60,5 +60,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank Assault Hunter.blk b/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank Assault Hunter.blk
index 69d96bb6282..2ea95899b4b 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank Assault Hunter.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Hunter Light Support Tank Assault Hunter.blk	
@@ -58,5 +58,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (3055 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (3055 Upgrade).blk
index 0a7a0b1cfe4..d58cc434008 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (3055 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (3055 Upgrade).blk	
@@ -86,7 +86,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (BA).blk b/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (BA).blk
index 6daa4c9c18b..d59b4df3c28 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (BA).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (BA).blk	
@@ -59,5 +59,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (Periphery).blk b/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (Periphery).blk
index 5938b8d1750..4c54055d258 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (Periphery).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Karnov UR Transport (Periphery).blk	
@@ -63,5 +63,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (Clan).blk b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (Clan).blk
index 64a34397e6d..0e5280a24cd 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (Clan).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (Clan).blk	
@@ -86,7 +86,7 @@ CLMG
 </Rotor Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (ML).blk b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (ML).blk
index c9d1e718c43..6e01095dc22 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (ML).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (ML).blk	
@@ -57,5 +57,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (MedEvac).blk b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (MedEvac).blk
index 5832c764e6f..b8fa938f9f4 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (MedEvac).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (MedEvac).blk	
@@ -62,5 +62,5 @@ IS Level 3
 VTOL
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (SL).blk b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (SL).blk
index 933ce207777..3c32dbe446c 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (SL).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (SL).blk	
@@ -58,5 +58,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (SRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (SRM).blk
index 15dbf5f9a44..308cc128d8e 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL (SRM).blk	
@@ -60,5 +60,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL.blk b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL.blk
index 5a9d707f573..bc4aa47e495 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Kestrel VTOL.blk	
@@ -64,5 +64,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/LRM Carrier (3055 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/LRM Carrier (3055 Upgrade).blk
index 0323241677b..83c6cfd4367 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/LRM Carrier (3055 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/LRM Carrier (3055 Upgrade).blk	
@@ -126,7 +126,7 @@ TARGETING:FireScan with IndirecTrack
 </systemManufacturers>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/LRM Carrier (WoB).blk b/megamek/data/mechfiles/vehicles/3058Uu/LRM Carrier (WoB).blk
index cfa2c9b70d2..08fb14c1246 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/LRM Carrier (WoB).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/LRM Carrier (WoB).blk	
@@ -126,7 +126,7 @@ TARGETING:FireScan with IndirecTrack
 </systemManufacturers>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/MRM Carrier.blk b/megamek/data/mechfiles/vehicles/3058Uu/MRM Carrier.blk
index 4ae1cdae9dd..19306095786 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/MRM Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/MRM Carrier.blk	
@@ -120,7 +120,7 @@ TARGETING:FireScan with IndirecTrack
 </systemManufacturers>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (BA).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (BA).blk
index d8a6c22c957..8bfa33b6a9a 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (BA).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (BA).blk	
@@ -59,5 +59,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Basic).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Basic).blk
index e67edfd67eb..7bb0d5dd436 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Basic).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Basic).blk	
@@ -59,5 +59,5 @@ IS Level 1
 Hover
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Fusion).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Fusion).blk
index 5183dcf54c8..157819be0dd 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Fusion).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Fusion).blk	
@@ -56,5 +56,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Intermediate).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Intermediate).blk
index 6598b682247..4281fc49ab3 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Intermediate).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (Intermediate).blk	
@@ -59,5 +59,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (MG).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (MG).blk
index 3b57e9cf04a..ae8c41a2049 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maultier Hover APC (MG).blk	
@@ -59,5 +59,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim (I) Heavy Hover Transport (Company Command).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim (I) Heavy Hover Transport (Company Command).blk
index b0b56813d49..9473ec21556 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim (I) Heavy Hover Transport (Company Command).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim (I) Heavy Hover Transport (Company Command).blk	
@@ -63,7 +63,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim (I) Heavy Hover Transport.blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim (I) Heavy Hover Transport.blk
index d54fb951c7b..7e954aedc7d 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim (I) Heavy Hover Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim (I) Heavy Hover Transport.blk	
@@ -63,7 +63,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (3052 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (3052 Upgrade).blk
index 2ef21a8ad1c..458a38b4a09 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (3052 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (3052 Upgrade).blk	
@@ -76,7 +76,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Anti-Personnel).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Anti-Personnel).blk
index 51bb96fc428..12ac9ead86f 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Anti-Personnel).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Anti-Personnel).blk	
@@ -79,7 +79,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (BA Factory Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (BA Factory Upgrade).blk
index 145be57dc09..12c6e45f3da 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (BA Factory Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (BA Factory Upgrade).blk	
@@ -75,7 +75,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (BA Field Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (BA Field Upgrade).blk
index d47a080e4b2..954119e29aa 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (BA Field Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (BA Field Upgrade).blk	
@@ -73,7 +73,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (C3M).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (C3M).blk
index 0f6e58eab49..4375f007e5e 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (C3M).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (C3M).blk	
@@ -70,7 +70,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (C3S).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (C3S).blk
index 0843cb184f4..4ec00196196 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (C3S).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (C3S).blk	
@@ -74,7 +74,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Clan).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Clan).blk
index 034dbaccb2c..2158416c212 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Clan).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Clan).blk	
@@ -104,7 +104,7 @@ CLStreakSRM6
 </Turret Equipment>
 
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
@@ -116,7 +116,7 @@ PETROCHEMICALS
 </fuelType>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Fire Support).blk b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Fire Support).blk
index 1188884ba78..fc0e9db7fad 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Fire Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Maxim Heavy Hover Transport (Fire Support).blk	
@@ -69,7 +69,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Ontos Heavy Tank (3053 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Ontos Heavy Tank (3053 Upgrade).blk
index e9fc6f9b2b1..216886b77dc 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Ontos Heavy Tank (3053 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Ontos Heavy Tank (3053 Upgrade).blk	
@@ -135,7 +135,7 @@ TARGETING:GuideRite with Laser Coordination Link and Artemis FCS
 </systemManufacturers>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Ontos Heavy Tank (Light Gauss).blk b/megamek/data/mechfiles/vehicles/3058Uu/Ontos Heavy Tank (Light Gauss).blk
index 5b93f03e6e1..46bb93f568d 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Ontos Heavy Tank (Light Gauss).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Ontos Heavy Tank (Light Gauss).blk	
@@ -126,7 +126,7 @@ TARGETING:GuideRite with Laser Coordination Link and Artemis FCS
 </systemManufacturers>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Padilla Heavy Artillery Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Padilla Heavy Artillery Tank (LRM).blk
index 42401c92afe..ca27050b128 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Padilla Heavy Artillery Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Padilla Heavy Artillery Tank (LRM).blk	
@@ -82,6 +82,6 @@ LRM 20
 </Rear Equipment>
 
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
 
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Company Command).blk b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Company Command).blk
index b8d5402d0fc..b8f05763086 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Company Command).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Company Command).blk	
@@ -66,5 +66,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Lance Command).blk b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Lance Command).blk
index 2cc0796e8c0..12bfcf8a880 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Lance Command).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Lance Command).blk	
@@ -65,5 +65,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Quad RAC).blk b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Quad RAC).blk
index 71355054b53..049c62085b8 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Quad RAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (Quad RAC).blk	
@@ -64,5 +64,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (RAC).blk b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (RAC).blk
index 3ff56443062..29324aaf8ff 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (RAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (RAC).blk	
@@ -65,5 +65,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (XL).blk b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (XL).blk
index f240e4a58ef..b6a1fb12182 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (XL).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank (XL).blk	
@@ -66,5 +66,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank.blk
index bcb51da32d5..45a6c48bad4 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Air Defense Tank.blk	
@@ -64,5 +64,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Heavy Tank (C3).blk b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Heavy Tank (C3).blk
index 440b8775d53..57cbe7ef529 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Partisan Heavy Tank (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Partisan Heavy Tank (C3).blk	
@@ -86,7 +86,7 @@ Autocannon/5
 </Turret Equipment>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Patton Tank (Ultra).blk b/megamek/data/mechfiles/vehicles/3058Uu/Patton Tank (Ultra).blk
index 422d6078772..cbff9bb6c0c 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Patton Tank (Ultra).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Patton Tank (Ultra).blk	
@@ -69,7 +69,7 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
 
 <capabilities>
@@ -104,7 +104,7 @@ TARGETING:TharHes Mars5
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (3058 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (3058 Upgrade).blk
index 3c291402cd1..7428dac361c 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (3058 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (3058 Upgrade).blk	
@@ -64,7 +64,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (C3).blk b/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (C3).blk
index 184b1536568..87f538e5238 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (C3).blk	
@@ -62,7 +62,7 @@ Hover
 </motion_type>
 
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (MRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (MRM).blk
index 408b02ffda2..75487ccf771 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (MRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Pegasus Scout Hover Tank (MRM).blk	
@@ -64,7 +64,7 @@ Hover
 </motion_type>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL (Cargo).blk b/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL (Cargo).blk
index a76e9373deb..f00cfdd0b1b 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL (Cargo).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL (Cargo).blk	
@@ -60,5 +60,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL (Kurita).blk b/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL (Kurita).blk
index eed4b10f8b9..a3a6ca3b1e7 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL (Kurita).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL (Kurita).blk	
@@ -60,5 +60,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL.blk b/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL.blk
index e6910536028..bbfb9300036 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Peregrine Attack VTOL.blk	
@@ -68,5 +68,5 @@ IS Level 1
 VTOL
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Pilum Heavy Tank (Arrow IV).blk b/megamek/data/mechfiles/vehicles/3058Uu/Pilum Heavy Tank (Arrow IV).blk
index 9af335ff421..b3f43288c68 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Pilum Heavy Tank (Arrow IV).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Pilum Heavy Tank (Arrow IV).blk	
@@ -67,5 +67,5 @@ IS Level 3
 Wheeled
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Pilum Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Pilum Heavy Tank.blk
index 9012baeacd6..b323115b9f2 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Pilum Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Pilum Heavy Tank.blk	
@@ -69,5 +69,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank (SSRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank (SSRM).blk
index 65edc7cb0e3..3e9ffa7f224 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank (SSRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank (SSRM).blk	
@@ -63,5 +63,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank (Scout).blk b/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank (Scout).blk
index 2645bd48cc4..81f28c5707c 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank (Scout).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank (Scout).blk	
@@ -79,6 +79,6 @@ SRM 6
 </Turret Equipment>
 
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
 
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank.blk
index 21753dbbc5b..d7a26c061f2 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Plainsman Medium Hovertank.blk	
@@ -63,5 +63,5 @@ IS Level 1
 Hover
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank (LB-X).blk b/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank (LB-X).blk
index 139be740e18..56be5175f80 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank (LB-X).blk	
@@ -64,5 +64,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank (Light Gauss).blk b/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank (Light Gauss).blk
index 0dea0309248..966de205676 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank (Light Gauss).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank (Light Gauss).blk	
@@ -68,5 +68,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank.blk
index 444f01fd24e..428a4c5f128 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Po Heavy Tank.blk	
@@ -63,5 +63,5 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank (Arrow IV).blk b/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank (Arrow IV).blk
index b92b68082a1..ce2b7fdbe94 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank (Arrow IV).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank (Arrow IV).blk	
@@ -59,5 +59,5 @@ IS Level 3
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank (RAC).blk b/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank (RAC).blk
index 4a186151af0..efed4afc188 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank (RAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank (RAC).blk	
@@ -62,5 +62,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank.blk
index 6c0e147e8fd..06018741daa 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Regulator Hovertank.blk	
@@ -58,5 +58,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Rommel Tank (Gauss).blk b/megamek/data/mechfiles/vehicles/3058Uu/Rommel Tank (Gauss).blk
index c6459244949..b52a2c9d127 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Rommel Tank (Gauss).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Rommel Tank (Gauss).blk	
@@ -102,7 +102,7 @@ TARGETING:TharHes Mars5
 </systemManufacturers>
 
 <source>
-TRO 3039 - Clan Invasion
+TRO: 3039 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (3054 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (3054 Upgrade).blk
index 56015747d20..082b2e53380 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (3054 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (3054 Upgrade).blk	
@@ -127,7 +127,7 @@ TARGETING:FireScan with IndirecTrack
 </systemManufacturers>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (C3).blk b/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (C3).blk
index 62013ea2109..8d87766e484 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (C3).blk	
@@ -84,7 +84,7 @@ SRM 6
 </Front Equipment>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (WoB).blk b/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (WoB).blk
index 99dcb29b008..8b06ad8f8ba 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (WoB).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/SRM Carrier (WoB).blk	
@@ -132,7 +132,7 @@ TARGETING:FireScan with IndirecTrack
 </systemManufacturers>
 
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (Clan Cargo).blk b/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (Clan Cargo).blk
index 6b3f6a89e0d..3b6e4edef0b 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (Clan Cargo).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (Clan Cargo).blk	
@@ -92,7 +92,7 @@ Cargo (1 ton)
 </Rear Equipment>
 
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (LB-X).blk b/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (LB-X).blk
index caaf40fb1d9..1fc14e38cd5 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (LB-X).blk	
@@ -58,5 +58,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (Ultra).blk b/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (Ultra).blk
index 92b8c864623..ab887ea15e5 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (Ultra).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Saladin Assault Hover Tank (Ultra).blk	
@@ -57,5 +57,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Saracen Medium Hover Tank (MRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Saracen Medium Hover Tank (MRM).blk
index 75c8687d1a3..f2ed43b1fa5 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Saracen Medium Hover Tank (MRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Saracen Medium Hover Tank (MRM).blk	
@@ -60,5 +60,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Scimitar Medium Hover Tank (TAG).blk b/megamek/data/mechfiles/vehicles/3058Uu/Scimitar Medium Hover Tank (TAG).blk
index b217432a4df..27e9cc6c466 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Scimitar Medium Hover Tank (TAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Scimitar Medium Hover Tank (TAG).blk	
@@ -62,5 +62,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Scorpion Light Tank (MRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Scorpion Light Tank (MRM).blk
index 5a4752d1e2f..4062fdf71fb 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Scorpion Light Tank (MRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Scorpion Light Tank (MRM).blk	
@@ -62,5 +62,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (C3).blk b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (C3).blk
index 45b7500480a..173bb3087af 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (C3).blk	
@@ -55,5 +55,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (C3i).blk b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (C3i).blk
index bb4d5c48283..763baf6b91b 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (C3i).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (C3i).blk	
@@ -54,5 +54,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (Laser).blk b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (Laser).blk
index bf1aec09f6c..92a1fb2d52c 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (Laser).blk	
@@ -55,5 +55,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (Troop Transport).blk b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (Troop Transport).blk
index 52f44cc67b8..ac4c052fbc0 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (Troop Transport).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter (Troop Transport).blk	
@@ -56,5 +56,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter.blk b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter.blk
index 57b04f7348f..91326f943ac 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Sprint Scout Helicopter.blk	
@@ -58,5 +58,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (3053 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (3053 Upgrade).blk
index 1af405853c8..f703f71e12d 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (3053 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (3053 Upgrade).blk	
@@ -61,5 +61,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (3061 Upgrade).blk b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (3061 Upgrade).blk
index ec8a0c17e32..15602f78d01 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (3061 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (3061 Upgrade).blk	
@@ -62,5 +62,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Ammo).blk b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Ammo).blk
index 13f1fd647f9..6e13113ce90 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Ammo).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Ammo).blk	
@@ -61,5 +61,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Laser).blk b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Laser).blk
index 32054e23bea..7b287b9fc48 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Laser).blk	
@@ -62,5 +62,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Narc).blk b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Narc).blk
index 4d9ca0c9b47..0cb77568950 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Narc).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Striker Light Tank (Narc).blk	
@@ -62,5 +62,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (C3).blk b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (C3).blk
index cd4cc5c74ca..043f03badac 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (C3).blk	
@@ -67,5 +67,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (MRM).blk b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (MRM).blk
index aef62b89ef1..f11cbda0550 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (MRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (MRM).blk	
@@ -68,5 +68,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (Streak).blk b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (Streak).blk
index 68dd6879eb4..ab51fd9cd81 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (Streak).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank (Streak).blk	
@@ -65,5 +65,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank TKG-150.blk b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank TKG-150.blk
index 14d3cc9a9b6..62c76fc1c19 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank TKG-150.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank TKG-150.blk	
@@ -64,5 +64,5 @@ IS Level 1
 Wheeled
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank TKG-151.blk b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank TKG-151.blk
index b9f7f651d0b..98c6b693a9f 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank TKG-151.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank TKG-151.blk	
@@ -64,6 +64,4 @@ IS Level 1
 <motion_type>
 Wheeled
 </motion_type>
-<source>
-Succession Wars
-</source>
+<source>TRO 3058 - Succession Wars</source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank.blk
index 9c28183c851..4467825a8c9 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Tokugawa Heavy Tank.blk	
@@ -67,5 +67,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (LB-X).blk b/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (LB-X).blk
index 5f7c9d7c588..a1eb7ab07d4 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (LB-X).blk	
@@ -70,5 +70,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (RAC).blk b/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (RAC).blk
index 0a708b735d5..b61b270f9b0 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (RAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (RAC).blk	
@@ -71,5 +71,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (Tracked).blk b/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (Tracked).blk
index a049d6aa51a..645655a1db6 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (Tracked).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle (Tracked).blk	
@@ -74,5 +74,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle.blk b/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle.blk
index 8e33b8f2790..2ec26deec1d 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Typhoon Urban Assault Vehicle.blk	
@@ -74,5 +74,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (LB-X).blk b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (LB-X).blk
index 9fcfe1680e8..3f3358c2842 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (LB-X).blk	
@@ -121,7 +121,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (Light Gauss).blk b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (Light Gauss).blk
index d15abb06013..3c92569e88e 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (Light Gauss).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (Light Gauss).blk	
@@ -119,7 +119,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO 3058 - Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (NETC).blk b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (NETC).blk
index 5e4b87fc7dd..30cd7c43c5f 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (NETC).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (NETC).blk	
@@ -121,7 +121,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (RAC).blk b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (RAC).blk
index cd8e6959727..6c0df5f59a0 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (RAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (RAC).blk	
@@ -112,7 +112,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (Ultra).blk b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (Ultra).blk
index 9a1eb1b7e94..e7162f8aa45 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (Ultra).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank (Ultra).blk	
@@ -119,7 +119,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank Doris Delight.blk b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank Doris Delight.blk
index 583c682dd94..bcd883c5fbe 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank Doris Delight.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Vedette Medium Tank Doris Delight.blk	
@@ -121,7 +121,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO 3058 - Civil War
+TRO: 3058 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Warrior H-8 Attack Helicopter.blk b/megamek/data/mechfiles/vehicles/3058Uu/Warrior H-8 Attack Helicopter.blk
index b6b9ad22227..93e65a0790a 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Warrior H-8 Attack Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Warrior H-8 Attack Helicopter.blk	
@@ -122,7 +122,7 @@ TARGETING:N&D Handsfree
 </systemManufacturers>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Warrior H-9 Attack Helicopter.blk b/megamek/data/mechfiles/vehicles/3058Uu/Warrior H-9 Attack Helicopter.blk
index 4772de019b4..0626a610e29 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Warrior H-9 Attack Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Warrior H-9 Attack Helicopter.blk	
@@ -119,7 +119,7 @@ TARGETING:N&D Handsfree
 </systemManufacturers>
 
 <source>
-TRO 3058 - Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (Ammo).blk b/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (Ammo).blk
index 0931e5be1fe..51050950748 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (Ammo).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (Ammo).blk	
@@ -59,5 +59,5 @@ IS
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (Arrow IV).blk b/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (Arrow IV).blk
index 3402668c4bd..75eab96ed2b 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (Arrow IV).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (Arrow IV).blk	
@@ -59,5 +59,5 @@ IS Level 3
 VTOL
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (RAC).blk b/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (RAC).blk
index 4fd5b5aef1f..aaf3fb667cf 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (RAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship (RAC).blk	
@@ -60,5 +60,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Civil War
+TRO: 3058 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship.blk b/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship.blk
index b92f4cd3d12..a74da0bbcec 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Yellow Jacket Gunship.blk	
@@ -61,5 +61,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3058 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Zhukov Heavy Tank (WoB).blk b/megamek/data/mechfiles/vehicles/3058Uu/Zhukov Heavy Tank (WoB).blk
index 870794e6648..20be8b76846 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Zhukov Heavy Tank (WoB).blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Zhukov Heavy Tank (WoB).blk	
@@ -86,7 +86,7 @@ ISLargeVSPLaser
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3058 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3058Uu/Zhukov Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3058Uu/Zhukov Heavy Tank.blk
index 8c73214bb48..970d54c142a 100644
--- a/megamek/data/mechfiles/vehicles/3058Uu/Zhukov Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3058Uu/Zhukov Heavy Tank.blk	
@@ -63,5 +63,5 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-Succession Wars
+TRO 3058 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Anhur Transport (BA).blk b/megamek/data/mechfiles/vehicles/3060u/Anhur Transport (BA).blk
index dfae6050f9f..613d8ef62cb 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Anhur Transport (BA).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Anhur Transport (BA).blk	
@@ -90,7 +90,7 @@ CLAPGaussRifle
 </Rotor Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Ares Medium Tank (Plasma).blk b/megamek/data/mechfiles/vehicles/3060u/Ares Medium Tank (Plasma).blk
index 554f145341e..fa801507745 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Ares Medium Tank (Plasma).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Ares Medium Tank (Plasma).blk	
@@ -89,7 +89,7 @@ CLPlasmaCannon
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Ares Medium Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Ares Medium Tank.blk
index 393b9bd7e23..7e7c20c11d7 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Ares Medium Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Ares Medium Tank.blk	
@@ -87,7 +87,7 @@ CLERLargeLaser
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Asshur Artillery Spotter.blk b/megamek/data/mechfiles/vehicles/3060u/Asshur Artillery Spotter.blk
index b854d3dd24f..2c0d128b1c3 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Asshur Artillery Spotter.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Asshur Artillery Spotter.blk	
@@ -85,7 +85,7 @@ CLStreakSRM6
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Asshur Fast Reconnaissance Vehicle (PAC).blk b/megamek/data/mechfiles/vehicles/3060u/Asshur Fast Reconnaissance Vehicle (PAC).blk
index fdb385c789b..29761eeb60d 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Asshur Fast Reconnaissance Vehicle (PAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Asshur Fast Reconnaissance Vehicle (PAC).blk	
@@ -75,5 +75,5 @@ Hover
 </motion_type>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Asshur Fast Reconnaissance Vehicle.blk b/megamek/data/mechfiles/vehicles/3060u/Asshur Fast Reconnaissance Vehicle.blk
index 4a43a8b5859..0cc0c76be33 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Asshur Fast Reconnaissance Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Asshur Fast Reconnaissance Vehicle.blk	
@@ -86,7 +86,7 @@ CLERMediumLaser
 </Turret Equipment>
 
 <source>
-RS 3060U
+RS 3060U - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Athena Combat Vehicle (HAG).blk b/megamek/data/mechfiles/vehicles/3060u/Athena Combat Vehicle (HAG).blk
index 9d523c7bba9..33930f6619e 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Athena Combat Vehicle (HAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Athena Combat Vehicle (HAG).blk	
@@ -93,7 +93,7 @@ CLAPGaussRifle
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Athena Combat Vehicle.blk b/megamek/data/mechfiles/vehicles/3060u/Athena Combat Vehicle.blk
index d4d0e230446..9a787c63a49 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Athena Combat Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Athena Combat Vehicle.blk	
@@ -93,7 +93,7 @@ CLMG
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (BAP).blk b/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (BAP).blk
index 4f63ec7a254..3fedfb34f23 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (BAP).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (BAP).blk	
@@ -64,5 +64,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (MML).blk b/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (MML).blk
index 761e9a3279e..4fced485ec6 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (MML).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (MML).blk	
@@ -61,5 +61,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (Speed).blk b/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (Speed).blk
index cb7372ecbb0..adca61be10e 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (Speed).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Chevalier Light Tank (Speed).blk	
@@ -81,7 +81,7 @@ ISERLargeLaser
 </Turret Equipment>
 
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Demolisher II Heavy Tank (Thunderbolt).blk b/megamek/data/mechfiles/vehicles/3060u/Demolisher II Heavy Tank (Thunderbolt).blk
index ff90a146ee5..b05d6cd6f17 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Demolisher II Heavy Tank (Thunderbolt).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Demolisher II Heavy Tank (Thunderbolt).blk	
@@ -89,7 +89,7 @@ Tracked
 </motion_type>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Demolisher II Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Demolisher II Heavy Tank.blk
index cae73021a9b..eee0c1cbbdc 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Demolisher II Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Demolisher II Heavy Tank.blk	
@@ -73,7 +73,7 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter (Close Support).blk b/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter (Close Support).blk
index 007c41b8a34..57fbdbd57ac 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter (Close Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter (Close Support).blk	
@@ -86,7 +86,7 @@ CLMastMount
 </Rotor Equipment>
 
 <source>
-Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter (Recon).blk b/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter (Recon).blk
index b7fa1f4662c..d60e9b7c367 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter (Recon).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter (Recon).blk	
@@ -83,7 +83,7 @@ CLTAG
 </Rotor Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter.blk b/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter.blk
index 78f3da41865..fee281b3a16 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Donar Assault Helicopter.blk	
@@ -84,7 +84,7 @@ CLStreakSRM2
 </Rotor Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank A.blk b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank A.blk
index c5e186a2cd3..d036abbc30c 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank A.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank A.blk	
@@ -97,7 +97,7 @@ CLLRM20:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank B.blk b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank B.blk
index 5c248b089bc..df34742ef51 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank B.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank B.blk	
@@ -94,7 +94,7 @@ CLUltraAC10:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank C.blk b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank C.blk
index e481f79b46e..c25083acaae 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank C.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank C.blk	
@@ -93,7 +93,7 @@ CLStreakSRM6:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank D.blk b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank D.blk
index be7f7020d10..9dbf1af5ec7 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank D.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank D.blk	
@@ -95,7 +95,7 @@ CLCASE:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank E.blk b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank E.blk
index b4bccdc6505..daa91977276 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank E.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank E.blk	
@@ -101,7 +101,7 @@ CLCASE:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank Prime.blk b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank Prime.blk
index a2d3bed491e..727bb8d572b 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Epona Pursuit Tank Prime.blk	
@@ -94,7 +94,7 @@ CLStreakSRM4:OMNI
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Gladius Medium Hover Tank Mk II.blk b/megamek/data/mechfiles/vehicles/3060u/Gladius Medium Hover Tank Mk II.blk
index 2c04732078a..c0835f501d6 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Gladius Medium Hover Tank Mk II.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Gladius Medium Hover Tank Mk II.blk	
@@ -69,5 +69,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Gladius Medium Hover Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Gladius Medium Hover Tank.blk
index 8fbf0d045be..17ac62b809e 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Gladius Medium Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Gladius Medium Hover Tank.blk	
@@ -60,5 +60,5 @@ IS Level 1
 Hover
 </motion_type>
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank (AAA).blk b/megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank (AAA).blk
index 34d64a2f1ca..0cd6e01e02e 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank (AAA).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank (AAA).blk	
@@ -89,7 +89,7 @@ CLCASE
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank.blk
index 81dc51fb9ec..53a87343db4 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Hachiman Fire Support Tank.blk	
@@ -92,7 +92,7 @@ CLArtemisIV
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship (Armor).blk b/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship (Armor).blk
index 625f5f03aec..709b2af7c6f 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship (Armor).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship (Armor).blk	
@@ -81,7 +81,7 @@ ISLightGaussRifle
 </Rotor Equipment>
 
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship (Thunderbolt).blk b/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship (Thunderbolt).blk
index 8c34cd46e03..530eabfd70d 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship (Thunderbolt).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship (Thunderbolt).blk	
@@ -75,5 +75,5 @@ VTOL
 </motion_type>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship.blk b/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship.blk
index 14fcb697a41..4a7b3fe198c 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Hawk Moth Gunship.blk	
@@ -82,7 +82,7 @@ ISLightGaussRifle
 </Rotor Equipment>
 
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Heavy Hover APC (Scout Tank).blk b/megamek/data/mechfiles/vehicles/3060u/Heavy Hover APC (Scout Tank).blk
index bf4c715e7a1..33fe790f6b5 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Heavy Hover APC (Scout Tank).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Heavy Hover APC (Scout Tank).blk	
@@ -115,5 +115,5 @@ Hover
 </motion_type>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Heavy LRM Carrier.blk b/megamek/data/mechfiles/vehicles/3060u/Heavy LRM Carrier.blk
index 54ca45132c4..1c7de5a0c75 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Heavy LRM Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Heavy LRM Carrier.blk	
@@ -67,5 +67,5 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Heavy MML Carrier.blk b/megamek/data/mechfiles/vehicles/3060u/Heavy MML Carrier.blk
index 5d2ce5e6e9e..34916ddd22d 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Heavy MML Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Heavy MML Carrier.blk	
@@ -93,5 +93,5 @@ ISMML9
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Heavy Wheeled APC (WoB).blk b/megamek/data/mechfiles/vehicles/3060u/Heavy Wheeled APC (WoB).blk
index 7ed5d8b4a0a..8169dfc3cd2 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Heavy Wheeled APC (WoB).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Heavy Wheeled APC (WoB).blk	
@@ -118,5 +118,5 @@ TroopSpace:6
 </transporters>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Huitzilopochtli Assault Tank 'Huey' (AAA).blk b/megamek/data/mechfiles/vehicles/3060u/Huitzilopochtli Assault Tank 'Huey' (AAA).blk
index d5b9e088d4b..682af398d16 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Huitzilopochtli Assault Tank 'Huey' (AAA).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Huitzilopochtli Assault Tank 'Huey' (AAA).blk	
@@ -99,7 +99,7 @@ CLCASE
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Indra Infantry Transport (BA).blk b/megamek/data/mechfiles/vehicles/3060u/Indra Infantry Transport (BA).blk
index c9088a94a62..d9407357d51 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Indra Infantry Transport (BA).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Indra Infantry Transport (BA).blk	
@@ -96,7 +96,7 @@ CLCASE
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Indra Infantry Transport.blk b/megamek/data/mechfiles/vehicles/3060u/Indra Infantry Transport.blk
index f0bff00935e..c26538d31b4 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Indra Infantry Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Indra Infantry Transport.blk	
@@ -90,7 +90,7 @@ CLMG
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Ishtar Heavy Fire Support Tank (Gauss).blk b/megamek/data/mechfiles/vehicles/3060u/Ishtar Heavy Fire Support Tank (Gauss).blk
index ed1567cfbbd..b4b17812ee6 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Ishtar Heavy Fire Support Tank (Gauss).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Ishtar Heavy Fire Support Tank (Gauss).blk	
@@ -92,7 +92,7 @@ CLGaussRifle
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Ishtar Heavy Fire Support Tank (Original).blk b/megamek/data/mechfiles/vehicles/3060u/Ishtar Heavy Fire Support Tank (Original).blk
index 205f36316d6..714d9ffe90a 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Ishtar Heavy Fire Support Tank (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Ishtar Heavy Fire Support Tank (Original).blk	
@@ -89,7 +89,7 @@ CLUltraAC10
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Ku Wheeled Assault Tank (IFV).blk b/megamek/data/mechfiles/vehicles/3060u/Ku Wheeled Assault Tank (IFV).blk
index 3909d971c7c..18349828e55 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Ku Wheeled Assault Tank (IFV).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Ku Wheeled Assault Tank (IFV).blk	
@@ -90,7 +90,7 @@ CLAPGaussRifle
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Ku Wheeled Assault Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Ku Wheeled Assault Tank.blk
index 4c0ea644314..369e061ddf0 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Ku Wheeled Assault Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Ku Wheeled Assault Tank.blk	
@@ -87,7 +87,7 @@ CLUltraAC10
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Light SRM Carrier.blk b/megamek/data/mechfiles/vehicles/3060u/Light SRM Carrier.blk
index 5679d3417a1..1ffb498e751 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Light SRM Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Light SRM Carrier.blk	
@@ -63,5 +63,5 @@ IS Level 1
 Wheeled
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Light Thunderbolt Carrier.blk b/megamek/data/mechfiles/vehicles/3060u/Light Thunderbolt Carrier.blk
index ae0ca0654a3..0c563d68a1b 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Light Thunderbolt Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Light Thunderbolt Carrier.blk	
@@ -63,5 +63,5 @@ IS Level 3
 Wheeled
 </motion_type>
 <source>
-TRO 3060
+TRO: 3060
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Mantis Light Attack VTOL (ECCM).blk b/megamek/data/mechfiles/vehicles/3060u/Mantis Light Attack VTOL (ECCM).blk
index 845b860e0ee..677c9c497a0 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Mantis Light Attack VTOL (ECCM).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Mantis Light Attack VTOL (ECCM).blk	
@@ -73,5 +73,5 @@ VTOL
 </motion_type>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Mantis Light Attack VTOL.blk b/megamek/data/mechfiles/vehicles/3060u/Mantis Light Attack VTOL.blk
index 732d2992b66..6d1d8a0d4ff 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Mantis Light Attack VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Mantis Light Attack VTOL.blk	
@@ -64,5 +64,5 @@ VTOL
 </motion_type>
 
 <source>
-Civil War
+TRO: 3060 - Civil War
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (ATM).blk b/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (ATM).blk
index f944be10c47..82a6055fa8e 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (ATM).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (ATM).blk	
@@ -115,7 +115,7 @@ CLMG
 </Turret Equipment>
 
 <source>
-TRO 3060 - Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (HAG).blk b/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (HAG).blk
index 03330a752cc..39331529d1e 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (HAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (HAG).blk	
@@ -103,7 +103,7 @@ CLAPGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3060 - Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (XL).blk b/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (XL).blk
index 57a973fd6c0..d191542ffac 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (XL).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle (XL).blk	
@@ -101,7 +101,7 @@ CLGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3060 - Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle.blk b/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle.blk
index 51431b198bb..eb55c2bc631 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Mars Assault Vehicle.blk	
@@ -115,7 +115,7 @@ CLMG
 </Turret Equipment>
 
 <source>
-TRO 3060 - Succession Wars
+TRO: 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Mithras Light Tank (ERLL).blk b/megamek/data/mechfiles/vehicles/3060u/Mithras Light Tank (ERLL).blk
index 72df02d675a..c7c29456771 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Mithras Light Tank (ERLL).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Mithras Light Tank (ERLL).blk	
@@ -85,7 +85,7 @@ CLERLargeLaser
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Mithras Light Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Mithras Light Tank.blk
index daff0e161f4..68f7e3ea305 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Mithras Light Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Mithras Light Tank.blk	
@@ -84,7 +84,7 @@ CLUltraAC2
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Myrmidon Medium Tank Type 2.blk b/megamek/data/mechfiles/vehicles/3060u/Myrmidon Medium Tank Type 2.blk
index 43f5b18b781..ea3dbe7fb5c 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Myrmidon Medium Tank Type 2.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Myrmidon Medium Tank Type 2.blk	
@@ -89,7 +89,7 @@ ISPlasmaRifle
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Myrmidon Medium Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Myrmidon Medium Tank.blk
index f973b28b783..2c0858c73f1 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Myrmidon Medium Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Myrmidon Medium Tank.blk	
@@ -58,5 +58,5 @@ IS Level 1
 Tracked
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Odin Scout Tank (Spotter).blk b/megamek/data/mechfiles/vehicles/3060u/Odin Scout Tank (Spotter).blk
index 46df24392c8..730e0622073 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Odin Scout Tank (Spotter).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Odin Scout Tank (Spotter).blk	
@@ -88,7 +88,7 @@ CLNarcBeacon
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Odin Scout Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Odin Scout Tank.blk
index 8c1384b074b..979af41df4a 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Odin Scout Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Odin Scout Tank.blk	
@@ -86,7 +86,7 @@ CLStreakSRM2
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Oro Heavy Tank (HAG).blk b/megamek/data/mechfiles/vehicles/3060u/Oro Heavy Tank (HAG).blk
index fb97c1fe2e2..7342fd4c062 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Oro Heavy Tank (HAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Oro Heavy Tank (HAG).blk	
@@ -90,6 +90,6 @@ CLHAG30
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
diff --git a/megamek/data/mechfiles/vehicles/3060u/Oro Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Oro Heavy Tank.blk
index a0082193d04..307fccf8939 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Oro Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Oro Heavy Tank.blk	
@@ -85,7 +85,7 @@ CLLBXAC20
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Pinto Attack VTOL (WoB).blk b/megamek/data/mechfiles/vehicles/3060u/Pinto Attack VTOL (WoB).blk
index 33496826b5f..3f36256c3df 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Pinto Attack VTOL (WoB).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Pinto Attack VTOL (WoB).blk	
@@ -106,6 +106,6 @@ TroopSpace:6
 </transporters>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
diff --git a/megamek/data/mechfiles/vehicles/3060u/Pinto Attack VTOL.blk b/megamek/data/mechfiles/vehicles/3060u/Pinto Attack VTOL.blk
index 5f09efd94cf..781fc6d37e7 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Pinto Attack VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Pinto Attack VTOL.blk	
@@ -90,7 +90,7 @@ BeagleActiveProbe
 </Rotor Equipment>
 
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform A.blk b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform A.blk
index a546bbfcb3c..e781171d64d 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform A.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform A.blk	
@@ -107,7 +107,7 @@ MRM 10:OMNI
 </Turret Equipment>
 
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform B.blk b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform B.blk
index 7fe28b653dd..34a555097f6 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform B.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform B.blk	
@@ -108,7 +108,7 @@ ISArtemisIV:OMNI
 </Turret Equipment>
 
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform C.blk b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform C.blk
index 8c24138faf6..42216c373ed 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform C.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform C.blk	
@@ -93,7 +93,7 @@ Large Laser:OMNI
 </Turret Equipment>
 
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform D.blk b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform D.blk
index 8213eff6eb5..16fda526d55 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform D.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform D.blk	
@@ -103,7 +103,7 @@ ISRotaryAC5:OMNI
 </Turret Equipment>
 
 <source>
-Civil War
+TRO: 3060 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform E.blk b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform E.blk
index 517a4e07dc7..c61dc8dffc6 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform E.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform E.blk	
@@ -104,7 +104,7 @@ Light Auto Cannon/5:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform F.blk b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform F.blk
index d6b59fa5bac..b3f9caea0d6 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform F.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform F.blk	
@@ -108,7 +108,7 @@ ISERMediumLaser:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform Prime.blk b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform Prime.blk
index 4eba13974d2..1aa5e5b6a06 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Schiltron Mobile Fire-Support Platform Prime.blk	
@@ -105,7 +105,7 @@ Small Laser:OMNI
 </Turret Equipment>
 
 <source>
-Clan Invasion
+TRO: 3060 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Shamash Reconnaissance Vehicle (Flamer).blk b/megamek/data/mechfiles/vehicles/3060u/Shamash Reconnaissance Vehicle (Flamer).blk
index 4687672cde8..083726b38d2 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Shamash Reconnaissance Vehicle (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Shamash Reconnaissance Vehicle (Flamer).blk	
@@ -81,7 +81,7 @@ CLERFlamer
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Shamash Reconnaissance Vehicle.blk b/megamek/data/mechfiles/vehicles/3060u/Shamash Reconnaissance Vehicle.blk
index e6382b2f7b5..f2de1d7619b 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Shamash Reconnaissance Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Shamash Reconnaissance Vehicle.blk	
@@ -83,7 +83,7 @@ CLERSmallLaser
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle (ATM).blk b/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle (ATM).blk
index 4000b1914d5..f94ae80f607 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle (ATM).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle (ATM).blk	
@@ -92,7 +92,7 @@ CLCASE
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle (Original).blk b/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle (Original).blk
index fa89267509e..8ad3f6cdcba 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle (Original).blk	
@@ -93,7 +93,7 @@ CLStreakSRM4
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle.blk b/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle.blk
index 5d602218418..955ed05c6ea 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Svantovit Infantry Fighting Vehicle.blk	
@@ -93,7 +93,7 @@ CLStreakSRM2
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank (ATM).blk b/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank (ATM).blk
index 96decdde29f..27d8b4f9751 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank (ATM).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank (ATM).blk	
@@ -63,5 +63,5 @@ Clan Level 3
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3060 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank (Ammo).blk b/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank (Ammo).blk
index a094ec88e8d..b608277437a 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank (Ammo).blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank (Ammo).blk	
@@ -63,5 +63,5 @@ Clan Level 2
 Tracked
 </motion_type>
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank.blk b/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank.blk
index 5570306163f..85f8a1f99cc 100644
--- a/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3060u/Zorya Light Tank.blk	
@@ -63,5 +63,5 @@ Clan Level 2
 Tracked
 </motion_type>
 <source>
-Succession Wars
+TRO 3060 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Enyo Strike Tank Sholef.blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Enyo Strike Tank Sholef.blk
index 7f1d75adadf..ff44d907579 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Enyo Strike Tank Sholef.blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Enyo Strike Tank Sholef.blk	
@@ -93,7 +93,7 @@ CLSRM6
 </Turret Equipment>
 
 <source>
-RS 3067U
+RS 3067U - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Heimdall Ground Monitor Tank B.blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Heimdall Ground Monitor Tank B.blk
index 98e4cdcf98f..fe079dd2c3d 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Heimdall Ground Monitor Tank B.blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Heimdall Ground Monitor Tank B.blk	
@@ -94,7 +94,7 @@ CLLRM20:OMNI
 </Turret Equipment>
 
 <source>
-RS 3067U
+RS 3067U - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Heimdall Ground Monitor Tank C.blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Heimdall Ground Monitor Tank C.blk
index d5938f8136f..c3abb0c6aaf 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Heimdall Ground Monitor Tank C.blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Heimdall Ground Monitor Tank C.blk	
@@ -92,7 +92,7 @@ CLMediumPulseLaser:OMNI
 </Turret Equipment>
 
 <source>
-RS 3067U
+RS 3067U - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Hephaestus Scout Tank D.blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Hephaestus Scout Tank D.blk
index a7d64681aa3..04587c9187c 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Hephaestus Scout Tank D.blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Hephaestus Scout Tank D.blk	
@@ -102,7 +102,7 @@ CLERMediumLaser:OMNI
 </Turret Equipment>
 
 <source>
-RS 3067U
+RS 3067U - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Morrigu Fire Support Vehicle (HAG).blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Morrigu Fire Support Vehicle (HAG).blk
index ddfa121a188..44a1a52e9dd 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Morrigu Fire Support Vehicle (HAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Morrigu Fire Support Vehicle (HAG).blk	
@@ -88,7 +88,7 @@ CLLRM15
 </Turret Equipment>
 
 <source>
-RS 3067U
+RS 3067U - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Shoden Assault Vehicle LB-X.blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Shoden Assault Vehicle LB-X.blk
index a64c35bef72..c3cefd17bf6 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Shoden Assault Vehicle LB-X.blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Shoden Assault Vehicle LB-X.blk	
@@ -93,7 +93,7 @@ CLLBXAC10
 </Turret Equipment>
 
 <source>
-RS 3067U
+RS 3067U - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Tyr Infantry Support Tank (Kurita).blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Tyr Infantry Support Tank (Kurita).blk
index 2c260738ff0..caaab81c2a1 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Tyr Infantry Support Tank (Kurita).blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/Clan Vehicles/Tyr Infantry Support Tank (Kurita).blk	
@@ -82,7 +82,7 @@ Light Machine Gun
 </Turret Equipment>
 
 <source>
-RS 3067U
+RS 3067U - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Ajax Assault Tank C.blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Ajax Assault Tank C.blk
index 5cad5bae942..fa97116fff3 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Ajax Assault Tank C.blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Ajax Assault Tank C.blk	
@@ -132,5 +132,5 @@ TARGETING:Sync Tracker (39-42071)
 </systemManufacturers>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Ajax Assault Tank D.blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Ajax Assault Tank D.blk
index 703576807eb..ca0e5d94a88 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Ajax Assault Tank D.blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Ajax Assault Tank D.blk	
@@ -141,5 +141,5 @@ TARGETING:Sync Tracker (39-42071)
 </systemManufacturers>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Glaive Medium Tank (MFB).blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Glaive Medium Tank (MFB).blk
index 3560284f385..b6a0137da06 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Glaive Medium Tank (MFB).blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Glaive Medium Tank (MFB).blk	
@@ -76,7 +76,7 @@ ISLimitedAmphibiousChassis
 </Rear Equipment>
 
 <source>
-TRO 3067 - Jihad
+TRO: 3067 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Musketeer Hover Tank (3080 Upgrade).blk b/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Musketeer Hover Tank (3080 Upgrade).blk
index 92ad573b1f4..91e5e96be39 100644
--- a/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Musketeer Hover Tank (3080 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3067 Unabridged/IS Vehicles/Musketeer Hover Tank (3080 Upgrade).blk	
@@ -89,7 +89,7 @@ ISRotaryAC5
 </Turret Equipment>
 
 <source>
-TRO 3067 U
+TRO: 3067 U
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank A.blk b/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank A.blk
index b8b91b69d41..9ccc9bfa395 100644
--- a/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank A.blk	
+++ b/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank A.blk	
@@ -135,5 +135,5 @@ TARGETING:Sync Tracker (39-42071)
 </systemManufacturers>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank B.blk b/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank B.blk
index 722a91f504d..901a457fe8a 100644
--- a/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank B.blk	
+++ b/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank B.blk	
@@ -134,5 +134,5 @@ TARGETING:Sync Tracker (39-42071)
 </systemManufacturers>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank Prime.blk b/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank Prime.blk
index 0335313e246..77dddeb7f95 100644
--- a/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Ajax Assault Tank Prime.blk	
@@ -128,7 +128,7 @@ TARGETING:Sync Tracker (39-42071)
 </systemManufacturers>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Glaive Medium Tank.blk b/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Glaive Medium Tank.blk
index e2d54847c34..1d5dc4bc571 100644
--- a/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Glaive Medium Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3067/3067 IS Land/Glaive Medium Tank.blk	
@@ -86,7 +86,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3067 - Civil War
+TRO: 3067 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle (Cargo).blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle (Cargo).blk
index 6c35a635676..97c17e30a83 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle (Cargo).blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle (Cargo).blk	
@@ -97,7 +97,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle Reverse Buffel.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle Reverse Buffel.blk
index 7b3255827e8..2d1ee67f8f3 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle Reverse Buffel.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle Reverse Buffel.blk	
@@ -99,7 +99,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle.blk
index 9f07fdf4dc6..a7a07768939 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VII Engineering Support Vehicle.blk	
@@ -99,7 +99,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VIII Engineering Support Vehicle.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VIII Engineering Support Vehicle.blk
index 169f61193fa..138e3dccf99 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VIII Engineering Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Buffel VIII Engineering Support Vehicle.blk	
@@ -96,7 +96,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Dromedary Water Transport.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Dromedary Water Transport.blk
index e485cadb8fa..2191e5bbd9a 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Dromedary Water Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Dromedary Water Transport.blk	
@@ -107,7 +107,7 @@ Machine Gun
 </armor_tech_rating>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) DeConAid Trailer.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) DeConAid Trailer.blk
index fa39b98ca9a..588e3ecc17c 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) DeConAid Trailer.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) DeConAid Trailer.blk	
@@ -113,5 +113,5 @@ Tracked
 </motion_type>
 
 <source>
-TRO 3075 - Succession Wars
+TRO: 3075 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Oppie O-65.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Oppie O-65.blk
index 04dc2c26146..68219417536 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Oppie O-65.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Oppie O-65.blk	
@@ -107,7 +107,7 @@ Searchlight
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Succession Wars
+TRO: 3075 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Oppie O-66.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Oppie O-66.blk
index 4ed49cc83ca..313b20311b3 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Oppie O-66.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Oppie O-66.blk	
@@ -116,5 +116,5 @@ Tracked
 </motion_type>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Salvage Bed.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Salvage Bed.blk
index 365189cd408..c2d477e34e7 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Salvage Bed.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/HMRV (Hazardous Materials Recovery Vehicle) Salvage Bed.blk	
@@ -108,5 +108,5 @@ Tracked
 </motion_type>
 
 <source>
-TRO 3075 - Succession Wars
+TRO: 3075 - Succession Wars
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (Hoist).blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (Hoist).blk
index dea4e86d53c..7d0b87c3eab 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (Hoist).blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (Hoist).blk	
@@ -90,7 +90,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (MG).blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (MG).blk
index f246ec6004b..600cddb220b 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (MG).blk	
@@ -89,7 +89,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (ML).blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (ML).blk
index 81122d90a31..24551f17d3e 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (ML).blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (ML).blk	
@@ -88,7 +88,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (Q-Vehicle).blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (Q-Vehicle).blk
index 9376ce222c7..545424970e2 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (Q-Vehicle).blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50 (Q-Vehicle).blk	
@@ -98,7 +98,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50.blk
index 467881066ee..3677a720eef 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Jifty Transportable Field Repair Unit JI-50.blk	
@@ -89,7 +89,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Merkava Heavy Tank Mk VII.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Merkava Heavy Tank Mk VII.blk
index e8d7271a29b..db7d95cf2df 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Merkava Heavy Tank Mk VII.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Merkava Heavy Tank Mk VII.blk	
@@ -89,7 +89,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle (MFB).blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle (MFB).blk
index 3cfe34550e7..dab291b6a8c 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle (MFB).blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle (MFB).blk	
@@ -88,7 +88,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle.blk
index 137aa8569cc..aecbe260a28 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Paramour Mobile Repair Vehicle.blk	
@@ -89,7 +89,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Prometheus Combat Support Bridgelayer.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Prometheus Combat Support Bridgelayer.blk
index b346ff9c9e2..6e92b2d9575 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Prometheus Combat Support Bridgelayer.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Prometheus Combat Support Bridgelayer.blk	
@@ -87,7 +87,7 @@ HeavyBridgeLayer
 </Rear Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075 Support tanks/Transportable Field Repair Unit Nifty.blk b/megamek/data/mechfiles/vehicles/3075 Support tanks/Transportable Field Repair Unit Nifty.blk
index ecf55c2145a..2b5236bb754 100644
--- a/megamek/data/mechfiles/vehicles/3075 Support tanks/Transportable Field Repair Unit Nifty.blk	
+++ b/megamek/data/mechfiles/vehicles/3075 Support tanks/Transportable Field Repair Unit Nifty.blk	
@@ -89,7 +89,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Bellona  Hover Tank (Laser).blk b/megamek/data/mechfiles/vehicles/3075/Bellona  Hover Tank (Laser).blk
index d1474ff0186..01c0e33ff7a 100644
--- a/megamek/data/mechfiles/vehicles/3075/Bellona  Hover Tank (Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Bellona  Hover Tank (Laser).blk	
@@ -29,7 +29,7 @@ Bellona Hover Tank
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Bellona Hover Tank.blk b/megamek/data/mechfiles/vehicles/3075/Bellona Hover Tank.blk
index fc7d7465b1a..b65200cb0be 100644
--- a/megamek/data/mechfiles/vehicles/3075/Bellona Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Bellona Hover Tank.blk	
@@ -29,7 +29,7 @@ Bellona Hover Tank
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Cobra Transport VTOL (Command).blk b/megamek/data/mechfiles/vehicles/3075/Cobra Transport VTOL (Command).blk
index 42f8bd2c440..caf218c988a 100644
--- a/megamek/data/mechfiles/vehicles/3075/Cobra Transport VTOL (Command).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Cobra Transport VTOL (Command).blk	
@@ -29,7 +29,7 @@ Cobra Transport VTOL
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Star League
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Cobra Transport VTOL (MASH.).blk b/megamek/data/mechfiles/vehicles/3075/Cobra Transport VTOL (MASH.).blk
index 42ab6abe6c7..cedc91f8c3c 100644
--- a/megamek/data/mechfiles/vehicles/3075/Cobra Transport VTOL (MASH.).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Cobra Transport VTOL (MASH.).blk	
@@ -29,7 +29,7 @@ Cobra Transport VTOL
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Star League
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Condor Heavy Hover Tank (Upgrade Laser).blk b/megamek/data/mechfiles/vehicles/3075/Condor Heavy Hover Tank (Upgrade Laser).blk
index 02f262e5059..cbf203bc41f 100644
--- a/megamek/data/mechfiles/vehicles/3075/Condor Heavy Hover Tank (Upgrade Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Condor Heavy Hover Tank (Upgrade Laser).blk	
@@ -29,7 +29,7 @@ Condor Heavy Hover Tank
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Condor Heavy Hover Tank (Upgrade).blk b/megamek/data/mechfiles/vehicles/3075/Condor Heavy Hover Tank (Upgrade).blk
index f17c3d4c5c8..c5b80031f99 100644
--- a/megamek/data/mechfiles/vehicles/3075/Condor Heavy Hover Tank (Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Condor Heavy Hover Tank (Upgrade).blk	
@@ -29,7 +29,7 @@ Condor Heavy Hover Tank
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Civil War
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter 'Dragonfly'.blk b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter 'Dragonfly'.blk
index 377c6290793..6b85c3df3a0 100644
--- a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter 'Dragonfly'.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter 'Dragonfly'.blk	
@@ -114,7 +114,7 @@ TARGETING:Skyhunter IV with Forward-1 TAG and Wunderland Beagle Active Probe
 </systemManufacturers>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (C3).blk b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (C3).blk
index 260d9f8f295..adcee49ab02 100644
--- a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (C3).blk	
@@ -29,7 +29,7 @@ Crow Scout Helicopter
 </year>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
@@ -124,5 +124,5 @@ TARGETING:Skyhunter IV with Forward-1 TAG and Wunderland Beagle Active Probe
 </systemManufacturers>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (Export).blk b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (Export).blk
index 9dc1abf176f..b23ab4d2286 100644
--- a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (Export).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter (Export).blk	
@@ -29,7 +29,7 @@ Crow Scout Helicopter
 </year>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
@@ -126,5 +126,5 @@ TARGETING:Skyhunter IV with Forward-1 TAG and Wunderland Beagle Active Probe
 </systemManufacturers>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter.blk b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter.blk
index 1ad327597e5..f20ce14b001 100644
--- a/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Crow Scout Helicopter.blk	
@@ -29,7 +29,7 @@ Crow Scout Helicopter
 </year>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
@@ -108,5 +108,5 @@ TARGETING:Skyhunter IV with Forward-1 TAG and Wunderland Beagle Active Probe
 </systemManufacturers>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank (Gauss).blk b/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank (Gauss).blk
index 74a5b0a042f..debde929a01 100644
--- a/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank (Gauss).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank (Gauss).blk	
@@ -72,7 +72,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank (LRM).blk
index d1ab43cc1aa..3784a8e4ed0 100644
--- a/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank (LRM).blk	
@@ -78,7 +78,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank.blk b/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank.blk
index c56d12ffa97..41b04bc9af5 100644
--- a/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/DI Morgan Assault Tank.blk	
@@ -64,7 +64,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-K.blk b/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-K.blk
index eb75aebe400..7ab60035cb3 100644
--- a/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-K.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-K.blk	
@@ -29,7 +29,7 @@ Daimyo HQ
 </year>
 
 <source>
-Succession Wars
+TRO 3075 - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-K2.blk b/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-K2.blk
index 24985d52eb9..78712097ca5 100644
--- a/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-K2.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-K2.blk	
@@ -29,7 +29,7 @@ Daimyo HQ
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Civil War
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-NC.blk b/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-NC.blk
index a16b6a8b814..d1dd2593e79 100644
--- a/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-NC.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-NC.blk	
@@ -89,7 +89,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO 3075 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-R.blk b/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-R.blk
index 949ce6f3109..3550ec251fe 100644
--- a/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-R.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Daimyo HQ 67-R.blk	
@@ -29,7 +29,7 @@ Daimyo HQ
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Danai Support Vehicle.blk b/megamek/data/mechfiles/vehicles/3075/Danai Support Vehicle.blk
index 7f45b3c7f5f..ad0d4b09ae9 100644
--- a/megamek/data/mechfiles/vehicles/3075/Danai Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Danai Support Vehicle.blk	
@@ -29,7 +29,7 @@ Danai Support Vehicle
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (BAP).blk b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (BAP).blk
index 6d0296cfb2b..e8de2b1182c 100644
--- a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (BAP).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (BAP).blk	
@@ -48,7 +48,7 @@ IS
 3053
 </year>
 <source>
-Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 <internal_type>
 0
diff --git a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (C3).blk b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (C3).blk
index 712d00c50a6..4cd8e0cee14 100644
--- a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (C3).blk	
@@ -48,7 +48,7 @@ IS
 3057
 </year>
 <source>
-Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 <internal_type>
 0
diff --git a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (ECM).blk b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (ECM).blk
index ad23b773e46..f4fd728929f 100644
--- a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (ECM).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (ECM).blk	
@@ -48,7 +48,7 @@ IS
 3054
 </year>
 <source>
-Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 <internal_type>
 0
diff --git a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (SRM).blk b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (SRM).blk
index be14b5b6659..8e2e7df23db 100644
--- a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (SRM).blk	
@@ -47,7 +47,7 @@ IS
 2835
 </year>
 <source>
-Succession Wars
+TRO 3075 - Succession Wars
 </source>
 <internal_type>
 0
diff --git a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (SRM-2).blk b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (SRM-2).blk
index 8a68b29eeb3..d982450cedf 100644
--- a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (SRM-2).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car (SRM-2).blk	
@@ -49,7 +49,7 @@ IS
 2835
 </year>
 <source>
-Succession Wars
+TRO 3075 - Succession Wars
 </source>
 <internal_type>
 0
diff --git a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car.blk b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car.blk
index 0f03c6e8da0..ca4a2a92ea4 100644
--- a/megamek/data/mechfiles/vehicles/3075/Darter Scout Car.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Darter Scout Car.blk	
@@ -47,7 +47,7 @@ IS Level 1
 2822
 </year>
 <source>
-Succession Wars
+TRO 3075 - Succession Wars
 </source>
 <internal_type>
 0
diff --git a/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport (LPPC).blk b/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport (LPPC).blk
index 0a20e0e9ee6..7193e18ce5b 100644
--- a/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport (LPPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport (LPPC).blk	
@@ -53,7 +53,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport (MRM).blk b/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport (MRM).blk
index 41cd2667841..bba62fdca69 100644
--- a/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport (MRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport (MRM).blk	
@@ -58,7 +58,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport.blk b/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport.blk
index 05a2538891c..c91195ad63b 100644
--- a/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Hiryo Armored Infantry Transport.blk	
@@ -56,7 +56,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3075/JES I Tactical Missile Carrier.blk b/megamek/data/mechfiles/vehicles/3075/JES I Tactical Missile Carrier.blk
index 8d33b13d3c0..fccfab48a1f 100644
--- a/megamek/data/mechfiles/vehicles/3075/JES I Tactical Missile Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/JES I Tactical Missile Carrier.blk	
@@ -26,7 +26,7 @@ JES I Tactical Missile Carrier
 3075
 </year>
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/MIT23 MASH Vehicle.blk b/megamek/data/mechfiles/vehicles/3075/MIT23 MASH Vehicle.blk
index bfcf91c2cb5..aab1d429568 100644
--- a/megamek/data/mechfiles/vehicles/3075/MIT23 MASH Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/MIT23 MASH Vehicle.blk	
@@ -79,7 +79,7 @@ MASH Equipment:SIZE:7
 </Rear Equipment>
 
 <source>
-Clan Invasion
+TRO: 3075 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Marsden II MBT II-A (LBX).blk b/megamek/data/mechfiles/vehicles/3075/Marsden II MBT II-A (LBX).blk
index 26d8c0bed95..9b4fd80ed1e 100644
--- a/megamek/data/mechfiles/vehicles/3075/Marsden II MBT II-A (LBX).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Marsden II MBT II-A (LBX).blk	
@@ -85,7 +85,7 @@ ISLBXAC10
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Marsden II MBT II-A.blk b/megamek/data/mechfiles/vehicles/3075/Marsden II MBT II-A.blk
index 22c12d5bd51..57c98e91075 100644
--- a/megamek/data/mechfiles/vehicles/3075/Marsden II MBT II-A.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Marsden II MBT II-A.blk	
@@ -83,7 +83,7 @@ Autocannon/10
 </Turret Equipment>
 
 <source>
-Civil War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Marsden II MBT.blk b/megamek/data/mechfiles/vehicles/3075/Marsden II MBT.blk
index 2ebc9ecdf7e..54cd332c091 100644
--- a/megamek/data/mechfiles/vehicles/3075/Marsden II MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Marsden II MBT.blk	
@@ -89,3 +89,6 @@ Machine Gun
 Machine Gun
 </Turret Equipment>
 
+<source>
+TRO: 3075 - Age of War
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/3075/Mauna Kea Command Vessel (LB-X).blk b/megamek/data/mechfiles/vehicles/3075/Mauna Kea Command Vessel (LB-X).blk
index 07fe81f65d6..825b9a9122e 100644
--- a/megamek/data/mechfiles/vehicles/3075/Mauna Kea Command Vessel (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Mauna Kea Command Vessel (LB-X).blk	
@@ -29,7 +29,7 @@ Mauna Kea Command Vessel
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Merkava Heavy Tank Mk IX.blk b/megamek/data/mechfiles/vehicles/3075/Merkava Heavy Tank Mk IX.blk
index 1fcac467e76..8dddbb23abf 100644
--- a/megamek/data/mechfiles/vehicles/3075/Merkava Heavy Tank Mk IX.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Merkava Heavy Tank Mk IX.blk	
@@ -29,7 +29,7 @@ Mk IX
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Puma Assault Tank PAT-005b.blk b/megamek/data/mechfiles/vehicles/3075/Puma Assault Tank PAT-005b.blk
index 5308a54a7e5..cf4375a8d09 100644
--- a/megamek/data/mechfiles/vehicles/3075/Puma Assault Tank PAT-005b.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Puma Assault Tank PAT-005b.blk	
@@ -100,7 +100,7 @@ ISERPPC
 </Turret Equipment>
 
 <source>
-TRO 3075 - Star League
+TRO: 3075 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/SM1 Tank Destroyer.blk b/megamek/data/mechfiles/vehicles/3075/SM1 Tank Destroyer.blk
index a079c141423..a1585cac019 100644
--- a/megamek/data/mechfiles/vehicles/3075/SM1 Tank Destroyer.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/SM1 Tank Destroyer.blk	
@@ -29,7 +29,7 @@ SM1
 </year>
 
 <source>
-Civil War
+TRO: 3075 - Civil War
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/SM1A Tank Destroyer.blk b/megamek/data/mechfiles/vehicles/3075/SM1A Tank Destroyer.blk
index 66b8428c9b0..bad6fbffec1 100644
--- a/megamek/data/mechfiles/vehicles/3075/SM1A Tank Destroyer.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/SM1A Tank Destroyer.blk	
@@ -29,7 +29,7 @@ SM1A
 </year>
 
 <source>
-Civil War
+TRO: 3075 - Civil War
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/SM3 Tank Destroyer.blk b/megamek/data/mechfiles/vehicles/3075/SM3 Tank Destroyer.blk
index 56e0195f653..18cd8cc2073 100644
--- a/megamek/data/mechfiles/vehicles/3075/SM3 Tank Destroyer.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/SM3 Tank Destroyer.blk	
@@ -29,7 +29,7 @@ SM3
 </year>
 
 <source>
-Civil War
+TRO: 3075 - Civil War
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Saxon APC (HQ).blk b/megamek/data/mechfiles/vehicles/3075/Saxon APC (HQ).blk
index ab7bfe2a166..ca2ba219809 100644
--- a/megamek/data/mechfiles/vehicles/3075/Saxon APC (HQ).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Saxon APC (HQ).blk	
@@ -79,7 +79,7 @@ ISTAG
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Saxon APC (Laser).blk b/megamek/data/mechfiles/vehicles/3075/Saxon APC (Laser).blk
index 3fc27dc961f..d87cc213f54 100644
--- a/megamek/data/mechfiles/vehicles/3075/Saxon APC (Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Saxon APC (Laser).blk	
@@ -29,7 +29,7 @@ Saxon APC
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Saxon APC (MASH).blk b/megamek/data/mechfiles/vehicles/3075/Saxon APC (MASH).blk
index 5de7a9f6383..87923b84eab 100644
--- a/megamek/data/mechfiles/vehicles/3075/Saxon APC (MASH).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Saxon APC (MASH).blk	
@@ -79,7 +79,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Saxon APC.blk b/megamek/data/mechfiles/vehicles/3075/Saxon APC.blk
index ed0ad86b14d..fda88442a78 100644
--- a/megamek/data/mechfiles/vehicles/3075/Saxon APC.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Saxon APC.blk	
@@ -29,7 +29,7 @@ Saxon APC
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled (Flamer).blk b/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled (Flamer).blk
index 9ac6487ced0..047c73817eb 100644
--- a/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled (Flamer).blk	
@@ -29,7 +29,7 @@ Tamerlane Strike Sled
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled (RL).blk b/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled (RL).blk
index e8198030496..109a3be5cc0 100644
--- a/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled (RL).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled (RL).blk	
@@ -29,7 +29,7 @@ Tamerlane Strike Sled
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled 2.blk b/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled 2.blk
index fbfb1decf4a..21d84ed30d4 100644
--- a/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled 2.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled 2.blk	
@@ -29,7 +29,7 @@ Tamerlane Strike Sled
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled.blk b/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled.blk
index 6b8f8b41c6f..5072f5ccac0 100644
--- a/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Tamerlane Strike Sled.blk	
@@ -29,7 +29,7 @@ Tamerlane Strike Sled
 </year>
 
 <source>
-Jihad
+TRO: 3075 - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/3075/Thumper Artillery Vehicle TAV-1.blk b/megamek/data/mechfiles/vehicles/3075/Thumper Artillery Vehicle TAV-1.blk
index 65c24bff35d..eeab9026395 100644
--- a/megamek/data/mechfiles/vehicles/3075/Thumper Artillery Vehicle TAV-1.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Thumper Artillery Vehicle TAV-1.blk	
@@ -87,7 +87,7 @@ ISERSmallLaser
 </Turret Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Thumper Artillery Vehicle TAV-2.blk b/megamek/data/mechfiles/vehicles/3075/Thumper Artillery Vehicle TAV-2.blk
index 53f3ea4a0b9..630b2e280c2 100644
--- a/megamek/data/mechfiles/vehicles/3075/Thumper Artillery Vehicle TAV-2.blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Thumper Artillery Vehicle TAV-2.blk	
@@ -87,7 +87,7 @@ ISERSmallLaser
 </Turret Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (C3).blk b/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (C3).blk
index cc31d74eaf1..b16e3967efa 100644
--- a/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (C3).blk	
@@ -94,7 +94,7 @@ Large Laser
 </Turret Equipment>
 
 <source>
-TRO 3075 - Jihad
+TRO: 3075 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (Original).blk b/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (Original).blk
index e25b48d0e09..4090a44d584 100644
--- a/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (Original).blk	
@@ -85,7 +85,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3075 - Age of War
+TRO: 3075 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3075/Turhan Urban Combat Vehicle.blk
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Aeron Strike VTOL (BAP).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Aeron Strike VTOL (BAP).blk
index c424979a1b4..9444ca503a6 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Aeron Strike VTOL (BAP).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Aeron Strike VTOL (BAP).blk	
@@ -60,7 +60,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Aeron Strike VTOL.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Aeron Strike VTOL.blk
index fdf097a6c74..a6307b6c648 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Aeron Strike VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Aeron Strike VTOL.blk	
@@ -58,7 +58,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Augustus MBT A3.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Augustus MBT A3.blk
index 298c39eb3ab..e84ea409744 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Augustus MBT A3.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Augustus MBT A3.blk	
@@ -104,7 +104,7 @@ Autocannon/2
 </armor_tech_rating>
 
 <source>
-TRO 3085 - Age of War
+TRO: 3085 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL (LRM).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL (LRM).blk
index c7292c47dbb..ff191c1596e 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL (LRM).blk	
@@ -86,7 +86,7 @@ CLERMediumLaser
 </Rotor Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL (Spotter).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL (Spotter).blk
index d338739a8c4..4f36f46404f 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL (Spotter).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL (Spotter).blk	
@@ -87,7 +87,7 @@ CLTAG
 </Rotor Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL.blk
index 684e29c878e..cfc299ce687 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Balac Strike VTOL.blk	
@@ -87,7 +87,7 @@ CLATM6
 </Rotor Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank A.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank A.blk
index dbfffced811..2d7ce4941b4 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank A.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank A.blk	
@@ -104,7 +104,7 @@ ISTAG:OMNI
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank B.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank B.blk
index 9501b22f7a3..f4d5b60cf6b 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank B.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank B.blk	
@@ -107,7 +107,7 @@ ISMagshotGR:OMNI
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank C.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank C.blk
index da54e563193..c8291871949 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank C.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank C.blk	
@@ -106,7 +106,7 @@ ISTAG:OMNI
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Comminus.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Comminus.blk
index 741a4d02bf3..ae3d6411476 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Comminus.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Comminus.blk	
@@ -102,7 +102,7 @@ ISAntiMissileSystem:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Dominus.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Dominus.blk
index 62485da5cce..2f49fe7bf5a 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Dominus.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Dominus.blk	
@@ -104,7 +104,7 @@ Heavy Flamer:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Infernus.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Infernus.blk
index f3669820d12..6aff162c925 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Infernus.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Infernus.blk	
@@ -102,7 +102,7 @@ ISStreakSRM6:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Invictus.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Invictus.blk
index 37707e68938..4ee355085c8 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Invictus.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Invictus.blk	
@@ -103,7 +103,7 @@ Machine Gun:OMNI
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Prime.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Prime.blk
index 03646014380..735a2c9210d 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Bolla Stealth Tank Prime.blk	
@@ -107,7 +107,7 @@ ISTAG:OMNI
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank (HAG).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank (HAG).blk
index 0ae97ac3466..8be14a15f9f 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank (HAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank (HAG).blk	
@@ -85,7 +85,7 @@ Clan Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank (Second Line).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank (Second Line).blk
index 1edee1736f2..a2f9db9009e 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank (Second Line).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank (Second Line).blk	
@@ -74,7 +74,7 @@ Clan Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank.blk
index 3e0f41fbaa8..1db498a41cb 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Carnivore Assault Tank.blk	
@@ -78,7 +78,7 @@ Clan Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Chalchiuhtotolin Support Tank (Bombast Laser).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Chalchiuhtotolin Support Tank (Bombast Laser).blk
index 68c58ce1ec3..3e2182f95b4 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Chalchiuhtotolin Support Tank (Bombast Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Chalchiuhtotolin Support Tank (Bombast Laser).blk	
@@ -90,7 +90,7 @@ CLStreakSRM4
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Chalchiuhtotolin Support Tank.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Chalchiuhtotolin Support Tank.blk
index 26289f090fe..b991f1df0f8 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Chalchiuhtotolin Support Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Chalchiuhtotolin Support Tank.blk	
@@ -94,7 +94,7 @@ CLStreakSRM4
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Demon Medium Tank (Rifle).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Demon Medium Tank (Rifle).blk
index 99985c46957..9a25ad426fe 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Demon Medium Tank (Rifle).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Demon Medium Tank (Rifle).blk	
@@ -58,5 +58,5 @@ IS Level 4
 Wheeled
 </motion_type>
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Demon Medium Tank.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Demon Medium Tank.blk
index 577b5c56f77..4d97673a9c4 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Demon Medium Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Demon Medium Tank.blk	
@@ -65,5 +65,5 @@ IS Level 2
 Wheeled
 </motion_type>
 <source>
-TRO3085
+TRO3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Eldingar Hover Sled (Streak).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Eldingar Hover Sled (Streak).blk
index abb8d828a15..e6118ede80f 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Eldingar Hover Sled (Streak).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Eldingar Hover Sled (Streak).blk	
@@ -86,7 +86,7 @@ CLStreakLRM15
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Eldingar Hover Sled.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Eldingar Hover Sled.blk
index 0e0776a4df0..211e205950e 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Eldingar Hover Sled.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Eldingar Hover Sled.blk	
@@ -94,7 +94,7 @@ CLStreakSRM2
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE (HAG).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE (HAG).blk
index 3aac68c8408..223528a49d1 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE (HAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE (HAG).blk	
@@ -68,7 +68,7 @@ Mixed (IS Chassis) Experimental
 </year>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE (Infantry).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE (Infantry).blk
index e709348b400..83d190d79fa 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE (Infantry).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE (Infantry).blk	
@@ -69,7 +69,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE.blk
index ce4a391a633..7e285b304bb 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fensalir Combat WiGE.blk	
@@ -69,7 +69,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car (Flamer).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car (Flamer).blk
index 3c6c8ab5e54..22ff77f161d 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car (Flamer).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car (Flamer).blk	
@@ -58,5 +58,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car (VSP).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car (VSP).blk
index 1dc01f8f688..7a3562f1ca2 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car (VSP).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car (VSP).blk	
@@ -57,5 +57,5 @@ IS Level 3
 Hover
 </motion_type>
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car.blk
index 126d1bfad61..699cfd083b9 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Fox Armored Car.blk	
@@ -60,5 +60,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-TRO 3085
+TRO: 3085
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Giggins APC (Fire Support).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Giggins APC (Fire Support).blk
index d5fdfbb8127..6ffb1a86fac 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Giggins APC (Fire Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Giggins APC (Fire Support).blk	
@@ -61,7 +61,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Giggins APC.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Giggins APC.blk
index 94a913e51e9..d6c79c7de2f 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Giggins APC.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Giggins APC.blk	
@@ -60,7 +60,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Guerteltier MBT (C3M).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Guerteltier MBT (C3M).blk
index 921e38d9aa2..062a1b58a48 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Guerteltier MBT (C3M).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Guerteltier MBT (C3M).blk	
@@ -87,7 +87,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Guerteltier MBT.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Guerteltier MBT.blk
index 455b037e50e..99fbc063791 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Guerteltier MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Guerteltier MBT.blk	
@@ -82,7 +82,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/J-37 Ordnance Transport (Original).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/J-37 Ordnance Transport (Original).blk
index 4605f1741ce..17704ac8107 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/J-37 Ordnance Transport (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/J-37 Ordnance Transport (Original).blk	
@@ -90,7 +90,7 @@ Small Laser
 </structural_tech_rating>
 
 <source>
-TRO 3085 - Succession Wars
+TRO: 3085 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/J-37 Ordnance Transport.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/J-37 Ordnance Transport.blk
index a8b243f79de..f9b794e4708 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/J-37 Ordnance Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/J-37 Ordnance Transport.blk	
@@ -63,7 +63,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/JES II Strategic Missile  Carrier (Ammo).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/JES II Strategic Missile  Carrier (Ammo).blk
index decf1011b9c..1360b96c560 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/JES II Strategic Missile  Carrier (Ammo).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/JES II Strategic Missile  Carrier (Ammo).blk	
@@ -82,5 +82,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/JES II Strategic Missile  Carrier.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/JES II Strategic Missile  Carrier.blk
index c5c229dcdf6..1569f7614d5 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/JES II Strategic Missile  Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/JES II Strategic Missile  Carrier.blk	
@@ -84,5 +84,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Joust Medium Tank BE700.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Joust Medium Tank BE700.blk
index b426cc57d5c..43b0c705dc0 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Joust Medium Tank BE700.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Joust Medium Tank BE700.blk	
@@ -91,7 +91,7 @@ CLLightMG
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Joust Medium Tank BE701.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Joust Medium Tank BE701.blk
index 62f413bd057..73ba2b5fb6f 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Joust Medium Tank BE701.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Joust Medium Tank BE701.blk	
@@ -92,7 +92,7 @@ CLLightMG
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Kinnol MBT (PPC).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Kinnol MBT (PPC).blk
index 7c1f0160619..1a0bdb578df 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Kinnol MBT (PPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Kinnol MBT (PPC).blk	
@@ -70,5 +70,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Marksman M1 MBT.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Marksman M1 MBT.blk
index f88c7589000..744e7ac4bdb 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Marksman M1 MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Marksman M1 MBT.blk	
@@ -73,7 +73,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Marksman M1A MBT.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Marksman M1A MBT.blk
index 682d7c707f3..f6cc3487d50 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Marksman M1A MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Marksman M1A MBT.blk	
@@ -75,7 +75,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Maxim Mk II Transport (Infantry Support).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Maxim Mk II Transport (Infantry Support).blk
index 30d11389390..3b1c2a95752 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Maxim Mk II Transport (Infantry Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Maxim Mk II Transport (Infantry Support).blk	
@@ -68,5 +68,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Maxim Mk II Transport.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Maxim Mk II Transport.blk
index 3471da934e9..0e6eafa7c9a 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Maxim Mk II Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Maxim Mk II Transport.blk	
@@ -63,5 +63,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M1 MBT.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M1 MBT.blk
index e10313aad63..d16988fc54c 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M1 MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M1 MBT.blk	
@@ -61,5 +61,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M2 MBT.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M2 MBT.blk
index 73e7c99d08e..680e3acd9f0 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M2 MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M2 MBT.blk	
@@ -69,5 +69,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M3 MBT.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M3 MBT.blk
index 00a904a496e..03c02286bc6 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M3 MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Moltke M3 MBT.blk	
@@ -64,5 +64,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank (LTC).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank (LTC).blk
index f4c612b1a6d..a832faad925 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank (LTC).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank (LTC).blk	
@@ -88,7 +88,7 @@ LRM 5
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank (Thumper).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank (Thumper).blk
index 6d3ea466c00..3718ba1faad 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank (Thumper).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank (Thumper).blk	
@@ -67,5 +67,5 @@ IS Level 3
 Wheeled
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank.blk
index 3ece97a589e..3fd7073766e 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Padilla Tube Artillery Tank.blk	
@@ -66,5 +66,5 @@ IS Level 3
 Wheeled
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Palmoni Assault Infantry Fighting Vehicle.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Palmoni Assault Infantry Fighting Vehicle.blk
index bcdde7ec18c..57dcdfc1fe2 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Palmoni Assault Infantry Fighting Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Palmoni Assault Infantry Fighting Vehicle.blk	
@@ -88,7 +88,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
@@ -112,5 +112,5 @@ TroopSpace:8
 </transporters>
 
 <history>
-Based of the Trajan Design - Designed original for the Word of Blake Militia, the Palmoni had C3i Computer instead of C3 and Guardian ECM.  See TRO 3085
+Based of the Trajan Design - Designed original for the Word of Blake Militia, the Palmoni had C3i Computer instead of C3 and Guardian ECM.  See TRO: 3085
 </history>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE (C3).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE (C3).blk
index 7339fe7bcdd..2d07e32b3d1 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE (C3).blk	
@@ -61,7 +61,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE (Infantry).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE (Infantry).blk
index 15f4bbf14a1..fcd210d5350 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE (Infantry).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE (Infantry).blk	
@@ -59,7 +59,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE.blk
index d942bfb9323..808d77b37ae 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Pandion Combat WiGE.blk	
@@ -65,7 +65,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Po II Heavy Tank (Arrow IV).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Po II Heavy Tank (Arrow IV).blk
index 020b4766cbc..15b0e5aaedc 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Po II Heavy Tank (Arrow IV).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Po II Heavy Tank (Arrow IV).blk	
@@ -76,5 +76,5 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Po II Heavy Tank.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Po II Heavy Tank.blk
index 29070881070..5306818286d 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Po II Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Po II Heavy Tank.blk	
@@ -76,5 +76,5 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (RAF).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (RAF).blk
index 867a549d885..7710513271d 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (RAF).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (RAF).blk	
@@ -68,7 +68,7 @@ IS Level 3
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Sealed).blk
index b4311310c4d..a20c789de56 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Sealed).blk	
@@ -72,7 +72,7 @@ IS Level 3
 </year>
 
 <source>
-Succession Wars
+TRO 3085 - Succession Wars
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Succession Wars).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Succession Wars).blk
index a8409e581a9..a3134ec6e96 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Succession Wars).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Succession Wars).blk	
@@ -74,7 +74,7 @@ IS Level 3
 </year>
 
 <source>
-Succession Wars
+TRO 3085 - Succession Wars
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Support).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Support).blk
index 199fe02c536..2b9643c4f6d 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (Support).blk	
@@ -68,7 +68,7 @@ IS Level 3
 </year>
 
 <source>
-Succession Wars
+TRO 3085 - Succession Wars
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (WoB).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (WoB).blk
index aab0db7db66..8b3bd764d96 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (WoB).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Prowler Multi-Terrain Vehicle (WoB).blk	
@@ -67,7 +67,7 @@ IS Level 3
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV1 (MG).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV1 (MG).blk
index d812dd9d9f0..ca75722f600 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV1 (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV1 (MG).blk	
@@ -74,7 +74,7 @@ IS Level 1
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV1.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV1.blk
index 7ca14a25e7f..6a8a062e967 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV1.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV1.blk	
@@ -74,7 +74,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV2.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV2.blk
index 469316067fe..33252bf3ac8 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV2.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV2.blk	
@@ -73,7 +73,7 @@ IS Level 3
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV22.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV22.blk
index abf4bac043f..0e796735602 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV22.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Ranger Armored Fighting Vehicle VV22.blk	
@@ -73,7 +73,7 @@ IS Level 4
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank (RAC).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank (RAC).blk
index a4667d82d1f..80e27b6b405 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank (RAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank (RAC).blk	
@@ -62,7 +62,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank (Stealth).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank (Stealth).blk
index f2633739f57..5262dfe50da 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank (Stealth).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank (Stealth).blk	
@@ -87,5 +87,5 @@ ISLightGaussRifle
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank.blk
index 429281d809c..0c398dfc6ce 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Regulator II Hovertank.blk	
@@ -59,7 +59,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tonbo Superheavy Transport.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tonbo Superheavy Transport.blk
index 123f157da37..2347acfc905 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tonbo Superheavy Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tonbo Superheavy Transport.blk	
@@ -70,7 +70,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3085 - Clan Invasion
+TRO: 3085 - Clan Invasion
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trajan Assault Infantry Fighting Vehicle (ICE).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trajan Assault Infantry Fighting Vehicle (ICE).blk
index e07468afa5e..d2a5b51a486 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trajan Assault Infantry Fighting Vehicle (ICE).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trajan Assault Infantry Fighting Vehicle (ICE).blk	
@@ -82,7 +82,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trajan Assault Infantry Fighting Vehicle.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trajan Assault Infantry Fighting Vehicle.blk
index a42d1e62e86..0c7cb00c3fe 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trajan Assault Infantry Fighting Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trajan Assault Infantry Fighting Vehicle.blk	
@@ -89,7 +89,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Transportable Field Repair Unit JI-100.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Transportable Field Repair Unit JI-100.blk
index c15020cfe9d..12cd7a2c461 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Transportable Field Repair Unit JI-100.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Transportable Field Repair Unit JI-100.blk	
@@ -73,7 +73,7 @@ Lift Hoist
 </Rear Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trireme Infantry Transport (CS).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trireme Infantry Transport (CS).blk
index 1db9db9ae3c..55b93391a2b 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trireme Infantry Transport (CS).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trireme Infantry Transport (CS).blk	
@@ -68,7 +68,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trireme Infantry Transport.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trireme Infantry Transport.blk
index dbca90a32ab..d07f012348d 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trireme Infantry Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Trireme Infantry Transport.blk	
@@ -91,7 +91,7 @@ battlearmorbay:4.5:1
 </barrating>
 
 <source>
-TRO 3085 - Early Republic
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tufana Hovercraft (iNarc).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tufana Hovercraft (iNarc).blk
index 638005c7ff5..67332e0c9aa 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tufana Hovercraft (iNarc).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tufana Hovercraft (iNarc).blk	
@@ -65,5 +65,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tufana Hovercraft.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tufana Hovercraft.blk
index eeb50e4abac..59ac9aa0e6e 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tufana Hovercraft.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Tufana Hovercraft.blk	
@@ -63,5 +63,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Winston Combat Vehicle (LAC).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Winston Combat Vehicle (LAC).blk
index e22800c3538..e776cdf3def 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Winston Combat Vehicle (LAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Winston Combat Vehicle (LAC).blk	
@@ -74,7 +74,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL (Interdictor).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL (Interdictor).blk
index fc9b25f1506..ee6b3575df8 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL (Interdictor).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL (Interdictor).blk	
@@ -96,7 +96,7 @@ ISArtemisIV
 </Rotor Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL Spectre.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL Spectre.blk
index 91a22c6f8b3..05d08a595c4 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL Spectre.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL Spectre.blk	
@@ -60,7 +60,7 @@ IS Level 4
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL.blk
index 18ae80c75ad..b0379fac234 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Yasha VTOL.blk	
@@ -65,7 +65,7 @@ IS Level 2
 </year>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zephyros Infantry Support Vehicle (Dual Turret).blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zephyros Infantry Support Vehicle (Dual Turret).blk
index e3ac5802d77..316920427ea 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zephyros Infantry Support Vehicle (Dual Turret).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zephyros Infantry Support Vehicle (Dual Turret).blk	
@@ -90,7 +90,7 @@ CLERMediumLaser
 </Front Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3085 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zephyros Infantry Support Vehicle.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zephyros Infantry Support Vehicle.blk
index 554bbb4de29..357fd2d34a8 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zephyros Infantry Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zephyros Infantry Support Vehicle.blk	
@@ -86,7 +86,7 @@ CLLightMG
 </Turret Equipment>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft A.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft A.blk
index 268b993bfc4..5426593a477 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft A.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft A.blk	
@@ -126,7 +126,7 @@ Advanced Fire Control
 </structural_tech_rating>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft B.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft B.blk
index 0a1bf546cb5..5a4ba4c91e4 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft B.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft B.blk	
@@ -129,7 +129,7 @@ Advanced Fire Control
 </structural_tech_rating>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft C.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft C.blk
index f5f8acd44e9..24a0c879284 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft C.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft C.blk	
@@ -120,7 +120,7 @@ This configuration is 4 tons overweight as given in the official source.
 </notes>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft D.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft D.blk
index d5ecef7e3cc..cadfbf0604b 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft D.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft D.blk	
@@ -136,7 +136,7 @@ MML is assigning 2 slots for armor when per pg 134 of TM it should have 0 slots
 </notes>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft E.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft E.blk
index ef031074b01..d8a3f86e1b5 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft E.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft E.blk	
@@ -125,7 +125,7 @@ Advanced Fire Control
 </structural_tech_rating>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft Prime.blk b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft Prime.blk
index e2558021e55..2dbf8f611ac 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Cutting Edge/Zugvogel Omni Support Aircraft Prime.blk	
@@ -125,7 +125,7 @@ Advanced Fire Control
 </structural_tech_rating>
 
 <source>
-TRO 3085
+TRO: 3085
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Ajax Assault Tank (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Ajax Assault Tank (Sealed).blk
index a1f653efa48..f7a3041e557 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Ajax Assault Tank (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Ajax Assault Tank (Sealed).blk	
@@ -123,7 +123,7 @@ TARGETING:Sync Tracker (39-42071)
 </systemManufacturers>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Beagle (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Beagle (Sealed).blk
index 4dbf50bc928..2a85eeadf14 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Beagle (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Beagle (Sealed).blk	
@@ -69,5 +69,5 @@ ISC3iUnit
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Brutus Assault Tank (HPPC).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Brutus Assault Tank (HPPC).blk
index dddade56b04..1c0836e8190 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Brutus Assault Tank (HPPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Brutus Assault Tank (HPPC).blk	
@@ -68,5 +68,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Challenger XIVs MBT.blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Challenger XIVs MBT.blk
index bf121013b45..e73c7adcb20 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Challenger XIVs MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Challenger XIVs MBT.blk	
@@ -81,5 +81,5 @@ IS Level 3
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Chaparral (CASE).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Chaparral (CASE).blk
index c45eb88d534..0702acdf8e5 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Chaparral (CASE).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Chaparral (CASE).blk	
@@ -73,7 +73,7 @@ IS Level 3
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Demolisher II Heavy Tank (MML).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Demolisher II Heavy Tank (MML).blk
index c98377c5f6c..5f7a60a0e61 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Demolisher II Heavy Tank (MML).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Demolisher II Heavy Tank (MML).blk	
@@ -77,7 +77,7 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Drillson Heavy Hover Tank (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Drillson Heavy Hover Tank (Sealed).blk
index c2ba3c154e1..2045d438bca 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Drillson Heavy Hover Tank (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Drillson Heavy Hover Tank (Sealed).blk	
@@ -86,7 +86,7 @@ ISMML3
 </Turret Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Fortune Wheeled Assault Vehicle (C3M).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Fortune Wheeled Assault Vehicle (C3M).blk
index 7eb2e82c7fb..dfcc8bfc261 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Fortune Wheeled Assault Vehicle (C3M).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Fortune Wheeled Assault Vehicle (C3M).blk	
@@ -66,7 +66,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Fulcrum III Heavy Hovertank.blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Fulcrum III Heavy Hovertank.blk
index dfb55eaeacb..e14dffb3e84 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Fulcrum III Heavy Hovertank.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Fulcrum III Heavy Hovertank.blk	
@@ -64,5 +64,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Goblin Infantry Support Vehicle (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Goblin Infantry Support Vehicle (Sealed).blk
index e3bc29ac8d3..3095c214c57 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Goblin Infantry Support Vehicle (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Goblin Infantry Support Vehicle (Sealed).blk	
@@ -65,5 +65,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Hetzer Wheeled Assault Gun (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Hetzer Wheeled Assault Gun (Sealed).blk
index 132f76fe057..3be6e889016 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Hetzer Wheeled Assault Gun (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Hetzer Wheeled Assault Gun (Sealed).blk	
@@ -62,7 +62,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/JES I Tactical Missile Carrier (3082 Upgrade).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/JES I Tactical Missile Carrier (3082 Upgrade).blk
index e001e3bc249..650a530a0fb 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/JES I Tactical Missile Carrier (3082 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/JES I Tactical Missile Carrier (3082 Upgrade).blk	
@@ -70,6 +70,6 @@ IS
 <motion_type>
 Hover
 </motion_type>
-<Source>
-Dark Age
-</Source>
+<source>
+TRO: 3085 - Early Republic
+</source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Ontos Heavy Tank (MML).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Ontos Heavy Tank (MML).blk
index 0a6f486f500..73c3a93a499 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Ontos Heavy Tank (MML).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Ontos Heavy Tank (MML).blk	
@@ -131,7 +131,7 @@ TARGETING:GuideRite with Laser Coordination Link and Artemis FCS
 </systemManufacturers>
 
 <source>
-TRO - 3085
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Ontos Heavy Tank (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Ontos Heavy Tank (Sealed).blk
index c0b3be58182..4735dc3e364 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Ontos Heavy Tank (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Ontos Heavy Tank (Sealed).blk	
@@ -135,7 +135,7 @@ TARGETING:GuideRite with Laser Coordination Link and Artemis FCS
 </systemManufacturers>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Partisan Air Defense Tank (Cell).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Partisan Air Defense Tank (Cell).blk
index 8e094589a6c..e4c58ebe51c 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Partisan Air Defense Tank (Cell).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Partisan Air Defense Tank (Cell).blk	
@@ -71,5 +71,5 @@ IS Level 3
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Partisan Air Defense Tank (LRM).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Partisan Air Defense Tank (LRM).blk
index e0271cc9966..92d44b76e4f 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Partisan Air Defense Tank (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Partisan Air Defense Tank (LRM).blk	
@@ -77,5 +77,5 @@ IS Level 3
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Pegasus Scout Hover Tank (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Pegasus Scout Hover Tank (Sealed).blk
index 857d5feb17e..bfb3dc6609d 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Pegasus Scout Hover Tank (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Pegasus Scout Hover Tank (Sealed).blk	
@@ -68,7 +68,7 @@ IS Level 3
 </year>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Plainsman Medium Hovertank (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Plainsman Medium Hovertank (Sealed).blk
index 32422309d20..26dcef1117c 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Plainsman Medium Hovertank (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Plainsman Medium Hovertank (Sealed).blk	
@@ -67,7 +67,7 @@ IS Level 3
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Rommel Tank (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Rommel Tank (Sealed).blk
index 65d694fe725..ba4927b9b1b 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Rommel Tank (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Rommel Tank (Sealed).blk	
@@ -105,7 +105,7 @@ TARGETING:TharHes Mars5
 </systemManufacturers>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Savannah Master Hovercraft (Interdictor).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Savannah Master Hovercraft (Interdictor).blk
index 8e796317b61..1a0e30e29be 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Savannah Master Hovercraft (Interdictor).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Savannah Master Hovercraft (Interdictor).blk	
@@ -53,7 +53,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Schrek PPC Carrier (Armor).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Schrek PPC Carrier (Armor).blk
index c5281547740..44f17b9252a 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Schrek PPC Carrier (Armor).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Schrek PPC Carrier (Armor).blk	
@@ -86,7 +86,7 @@ PPC
 </Turret Equipment>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Schrek PPC Carrier (C3M).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Schrek PPC Carrier (C3M).blk
index 7f726335ff0..b327632a047 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Schrek PPC Carrier (C3M).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Schrek PPC Carrier (C3M).blk	
@@ -67,7 +67,7 @@ IS Level 2
 </year>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Scimitar Medium Hover Tank (C3).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Scimitar Medium Hover Tank (C3).blk
index 1abc9e1daca..cdc4c6a7f23 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Scimitar Medium Hover Tank (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Scimitar Medium Hover Tank (C3).blk	
@@ -59,5 +59,5 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Scorpion Light Tank (LAC).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Scorpion Light Tank (LAC).blk
index d8fc11db4a9..753cfa56b69 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Scorpion Light Tank (LAC).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Scorpion Light Tank (LAC).blk	
@@ -64,7 +64,7 @@ IS Level 2
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Shamash Reconnaissance Vehicle (Interdictor).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Shamash Reconnaissance Vehicle (Interdictor).blk
index b60ff9b9d35..fa05fc73e60 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Shamash Reconnaissance Vehicle (Interdictor).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Shamash Reconnaissance Vehicle (Interdictor).blk	
@@ -81,7 +81,7 @@ CLERMediumLaser
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Skulker Wheeled Scout Tank (C3M).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Skulker Wheeled Scout Tank (C3M).blk
index 880af1d3d89..4b0947210c0 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Skulker Wheeled Scout Tank (C3M).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Skulker Wheeled Scout Tank (C3M).blk	
@@ -114,7 +114,7 @@ TARGETING:Targeting System 2.3
 </systemManufacturers>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Sprint Scout Helicopter (Interdictor).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Sprint Scout Helicopter (Interdictor).blk
index eeeee3838a1..d297690d9ec 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Sprint Scout Helicopter (Interdictor).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Sprint Scout Helicopter (Interdictor).blk	
@@ -55,5 +55,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Clan Invasion
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Striker Light Tank (Sealed).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Striker Light Tank (Sealed).blk
index 8c4d2a286f8..529f03f6e52 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Striker Light Tank (Sealed).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Striker Light Tank (Sealed).blk	
@@ -65,7 +65,7 @@ IS Level 3
 </year>
 
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Vedette Medium Tank (Cell).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Vedette Medium Tank (Cell).blk
index 7d539e2adeb..9b05d033b77 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Vedette Medium Tank (Cell).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Vedette Medium Tank (Cell).blk	
@@ -121,7 +121,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO 3085 - Jihad
+TRO: 3085 - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Yellow Jacket Gunship (PPC).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Yellow Jacket Gunship (PPC).blk
index 3036bd5302f..1d2916e18a2 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Yellow Jacket Gunship (PPC).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Yellow Jacket Gunship (PPC).blk	
@@ -55,5 +55,5 @@ IS Level 2
 VTOL
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Zhukov Heavy Tank (LB-X).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Zhukov Heavy Tank (LB-X).blk
index ee0e87053fa..540729285d7 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Zhukov Heavy Tank (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Zhukov Heavy Tank (LB-X).blk	
@@ -65,5 +65,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/ONN/Zhukov Heavy Tank (Liao).blk b/megamek/data/mechfiles/vehicles/3085u/ONN/Zhukov Heavy Tank (Liao).blk
index dc8addf66bb..16304ac0267 100644
--- a/megamek/data/mechfiles/vehicles/3085u/ONN/Zhukov Heavy Tank (Liao).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/ONN/Zhukov Heavy Tank (Liao).blk	
@@ -66,5 +66,5 @@ IS Level 2
 Tracked
 </motion_type>
 <source>
-Jihad
+TRO: 3085 - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Bokkusu Support Trailer (Standard).blk b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Bokkusu Support Trailer.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/3085u/Supplemental/Bokkusu Support Trailer (Standard).blk
rename to megamek/data/mechfiles/vehicles/3085u/Supplemental/Bokkusu Support Trailer.blk
index 07cb7b50f39..46a8c8b0f5d 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Bokkusu Support Trailer (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Bokkusu Support Trailer.blk	
@@ -96,7 +96,7 @@ Hitch
 </Rear Equipment>
 
 <source>
-TRO3086S - Early Repubic Era
+TRO3085S - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Manta Fast Attack Submarine (Standard).blk b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Manta Fast Attack Submarine.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/3085u/Supplemental/Manta Fast Attack Submarine (Standard).blk
rename to megamek/data/mechfiles/vehicles/3085u/Supplemental/Manta Fast Attack Submarine.blk
diff --git a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine (Original).blk b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine (Original).blk
index aa07f8a09b8..d4c6018bf76 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine (Original).blk	
@@ -99,7 +99,7 @@ SRT 6
 </Turret Equipment>
 
 <source>
-TRO 3085S - Star League
+TRO: 3085S - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine (Standard).blk b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine (Standard).blk
rename to megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine.blk
index d2e07cf0bc5..2cfae490b4a 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Moray Heavy Attack Submarine.blk	
@@ -99,7 +99,7 @@ SRT 6
 </Turret Equipment>
 
 <source>
-TRO 3085S - Jihad
+TRO: 3085S - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Tenmaku Command Trailer (Standard.blk b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Tenmaku Command Trailer (Standard.blk
index 215b0f0a6e9..7a5e51f4ddf 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Tenmaku Command Trailer (Standard.blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Tenmaku Command Trailer (Standard.blk	
@@ -102,7 +102,7 @@ ISAntiMissileSystem
 </Turret Equipment>
 
 <source>
-TRO 3085S - Early Republic
+TRO: 3085S - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Teppo Artillery Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Teppo Artillery Vehicle.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/3085u/Supplemental/Teppo Artillery Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3085u/Supplemental/Teppo Artillery Vehicle.blk
index 3940bdae8da..b792d293d5c 100644
--- a/megamek/data/mechfiles/vehicles/3085u/Supplemental/Teppo Artillery Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3085u/Supplemental/Teppo Artillery Vehicle.blk	
@@ -119,7 +119,7 @@ ISSniper
 </Turret Equipment>
 
 <source>
-TRO 3085S - Early Republic
+TRO: 3085S - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle (HAG).blk b/megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle (HAG).blk
index 5e3d9973ea7..8f5938904d9 100644
--- a/megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle (HAG).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle (HAG).blk	
@@ -88,7 +88,7 @@ CLCASE
 </Turret Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle.blk
index b2502794deb..3d980923acf 100644
--- a/megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Clans/Aesir Medium AA Vehicle.blk	
@@ -87,7 +87,7 @@ CLLBXAC2
 </Turret Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Clans/Anat APC (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Clans/Anat APC.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Clans/Anat APC (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Clans/Anat APC.blk
index 3b62101e8ce..3100981b6b4 100644
--- a/megamek/data/mechfiles/vehicles/3145/Clans/Anat APC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Clans/Anat APC.blk	
@@ -86,7 +86,7 @@ CLMicroPulseLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Clans/Gurzil Support Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Clans/Gurzil Support Tank.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/3145/Clans/Gurzil Support Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Clans/Gurzil Support Tank.blk
index 628de82905c..afac460cdfc 100644
--- a/megamek/data/mechfiles/vehicles/3145/Clans/Gurzil Support Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Clans/Gurzil Support Tank.blk	
@@ -94,7 +94,7 @@ CLMediumPulseLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Clans/Hadur Fast Support Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Clans/Hadur Fast Support Vehicle.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Clans/Hadur Fast Support Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Clans/Hadur Fast Support Vehicle.blk
index e03e98d716f..b525d92e1ad 100644
--- a/megamek/data/mechfiles/vehicles/3145/Clans/Hadur Fast Support Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Clans/Hadur Fast Support Vehicle.blk	
@@ -81,7 +81,7 @@ CLArrowIV
 </Turret Equipment>
 
 <source>
-TRO 3145 The Clans - Late Republic
+TRO: 3145 The Clans - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Clans/Nacon Armored Scout (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Clans/Nacon Armored Scout.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Clans/Nacon Armored Scout (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Clans/Nacon Armored Scout.blk
index fc3fcf145cb..87f4f950696 100644
--- a/megamek/data/mechfiles/vehicles/3145/Clans/Nacon Armored Scout (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Clans/Nacon Armored Scout.blk	
@@ -81,7 +81,7 @@ CLLightMG
 </Rear Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Clans/Skadi Swift Attack VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Clans/Skadi Swift Attack VTOL.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Clans/Skadi Swift Attack VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Clans/Skadi Swift Attack VTOL.blk
index 5e49586654a..e5a5a30d8f7 100644
--- a/megamek/data/mechfiles/vehicles/3145/Clans/Skadi Swift Attack VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Clans/Skadi Swift Attack VTOL.blk	
@@ -88,7 +88,7 @@ CLUltraAC10
 </Turret Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Clans/Skanda Light Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Clans/Skanda Light Tank.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Clans/Skanda Light Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Clans/Skanda Light Tank.blk
index 7b5dabf0b67..9c2afe4b3b0 100644
--- a/megamek/data/mechfiles/vehicles/3145/Clans/Skanda Light Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Clans/Skanda Light Tank.blk	
@@ -81,7 +81,7 @@ CLUltraAC2
 </Rear Equipment>
 
 <source>
-TRO 3145 The Clans - Early Republic
+TRO: 3145 The Clans - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Ballista Artillery Trailer (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Ballista Artillery Trailer.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Ballista Artillery Trailer (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Ballista Artillery Trailer.blk
index c67600542e8..3d46c99519e 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Ballista Artillery Trailer (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Ballista Artillery Trailer.blk	
@@ -116,7 +116,7 @@ ISArrowIV
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Destrier Siege Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Destrier Siege Vehicle.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Destrier Siege Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Destrier Siege Vehicle.blk
index 4195cf2e7c3..176b6d43783 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Destrier Siege Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Destrier Siege Vehicle.blk	
@@ -124,7 +124,7 @@ ISAntiMissileSystem
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Hanse MBT (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Hanse MBT.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Hanse MBT (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Hanse MBT.blk
index 238ddf3bce0..03d35e9246e 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Hanse MBT (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Hanse MBT.blk	
@@ -92,7 +92,7 @@ Light Machine Gun(ST)
 </Rear Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Hasek Mechanized Combat Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Hasek Mechanized Combat Vehicle.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Hasek Mechanized Combat Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Hasek Mechanized Combat Vehicle.blk
index 5044100271e..7ec0b137324 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Hasek Mechanized Combat Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Hasek Mechanized Combat Vehicle.blk	
@@ -85,7 +85,7 @@ ISSmallPulseLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC (MML).blk b/megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC (MML).blk
index a2fa5b3577c..1b1933da964 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC (MML).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC (MML).blk	
@@ -87,7 +87,7 @@ ISMML3
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC.blk
index cf9e88abac0..0511f3ddebe 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/JI2A1 Attack APC.blk	
@@ -86,7 +86,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car (Original).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car (Original).blk
index 9669b9a58cd..4cd2dc077ca 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car (Original).blk	
@@ -73,7 +73,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Star League
+TRO: 3145 Federated Suns - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car.blk
index 17fc3ceca1f..4682a921519 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Kruger Combat Car.blk	
@@ -81,7 +81,7 @@ ISERMediumLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL (Infantry).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL (Infantry).blk
index 3c93392652e..0cfc1d1c19c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL (Infantry).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL (Infantry).blk	
@@ -76,7 +76,7 @@ RemoteSensorDispenser
 </Rotor Equipment>
 
 <source>
-TRO 3145 Federated Suns - Succession Wars
+TRO: 3145 Federated Suns - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL.blk
index 0760cf8b4f5..cc3ee0e8050 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Marten Scout VTOL.blk	
@@ -78,7 +78,7 @@ RemoteSensorDispenser
 </Rotor Equipment>
 
 <source>
-TRO 3145 Federated Suns - Succession Wars
+TRO: 3145 Federated Suns - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Paladin Defense System (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Paladin Defense System.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Paladin Defense System (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Paladin Defense System.blk
index 352d6736a3c..e23f5da71c8 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Paladin Defense System (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Paladin Defense System.blk	
@@ -100,7 +100,7 @@ ISLongTom
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Sniper Artillery (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Sniper Artillery.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Sniper Artillery (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Sniper Artillery.blk
index 5c35b6b7fd0..b1a48a0a2d4 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Sniper Artillery (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Sniper Artillery.blk	
@@ -88,7 +88,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft (Interdictor).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft (Interdictor).blk
index 0e239618d2c..ba4b22ce29c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft (Interdictor).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft (Interdictor).blk	
@@ -82,7 +82,7 @@ Light PPC
 </Rear Equipment>
 
 <source>
-TRO 3145 Federated Suns - Late Republic
+TRO: 3145 Federated Suns - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft.blk
index 5c22b9f63d5..ec2bfc630ba 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Sortek Assault Craft.blk	
@@ -81,7 +81,7 @@ ISAntiMissileSystem
 </Rear Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (A).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (A).blk
index 9cd4ff9d5d8..f9e817321c7 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (A).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (A).blk	
@@ -94,7 +94,7 @@ Light Auto Cannon/2:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (B).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (B).blk
index da0c0a5b1b5..e1ee173fcc9 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (B).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (B).blk	
@@ -99,7 +99,7 @@ ISLMGA:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (C).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (C).blk
index 683ee4361bf..8f95ae6c2b1 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (C).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (C).blk	
@@ -94,7 +94,7 @@ ISMML7:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (D).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (D).blk
index e4f07be8b25..7f0a6a7ccd8 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (D).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (D).blk	
@@ -90,7 +90,7 @@ Heavy PPC:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (Prime).blk b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (Prime).blk
index fa5d287c7d2..1d4e76a5fd2 100644
--- a/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (Prime).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Davion/Zibler Fast Strike Tank (Prime).blk	
@@ -98,7 +98,7 @@ ISStreakSRM4:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Federated Suns - Early Republic
+TRO: 3145 Federated Suns - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Cizin (Support).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Cizin (Support).blk
index 5086445e8c8..1bcf4ae8daf 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Cizin (Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Cizin (Support).blk	
@@ -85,7 +85,7 @@ CLERLargeLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Cizin (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Cizin.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/Cizin (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/Cizin.blk
index d0d505b85ed..374d10bb584 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Cizin (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Cizin.blk
@@ -87,7 +87,7 @@ CLERMediumLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Early Republic
+TRO: 3145 Draconis Combine - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL (Gauss).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL (Gauss).blk
index 8c82a22284b..64b36a75378 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL (Gauss).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL (Gauss).blk	
@@ -122,7 +122,7 @@ TARGETING:Radcom T11
 </systemManufacturers>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL.blk
index 5d81081b8c0..8a327ca0a6d 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Kamakiri Attack VTOL.blk	
@@ -85,7 +85,7 @@ Thunderbolt 10
 </Rotor Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Early Republic
+TRO: 3145 Draconis Combine - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Mamono IFV (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Mamono IFV.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/Mamono IFV (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/Mamono IFV.blk
index 8bf04ba005c..594c1746ff9 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Mamono IFV (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Mamono IFV.blk	
@@ -95,7 +95,7 @@ ISApollo
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Early Republic
+TRO: 3145 Draconis Combine - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Narukami Heavy Tank NK-1C.blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Narukami Heavy Tank NK-1C.blk
index af6218bc126..b203f72d4de 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Narukami Heavy Tank NK-1C.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Narukami Heavy Tank NK-1C.blk	
@@ -89,7 +89,7 @@ ISAntiMissileSystem
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Early Republic
+TRO: 3145 Draconis Combine - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Narukami Heavy Tank NK-BC3.blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Narukami Heavy Tank NK-BC3.blk
index 861a1d14559..f1640bb4ee6 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Narukami Heavy Tank NK-BC3.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Narukami Heavy Tank NK-BC3.blk	
@@ -93,7 +93,7 @@ ISSRM2IOS
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle (LTC).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle (LTC).blk
index f92da49db74..818d2da877d 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle (LTC).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle (LTC).blk	
@@ -86,7 +86,7 @@ CLHeavyMG
 </Rear Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Early Republic
+TRO: 3145 Draconis Combine - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle.blk
index 0053bbe0c32..7e35a7c7903 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/SM2 Heavy Artillery Vehicle.blk	
@@ -86,7 +86,7 @@ CLHeavyMG
 </Rear Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Early Republic
+TRO: 3145 Draconis Combine - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV (BC3).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV (BC3).blk
index 1b13de7d125..a30edb09b8b 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV (BC3).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV (BC3).blk	
@@ -79,7 +79,7 @@ RL10
 </Rear Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV.blk
index 39c0355150c..f33b417bfd5 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Saladin Mk II HCV.blk	
@@ -78,7 +78,7 @@ ISStreakSRM4
 </Rear Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV (BC3).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV (BC3).blk
index 1807fd4ad35..64117846731 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV (BC3).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV (BC3).blk	
@@ -84,7 +84,7 @@ ISMML5
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV.blk
index bf1ffe2d5fc..3d33503e81d 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Saracen Mk II HCV.blk	
@@ -84,7 +84,7 @@ ISMML7
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (3136 Upgrade).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (3136 Upgrade).blk
index 3f0073d7596..fc53bebce44 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (3136 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (3136 Upgrade).blk	
@@ -87,7 +87,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (BC3).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (BC3).blk
index 0bb4bf47af6..706441cc1b9 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (BC3).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (BC3).blk	
@@ -83,7 +83,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Dark Ages
+TRO: 3145 Draconis Combine - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV.blk
index 2833bcc591f..6b7920a9790 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Scimitar Mk II HCV.blk	
@@ -82,7 +82,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Sekhmet Assault Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Sekhmet Assault Vehicle.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/Sekhmet Assault Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/Sekhmet Assault Vehicle.blk
index 0a3274365cb..b5039ae77ad 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Sekhmet Assault Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Sekhmet Assault Vehicle.blk	
@@ -88,7 +88,7 @@ CLLargePulseLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Late Republic
+TRO: 3145 Draconis Combine - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank (Original).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank (Original).blk
index b186ae9ff3e..0efc5d9e3b8 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank (Original).blk	
@@ -76,7 +76,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Succession Wars
+TRO: 3145 Draconis Combine - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank.blk
index 88b0762ef1d..d918676a444 100644
--- a/megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Kurita/Shillelagh Missile Tank.blk	
@@ -81,7 +81,7 @@ ISMML5
 </Turret Equipment>
 
 <source>
-TRO 3145 Draconis Combine - Early Republic
+TRO: 3145 Draconis Combine - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Arrow IV Assault Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Arrow IV Assault Vehicle.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Liao/Arrow IV Assault Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Liao/Arrow IV Assault Vehicle.blk
index 866e72b4834..db1da0d2543 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Arrow IV Assault Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Arrow IV Assault Vehicle.blk	
@@ -102,7 +102,7 @@ ISMediumVSPLaser
 </Front Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank (Support).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank (Support).blk
index e88e2855365..324cb3742eb 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank (Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank (Support).blk	
@@ -92,7 +92,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank.blk
index 2a6066aa183..f7936e975c6 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Behemoth II Heavy Tank.blk	
@@ -102,7 +102,7 @@ RL10
 </Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Luduan Scout Vehicle.blk b/megamek/data/mechfiles/vehicles/3145/Liao/Luduan Scout Vehicle.blk
index 72748427de4..0f2fcdfbfca 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Luduan Scout Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Luduan Scout Vehicle.blk	
@@ -86,7 +86,7 @@ ISTAG
 </Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Dark Ages
+TRO: 3145 Capellan Confederation - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE (Support).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE (Support).blk
index a15fa0f4e8a..dc7781ab63c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE (Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE (Support).blk	
@@ -84,7 +84,7 @@ Extended LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE.blk
index 0b92db96bc7..ee3dc1d584e 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Nisos Attack WIGE.blk	
@@ -84,7 +84,7 @@ SRM 6
 </Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Pixiu Heavy Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Pixiu Heavy Tank.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Liao/Pixiu Heavy Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Liao/Pixiu Heavy Tank.blk
index 2444ca06877..7ab7a58f16a 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Pixiu Heavy Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Pixiu Heavy Tank.blk	
@@ -87,7 +87,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Early Republic
+TRO: 3145 Capellan Confederation - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer (Original).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer (Original).blk
index c3cac210874..0b9937edccb 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer (Original).blk	
@@ -69,7 +69,7 @@ Autocannon/20
 </Rear Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Succession Wars
+TRO: 3145 Capellan Confederation - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer.blk
similarity index 93%
rename from megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer.blk
index 0e1c668de32..3b336268127 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Predator Tank Destroyer.blk	
@@ -78,7 +78,7 @@ ISLBXAC20
 </Rear Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Sheriff Infantry Support Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Sheriff Infantry Support Tank.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Liao/Sheriff Infantry Support Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Liao/Sheriff Infantry Support Tank.blk
index aa9beaa6225..979b4d0adfe 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Sheriff Infantry Support Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Sheriff Infantry Support Tank.blk	
@@ -90,7 +90,7 @@ Light Auto Cannon/5
 </Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Shun Transport VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Shun Transport VTOL.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Liao/Shun Transport VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Liao/Shun Transport VTOL.blk
index 7b0592f6fa4..ec7caee45f6 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Shun Transport VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Shun Transport VTOL.blk	
@@ -89,7 +89,7 @@ ISTAG
 </Rotor Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Liao/Zahn Heavy Transport (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Liao/Zahn Heavy Transport.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Liao/Zahn Heavy Transport (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Liao/Zahn Heavy Transport.blk
index 0d5fcda1b47..094b6a74b0c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Liao/Zahn Heavy Transport (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Liao/Zahn Heavy Transport.blk	
@@ -96,7 +96,7 @@ Vehicle Flamer
 </Front Turret Equipment>
 
 <source>
-TRO 3145 Capellan Confederation - Late Republic
+TRO: 3145 Capellan Confederation - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank (Minesweeper).blk b/megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank (Minesweeper).blk
index 602b55f5c9b..b213f0b6674 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank (Minesweeper).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank (Minesweeper).blk	
@@ -102,7 +102,7 @@ Heavy PPC
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank.blk
index 9c9bf6ecb3e..daef580fa3d 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/Bardiche Heavy Strike Tank.blk	
@@ -107,7 +107,7 @@ Light PPC
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/Bulwark Assault Vehicle (Original).blk b/megamek/data/mechfiles/vehicles/3145/Marik/Bulwark Assault Vehicle (Original).blk
index 7186a6127e5..6bbf89bdb05 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/Bulwark Assault Vehicle (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/Bulwark Assault Vehicle (Original).blk	
@@ -87,7 +87,7 @@ ISGaussRifle
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Jihad
+TRO: 3145 Free Worlds League - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/Bulwark Assault Vehicle (Standardl).blk b/megamek/data/mechfiles/vehicles/3145/Marik/Bulwark Assault Vehicle (Standardl).blk
index fdfb40c12a4..d749912297c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/Bulwark Assault Vehicle (Standardl).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/Bulwark Assault Vehicle (Standardl).blk	
@@ -85,7 +85,7 @@ Heavy PPC
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle (3134 Upgrade).blk b/megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle (3134 Upgrade).blk
index 43cec613649..89e1d3d04d8 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle (3134 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle (3134 Upgrade).blk	
@@ -86,7 +86,7 @@ RL10
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Dark Ages
+TRO: 3145 Free Worlds League - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle.blk
index 8f68de17103..d64071a9b58 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/Partisan AA Vehicle.blk	
@@ -84,7 +84,7 @@ ISLBXAC5
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (A).blk b/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (A).blk
index 3fbae318a2e..d89e7c9543e 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (A).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (A).blk	
@@ -100,7 +100,7 @@ Medium Laser:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (B).blk b/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (B).blk
index 952a8f6e81d..f2451456e67 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (B).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (B).blk	
@@ -99,7 +99,7 @@ ISLBXAC10:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (Coolant Truck).blk b/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (Coolant Truck).blk
index 68e569c4461..62d333c7368 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (Coolant Truck).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (Coolant Truck).blk	
@@ -91,7 +91,7 @@ Flamer (Vehicle)
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (Prime).blk b/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (Prime).blk
index f6be650af19..72fd54e99b0 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (Prime).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/R10 Mechanized ICV (Prime).blk	
@@ -102,7 +102,7 @@ SRM 6:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/Red Kite Attack VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Marik/Red Kite Attack VTOL.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Marik/Red Kite Attack VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Marik/Red Kite Attack VTOL.blk
index 5dc95779580..22a9fbe658a 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/Red Kite Attack VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/Red Kite Attack VTOL.blk	
@@ -99,7 +99,7 @@ CLMediumChemicalLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Late Republic
+TRO: 3145 Free Worlds League - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Marik/Thang-Ta APC (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Marik/Thang-Ta APC.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Marik/Thang-Ta APC (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Marik/Thang-Ta APC.blk
index a54f2ff71ef..0a3efcfce21 100644
--- a/megamek/data/mechfiles/vehicles/3145/Marik/Thang-Ta APC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Marik/Thang-Ta APC.blk	
@@ -85,7 +85,7 @@ ISERSmallLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Free Worlds League - Early Republic
+TRO: 3145 Free Worlds League - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Bishop Transport VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Bishop Transport VTOL.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Merc/Bishop Transport VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Merc/Bishop Transport VTOL.blk
index 9d5bf3f4649..119ad35befa 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Bishop Transport VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Bishop Transport VTOL.blk	
@@ -85,7 +85,7 @@ Environmental Sealing
 </Rotor Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport (RAF).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport (RAF).blk
index 9c9f76757da..965becb6bed 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport (RAF).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport (RAF).blk	
@@ -93,7 +93,7 @@ ISMML5
 </Rotor Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport.blk
index a0d23eacce0..196a6e29d63 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Cardinal Transport.blk	
@@ -90,7 +90,7 @@ CLLRM5
 </Rotor Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Garrot Superheavy Transport.blk b/megamek/data/mechfiles/vehicles/3145/Merc/Garrot Superheavy Transport.blk
index 953cc733e62..eac09709684 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Garrot Superheavy Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Garrot Superheavy Transport.blk	
@@ -90,7 +90,7 @@ Light Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Gossamer (XL) VTOL.blk b/megamek/data/mechfiles/vehicles/3145/Merc/Gossamer (XL) VTOL.blk
index a1e6d2b6da9..fbc705aa9c3 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Gossamer (XL) VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Gossamer (XL) VTOL.blk	
@@ -81,7 +81,7 @@ CLLBXAC10
 </Rotor Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Gossamer VTOL.blk b/megamek/data/mechfiles/vehicles/3145/Merc/Gossamer VTOL.blk
index c3a97bd1e23..8d76245a8fd 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Gossamer VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Gossamer VTOL.blk	
@@ -82,7 +82,7 @@ CLMediumPulseLaser
 </Rotor Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Lamprey Transport Helicopter.blk b/megamek/data/mechfiles/vehicles/3145/Merc/Lamprey Transport Helicopter.blk
index 38cc5e79698..917dfe5dfb6 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Lamprey Transport Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Lamprey Transport Helicopter.blk	
@@ -84,7 +84,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Savior Repair Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Savior Repair Vehicle.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Merc/Savior Repair Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Merc/Savior Repair Vehicle.blk
index 89c3a5c4736..4cfc9884d4a 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Savior Repair Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Savior Repair Vehicle.blk	
@@ -88,7 +88,7 @@ Small Laser
 </barrating>
 
 <source>
-TRO 3145 Mercenaries - Clan Invasion
+TRO: 3145 Mercenaries - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Testudo Siege Tank Tank.blk b/megamek/data/mechfiles/vehicles/3145/Merc/Testudo Siege Tank Tank.blk
index 52222059256..7e6f1a0c924 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Testudo Siege Tank Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Testudo Siege Tank Tank.blk	
@@ -91,7 +91,7 @@ ISArrowIV
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Dark Ages
+TRO: 3145 Mercenaries - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Ambush).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Ambush).blk
index 06f10eb6218..3597d909f52 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Ambush).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Ambush).blk	
@@ -81,7 +81,7 @@ RL15
 </Rear Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Artillery AAA).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Artillery AAA).blk
index b2312367dd6..35b0973f560 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Artillery AAA).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Artillery AAA).blk	
@@ -87,7 +87,7 @@ ISArrowIV
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (LRM).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (LRM).blk
index 2d2ea4e586a..be8314281ff 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (LRM).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (LRM).blk	
@@ -96,7 +96,7 @@ LRM 10
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Mjolnir).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Mjolnir).blk
index 394998b967c..60c3738c4dd 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Mjolnir).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Mjolnir).blk	
@@ -89,7 +89,7 @@ ISVehicularGrenadeLauncher
 </Rear Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Siege).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Siege).blk
index a87de3d269e..4a261ee5e77 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Siege).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Siege).blk	
@@ -89,7 +89,7 @@ IS Mech Mortar-2
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Sniper Cannon).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Sniper Cannon).blk
index f47da3fe7fa..8a6daace648 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Sniper Cannon).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Sniper Cannon).blk	
@@ -94,7 +94,7 @@ ISSniperCannon
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Stronghold).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Stronghold).blk
index 34176f4aa3b..2560c13eead 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Stronghold).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Stronghold).blk	
@@ -87,7 +87,7 @@ Light Auto Cannon/5
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Thumper).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Thumper).blk
index 4a09cf30445..6a163b268d4 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Thumper).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Thumper).blk	
@@ -94,7 +94,7 @@ ISThumper
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Thunderbolt).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Thunderbolt).blk
index d51ae635d26..c1349d0455b 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Thunderbolt).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Thunderbolt).blk	
@@ -94,7 +94,7 @@ Thunderbolt 20
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Ultra).blk b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Ultra).blk
index 1a92c4b34c3..e282e1a6e2c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Ultra).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Merc/Trailers/Gun Trailer (Ultra).blk	
@@ -94,7 +94,7 @@ ISUltraAC20
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Early Republic
+TRO: 3145 Mercenaries - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/NTNU/Balac Strike VTOL (Hybrid).blk b/megamek/data/mechfiles/vehicles/3145/NTNU/Balac Strike VTOL (Hybrid).blk
index 450b019f712..6b77eb093a9 100644
--- a/megamek/data/mechfiles/vehicles/3145/NTNU/Balac Strike VTOL (Hybrid).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/NTNU/Balac Strike VTOL (Hybrid).blk	
@@ -86,7 +86,7 @@ CLHeavyMG
 </Rotor Equipment>
 
 <source>
-Jihad
+TRO: 3145 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/NTNU/Condor Heavy Hover Tank (Laser Upgrade).blk b/megamek/data/mechfiles/vehicles/3145/NTNU/Condor Heavy Hover Tank (Laser Upgrade).blk
index da196ab4b43..8d717217f77 100644
--- a/megamek/data/mechfiles/vehicles/3145/NTNU/Condor Heavy Hover Tank (Laser Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/NTNU/Condor Heavy Hover Tank (Laser Upgrade).blk	
@@ -86,7 +86,7 @@ Medium Re-engineered Laser
 </Turret Equipment>
 
 <source>
-RS 3145 NT NU
+RS 3145 NTNU - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/NTNU/Glory Heavy Fire Support Vehicle (3090 Upgrade).blk b/megamek/data/mechfiles/vehicles/3145/NTNU/Glory Heavy Fire Support Vehicle (3090 Upgrade).blk
index 2117a5a720a..d5ba6733f5f 100644
--- a/megamek/data/mechfiles/vehicles/3145/NTNU/Glory Heavy Fire Support Vehicle (3090 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/NTNU/Glory Heavy Fire Support Vehicle (3090 Upgrade).blk	
@@ -100,7 +100,7 @@ ISArtemisIV
 </Turret Equipment>
 
 <source>
-RS 3145 NT NU
+RS 3145 NTNU - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/NTNU/JES II Strategic Missile Carrier (Support).blk b/megamek/data/mechfiles/vehicles/3145/NTNU/JES II Strategic Missile Carrier (Support).blk
index 6f459b43f1c..6525e4e1617 100644
--- a/megamek/data/mechfiles/vehicles/3145/NTNU/JES II Strategic Missile Carrier (Support).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/NTNU/JES II Strategic Missile Carrier (Support).blk	
@@ -89,7 +89,7 @@ ISArtemisIV
 </Rear Equipment>
 
 <source>
-RS 3145 NT NU
+RS 3145 NTNU - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/NTNU/Mortar Carrier (Standard).blk b/megamek/data/mechfiles/vehicles/3145/NTNU/Mortar Carrier.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/3145/NTNU/Mortar Carrier (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/NTNU/Mortar Carrier.blk
diff --git a/megamek/data/mechfiles/vehicles/3145/NTNU/Prowler Multi-Terrain Vehicle (3140 Upgrade).blk b/megamek/data/mechfiles/vehicles/3145/NTNU/Prowler Multi-Terrain Vehicle (3140 Upgrade).blk
index c5ec7c8f6b2..da50a7eabe6 100644
--- a/megamek/data/mechfiles/vehicles/3145/NTNU/Prowler Multi-Terrain Vehicle (3140 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/NTNU/Prowler Multi-Terrain Vehicle (3140 Upgrade).blk	
@@ -81,7 +81,7 @@ ISMML7
 </Turret Equipment>
 
 <source>
-RS 3145 NY NU
+RS 3145 NTNU - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/NTNU/Zugvogel Omni Support Aircraft F.blk b/megamek/data/mechfiles/vehicles/3145/NTNU/Zugvogel Omni Support Aircraft F.blk
index 386eb8f38e2..36d18bbfe9d 100644
--- a/megamek/data/mechfiles/vehicles/3145/NTNU/Zugvogel Omni Support Aircraft F.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/NTNU/Zugvogel Omni Support Aircraft F.blk	
@@ -141,7 +141,7 @@ Advanced Fire Control
 </structural_tech_rating>
 
 <source>
-RS 3145 NT NU
+RS 3145 NTNU - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Crane Heavy Transport (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Crane Heavy Transport.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Republic/Crane Heavy Transport (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Republic/Crane Heavy Transport.blk
index 1ac532f63dc..e5e006986cb 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Crane Heavy Transport (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Crane Heavy Transport.blk	
@@ -81,7 +81,7 @@ Machine Gun(ST)
 </Rotor Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (MML).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (MML).blk
index b6dfb338378..ac1bcc13315 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (MML).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (MML).blk	
@@ -89,7 +89,7 @@ ISERMediumLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (Sniper).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (Sniper).blk
index 155527369ac..cf972b1075d 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (Sniper).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (Sniper).blk	
@@ -86,7 +86,7 @@ Hyper Velocity Auto Cannon/2
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship.blk
index 8b3802e9919..c0fc6b9d6b4 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Hawk Moth II Gunship.blk	
@@ -88,7 +88,7 @@ ISERMediumLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (C3).blk b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (C3).blk
index b1e6bf3ae09..22002ddf0e9 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (C3).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (C3).blk	
@@ -91,7 +91,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (MML).blk b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (MML).blk
index 37b09bf2b8b..e7a84911114 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (MML).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (MML).blk	
@@ -95,7 +95,7 @@ ISMML9
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Speed).blk b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Speed).blk
index d27d64ac744..4f95f5a9cc1 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Speed).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Speed).blk	
@@ -96,7 +96,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Thunderbolt).blk b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Thunderbolt).blk
index 060fa3941b7..ae7c0a62611 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Thunderbolt).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Thunderbolt).blk	
@@ -91,7 +91,7 @@ Thunderbolt 10
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier.blk
index f2eaa51ecc7..596a5da1e64 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/JES III Missile Carrier.blk	
@@ -91,7 +91,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Dark Ages
+TRO: 3145 Republic of the Sphere - Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/MHI Amphibious APC (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Republic/MHI Amphibious APC.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Republic/MHI Amphibious APC (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Republic/MHI Amphibious APC.blk
index 63923976c43..42bfd6ba2b6 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/MHI Amphibious APC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/MHI Amphibious APC.blk	
@@ -77,7 +77,7 @@ ISERMediumLaser
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/MHI Defense AA Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Republic/MHI Defense AA Tank.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Republic/MHI Defense AA Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Republic/MHI Defense AA Tank.blk
index c24be7e3797..40504ced4ec 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/MHI Defense AA Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/MHI Defense AA Tank.blk	
@@ -91,7 +91,7 @@ ISLBXAC10
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (A).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (A).blk
index ee923a82bda..526c380429c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (A).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (A).blk	
@@ -91,7 +91,7 @@ ISRotaryAC5:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic
+TRO: 3145 Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (B).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (B).blk
index baf8d147085..3788b0c3167 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (B).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (B).blk	
@@ -89,7 +89,7 @@ ISLightGaussRifle:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (C).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (C).blk
index 4e5cea7e0ec..3439a355c34 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (C).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (C).blk	
@@ -90,7 +90,7 @@ ISLBXAC10:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (D).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (D).blk
index 2462f90d8f0..a5c7108c1fa 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (D).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (D).blk	
@@ -91,7 +91,7 @@ ISImprovedNarc:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (E).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (E).blk
index 00c40162427..b2fc63bb7da 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (E).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (E).blk	
@@ -91,7 +91,7 @@ ISThumperCannon:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (F).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (F).blk
index 51afbff8119..4c42a112d0c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (F).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (F).blk	
@@ -92,7 +92,7 @@ ISTAG:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (G).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (G).blk
index d266ca66dee..22853d7cce0 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (G).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (G).blk	
@@ -93,7 +93,7 @@ Light Auto Cannon/2:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (H).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (H).blk
index f03dc68edf9..4188d7501dc 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (H).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (H).blk	
@@ -90,7 +90,7 @@ ISMediumVSPLaser:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (I).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (I).blk
index c479de65d3f..2cf3d9415dc 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (I).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (I).blk	
@@ -90,7 +90,7 @@ TSEMP Cannon:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (J).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (J).blk
index 24d21759c92..5ee038dee49 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (J).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (J).blk	
@@ -98,7 +98,7 @@ ISMediumPulseLaser:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (Primary).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (Primary).blk
index e7286f02edb..0c03087fb57 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (Primary).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Scapha Hovertank (Primary).blk	
@@ -93,7 +93,7 @@ Light PPC:OMNI
 </Turret Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle (Original).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle (Original).blk
index 914da01ad24..04851b46378 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle (Original).blk	
@@ -71,7 +71,7 @@ Machine Gun
 </Rear Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Early Republic
+TRO: 3145 Republic of the Sphere - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle.blk
similarity index 93%
rename from megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle.blk
index c77a4b33355..c2977dd1951 100644
--- a/megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Republic/Shandra Advanced Scout Vehicle.blk	
@@ -74,7 +74,7 @@ Machine Gun
 </Rear Equipment>
 
 <source>
-TRO 3145 Republic of the Sphere - Late Republic
+TRO: 3145 Republic of the Sphere - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL (Gunship).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL (Gunship).blk
index 5cfde50c48a..2d580aceba1 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL (Gunship).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL (Gunship).blk	
@@ -87,7 +87,7 @@ Light PPC
 </Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Early Republic
+TRO: 3145 Lyran Commonwealth - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL.blk
index 74561088304..0385f352f18 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/DI Multipurpose VTOL.blk	
@@ -90,7 +90,7 @@ Light PPC
 </Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Early Republic
+TRO: 3145 Lyran Commonwealth - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank (Targeting Computer).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank (Targeting Computer).blk
index 52854589303..d0737f85b60 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank (Targeting Computer).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank (Targeting Computer).blk	
@@ -99,7 +99,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank.blk
index 8bd2bda9255..5f73bb5be1e 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/DI Schmitt Tank.blk	
@@ -97,7 +97,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (A).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (A).blk
index b945d8a5b95..107315a3afe 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (A).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (A).blk	
@@ -118,7 +118,7 @@ CLArtemisV:OMNI
 </Front Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (B).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (B).blk
index c2c8c0a719e..cf6b4ab43e0 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (B).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (B).blk	
@@ -109,7 +109,7 @@ ISLongTomCannon:OMNI
 </Front Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (Prime).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (Prime).blk
index c22a975d4c8..4f81a5b4d72 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (Prime).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Gulltoppr OmniMonitor (Prime).blk	
@@ -111,7 +111,7 @@ ISGaussRifle:OMNI
 </Front Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Kelswa Assault Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Kelswa Assault Tank.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Steiner/Kelswa Assault Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Steiner/Kelswa Assault Tank.blk
index f28a62631b8..af98632f5a3 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Kelswa Assault Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Kelswa Assault Tank.blk	
@@ -92,7 +92,7 @@ Heavy Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Manticore II Heavy Tank (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Manticore II Heavy Tank.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/3145/Steiner/Manticore II Heavy Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Steiner/Manticore II Heavy Tank.blk
index 17043f0bc78..76ed10842b4 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Manticore II Heavy Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Manticore II Heavy Tank.blk	
@@ -124,7 +124,7 @@ TARGETING:TharHes TargiTrack with Advanced Targeting Computer
 </systemManufacturers>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Schildkrote Line Tank.blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Schildkrote Line Tank.blk
index a7f9413b4b5..b0828e2ca22 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Schildkrote Line Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Schildkrote Line Tank.blk	
@@ -88,7 +88,7 @@ ISAntiMissileSystem
 </Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Late Republic
+TRO: 3145 Lyran Commonwealth - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE (Original).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE (Original).blk
index 5857ce66b26..3732dba957c 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE (Original).blk	
@@ -87,7 +87,7 @@ ISSNPPC
 </Rear Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Early Republic
+TRO: 3145 Lyran Commonwealth - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE.blk
index 2c6fab3a336..5650545ee88 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Swallow Attack WIGE.blk	
@@ -88,7 +88,7 @@ ISLBXAC20
 </Rear Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Early Republic
+TRO: 3145 Lyran Commonwealth - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3145/Steiner/Winterhawk APC (Standard).blk b/megamek/data/mechfiles/vehicles/3145/Steiner/Winterhawk APC.blk
similarity index 94%
rename from megamek/data/mechfiles/vehicles/3145/Steiner/Winterhawk APC (Standard).blk
rename to megamek/data/mechfiles/vehicles/3145/Steiner/Winterhawk APC.blk
index a73e8a1275f..97122a24f0d 100644
--- a/megamek/data/mechfiles/vehicles/3145/Steiner/Winterhawk APC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/3145/Steiner/Winterhawk APC.blk	
@@ -79,7 +79,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO 3145 Lyran Commonwealth - Clan Invasion
+TRO: 3145 Lyran Commonwealth - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (3132 Upgrade).blk b/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (3132 Upgrade).blk
index 68b1a3b5e43..dced3b65ba6 100644
--- a/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (3132 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (3132 Upgrade).blk	
@@ -125,7 +125,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (3137 Upgrade).blk b/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (3137 Upgrade).blk
index bbf2eb137a4..1ec191317cf 100644
--- a/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (3137 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (3137 Upgrade).blk	
@@ -132,5 +132,5 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (Stealth).blk b/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (Stealth).blk
index 5e329c10b8c..cfe6928ae15 100644
--- a/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (Stealth).blk	
+++ b/megamek/data/mechfiles/vehicles/3150/Fensalir Combat WiGE (Stealth).blk	
@@ -133,5 +133,5 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
diff --git a/megamek/data/mechfiles/vehicles/3150/Kite Reconnaissance Vehicle.blk b/megamek/data/mechfiles/vehicles/3150/Kite Reconnaissance Vehicle.blk
index 23200d4406e..a87d03a9d8f 100644
--- a/megamek/data/mechfiles/vehicles/3150/Kite Reconnaissance Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/3150/Kite Reconnaissance Vehicle.blk	
@@ -89,7 +89,7 @@ CLLightTAG
 </Turret Equipment>
 
 <source>
-TRO 3145 Mercenaries - Late Republic
+TRO: 3145 Mercenaries - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3150/Pandion Combat WiGE (3135 Upgrade).blk b/megamek/data/mechfiles/vehicles/3150/Pandion Combat WiGE (3135 Upgrade).blk
index cd6bc342c8c..ba57af4c169 100644
--- a/megamek/data/mechfiles/vehicles/3150/Pandion Combat WiGE (3135 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3150/Pandion Combat WiGE (3135 Upgrade).blk	
@@ -95,7 +95,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-TRO 3150 - Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/3150/Pandion Combat WiGE (3140 Upgrade).blk b/megamek/data/mechfiles/vehicles/3150/Pandion Combat WiGE (3140 Upgrade).blk
index d2893f5a709..aa1ae2ba83f 100644
--- a/megamek/data/mechfiles/vehicles/3150/Pandion Combat WiGE (3140 Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/3150/Pandion Combat WiGE (3140 Upgrade).blk	
@@ -91,7 +91,7 @@ RL15
 </Turret Equipment>
 
 <source>
-Dark Age
+TRO: 3150 - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft A.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft A.blk
index 7151dbaeb61..3c688bed5c4 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft A.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft A.blk	
@@ -108,7 +108,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft B.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft B.blk
index b3a03ae2274..9c7a2aaa532 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft B.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft B.blk	
@@ -108,7 +108,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft Prime.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft Prime.blk
index 74e430f1240..06fd089fc04 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Boreas Cavalry Hovercraft Prime.blk	
@@ -109,7 +109,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Hoodling Sensor Hoverjeep.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Hoodling Sensor Hoverjeep.blk
index 218dc8ed88a..3b127d77737 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Hoodling Sensor Hoverjeep.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Hoodling Sensor Hoverjeep.blk	
@@ -99,7 +99,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Hoverpod.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Hoverpod.blk
index f2bfea23beb..d993fa6e1d6 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Hoverpod.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/Hoverpod.blk	
@@ -97,7 +97,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/JI-002 Hoverbike.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/JI-002 Hoverbike.blk
index dd05cddadb7..538a5fb011a 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Hover/JI-002 Hoverbike.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Hover/JI-002 Hoverbike.blk	
@@ -98,7 +98,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Naval/Harpoon ParaSub.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Naval/Harpoon ParaSub.blk
index 8ffb8d902f5..9ab91477137 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Naval/Harpoon ParaSub.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Naval/Harpoon ParaSub.blk	
@@ -103,7 +103,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Naval/Small Steamer (Standard).blk b/megamek/data/mechfiles/vehicles/AToW Companion/Naval/Small Steamer.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/AToW Companion/Naval/Small Steamer (Standard).blk
rename to megamek/data/mechfiles/vehicles/AToW Companion/Naval/Small Steamer.blk
index fbe43ea36b5..f7b41ee384b 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Naval/Small Steamer (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Naval/Small Steamer.blk	
@@ -97,7 +97,7 @@ pillionseats:21.0:0
 </armor_tech_rating>
 
 <source>
-ATOW Companion
+ATOW Companion - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/VTOL/HTE Micro-Copter (Standard).blk b/megamek/data/mechfiles/vehicles/AToW Companion/VTOL/HTE Micro-Copter.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/AToW Companion/VTOL/HTE Micro-Copter (Standard).blk
rename to megamek/data/mechfiles/vehicles/AToW Companion/VTOL/HTE Micro-Copter.blk
index a8caf295484..925230d1c1d 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/VTOL/HTE Micro-Copter (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/VTOL/HTE Micro-Copter.blk	
@@ -100,7 +100,7 @@ UltraLightChassisMod
 </armor_tech_rating>
 
 <source>
-AToW Companion
+AToW Companion - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Assuan Armored Bike.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Assuan Armored Bike.blk
index 58f6ba69627..a163987ff9d 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Assuan Armored Bike.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Assuan Armored Bike.blk	
@@ -100,7 +100,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Beast Riot Car.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Beast Riot Car.blk
index f0dea68db42..4dfeebff849 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Beast Riot Car.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Beast Riot Car.blk	
@@ -105,7 +105,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Death Trike.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Death Trike.blk
index df2f01da8fd..c512cf9e992 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Death Trike.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Death Trike.blk	
@@ -105,7 +105,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Dune Buggy.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Dune Buggy.blk
index fb2ecd313e1..94fc3357394 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Dune Buggy.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Dune Buggy.blk	
@@ -25,11 +25,11 @@ Dune Buggy
 </mul id:>
 
 <year>
-2000
+2010
 </year>
 
 <originalBuildYear>
-2000
+2010
 </originalBuildYear>
 
 <type>
@@ -100,7 +100,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Eagre Firefighting ATV.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Eagre Firefighting ATV.blk
index 9589fe61e2b..12e87f1473a 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Eagre Firefighting ATV.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Eagre Firefighting ATV.blk	
@@ -100,7 +100,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Tracked Quad.blk b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Tracked Quad.blk
index d0e088b28b9..e81bb0ce03e 100644
--- a/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Tracked Quad.blk	
+++ b/megamek/data/mechfiles/vehicles/AToW Companion/Wheeled/Tracked Quad.blk	
@@ -101,7 +101,7 @@ These units have no weights in AToW.  The weights are estimates.  The units are
 </history>
 
 <source>
-AToW Companion
+AToW Companion - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Estevez AA.blk b/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Estevez AA.blk
index 334bd9a821a..8a99eccbc76 100644
--- a/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Estevez AA.blk	
+++ b/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Estevez AA.blk	
@@ -80,7 +80,7 @@ IS Level 4
 </year>
 
 <source>
-Era Digest: Age of War
+Era Digest:Age of War - Age of War
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Estevez MBT.blk b/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Estevez MBT.blk
index f4835b78fcb..3a11f9c255c 100644
--- a/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Estevez MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Estevez MBT.blk	
@@ -84,7 +84,7 @@ IS Level 4
 </year>
 
 <source>
-Era Digest: Age of War
+Era Digest:Age of War - Age of War
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Marsden I.blk b/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Marsden I.blk
index 27fa68a6725..993d66e31b7 100644
--- a/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Marsden I.blk	
+++ b/megamek/data/mechfiles/vehicles/Era Digests/Age of War/Marsden I.blk	
@@ -103,7 +103,7 @@ Machine Gun
 </armor_tech_rating>
 
 <source>
-Era Digest: Age of War
+Era Digest:Age of War - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Praetorian Mobile Strategic Command HQ (Standard).blk b/megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Praetorian Mobile Strategic Command HQ.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Praetorian Mobile Strategic Command HQ (Standard).blk
rename to megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Praetorian Mobile Strategic Command HQ.blk
index d087afeb901..bdad28b0b44 100644
--- a/megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Praetorian Mobile Strategic Command HQ (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Praetorian Mobile Strategic Command HQ.blk	
@@ -86,7 +86,7 @@ ISERMediumLaser
 </Turret Equipment>
 
 <source>
-ED Dark Ages
+Era Digest:Dark Age - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Tribune Mobile Tactical Command HQ (Standard).blk b/megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Tribune Mobile Tactical Command HQ.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Tribune Mobile Tactical Command HQ (Standard).blk
rename to megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Tribune Mobile Tactical Command HQ.blk
index 0fa271f0357..30e22222279 100644
--- a/megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Tribune Mobile Tactical Command HQ (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/Era Digests/Dark Age/Tribune Mobile Tactical Command HQ.blk	
@@ -81,7 +81,7 @@ RemoteSensorDispenser
 </Rear Equipment>
 
 <source>
-ED Dark Age
+Era Digest:Dark Age - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Golden Century/Kokou Defense Tank (XL).blk b/megamek/data/mechfiles/vehicles/Golden Century/Kokou Defense Tank (XL).blk
index 17065f387d3..23bf95b7592 100644
--- a/megamek/data/mechfiles/vehicles/Golden Century/Kokou Defense Tank (XL).blk	
+++ b/megamek/data/mechfiles/vehicles/Golden Century/Kokou Defense Tank (XL).blk	
@@ -92,7 +92,7 @@ CLLargePulseLaser
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Golden Century/Kokou Defense Tank.blk b/megamek/data/mechfiles/vehicles/Golden Century/Kokou Defense Tank.blk
index d5bfda3c379..6345b2d767b 100644
--- a/megamek/data/mechfiles/vehicles/Golden Century/Kokou Defense Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/Golden Century/Kokou Defense Tank.blk	
@@ -95,7 +95,7 @@ CLLargePulseLaser
 </Turret Equipment>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Golden Century/Manticore Heavy Tank EC (Standard).blk b/megamek/data/mechfiles/vehicles/Golden Century/Manticore Heavy Tank EC.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/Golden Century/Manticore Heavy Tank EC (Standard).blk
rename to megamek/data/mechfiles/vehicles/Golden Century/Manticore Heavy Tank EC.blk
index 3ba1baf1491..ef7f7b43176 100644
--- a/megamek/data/mechfiles/vehicles/Golden Century/Manticore Heavy Tank EC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/Golden Century/Manticore Heavy Tank EC.blk	
@@ -115,7 +115,7 @@ TARGETING:TargiTrack 717
 </systemManufacturers>
 
 <source>
-TRO:Golden Century - Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Golden Century/Rhino Fire Support Tank EC (Standard).blk b/megamek/data/mechfiles/vehicles/Golden Century/Rhino Fire Support Tank EC.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/Golden Century/Rhino Fire Support Tank EC (Standard).blk
rename to megamek/data/mechfiles/vehicles/Golden Century/Rhino Fire Support Tank EC.blk
index 3ea9b1b6b06..9beca4c2366 100644
--- a/megamek/data/mechfiles/vehicles/Golden Century/Rhino Fire Support Tank EC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/Golden Century/Rhino Fire Support Tank EC.blk	
@@ -99,7 +99,7 @@ A testbed for new tech, the Coyotes exchanged the LRM 20s for clan versions whil
 </history>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Golden Century/Zephyr Hovertank EC (Standard).blk b/megamek/data/mechfiles/vehicles/Golden Century/Zephyr Hovertank EC.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/Golden Century/Zephyr Hovertank EC (Standard).blk
rename to megamek/data/mechfiles/vehicles/Golden Century/Zephyr Hovertank EC.blk
index 6f60288e539..2fd079f759d 100644
--- a/megamek/data/mechfiles/vehicles/Golden Century/Zephyr Hovertank EC (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/Golden Century/Zephyr Hovertank EC.blk	
@@ -101,7 +101,7 @@ Before the Blood Spirits began isolating themselves, they built a popular armor
 </history>
 
 <source>
-Succession Wars
+TRO: Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/HB HD/Apocalypse World Rover (Standard).blk b/megamek/data/mechfiles/vehicles/HB HD/Apocalypse World Rover.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/HB HD/Apocalypse World Rover (Standard).blk
rename to megamek/data/mechfiles/vehicles/HB HD/Apocalypse World Rover.blk
diff --git a/megamek/data/mechfiles/vehicles/HB HM/Hector Road Train Tractor (Standard).blk b/megamek/data/mechfiles/vehicles/HB HM/Hector Road Train Tractor.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/HB HM/Hector Road Train Tractor (Standard).blk
rename to megamek/data/mechfiles/vehicles/HB HM/Hector Road Train Tractor.blk
diff --git a/megamek/data/mechfiles/vehicles/HB HM/Hector Road Train Trailer Module (Standard).blk b/megamek/data/mechfiles/vehicles/HB HM/Hector Road Train Trailer Module.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/HB HM/Hector Road Train Trailer Module (Standard).blk
rename to megamek/data/mechfiles/vehicles/HB HM/Hector Road Train Trailer Module.blk
diff --git a/megamek/data/mechfiles/vehicles/HB HM/Ibex RV (Standard).blk b/megamek/data/mechfiles/vehicles/HB HM/Ibex RV.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/HB HM/Ibex RV (Standard).blk
rename to megamek/data/mechfiles/vehicles/HB HM/Ibex RV.blk
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Ballista Self Propelled Artillery Tank.blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Ballista Self Propelled Artillery Tank.blk
index d68a24a62c5..102dcf20016 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Ballista Self Propelled Artillery Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Ballista Self Propelled Artillery Tank.blk	
@@ -110,7 +110,7 @@ The vehicle's armament fluff classifies the individual Sniper weapon as a cannon
 </notes>
 
 <source>
-Hist LOT II
+Historical:Liberation of Terra II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Pollux ADA Heavy Tank.blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Pollux ADA Heavy Tank.blk
index f5f2a3c005a..a3b32895dc3 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Pollux ADA Heavy Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Pollux ADA Heavy Tank.blk	
@@ -116,7 +116,7 @@ Pollux
 </primaryFactory>
 
 <source>
-Hist LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Vali Artillery Vehicle.blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Vali Artillery Vehicle.blk
index 87217a549fd..169fb0ae222 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Vali Artillery Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Vali Artillery Vehicle.blk	
@@ -112,7 +112,7 @@ Ozawa
 </primaryFactory>
 
 <source>
-Hist LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Vector (Attack).blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Vector (Attack).blk
index bb73a34feb4..9ab38f6c5cc 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Vector (Attack).blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Vector (Attack).blk	
@@ -114,7 +114,7 @@ Outreach
 </primaryFactory>
 
 <source>
-HIST LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Vector EW.blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Vector EW.blk
index 20677bfe85d..8af8fee0efe 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Vector EW.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Vector EW.blk	
@@ -116,7 +116,7 @@ Outreach
 </primaryFactory>
 
 <source>
-HIST LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Vector Scout.blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Vector Scout.blk
index c6cedd67cc6..e503eeb0c82 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Vector Scout.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Vector Scout.blk	
@@ -116,7 +116,7 @@ Outreach
 </primaryFactory>
 
 <source>
-HIST LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Vector Transport.blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Vector Transport.blk
index 2fd2918d138..dc7eabe9fc5 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Vector Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Vector Transport.blk	
@@ -86,7 +86,7 @@ Medium Laser
 </Rotor Equipment>
 
 <source>
-HIST LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (AC20).blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (AC20).blk
index b8c65df40d0..f1029ea4de6 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (AC20).blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (AC20).blk	
@@ -82,7 +82,7 @@ Autocannon/20
 </Rear Equipment>
 
 <source>
-Hist LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (LB-10X).blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (LB-10X).blk
index 1702831c1c7..e9ab596c248 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (LB-10X).blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (LB-10X).blk	
@@ -86,7 +86,7 @@ LRM 5
 </Rear Equipment>
 
 <source>
-Hist LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (Ultra5).blk b/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (Ultra5).blk
index c91bb4227d4..4c92e105f67 100644
--- a/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (Ultra5).blk	
+++ b/megamek/data/mechfiles/vehicles/Hist LOT II/Weapon Carrier Tracked (Ultra5).blk	
@@ -91,7 +91,7 @@ LRM 5
 </Rear Equipment>
 
 <source>
-Hist LOT II
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist Reunification War/Gallant Urban Assault Tank.blk b/megamek/data/mechfiles/vehicles/Hist Reunification War/Gallant Urban Assault Tank.blk
index 38773bc04e7..302bd380cd9 100644
--- a/megamek/data/mechfiles/vehicles/Hist Reunification War/Gallant Urban Assault Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist Reunification War/Gallant Urban Assault Tank.blk	
@@ -84,7 +84,7 @@ SRM 2
 </Turret Equipment>
 
 <source>
-Hist:Reunification War
+Historical:Reunification War - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist Reunification War/Hipparch Cavalry Tank.blk b/megamek/data/mechfiles/vehicles/Hist Reunification War/Hipparch Cavalry Tank.blk
index 175d49eb44e..ad0ecb29aa5 100644
--- a/megamek/data/mechfiles/vehicles/Hist Reunification War/Hipparch Cavalry Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist Reunification War/Hipparch Cavalry Tank.blk	
@@ -75,7 +75,7 @@ SRM 2
 </Turret Equipment>
 
 <source>
-Hist:Reunification War
+Historical:Reunification War - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist Reunification War/Tiger Medium Tank T-12.blk b/megamek/data/mechfiles/vehicles/Hist Reunification War/Tiger Medium Tank T-12.blk
index 9026a19e2ce..8ecbc02bdf4 100644
--- a/megamek/data/mechfiles/vehicles/Hist Reunification War/Tiger Medium Tank T-12.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist Reunification War/Tiger Medium Tank T-12.blk	
@@ -80,7 +80,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-Hist:Reunification War
+Historical:Reunification War - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Hist Reunification War/Wayland Mobile Base.blk b/megamek/data/mechfiles/vehicles/Hist Reunification War/Wayland Mobile Base.blk
index 84927bbad0d..240f327584c 100644
--- a/megamek/data/mechfiles/vehicles/Hist Reunification War/Wayland Mobile Base.blk	
+++ b/megamek/data/mechfiles/vehicles/Hist Reunification War/Wayland Mobile Base.blk	
@@ -98,7 +98,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-Hist:Reunification War
+Historical:Reunification War - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/House Arano/Sleipnir APC SRM.blk b/megamek/data/mechfiles/vehicles/House Arano/Sleipnir APC SRM.blk
index cddb4ee68c7..4396e4ec745 100644
--- a/megamek/data/mechfiles/vehicles/House Arano/Sleipnir APC SRM.blk	
+++ b/megamek/data/mechfiles/vehicles/House Arano/Sleipnir APC SRM.blk	
@@ -87,7 +87,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-House Arano
+House Arano - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/House Arano/Sleipnir APC.blk b/megamek/data/mechfiles/vehicles/House Arano/Sleipnir APC.blk
index 1f118eabb32..f415dd046e4 100644
--- a/megamek/data/mechfiles/vehicles/House Arano/Sleipnir APC.blk	
+++ b/megamek/data/mechfiles/vehicles/House Arano/Sleipnir APC.blk	
@@ -84,7 +84,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-House Arano
+House Arano - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/House Arano/Vargr APC LRM.blk b/megamek/data/mechfiles/vehicles/House Arano/Vargr APC LRM.blk
index 470c4ced83f..9a86128ddc6 100644
--- a/megamek/data/mechfiles/vehicles/House Arano/Vargr APC LRM.blk	
+++ b/megamek/data/mechfiles/vehicles/House Arano/Vargr APC LRM.blk	
@@ -84,7 +84,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-House Arano
+House Arano - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/House Arano/Vargr APC.blk b/megamek/data/mechfiles/vehicles/House Arano/Vargr APC.blk
index 3377236f41e..cd841c2cd43 100644
--- a/megamek/data/mechfiles/vehicles/House Arano/Vargr APC.blk	
+++ b/megamek/data/mechfiles/vehicles/House Arano/Vargr APC.blk	
@@ -84,7 +84,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-House Arano
+House Arano - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Hoverbike (Laser).blk b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Hoverbike (Laser).blk
index b7c6562faf5..d7a6c58b1b4 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Hoverbike (Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Hoverbike (Laser).blk	
@@ -96,7 +96,7 @@ Support Laser
 </armor_tech_rating>
 
 <source>
-IrTech
+TRO: Irregulars - Late Succession War - Renaissance
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Hoverbike (MG).blk b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Hoverbike (MG).blk
index aa3badda354..58cbbcf603c 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Hoverbike (MG).blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Hoverbike (MG).blk	
@@ -96,7 +96,7 @@ Machine Gun (Support)
 </armor_tech_rating>
 
 <source>
-IrTech
+TRO: Irregulars - Late Succession War - Renaissance
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Minigun Cycle (SRM).blk b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Minigun Cycle (SRM).blk
index 6c97557d548..eb809837c5c 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Minigun Cycle (SRM).blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Minigun Cycle (SRM).blk	
@@ -99,7 +99,7 @@ SRM Launcher (Light)
 </armor_tech_rating>
 
 <source>
-Age of War
+TRO: Irregulars - Age of War 
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Minigun Cycle.blk b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Minigun Cycle.blk
index ba7925c0760..3d5c2d2b415 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Minigun Cycle.blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Minigun Cycle.blk	
@@ -96,7 +96,7 @@ Machine Gun (Support)
 </armor_tech_rating>
 
 <source>
-Age of War
+TRO: Irregulars - Age of War 
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Monocycle.blk b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Monocycle.blk
index 7de9a506ad6..a69d05ef54d 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Monocycle.blk
+++ b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Monocycle.blk
@@ -99,7 +99,7 @@ Plasma Rifle (Man-Portable)
 </armor_tech_rating>
 
 <source>
-Jihad
+TRO: Irregulars - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Scout ATV.blk b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Scout ATV.blk
index 4b42682f21d..a1e22dc7417 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Scout ATV.blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Scout ATV.blk	
@@ -95,7 +95,7 @@ Grenade Launcher (Heavy)
 </armor_tech_rating>
 
 <source>
-Clan Invasion
+TRO: Irregulars - Late Succession War - Renaissance
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Smalls/TrackBike.blk b/megamek/data/mechfiles/vehicles/IrTech/Smalls/TrackBike.blk
index 40ff4b5d030..5d98fa5337c 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Smalls/TrackBike.blk
+++ b/megamek/data/mechfiles/vehicles/IrTech/Smalls/TrackBike.blk
@@ -94,7 +94,7 @@ Autocannon (Semi-Portable)
 </armor_tech_rating>
 
 <source>
-Age of War
+TRO: Irregulars - Age of War 
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Trike.blk b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Trike.blk
index 2cc50e92ac4..7414c6b7510 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Smalls/Trike.blk
+++ b/megamek/data/mechfiles/vehicles/IrTech/Smalls/Trike.blk
@@ -96,7 +96,7 @@ Flamer (Heavy)
 </armor_tech_rating>
 
 <source>
-Age of War
+TRO: Irregulars - Age of War 
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Prime Mover (Succession Wars).blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Prime Mover (Succession Wars).blk
index efa3e8ad409..3c79dae394a 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Prime Mover (Succession Wars).blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Prime Mover (Succession Wars).blk	
@@ -103,7 +103,7 @@ SRM 6
 </armor_tech_rating>
 
 <source>
-Succession Wars
+TRO: Irregulars - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Prime Mover.blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Prime Mover.blk
index 38ee728a827..75ae7d3af1a 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Prime Mover.blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Prime Mover.blk	
@@ -104,7 +104,7 @@ LRM 5
 </armor_tech_rating>
 
 <source>
-Clan Invasion
+TRO: Irregulars - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Gunship WiGE.blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Gunship WiGE.blk
index fb6a27d2322..23b4bf724b0 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Gunship WiGE.blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Gunship WiGE.blk	
@@ -100,7 +100,7 @@ ISVehicularMineDispenser
 </armor_tech_rating>
 
 <source>
-Civil War
+TRO: Irregulars - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE (LB-10X).blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE (LB-10X).blk
index a1b3cefc0ed..3d13b7f2023 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE (LB-10X).blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE (LB-10X).blk	
@@ -101,7 +101,7 @@ ISVehicularMineDispenser
 </armor_tech_rating>
 
 <source>
-Civil War
+TRO: Irregulars - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE (LB-2X).blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE (LB-2X).blk
index e1026b414dc..9324067262e 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE (LB-2X).blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE (LB-2X).blk	
@@ -102,7 +102,7 @@ ISVehicularMineDispenser
 </armor_tech_rating>
 
 <source>
-Civil War
+TRO: Irregulars - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE.blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE.blk
index 6dfc298f3cf..dd60820c0db 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE.blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Sturmvogel Maritime Patrol WiGE.blk	
@@ -103,7 +103,7 @@ RemoteSensorDispenser
 </armor_tech_rating>
 
 <source>
-Civil War
+TRO: Irregulars - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout (Camera).blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout (Camera).blk
index c107c65433e..06eeb896b04 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout (Camera).blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout (Camera).blk	
@@ -76,7 +76,7 @@ Medium Laser
 </Rear Equipment>
 
 <source>
-Star League
+TRO: Irregulars - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout (Sensors).blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout (Sensors).blk
index 1ec1ed6a2de..c49e046579b 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout (Sensors).blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout (Sensors).blk	
@@ -76,7 +76,7 @@ Medium Laser
 </Rear Equipment>
 
 <source>
-Star League
+TRO: Irregulars - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout .blk b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout .blk
index e927c126020..e2ccfea066d 100644
--- a/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout .blk	
+++ b/megamek/data/mechfiles/vehicles/IrTech/Vehicles/Wheeled Scout .blk	
@@ -76,7 +76,7 @@ Medium Laser
 </Rear Equipment>
 
 <source>
-Star League
+TRO: Irregulars - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Operation Klondike/Brunel Dump Truck AC20.blk b/megamek/data/mechfiles/vehicles/Operation Klondike/Brunel Dump Truck AC20.blk
index fb5678f5845..0b49b0711d2 100644
--- a/megamek/data/mechfiles/vehicles/Operation Klondike/Brunel Dump Truck AC20.blk	
+++ b/megamek/data/mechfiles/vehicles/Operation Klondike/Brunel Dump Truck AC20.blk	
@@ -113,7 +113,7 @@ Not enough item slots available! Using 14 slot(s) too many. Armor is based on fl
 </notes>
 
 <source>
-H:Operation Klondike - Succession Wars
+Historical:Operation Klondike - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Operation Klondike/Brunel Dump Truck LRM.blk b/megamek/data/mechfiles/vehicles/Operation Klondike/Brunel Dump Truck LRM.blk
index 2aa778eb959..6bda04c6c67 100644
--- a/megamek/data/mechfiles/vehicles/Operation Klondike/Brunel Dump Truck LRM.blk	
+++ b/megamek/data/mechfiles/vehicles/Operation Klondike/Brunel Dump Truck LRM.blk	
@@ -114,7 +114,7 @@ ISLRM20
 </tonnage>
 
 <source>
-H:Operation Klondike - Succession Wars
+Historical:Operation Klondike - Early Succession War
 </source>
 
 <history>
diff --git a/megamek/data/mechfiles/vehicles/Operation Klondike/Galleon Light Tank GAL-200 (RL).blk b/megamek/data/mechfiles/vehicles/Operation Klondike/Galleon Light Tank GAL-200 (RL).blk
index c2d6a0ffd56..d7b33a39e07 100644
--- a/megamek/data/mechfiles/vehicles/Operation Klondike/Galleon Light Tank GAL-200 (RL).blk	
+++ b/megamek/data/mechfiles/vehicles/Operation Klondike/Galleon Light Tank GAL-200 (RL).blk	
@@ -106,5 +106,5 @@ PETROCHEMICALS
 </fuelType>
 
 <source>
-OP Klondyke - Late Succession War
+Historical:Operation Klondike - Early Succession War
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/Operation Klondike/Von Luckner Heavy Tank (Royal).blk b/megamek/data/mechfiles/vehicles/Operation Klondike/Von Luckner Heavy Tank (Royal).blk
index 7affec44ad0..7fdf8bba254 100644
--- a/megamek/data/mechfiles/vehicles/Operation Klondike/Von Luckner Heavy Tank (Royal).blk	
+++ b/megamek/data/mechfiles/vehicles/Operation Klondike/Von Luckner Heavy Tank (Royal).blk	
@@ -132,7 +132,7 @@ TARGETING:O/P GRNDSTAT 50A
 </systemManufacturers>
 
 <source>
-Hist: Op Klondike - Star League
+Historical:Operation Klondike - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Operation Klondike/Von Luckner Heavy Tank (Star League).blk b/megamek/data/mechfiles/vehicles/Operation Klondike/Von Luckner Heavy Tank (Star League).blk
index 61bb849b73b..bff7fef5fab 100644
--- a/megamek/data/mechfiles/vehicles/Operation Klondike/Von Luckner Heavy Tank (Star League).blk	
+++ b/megamek/data/mechfiles/vehicles/Operation Klondike/Von Luckner Heavy Tank (Star League).blk	
@@ -136,5 +136,5 @@ TARGETING:O/P GRNDSTAT 50A
 </tonnage>
 
 <source>
-Hist: Op Klondike - Star League
+Historical:Operation Klondike - Star League
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Aithon Assault Transport.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Aithon Assault Transport.blk
index faa1f61f8ab..f29b94b37b0 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Aithon Assault Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Aithon Assault Transport.blk	
@@ -93,7 +93,7 @@ CLMediumPulseLaser
 </Turret Equipment>
 
 <source>
-TRO:Prototype
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Bandit Mk II.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Bandit Mk II.blk
index 86665ccc41e..0b7ea7402dc 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Bandit Mk II.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Bandit Mk II.blk	
@@ -85,7 +85,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO:Prototype
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Cavalry (Infiltrator).blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Cavalry (Infiltrator).blk
index 227fa3a026c..2adc8a2d6be 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Cavalry (Infiltrator).blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Cavalry (Infiltrator).blk	
@@ -97,7 +97,7 @@ ISMagshotGR
 </Turret Equipment>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Challenger MBT XV.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Challenger MBT XV.blk
index d6afd51d6be..140d7c352e7 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Challenger MBT XV.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Challenger MBT XV.blk	
@@ -94,7 +94,7 @@ ISSBGR
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Enyo Strike Tank ER Pulse.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Enyo Strike Tank ER Pulse.blk
index f8f47195f49..0e8f9dfe8bd 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Enyo Strike Tank ER Pulse.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Enyo Strike Tank ER Pulse.blk	
@@ -85,7 +85,7 @@ CLERMediumPulseLaser
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Fulcrum Heavy Hover Tank Hybrid.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Fulcrum Heavy Hover Tank Hybrid.blk
index 31c5c7454ec..b73c231a4b8 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Fulcrum Heavy Hover Tank Hybrid.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Fulcrum Heavy Hover Tank Hybrid.blk	
@@ -88,7 +88,7 @@ ISMagshotGR
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Garuda Heavy VTOL.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Garuda Heavy VTOL.blk
index a28f13f5696..ce768cbffbb 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Garuda Heavy VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Garuda Heavy VTOL.blk	
@@ -89,7 +89,7 @@ CLTAG
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Heavy NLRM Carrier.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Heavy NLRM Carrier.blk
index 65028cb6ee5..cfb58f6e8ad 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Heavy NLRM Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Heavy NLRM Carrier.blk	
@@ -87,7 +87,7 @@ Enhanced LRM 15
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Hephaestus (AP) Jump Tank.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Hephaestus (AP) Jump Tank.blk
index af7680785c2..bec0a18d38c 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Hephaestus (AP) Jump Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Hephaestus (AP) Jump Tank.blk	
@@ -99,7 +99,7 @@ CLAPGaussRifle
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Hephaestus Jump Tank.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Hephaestus Jump Tank.blk
index c1eaa3c9493..c013a906778 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Hephaestus Jump Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Hephaestus Jump Tank.blk	
@@ -97,7 +97,7 @@ CLTAG
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Hiryo Armored Infantry Transport BloodHound.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Hiryo Armored Infantry Transport BloodHound.blk
index f5c1561efb6..1de57b1bdcb 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Hiryo Armored Infantry Transport BloodHound.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Hiryo Armored Infantry Transport BloodHound.blk	
@@ -57,7 +57,7 @@ IS Level 3
 </year>
 
 <source>
-TRO:Prototype
+TRO:Prototypes - Early Republic
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Hunter Light Support Tank (Amphibious).blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Hunter Light Support Tank (Amphibious).blk
index 38c6b0a7d8a..af67fa9d316 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Hunter Light Support Tank (Amphibious).blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Hunter Light Support Tank (Amphibious).blk	
@@ -86,7 +86,7 @@ Enhanced LRM 10
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Kalki Cruise Missile Launcher.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Kalki Cruise Missile Launcher.blk
index 58183443a3d..687e28655c2 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Kalki Cruise Missile Launcher.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Kalki Cruise Missile Launcher.blk	
@@ -84,7 +84,7 @@ ISMagshotGR
 </Turret Equipment>
 
 <source>
-TRO:Prototype - Jihad
+TRO:Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Lexan Surveillance VTOL.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Lexan Surveillance VTOL.blk
index d590d31e515..2066d42c696 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Lexan Surveillance VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Lexan Surveillance VTOL.blk	
@@ -103,7 +103,7 @@ ISReconCamera
 </armor_tech_rating>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Myrmidon Medium Tank (Anti-Infantry).blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Myrmidon Medium Tank (Anti-Infantry).blk
index a82e0adc159..f76c5ef576e 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Myrmidon Medium Tank (Anti-Infantry).blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Myrmidon Medium Tank (Anti-Infantry).blk	
@@ -80,7 +80,7 @@ ISERLargeLaser
 </Turret Equipment>
 
 <source>
-TRO:Prototype
+TRO:Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Nuberu Anti Aircraft Tank 2 Numantia.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Nuberu Anti Aircraft Tank 2 Numantia.blk
index 225c887ea63..f3def5ca969 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Nuberu Anti Aircraft Tank 2 Numantia.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Nuberu Anti Aircraft Tank 2 Numantia.blk	
@@ -104,7 +104,7 @@ CLStreakSRM6
 </Front Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Nuberu Anti Aircraft Tank.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Nuberu Anti Aircraft Tank.blk
index aaf15a682df..22966d4b610 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Nuberu Anti Aircraft Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Nuberu Anti Aircraft Tank.blk	
@@ -89,7 +89,7 @@ CLLBXAC5
 </Front Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Pegasus Scout Hover Tank X-Pulse.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Pegasus Scout Hover Tank X-Pulse.blk
index 227e7512af6..d98f49a581d 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Pegasus Scout Hover Tank X-Pulse.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Pegasus Scout Hover Tank X-Pulse.blk	
@@ -85,7 +85,7 @@ ISStreakSRM6
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
@@ -125,5 +125,5 @@ TARGETING:Exeter LongScan with ReconLock
 </systemManufacturers>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Phalanx Support Tank (Production).blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Phalanx Support Tank (Production).blk
index 8a1c93d4dec..7fa3b69e00a 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Phalanx Support Tank (Production).blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Phalanx Support Tank (Production).blk	
@@ -78,7 +78,7 @@ ISSniperCannon
 </Turret Equipment>
 
 <source>
-Jihad
+TRO: Prototypes - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Phalanx Support Tank(Prototype).blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Phalanx Support Tank(Prototype).blk
index 28e45e40260..35b64f9fe16 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Phalanx Support Tank(Prototype).blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Phalanx Support Tank(Prototype).blk	
@@ -86,5 +86,5 @@ ISSniperCannon
 </Turret Equipment>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Po Heavy Tank HV.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Po Heavy Tank HV.blk
index 685f3007820..5c760d1fa40 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Po Heavy Tank HV.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Po Heavy Tank HV.blk	
@@ -84,7 +84,7 @@ Hyper Velocity Auto Cannon/10
 </Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Scorpion Light Tank (Minesweeper).blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Scorpion Light Tank (Minesweeper).blk
index c6ad7b15c34..122f8fea977 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Scorpion Light Tank (Minesweeper).blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Scorpion Light Tank (Minesweeper).blk	
@@ -83,7 +83,7 @@ ISMineSweeper
 </Rear Equipment>
 
 <source>
-TRO Prototypes
+TRO: Prototypes
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Sea Skimmer Hydrofoil ELRM.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Sea Skimmer Hydrofoil ELRM.blk
index dc4bab1b97a..f7f1d66424e 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Sea Skimmer Hydrofoil ELRM.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Sea Skimmer Hydrofoil ELRM.blk	
@@ -29,7 +29,7 @@ Sea Skimmer Hydrofoil
 </year>
 
 <Source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </Source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Skulker Wheeled Scout Tank MK II.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Skulker Wheeled Scout Tank MK II.blk
index 690e0bc547e..ccab76b8900 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Skulker Wheeled Scout Tank MK II.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Skulker Wheeled Scout Tank MK II.blk	
@@ -108,7 +108,7 @@ TARGETING:Targeting System 2.3 with Bloodhound
 </systemManufacturers>
 
 <source>
-TRO:Prototype
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Sokar Urban Combat Unit.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Sokar Urban Combat Unit.blk
index 9fe83353115..d27b1909269 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Sokar Urban Combat Unit.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Sokar Urban Combat Unit.blk	
@@ -93,7 +93,7 @@ CLAPGaussRifle
 </Turret Equipment>
 
 <source>
-TRO:Prototype
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Thumper Artillery Vehicle Angel.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Thumper Artillery Vehicle Angel.blk
index 1509445957f..5a2f5cff85e 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Thumper Artillery Vehicle Angel.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Thumper Artillery Vehicle Angel.blk	
@@ -81,7 +81,7 @@ Machine Gun(ST)
 </Rear Equipment>
 
 <source>
-TRO:Prototype
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Vedette Medium Tank V7.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Vedette Medium Tank V7.blk
index bf60ded51e7..66613aeb99f 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Vedette Medium Tank V7.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Vedette Medium Tank V7.blk	
@@ -122,7 +122,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Vidar Heavy Defense Tank.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Vidar Heavy Defense Tank.blk
index c4ceb2f6341..a55e44f9dd7 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Vidar Heavy Defense Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Vidar Heavy Defense Tank.blk	
@@ -105,7 +105,7 @@ CLLargeChemLaser
 </Front Turret Equipment>
 
 <source>
-TRO:Prototypes
+TRO:Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/ProtoTypes/Warrior S-9 Stealth Helicopter.blk b/megamek/data/mechfiles/vehicles/ProtoTypes/Warrior S-9 Stealth Helicopter.blk
index 923a60fb2ca..58a02350739 100644
--- a/megamek/data/mechfiles/vehicles/ProtoTypes/Warrior S-9 Stealth Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/ProtoTypes/Warrior S-9 Stealth Helicopter.blk	
@@ -121,7 +121,7 @@ TARGETING:Dwyerson Mk XIX
 </systemManufacturers>
 
 <source>
-TRO Prototypes - Early Republic
+TRO: Prototypes - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (Chemical).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (Chemical).blk
index 98f88dff035..d5145427b0d 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (Chemical).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (Chemical).blk	
@@ -95,7 +95,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-Rec Guide 25  - Early Republic
+Rec Guide:ilClan #25 - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (ERLL).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (ERLL).blk
index 50094fa716e..0891d1523f2 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (ERLL).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (ERLL).blk	
@@ -96,7 +96,7 @@ ISArtemisIV
 </Turret Equipment>
 
 <source>
-Rec Guide 25 - Early Republic
+Rec Guide:ilClan #25 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (LB-X).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (LB-X).blk
index 8eb9026911e..0ac5d226657 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (LB-X).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (LB-X).blk	
@@ -98,7 +98,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-Rec Guide 25 - Early Republic
+Rec Guide:ilClan #25 - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (Plasma).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (Plasma).blk
index 28d7db102a5..946c8e58eda 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (Plasma).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Bulldog Medium Tank (Plasma).blk	
@@ -95,7 +95,7 @@ ISStreakSRM4
 </Turret Equipment>
 
 <source>
-Rec Guide 25 - Early Republic
+Rec Guide:ilClan #25 - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Arrow IV).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Arrow IV).blk
index f3407193914..3ae209a471a 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Arrow IV).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Arrow IV).blk	
@@ -97,7 +97,7 @@ ISArrowIV
 </Turret Equipment>
 
 <source>
-Civil War
+Rec Guide:ilClan #25 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Cell).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Cell).blk
index bc230889cd6..8f82be6305a 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Cell).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Cell).blk	
@@ -98,7 +98,7 @@ ISUltraAC20
 </Turret Equipment>
 
 <source>
-Clan Invasion
+Rec Guide:ilClan #25 - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Clan).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Clan).blk
index bfdd0ef6aa0..44c3e836791 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Clan).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Clan).blk	
@@ -110,7 +110,7 @@ CLMediumPulseLaser
 </Turret Equipment>
 
 <source>
-Civil War
+Rec Guide:ilClan #27 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Gauss).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Gauss).blk
index 1ff87e2b3d2..6ab746cb547 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Gauss).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Gauss).blk	
@@ -94,7 +94,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-Clan Invasion
+Rec Guide:ilClan #25 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (MRM).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (MRM).blk
index 1aa2743369b..c85364d1d27 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (MRM).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (MRM).blk	
@@ -96,7 +96,7 @@ MRM 30
 </Turret Equipment>
 
 <source>
-Clan Invasion
+Rec Guide:ilClan #25 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Reinforced).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Reinforced).blk
index 9acabe9ddfa..da6995b943f 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Reinforced).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Demolisher Heavy Tank (Reinforced).blk	
@@ -94,7 +94,7 @@ ISUltraAC10
 </Turret Equipment>
 
 <source>
-Clan Invasion
+Rec Guide:ilClan #25 - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Pegasus Scout Hover Tank (Upgrade).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Pegasus Scout Hover Tank (Upgrade).blk
index 2a849172468..8bd914f0faa 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Pegasus Scout Hover Tank (Upgrade).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 25/Pegasus Scout Hover Tank (Upgrade).blk	
@@ -127,7 +127,7 @@ TARGETING:Exeter LongScan with ReconLock
 </systemManufacturers>
 
 <source>
-Rec Guide 25 - Early Republic
+Rec Guide:ilClan #25 - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 26/Condor Heavy Hover Tank (Laser).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 26/Condor Heavy Hover Tank (Laser).blk
index dadcbc0ea23..50bb82704c3 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 26/Condor Heavy Hover Tank (Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 26/Condor Heavy Hover Tank (Laser).blk	
@@ -64,7 +64,7 @@ IS Level 2
 Hover
 </motion_type>
 <source>
-Clan Invasion
+Rec Guide:ilClan #26 - Clan Invasion
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 27/Hawk Hover Tank (LTV-4).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 27/Hawk Hover Tank (LTV-4).blk
index 47ade995f6e..42b1e5edc60 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 27/Hawk Hover Tank (LTV-4).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 27/Hawk Hover Tank (LTV-4).blk	
@@ -81,11 +81,11 @@ SRM 4
 </Turret Equipment>
 
 <notes>
-Experimental until 2470. Originally known as the LTV-4 Hover Tank in XTRO: Primitives Vol 2.
+Experimental until 2470. Originally known as the LTV-4 Hover Tank in XTR:  Primitives Vol 2.
 </notes>
 
 <source>
-Rec Guide:ilClan #27 -  Age of War
+Rec Guide:ilClan #27 - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Harrier Heavy Hover Tank (Re-Laser).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Harrier Heavy Hover Tank (Re-Laser).blk
index 8752a0417cb..4a9947f131a 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Harrier Heavy Hover Tank (Re-Laser).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Harrier Heavy Hover Tank (Re-Laser).blk	
@@ -118,7 +118,7 @@ TARGETING:Maxell AT70
 </systemManufacturers>
 
 <source>
-ilClan #31 - Dark Age
+Rec Guide:ilClan #31 - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Manticore Heavy Tank (XL).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Manticore Heavy Tank (XL).blk
index 9f7c7e5ede4..2a263f1eb13 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Manticore Heavy Tank (XL).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Manticore Heavy Tank (XL).blk	
@@ -125,7 +125,7 @@ TARGETING:TargiTrack 717
 </systemManufacturers>
 
 <source>
-Rec Guide:ilClan #31 -  Dark Age
+Rec Guide:ilClan #31 - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Skimmer (Standard).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Skimmer.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Skimmer (Standard).blk
rename to megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 31/Skimmer.blk
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 32/J. Edgar Light Hover Tank (Kurita).blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 32/J. Edgar Light Hover Tank (Kurita).blk
index 3793e64d4ba..79a00fedc08 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 32/J. Edgar Light Hover Tank (Kurita).blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 32/J. Edgar Light Hover Tank (Kurita).blk	
@@ -91,7 +91,7 @@ Small Laser
 </Turret Equipment>
 
 <source>
-Clan Invasion
+Rec Guide:ilClan #32 - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 32/Schrek AC Carrier.blk b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 32/Schrek AC Carrier.blk
index 143646d61e7..1328c42189a 100644
--- a/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 32/Schrek AC Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/Rec Guides ilClan/Vol 32/Schrek AC Carrier.blk	
@@ -89,7 +89,7 @@ Autocannon/5
 </Turret Equipment>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Shrapnel/Vol 5/SM5 Field Commander Prime.blk b/megamek/data/mechfiles/vehicles/Shrapnel/Vol 5/SM5 Field Commander Prime.blk
index 56f9e38b0a3..bc11b66d12b 100644
--- a/megamek/data/mechfiles/vehicles/Shrapnel/Vol 5/SM5 Field Commander Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/Shrapnel/Vol 5/SM5 Field Commander Prime.blk	
@@ -135,7 +135,7 @@ TARGETING:Able-Seven Sensor Suite
 </systemManufacturers>
 
 <source>
-Shrapnel 6 - ilClan
+Shrapnel #6 - ilClan
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Somerset Strikers/Packrat LRPV PKR-T5 (TOC).blk b/megamek/data/mechfiles/vehicles/Somerset Strikers/Packrat LRPV PKR-T5 (TOC).blk
index cf97f00c0af..801a9df02bd 100644
--- a/megamek/data/mechfiles/vehicles/Somerset Strikers/Packrat LRPV PKR-T5 (TOC).blk	
+++ b/megamek/data/mechfiles/vehicles/Somerset Strikers/Packrat LRPV PKR-T5 (TOC).blk	
@@ -74,7 +74,7 @@ Communications Equipment (2 ton)
 </Rear Equipment>
 
 <source>
-Somerset Strikers
+Somerset Strikers - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TOS/Stotzing/Desert Scorpion (Standard).blk b/megamek/data/mechfiles/vehicles/TOS/Stotzing/Desert Scorpion.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/TOS/Stotzing/Desert Scorpion (Standard).blk
rename to megamek/data/mechfiles/vehicles/TOS/Stotzing/Desert Scorpion.blk
diff --git a/megamek/data/mechfiles/vehicles/TOS/Tortuga/Outrider (Standard).blk b/megamek/data/mechfiles/vehicles/TOS/Tortuga/Outrider.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/TOS/Tortuga/Outrider (Standard).blk
rename to megamek/data/mechfiles/vehicles/TOS/Tortuga/Outrider.blk
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Bayamo Hoverbike (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Bayamo Hoverbike.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Bayamo Hoverbike (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Bayamo Hoverbike.blk
index f95fb477d07..67fe956d68b 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Bayamo Hoverbike (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Bayamo Hoverbike.blk	
@@ -86,7 +86,7 @@ HHSearchlight
 </structural_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Buffalo BFFL Hovertruck (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Buffalo BFFL Hovertruck.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Buffalo BFFL Hovertruck (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Buffalo BFFL Hovertruck.blk
index b69a45433bb..ec61023e49a 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Buffalo BFFL Hovertruck (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Buffalo BFFL Hovertruck.blk	
@@ -94,7 +94,7 @@ Cargo Container (10 tons)
 </structural_tech_rating>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports CS535 Hover Car (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports CS535 Hover Car.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports CS535 Hover Car (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports CS535 Hover Car.blk
index 8af1e8088a4..45725c691cc 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports CS535 Hover Car (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports CS535 Hover Car.blk	
@@ -85,7 +85,7 @@ UltraLightChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports Crimson Streak Hover Racer (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports Crimson Streak Hover Racer.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports Crimson Streak Hover Racer (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports Crimson Streak Hover Racer.blk
index dd06cfe9616..f1d25405d51 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports Crimson Streak Hover Racer (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Champion Hoversports Crimson Streak Hover Racer.blk	
@@ -85,7 +85,7 @@ UltraLightChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Deusenberg VIP Luxury Hovercar (One).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Deusenberg VIP Luxury Hovercar (One).blk
index 6549b2d3058..700e9842c40 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Deusenberg VIP Luxury Hovercar (One).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Deusenberg VIP Luxury Hovercar (One).blk	
@@ -91,7 +91,7 @@ ISAntiPersonnelPod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Deusenberg VIP Luxury Hovercar (Original).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Deusenberg VIP Luxury Hovercar (Original).blk
index 8612679a9b7..a878233de90 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Deusenberg VIP Luxury Hovercar (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Deusenberg VIP Luxury Hovercar (Original).blk	
@@ -82,7 +82,7 @@ Armored Chassis
 </Rear Equipment>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Freedom 900 Hover Jeep (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Freedom 900 Hover Jeep.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Freedom 900 Hover Jeep (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Freedom 900 Hover Jeep.blk
index 12a23d35852..6cbc4f958ca 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Freedom 900 Hover Jeep (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Freedom 900 Hover Jeep.blk	
@@ -85,7 +85,7 @@ ConvertibleChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Ina-du Swamp Skimmer (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Ina-du Swamp Skimmer.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Ina-du Swamp Skimmer (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Ina-du Swamp Skimmer.blk
index 863f28747e7..4ef3bfba245 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Ina-du Swamp Skimmer (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Ina-du Swamp Skimmer.blk	
@@ -85,7 +85,7 @@ standardseats:.3:4
 </transporters>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Kressly Dillinger Police Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Kressly Dillinger Police Vehicle.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Kressly Dillinger Police Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Kressly Dillinger Police Vehicle.blk
index 6d299e3e20c..ca40fd609e1 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Kressly Dillinger Police Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Kressly Dillinger Police Vehicle.blk	
@@ -94,7 +94,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Lewis Skimmer Bus (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Lewis Skimmer Bus.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Lewis Skimmer Bus (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Lewis Skimmer Bus.blk
index c551e49c673..2c189d842da 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Lewis Skimmer Bus (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Lewis Skimmer Bus.blk	
@@ -92,7 +92,7 @@ standardseats:86.0:0
 </structural_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Routemaster Hover Shuttle (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Routemaster Hover Shuttle.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Routemaster Hover Shuttle (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Routemaster Hover Shuttle.blk
index a122137f310..80a1eac5abd 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Routemaster Hover Shuttle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Routemaster Hover Shuttle.blk	
@@ -84,7 +84,7 @@ standardseats:14.0:0
 </structural_tech_rating>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Slipper Hovercar LX-Series (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Slipper Hovercar LX-Series.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Slipper Hovercar LX-Series (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Slipper Hovercar LX-Series.blk
index 2363d3671dc..6a2a2e0188c 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Slipper Hovercar LX-Series (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Hover/Slipper Hovercar LX-Series.blk	
@@ -85,7 +85,7 @@ UltraLightChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Baleena Passenger Submarine.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Baleena Passenger Submarine.blk
index 87c9d70248c..bb5b02df25c 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Baleena Passenger Submarine.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Baleena Passenger Submarine.blk	
@@ -96,7 +96,7 @@ Cargo Container (10 tons)
 </structural_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Jonah Submarine.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Jonah Submarine.blk
index 372542357fe..af4f0f44149 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Jonah Submarine.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Jonah Submarine.blk	
@@ -102,7 +102,7 @@ Armor exceeds point limit for 2.0-ton Submarine support vehicle: 5 points > 4.
 </notes>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Seahorse Cargo Sub.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Seahorse Cargo Sub.blk
index 176c305c6b7..8c59c510274 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Seahorse Cargo Sub.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Submarine)/Seahorse Cargo Sub.blk	
@@ -92,7 +92,7 @@ LRT 10
 </structural_tech_rating>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Atlantia Luxury Yacht.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Atlantia Luxury Yacht.blk
index b40d9e23c1e..58e89a9d830 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Atlantia Luxury Yacht.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Atlantia Luxury Yacht.blk	
@@ -24,7 +24,7 @@ Atlantia Luxury Yacht
 </year>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Silverback Coastal Cutter.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Silverback Coastal Cutter.blk
index caca828deb4..9217785f18e 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Silverback Coastal Cutter.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Silverback Coastal Cutter.blk	
@@ -97,7 +97,7 @@ Searchlight
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Silverfin Coastal Cutter.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Silverfin Coastal Cutter.blk
index df0aada08e7..75c238e9154 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Silverfin Coastal Cutter.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Silverfin Coastal Cutter.blk	
@@ -97,7 +97,7 @@ Searchlight
 </structural_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Whitestreak Jetski.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Whitestreak Jetski.blk
index f8fa1c07533..901a31e98ae 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Whitestreak Jetski.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Whitestreak Jetski.blk	
@@ -84,7 +84,7 @@ cargobay:0.009:1:1
 </structural_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Whitestreak Speedboat.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Whitestreak Speedboat.blk
index 884477df527..f99e42e3655 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Whitestreak Speedboat.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Naval (Surface)/Whitestreak Speedboat.blk	
@@ -84,7 +84,7 @@ UltraLightChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Rail/Adelante Passenger-Cargo Train (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Rail/Adelante Passenger-Cargo Train.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Rail/Adelante Passenger-Cargo Train (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Rail/Adelante Passenger-Cargo Train.blk
index 4319f7e515a..7400a07b781 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Rail/Adelante Passenger-Cargo Train (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Rail/Adelante Passenger-Cargo Train.blk	
@@ -97,7 +97,7 @@ SV Chassis Mod [Tractor]
 </structural_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Cellco Ranger UPU-3000.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Cellco Ranger UPU-3000.blk
index 635c6bc9616..d1204a94115 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Cellco Ranger UPU-3000.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Cellco Ranger UPU-3000.blk	
@@ -104,7 +104,7 @@ HHSearchlight
 </armor_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Corx Mobile Tunnel Miner (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Corx Mobile Tunnel Miner.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Corx Mobile Tunnel Miner (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Corx Mobile Tunnel Miner.blk
index 8a17a19fa43..593fc4e41e7 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Corx Mobile Tunnel Miner (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Corx Mobile Tunnel Miner.blk	
@@ -117,7 +117,7 @@ MiningDrill
 </armor_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Croyle Systems Cortez Series N (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Croyle Systems Cortez Series N.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Croyle Systems Cortez Series N (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Croyle Systems Cortez Series N.blk
index fa8f3eff024..4289cab6d5a 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Croyle Systems Cortez Series N (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Croyle Systems Cortez Series N.blk	
@@ -110,7 +110,7 @@ Searchlight
 </structural_tech_rating>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Donovan-Miter Magellan Series Four (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Donovan-Miter Magellan Series Four.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Donovan-Miter Magellan Series Four (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Donovan-Miter Magellan Series Four.blk
index 68fcbde2327..e3ec38a40f0 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Donovan-Miter Magellan Series Four (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Donovan-Miter Magellan Series Four.blk	
@@ -109,7 +109,7 @@ Searchlight
 </Turret Equipment>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Trailer (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Trailer.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Trailer (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Trailer.blk
index dc1f88f2255..02f96a0be50 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Trailer (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Trailer.blk	
@@ -101,7 +101,7 @@ Environmental Sealing
 </armor_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Tug (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Tug.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Tug (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Tug.blk
index ca7fa5a5b05..1dd0a41f48a 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Tug (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Galaport Ground Tug.blk	
@@ -101,7 +101,7 @@ Searchlight
 </armor_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Gienah-Durapaq Elite Land Train (Tractor) Series 3.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Gienah-Durapaq Elite Land Train (Tractor) Series 3.blk
index 4fa07b01388..1dc10d455df 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Gienah-Durapaq Elite Land Train (Tractor) Series 3.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Gienah-Durapaq Elite Land Train (Tractor) Series 3.blk	
@@ -97,7 +97,7 @@ cargobay:2:1
 </transporters>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Gienah-Durapaq Elite Land Train (Trailer) Series 3.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Gienah-Durapaq Elite Land Train (Trailer) Series 3.blk
index 3e77b43e0a6..2f3d90362a7 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Gienah-Durapaq Elite Land Train (Trailer) Series 3.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Gienah-Durapaq Elite Land Train (Trailer) Series 3.blk	
@@ -87,7 +87,7 @@ cargobay:39.5:1
 </transporters>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Bulldozer).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Bulldozer).blk
index d1d8e9c225e..06bda5db896 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Bulldozer).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Bulldozer).blk	
@@ -91,7 +91,7 @@ Bulldozer:OMNI
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Cargo).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Cargo).blk
index d2be1e8bba4..90edc281570 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Cargo).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Cargo).blk	
@@ -90,7 +90,7 @@ OmniChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Crane).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Crane).blk
index 6fe6c61c749..10f62a5c7e7 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Crane).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Crane).blk	
@@ -90,7 +90,7 @@ Lift Hoist/Arresting Hoist:OMNI
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Harvester).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Harvester).blk
index ebbf293edbd..f599a4df776 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Harvester).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Hesiod Utility Vehicle (Harvester).blk	
@@ -91,7 +91,7 @@ Combine:OMNI
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Kallon UL-series Construction Vehicle UL-10 'Backhoe'.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Kallon UL-series Construction Vehicle UL-10 'Backhoe'.blk
index 114969a0c7d..8a4201113d1 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Kallon UL-series Construction Vehicle UL-10 'Backhoe'.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Kallon UL-series Construction Vehicle UL-10 'Backhoe'.blk	
@@ -80,7 +80,7 @@ Backhoe
 </Rear Equipment>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Luciano White Wolverine (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Luciano White Wolverine.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Luciano White Wolverine (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Luciano White Wolverine.blk
index cf73f09abce..ad2f28388ba 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Luciano White Wolverine (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Luciano White Wolverine.blk	
@@ -85,7 +85,7 @@ cargobay:.5:1
 </transporters>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/RRV.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/RRV.blk
index 0c30bc6ad80..20a631c8c26 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/RRV.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/RRV.blk	
@@ -109,7 +109,7 @@ Extra ammo:
 </notes>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Raptor.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Raptor.blk
index 32d4cd822d5..edbea6f7968 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Raptor.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Raptor.blk	
@@ -89,7 +89,7 @@ ISERSmallLaser
 </Turret Equipment>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Saturn Harvester (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Saturn Harvester.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Saturn Harvester (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Saturn Harvester.blk
index 7e1e571d87b..11c325ec046 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Saturn Harvester (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Saturn Harvester.blk	
@@ -96,7 +96,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck (MASH).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck (MASH).blk
index 9ed81a7fcf4..7115b779474 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck (MASH).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck (MASH).blk	
@@ -90,7 +90,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck.blk
index 4faada079b3..ea696f3f0b5 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Tracked/Sherpa Armored Truck.blk	
@@ -91,7 +91,7 @@ cargobay:7:1
 </transporters>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Baronet Passenger VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Baronet Passenger VTOL.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Baronet Passenger VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Baronet Passenger VTOL.blk
index 56247bfcb39..2244ca4a5a7 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Baronet Passenger VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Baronet Passenger VTOL.blk	
@@ -88,7 +88,7 @@ standardseats:200.0:0
 </structural_tech_rating>
 
 <source>
-TRO VAr - Jihad
+TRO: VAr - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Pegasus Passenger VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Pegasus Passenger VTOL.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Pegasus Passenger VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Pegasus Passenger VTOL.blk
index 0adbc51906f..c3e924f2242 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Pegasus Passenger VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Blackstone Pegasus Passenger VTOL.blk	
@@ -88,7 +88,7 @@ standardseats:100.0:0
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Cal-Boeing Swiftran RTC-215M (Passenger).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Cal-Boeing Swiftran RTC-215M (Passenger).blk
index 51bfc60f98d..8c494e46642 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Cal-Boeing Swiftran RTC-215M (Passenger).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Cal-Boeing Swiftran RTC-215M (Passenger).blk	
@@ -103,7 +103,7 @@ Paramedic Equipment
 </armor_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Lexan Oceanic Luxury VTOL Series VI.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Lexan Oceanic Luxury VTOL Series VI.blk
index e780714995f..682969e1aea 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Lexan Oceanic Luxury VTOL Series VI.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Lexan Oceanic Luxury VTOL Series VI.blk	
@@ -86,7 +86,7 @@ cargobay:1.5:1
 </transporters>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Lexan Oceanic Personal VTOL Series II.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Lexan Oceanic Personal VTOL Series II.blk
index 874759e8ac3..225793168a1 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Lexan Oceanic Personal VTOL Series II.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Lexan Oceanic Personal VTOL Series II.blk	
@@ -90,7 +90,7 @@ ISGuardianECMSuite
 </structural_tech_rating>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Peacekeeper SWAT Carrier (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Peacekeeper SWAT Carrier.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Peacekeeper SWAT Carrier (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Peacekeeper SWAT Carrier.blk
index b179d5e40e7..ec7915590b9 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Peacekeeper SWAT Carrier (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Peacekeeper SWAT Carrier.blk	
@@ -93,7 +93,7 @@ Searchlight
 </Rotor Equipment>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Cascatelle (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Cascatelle.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Cascatelle (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Cascatelle.blk
index 96f5b4e1eb3..703610bff65 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Cascatelle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Cascatelle.blk	
@@ -91,7 +91,7 @@ Cargo Container (10 tons)
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Lama-Deux (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Lama-Deux.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Lama-Deux (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Lama-Deux.blk
index a6773d60893..2d3704ccb4c 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Lama-Deux (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Pion-Laurier Lama-Deux.blk	
@@ -91,7 +91,7 @@ Tank Sprayer
 </structural_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/SOAR (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/SOAR.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/SOAR (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/SOAR.blk
index 9eb7405a905..db0de792eb9 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/SOAR (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/SOAR.blk	
@@ -93,7 +93,7 @@ Paramedic Equipment
 </structural_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Sky Eye News Helicopter (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Sky Eye News Helicopter.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Sky Eye News Helicopter (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Sky Eye News Helicopter.blk
index 54934b222ec..f69b92aaf33 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Sky Eye News Helicopter (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/Sky Eye News Helicopter.blk	
@@ -99,7 +99,7 @@ ISHighResImager
 </armor_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/St. Christopher Cargo Lifter C1.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/St. Christopher Cargo Lifter C1.blk
index 108d4d0b532..202a98b7199 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/St. Christopher Cargo Lifter C1.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/St. Christopher Cargo Lifter C1.blk	
@@ -89,7 +89,7 @@ Armored Chassis
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/St. Christopher Cargo Lifter C2.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/St. Christopher Cargo Lifter C2.blk
index ace840ab5f0..96693ddba7d 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/St. Christopher Cargo Lifter C2.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/VTOL/St. Christopher Cargo Lifter C2.blk	
@@ -88,7 +88,7 @@ standardseats:6.0:0
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Roadster (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Roadster.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Roadster (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Roadster.blk
index 3c55449b9a8..c614d452618 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Roadster (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Roadster.blk	
@@ -85,7 +85,7 @@ ConvertibleChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Traveler (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Traveler.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Traveler (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Traveler.blk
index 60fb76c5a25..829dcc92cc0 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Traveler (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Aston-Martin Fiver Traveler.blk	
@@ -84,7 +84,7 @@ cargobay:0.21:1:1
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bailey Armored Car (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bailey Armored Car.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bailey Armored Car (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bailey Armored Car.blk
index e373f022a7b..83a94553303 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bailey Armored Car (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bailey Armored Car.blk	
@@ -93,7 +93,7 @@ cargobay:3:1
 </transporters>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Brunel Dump Truck.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Brunel Dump Truck.blk
index cd9f028bdf8..da8a1c53be0 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Brunel Dump Truck.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Brunel Dump Truck.blk	
@@ -98,7 +98,7 @@ Dumper (Rear)
 </tonnage>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <history>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bulldog Medium Truck (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bulldog Medium Truck.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bulldog Medium Truck (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bulldog Medium Truck.blk
index cf5ba679b25..d4585605484 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bulldog Medium Truck (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Bulldog Medium Truck.blk	
@@ -88,7 +88,7 @@ HHSearchlight
 </structural_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Ceres-Bikes Flashbang.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Ceres-Bikes Flashbang.blk
index 6759784ac9d..d6ca2506262 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Ceres-Bikes Flashbang.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Ceres-Bikes Flashbang.blk	
@@ -85,7 +85,7 @@ BicycleChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Durandel-British 'Blue Nova' Convertible.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Durandel-British 'Blue Nova' Convertible.blk
index 2a93203d3f5..4df9756f0d8 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Durandel-British 'Blue Nova' Convertible.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Durandel-British 'Blue Nova' Convertible.blk	
@@ -85,7 +85,7 @@ ConvertibleChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro Heavy Support Truck (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro Heavy Support Truck.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro Heavy Support Truck (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro Heavy Support Truck.blk
index 0a3fdc6a5ac..8976d3de758 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro Heavy Support Truck (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro Heavy Support Truck.blk	
@@ -93,7 +93,7 @@ HHSearchlight
 </structural_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro II SuperHeavy Cargo Truck.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro II SuperHeavy Cargo Truck.blk
index 51b8eb050e5..a766265b520 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro II SuperHeavy Cargo Truck.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro II SuperHeavy Cargo Truck.blk	
@@ -83,7 +83,7 @@ Searchlight
 </Rear Equipment>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Knox Armored Car (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Knox Armored Car.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Knox Armored Car (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Knox Armored Car.blk
index 667570ae809..b44e79ec4ba 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Knox Armored Car (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Knox Armored Car.blk	
@@ -91,7 +91,7 @@ cargobay:1.5:1
 </transporters>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck.blk
index 9f2c282e342..82427229f11 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck.blk	
@@ -86,7 +86,7 @@ cargobay:20:1
 </transporters>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Mao-Heng Charioteer (Original).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Mao-Heng Charioteer (Original).blk
index e9cb9290769..becc04ad84f 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Mao-Heng Charioteer (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Mao-Heng Charioteer (Original).blk	
@@ -84,7 +84,7 @@ troopspace:.6
 </transporters>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Motuo Che Shang No.2.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Motuo Che Shang No.2.blk
index c74872f88b0..8958bb89967 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Motuo Che Shang No.2.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Motuo Che Shang No.2.blk	
@@ -85,7 +85,7 @@ MonocycleChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Pit Bull Medium Truck (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Pit Bull Medium Truck.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Pit Bull Medium Truck (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Pit Bull Medium Truck.blk
index c9ba07ffa71..6488671760f 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Pit Bull Medium Truck (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Pit Bull Medium Truck.blk	
@@ -89,7 +89,7 @@ HHSearchlight
 </structural_tech_rating>
 
 <source>
-TRO VAr - Succession Wars
+TRO: VAr - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Land Train (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Land Train.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Land Train (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Land Train.blk
index ebddf7a581e..8c200d8e54c 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Land Train (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Land Train.blk	
@@ -94,7 +94,7 @@ cargobay:17:1
 </transporters>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Module (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Module.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Module (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Module.blk
index 25d85cc9a45..4faa8908e78 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Module (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Prairie Schooner Module.blk	
@@ -93,7 +93,7 @@ cargobay:21.5:2
 </transporters>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saturnus V Grande Circuit Racer (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saturnus V Grande Circuit Racer.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saturnus V Grande Circuit Racer (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saturnus V Grande Circuit Racer.blk
index 4f774513ea0..ffe65bda991 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saturnus V Grande Circuit Racer (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saturnus V Grande Circuit Racer.blk	
@@ -84,7 +84,7 @@ UltraLightChassisMod
 </structural_tech_rating>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saurer-Bucher Fire Engine TLF-LL6500.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saurer-Bucher Fire Engine TLF-LL6500.blk
index 3238b55b624..6e8a3203da3 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saurer-Bucher Fire Engine TLF-LL6500.blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Saurer-Bucher Fire Engine TLF-LL6500.blk	
@@ -91,7 +91,7 @@ Tank Sprayer
 </structural_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Simca Ambulance (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Simca Ambulance.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Simca Ambulance (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Simca Ambulance.blk
index 23f4c4bb68b..c5ccb1ad088 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Simca Ambulance (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Simca Ambulance.blk	
@@ -88,7 +88,7 @@ Paramedic Equipment
 </structural_tech_rating>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Skoda 'Growler' Service Utility Truck (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Skoda 'Growler' Service Utility Truck.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Skoda 'Growler' Service Utility Truck (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Skoda 'Growler' Service Utility Truck.blk
index bba84be06c3..781e1c0199c 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Skoda 'Growler' Service Utility Truck (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Skoda 'Growler' Service Utility Truck.blk	
@@ -93,7 +93,7 @@ HHSearchlight
 </structural_tech_rating>
 
 <source>
-TRO VAr - Age of War
+TRO: VAr - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Coanda Personal Sports Craft (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Coanda Personal Sports Craft.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Coanda Personal Sports Craft (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Coanda Personal Sports Craft.blk
index 9eb5a84359b..8bb3dafead3 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Coanda Personal Sports Craft (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Coanda Personal Sports Craft.blk	
@@ -85,7 +85,7 @@ AmphibiousChassis
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft (Cargo).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft (Cargo).blk
index 3c951b04c09..61bd30f0d34 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft (Cargo).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft (Cargo).blk	
@@ -125,7 +125,7 @@ TARGETING:Unknown
 </systemManufacturers>
 
 <source>
-TRO VAr - Early Succession Wars
+TRO: VAr - Early Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft.blk
similarity index 99%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft.blk
index 1b1057efe54..10b33ba17c9 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Cormorant Medium Cargo Craft.blk	
@@ -87,7 +87,7 @@ Machine Gun
 </Rear Equipment>
 
 <source>
-TRO VAr - Star League
+TRO: VAr - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft (Original).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft (Original).blk
index def1a9b0619..831f305a61d 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft (Original).blk	
@@ -92,7 +92,7 @@ ISVehicularMineDispenser
 </Rear Equipment>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft.blk
index 7124aa36022..863ad3f8a4d 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Fulmar Patrol Craft.blk	
@@ -93,7 +93,7 @@ ISVehicularMineDispenser
 </Rear Equipment>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Koi Heavy Transport (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Koi Heavy Transport.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Koi Heavy Transport (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Koi Heavy Transport.blk
index b5b26ac4a81..4fa3042a2dc 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Koi Heavy Transport (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Koi Heavy Transport.blk	
@@ -88,7 +88,7 @@ AmphibiousChassis
 </Rear Equipment>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Quicksilver Personal Sports Craft (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Quicksilver Personal Sports Craft.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Quicksilver Personal Sports Craft (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Quicksilver Personal Sports Craft.blk
index c0c3d7e9311..32b8da7e9c6 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Quicksilver Personal Sports Craft (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Quicksilver Personal Sports Craft.blk	
@@ -85,7 +85,7 @@ AmphibiousChassis
 </structural_tech_rating>
 
 <source>
-TRO VAr - Clan Invasion
+TRO: VAr - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Ryu Heavy Transport (Standard).blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Ryu Heavy Transport.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Ryu Heavy Transport (Standard).blk
rename to megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Ryu Heavy Transport.blk
index 78ce550eb0f..8947d9b164a 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Ryu Heavy Transport (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/WiGE/Ryu Heavy Transport.blk	
@@ -101,7 +101,7 @@ Autocannon/5
 </Turret Equipment>
 
 <source>
-TRO VAr - Civil War
+TRO: VAr - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Turning Points/HTP Glengary/Heavy Weapons Carrier (PPC).blk b/megamek/data/mechfiles/vehicles/Turning Points/HTP Glengary/Heavy Weapons Carrier (PPC).blk
index c56fb1d0956..230faf38ded 100644
--- a/megamek/data/mechfiles/vehicles/Turning Points/HTP Glengary/Heavy Weapons Carrier (PPC).blk	
+++ b/megamek/data/mechfiles/vehicles/Turning Points/HTP Glengary/Heavy Weapons Carrier (PPC).blk	
@@ -72,7 +72,7 @@ PPC
 </Turret Equipment>
 
 <source>
-HTP: Glengarry
+HTP:Glengarry - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Turning Points/JTP Atreus/Tokugawa Heavy Tank SD2.blk b/megamek/data/mechfiles/vehicles/Turning Points/JTP Atreus/Tokugawa Heavy Tank SD2.blk
index 04f2780af2d..cc273e36175 100644
--- a/megamek/data/mechfiles/vehicles/Turning Points/JTP Atreus/Tokugawa Heavy Tank SD2.blk	
+++ b/megamek/data/mechfiles/vehicles/Turning Points/JTP Atreus/Tokugawa Heavy Tank SD2.blk	
@@ -95,7 +95,7 @@ ISUltraAC10
 </Turret Equipment>
 
 <source>
-JTP:Atreus - Jihad
+Jihad Turning Points:Atreus - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/Turning Points/TP Epsilon Eridani/Pollux II ADA Heavy Tank (Standard).blk b/megamek/data/mechfiles/vehicles/Turning Points/TP Epsilon Eridani/Pollux II ADA Heavy Tank.blk
similarity index 100%
rename from megamek/data/mechfiles/vehicles/Turning Points/TP Epsilon Eridani/Pollux II ADA Heavy Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/Turning Points/TP Epsilon Eridani/Pollux II ADA Heavy Tank.blk
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Hetzer Wheeled Assault Gun (Jadgpanzer II).blk b/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Hetzer Wheeled Assault Gun (Jadgpanzer II).blk
index dc0ae89a987..5952c5a3aa4 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Hetzer Wheeled Assault Gun (Jadgpanzer II).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Hetzer Wheeled Assault Gun (Jadgpanzer II).blk	
@@ -120,5 +120,5 @@ TARGETING:Scantrex Dual Tac
 </systemManufacturers>
 
 <source>
-XTRO Boondocks - Jihad
+XTR: Boondocks - Jihad
 </source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Lexan Surveillance Helo (Prototype).blk b/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Lexan Surveillance Helo (Prototype).blk
index a8f774d52d1..750f87bbadf 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Lexan Surveillance Helo (Prototype).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Lexan Surveillance Helo (Prototype).blk	
@@ -84,7 +84,7 @@ ISReconCamera
 </barrating>
 
 <source>
-XTRO Boondocks - Jihad
+XTR: Boondocks - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Sea Hunter Maritime Tank.blk b/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Sea Hunter Maritime Tank.blk
index 9e34e3b7178..0f57ee0d01a 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Sea Hunter Maritime Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Boondocks/Sea Hunter Maritime Tank.blk	
@@ -81,7 +81,7 @@ ISCombatVehicleEscapePod
 </Rear Equipment>
 
 <source>
-XTR Boondocks
+XTR: Boondocks - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Clans/Athena Combat Vehicle XR.blk b/megamek/data/mechfiles/vehicles/XTRs/Clans/Athena Combat Vehicle XR.blk
index 33802387192..2fa2bd93639 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Clans/Athena Combat Vehicle XR.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Clans/Athena Combat Vehicle XR.blk	
@@ -114,7 +114,7 @@ CLMG
 </Front Turret Equipment>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Clans/Enyo Strike Tank XR.blk b/megamek/data/mechfiles/vehicles/XTRs/Clans/Enyo Strike Tank XR.blk
index fd93b08c72e..8cef1ef5ece 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Clans/Enyo Strike Tank XR.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Clans/Enyo Strike Tank XR.blk	
@@ -82,7 +82,7 @@ CLERLargePulseLaser
 </Turret Equipment>
 
 <source>
-XTRO Clans - Jihad
+XTR: Clans - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Comstar/Demon Tank CX-2.blk b/megamek/data/mechfiles/vehicles/XTRs/Comstar/Demon Tank CX-2.blk
index b3c834053d4..84ad4f59b18 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Comstar/Demon Tank CX-2.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Comstar/Demon Tank CX-2.blk	
@@ -83,7 +83,7 @@ Medium Laser(ST)
 </Turret Equipment>
 
 <source>
-XTRO ComStar - Jihad
+XTR: ComStar - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Comstar/Fury CX-17.blk b/megamek/data/mechfiles/vehicles/XTRs/Comstar/Fury CX-17.blk
index ef6d818203e..f9729d5a44e 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Comstar/Fury CX-17.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Comstar/Fury CX-17.blk	
@@ -86,7 +86,7 @@ ISLBXAC5
 </Turret Equipment>
 
 <source>
-XTRO ComStar - Clan Invasion
+XTR: ComStar - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Comstar/Lightning Attack Hovercraft CX-3.blk b/megamek/data/mechfiles/vehicles/XTRs/Comstar/Lightning Attack Hovercraft CX-3.blk
index 32487154e85..e4073d3e81f 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Comstar/Lightning Attack Hovercraft CX-3.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Comstar/Lightning Attack Hovercraft CX-3.blk	
@@ -92,11 +92,11 @@ RL15(ST)
 </Rear Equipment>
 
 <notes>
-Vehicle overweight and Heat wrong in TRO. No errata at this time.
+Vehicle overweight and Heat wrong in TRO:. No errata at this time.
 </notes>
 
 <source>
-XTRO ComStar - Jihad
+XTR: ComStar - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Corporations/Maxim Flanker.blk b/megamek/data/mechfiles/vehicles/XTRs/Corporations/Maxim Flanker.blk
index 774dd8e67ea..4d52f6dc1ae 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Corporations/Maxim Flanker.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Corporations/Maxim Flanker.blk	
@@ -92,7 +92,7 @@ Machine Gun
 </tonnage>
 
 <source>
-XTRO Corporations - Jihad
+XTR: Corporations - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Corporations/Partisan Hull Defense.blk b/megamek/data/mechfiles/vehicles/XTRs/Corporations/Partisan Hull Defense.blk
index a268b3505d4..b79d423b8dd 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Corporations/Partisan Hull Defense.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Corporations/Partisan Hull Defense.blk	
@@ -91,7 +91,7 @@ ISC3BoostedSystemSlaveUnit
 </Turret Equipment>
 
 <source>
-XTRO Corporations - Jihad
+XTR: Corporations - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Corporations/Sea Skimmer Hydrofoil Sniper.blk b/megamek/data/mechfiles/vehicles/XTRs/Corporations/Sea Skimmer Hydrofoil Sniper.blk
index 2589ef80381..884976dc0ab 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Corporations/Sea Skimmer Hydrofoil Sniper.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Corporations/Sea Skimmer Hydrofoil Sniper.blk	
@@ -29,7 +29,7 @@ Sea Skimmer Hydrofoil
 </year>
 
 <Source>
-XTR Corporations
+XTR: Corporations - Jihad
 </Source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Corporations/Skulker Wheeled Scout Tank X-5.blk b/megamek/data/mechfiles/vehicles/XTRs/Corporations/Skulker Wheeled Scout Tank X-5.blk
index 8cf661f6590..5f0c412f4f6 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Corporations/Skulker Wheeled Scout Tank X-5.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Corporations/Skulker Wheeled Scout Tank X-5.blk	
@@ -108,7 +108,7 @@ TARGETING:Targeting System 2.3
 </systemManufacturers>
 
 <source>
-XTRO:Corporations - Jihad
+XTR: Corporations - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Corporations/SturmFeur Kalki Cruise Missile Launcher.blk b/megamek/data/mechfiles/vehicles/XTRs/Corporations/SturmFeur Kalki Cruise Missile Launcher.blk
index 7b1600d1319..e583c1bc435 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Corporations/SturmFeur Kalki Cruise Missile Launcher.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Corporations/SturmFeur Kalki Cruise Missile Launcher.blk	
@@ -91,7 +91,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTR Corporations - Jihad
+XTR: Corporations - Jihad
 </source>
 
 <tonnage>
@@ -103,7 +103,7 @@ For point-blank anti-infantry protection, the SturmFeur carries two huge missile
 </capabilities>
 
 <overview>
-The SturmFeur debuted in 3018. At that time, it was the largest combat vehicle dedicated to providing missile support in the Inner Sphere. The unit is 12.5 tons overweight. The unit in the TRO has been built wrong(IS calculated as if not Super-Heavy) and will likely be impossible to fix.  Included only for completeness.
+The SturmFeur debuted in 3018. At that time, it was the largest combat vehicle dedicated to providing missile support in the Inner Sphere. The unit is 12.5 tons overweight. The unit in the TRO: has been built wrong(IS calculated as if not Super-Heavy) and will likely be impossible to fix.  Included only for completeness.
 </overview>
 
 <deployment>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Davion/Cavalry Attack Helicopter Cadence Rain.blk b/megamek/data/mechfiles/vehicles/XTRs/Davion/Cavalry Attack Helicopter Cadence Rain.blk
index 2fd4abeb82f..fcf8c83fa64 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Davion/Cavalry Attack Helicopter Cadence Rain.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Davion/Cavalry Attack Helicopter Cadence Rain.blk	
@@ -93,7 +93,7 @@ ISMagshotGR
 </Rotor Equipment>
 
 <source>
-XTRO Davion - Jihad
+XTR: Davion - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Bandit Warthog.blk b/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Bandit Warthog.blk
index 4a2a1263cfb..c9a01c2e020 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Bandit Warthog.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Bandit Warthog.blk	
@@ -83,7 +83,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTR Gladiators
+XTR: Gladiators - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Manticore The Ballista.blk b/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Manticore The Ballista.blk
index cd1e7274489..e137a617f08 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Manticore The Ballista.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Manticore The Ballista.blk	
@@ -127,7 +127,7 @@ TARGETING:TargiTrack 717
 </systemManufacturers>
 
 <source>
-XTR Gladiators - Jihad
+XTR: Gladiators - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Minion Advanced Tactical Vehicle Silver Bullet.blk b/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Minion Advanced Tactical Vehicle Silver Bullet.blk
index 1b1803e7332..e63d368ee6a 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Minion Advanced Tactical Vehicle Silver Bullet.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Gladiators/Minion Advanced Tactical Vehicle Silver Bullet.blk	
@@ -78,7 +78,7 @@ ISLaserAntiMissileSystem
 </Rear Equipment>
 
 <source>
-XTR Gladiators
+XTR: Gladiators - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Beagle Hover Scout (LRRP).blk b/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Beagle Hover Scout (LRRP).blk
index 446a6e767c3..b1654c3fbd6 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Beagle Hover Scout (LRRP).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Beagle Hover Scout (LRRP).blk	
@@ -81,7 +81,7 @@ ISVehicularMineDispenser
 </Rear Equipment>
 
 <source>
-XTRO Gunslingers - Star League
+XTR: Gunslingers - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Burke II Superheavy Tank (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Burke II Superheavy Tank.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Burke II Superheavy Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Burke II Superheavy Tank.blk
index 97870df1822..952ae3f3234 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Burke II Superheavy Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Burke II Superheavy Tank.blk	
@@ -102,7 +102,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-XTRO Gunslingers - Star League
+XTR: Gunslingers - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Cyrano Gunship (Fury).blk b/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Cyrano Gunship (Fury).blk
index 3507ae8d439..9475df9760f 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Cyrano Gunship (Fury).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Cyrano Gunship (Fury).blk	
@@ -99,7 +99,7 @@ Medium Laser
 </Turret Equipment>
 
 <source>
-XTRO Gunslingers - Star League
+XTR: Gunslingers - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Rhino Fire Support Tank (Hagar).blk b/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Rhino Fire Support Tank (Hagar).blk
index 119ac5ea705..29471043b4d 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Rhino Fire Support Tank (Hagar).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Gunslingers/Rhino Fire Support Tank (Hagar).blk	
@@ -85,7 +85,7 @@ Medium Laser
 </Front Turret Equipment>
 
 <source>
-XTRO Gunslingers - Star League
+XTR: Gunslingers - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Kurita/Hiryo Armored Infantry Transport Hound.blk b/megamek/data/mechfiles/vehicles/XTRs/Kurita/Hiryo Armored Infantry Transport Hound.blk
index 4faa4cedb8b..cbcc4db0c52 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Kurita/Hiryo Armored Infantry Transport Hound.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Kurita/Hiryo Armored Infantry Transport Hound.blk	
@@ -58,7 +58,7 @@ IS Level 4
 </year>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <internal_type>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Kurita/Pegasus Scout Hover Tank X.blk b/megamek/data/mechfiles/vehicles/XTRs/Kurita/Pegasus Scout Hover Tank X.blk
index 926b5fda275..27f6922f762 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Kurita/Pegasus Scout Hover Tank X.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Kurita/Pegasus Scout Hover Tank X.blk	
@@ -29,7 +29,7 @@ X
 </year>
 
 <source>
-XTRO Kurita - Jihad
+XTR: Kurita - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Kurita/Tokugawa Heavy Tank Yumi.blk b/megamek/data/mechfiles/vehicles/XTRs/Kurita/Tokugawa Heavy Tank Yumi.blk
index dbc36ba1d17..ea1dc92f82a 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Kurita/Tokugawa Heavy Tank Yumi.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Kurita/Tokugawa Heavy Tank Yumi.blk	
@@ -29,7 +29,7 @@ Yumi
 </year>
 
 <source>
-XTRO Kurita - Civil War
+XTR: Kurita - Civil War
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Liao/Po Heavy Tank HV Prototype.blk b/megamek/data/mechfiles/vehicles/XTRs/Liao/Po Heavy Tank HV Prototype.blk
index d4f340115ff..2256d29d23b 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Liao/Po Heavy Tank HV Prototype.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Liao/Po Heavy Tank HV Prototype.blk	
@@ -88,5 +88,5 @@ Hyper Velocity Auto Cannon/10
 </Turret Equipment>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Liao/Regulator Hovertank Alan.blk b/megamek/data/mechfiles/vehicles/XTRs/Liao/Regulator Hovertank Alan.blk
index 75d9e678e3e..60477183bea 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Liao/Regulator Hovertank Alan.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Liao/Regulator Hovertank Alan.blk	
@@ -29,7 +29,7 @@ Regulator Hovertank
 </year>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Liao/Scorpion Light Tank Minesweeper.blk b/megamek/data/mechfiles/vehicles/XTRs/Liao/Scorpion Light Tank Minesweeper.blk
index 192ae6f8401..9da589d922a 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Liao/Scorpion Light Tank Minesweeper.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Liao/Scorpion Light Tank Minesweeper.blk	
@@ -29,7 +29,7 @@ Scorpion Light Tank
 </year>
 
 <source>
-XTRO Liao - Jihad
+XTR: Liao - Jihad
 </source>
 
 <type>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Marik/Galleon Light Tank Maxwell.blk b/megamek/data/mechfiles/vehicles/XTRs/Marik/Galleon Light Tank Maxwell.blk
index ef6eaf30fee..263fa02630f 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Marik/Galleon Light Tank Maxwell.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Marik/Galleon Light Tank Maxwell.blk	
@@ -88,7 +88,7 @@ ISERMediumLaser
 </Turret Equipment>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Marik/Thumper Artillery Vehicle Maxwell.blk b/megamek/data/mechfiles/vehicles/XTRs/Marik/Thumper Artillery Vehicle Maxwell.blk
index 992b77dc879..0ee1742015e 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Marik/Thumper Artillery Vehicle Maxwell.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Marik/Thumper Artillery Vehicle Maxwell.blk	
@@ -85,5 +85,5 @@ Machine Gun(ST)
 </Rear Equipment>
 
 <source>
-XTRO Marik - Jihad
+XTR: Marik - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Mercs/Schrek IIX PPC Carrier.blk b/megamek/data/mechfiles/vehicles/XTRs/Mercs/Schrek IIX PPC Carrier.blk
index 12a37b86457..e50abb87d06 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Mercs/Schrek IIX PPC Carrier.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Mercs/Schrek IIX PPC Carrier.blk	
@@ -89,7 +89,7 @@ Light PPC
 </Turret Equipment>
 
 <source>
-XTR Mercs - Jihad
+XTR: Mercenaries - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Mercs/Vedette Medium Tank V-G7X.blk b/megamek/data/mechfiles/vehicles/XTRs/Mercs/Vedette Medium Tank V-G7X.blk
index 2601db5a069..f8404584922 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Mercs/Vedette Medium Tank V-G7X.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Mercs/Vedette Medium Tank V-G7X.blk	
@@ -130,7 +130,7 @@ TARGETING:ComStar Test-2
 </systemManufacturers>
 
 <source>
-XTRO Mercs - Jihad
+XTR: Mercenaries - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Mercs/Warrior HX-9 Attack Helicopter.blk b/megamek/data/mechfiles/vehicles/XTRs/Mercs/Warrior HX-9 Attack Helicopter.blk
index dcab56578a7..5015ec10b40 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Mercs/Warrior HX-9 Attack Helicopter.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Mercs/Warrior HX-9 Attack Helicopter.blk	
@@ -122,7 +122,7 @@ TARGETING:Dwyerson Mk XIX
 </systemManufacturers>
 
 <source>
-XTRO Mercs - Clan Invasion
+XTR: Mercenaries - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Fensalir Combat WiGE (XXL).blk b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Fensalir Combat WiGE (XXL).blk
index fcd334229c4..d6cbf7257e8 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Fensalir Combat WiGE (XXL).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Fensalir Combat WiGE (XXL).blk	
@@ -96,7 +96,7 @@ ISSmallPulseLaser
 </Rear Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Harasser Missile Platform (Fuel Cell).blk b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Harasser Missile Platform (Fuel Cell).blk
index da89e4d6965..3b353b64e84 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Harasser Missile Platform (Fuel Cell).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Harasser Missile Platform (Fuel Cell).blk	
@@ -84,7 +84,7 @@ ISMML5
 </Turret Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Hawk Moth Verwandlung.blk b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Hawk Moth Verwandlung.blk
index a122e0d8668..76b2bab8c2e 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Hawk Moth Verwandlung.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Hawk Moth Verwandlung.blk	
@@ -95,7 +95,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Karnov UR Transport (Heavy Stealth).blk b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Karnov UR Transport (Heavy Stealth).blk
index b60823d7211..57b44ced052 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Karnov UR Transport (Heavy Stealth).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Karnov UR Transport (Heavy Stealth).blk	
@@ -97,7 +97,7 @@ Machine Gun(ST)
 </Rotor Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Von Luckner Heavy Tank VNL-X71 (Yakuza).blk b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Von Luckner Heavy Tank VNL-X71 (Yakuza).blk
index 3c72b0ce567..f11abe42edf 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Von Luckner Heavy Tank VNL-X71 (Yakuza).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Most Wanted/Von Luckner Heavy Tank VNL-X71 (Yakuza).blk	
@@ -88,7 +88,7 @@ ISArtemisIV
 </Turret Equipment>
 
 <source>
-XTRO Most Wanted - Jihad
+XTR: Most Wanted - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Danai Support Vehicle Arrow.blk b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Danai Support Vehicle Arrow.blk
index 5fed3dc10c2..40cdffd86b6 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Danai Support Vehicle Arrow.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Danai Support Vehicle Arrow.blk	
@@ -96,7 +96,7 @@ ISMagshotGR
 </Turret Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #1.blk b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #1.blk
index 9511668bd21..759b32c79b9 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #1.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #1.blk	
@@ -88,7 +88,7 @@ ISArtemisIV
 </Turret Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <transporters>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #2.blk b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #2.blk
index adf651347cb..5a55d2cf29f 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #2.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #2.blk	
@@ -93,7 +93,7 @@ liquidcargobay:18.2:1
 
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #3.blk b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #3.blk
index b54af5cef8f..26158c701e3 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #3.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #3.blk	
@@ -89,7 +89,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <transporters>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #4.blk b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #4.blk
index e90d977c5c9..b85dde76ba5 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #4.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Trailer Configuration #4.blk	
@@ -86,7 +86,7 @@ RL15
 </Turret Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <transporters>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Train (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Train.blk
similarity index 98%
rename from megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Train (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Train.blk
index 2f7f4e232cf..14e80a1f8df 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Train (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Dreadnought Mk II Land Train.blk	
@@ -134,7 +134,7 @@ Extended LRM 5
 </armor_tech_rating>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Patton Tank SB.blk b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Patton Tank SB.blk
index ba9228570da..c994631546b 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Patton Tank SB.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Patton Tank SB.blk	
@@ -96,7 +96,7 @@ ISERMediumLaser
 </Turret Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <tonnage>
@@ -135,7 +135,7 @@ TARGETING:TharHes Mars5
 </systemManufacturers>
 
 <source>
-TRO 3039 - Succession Wars
+TRO: 3039 - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Saladin Assault Hover Tank Ifrit.blk b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Saladin Assault Hover Tank Ifrit.blk
index 7f29f868807..9e6e8a1cc16 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Periphery/Saladin Assault Hover Tank Ifrit.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Periphery/Saladin Assault Hover Tank Ifrit.blk	
@@ -86,7 +86,7 @@ ISSNPPC
 </Rear Equipment>
 
 <source>
-XTRO Periphery - Jihad
+XTR: Periphery - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Ferret Light Scout VTOL (Fermi).blk b/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Ferret Light Scout VTOL (Fermi).blk
index 5ae6571cf22..33c61b893c0 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Ferret Light Scout VTOL (Fermi).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Ferret Light Scout VTOL (Fermi).blk	
@@ -85,7 +85,7 @@ CLECMSuite
 </Rotor Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Hi-Scout Drone Carrier (Cunnington).blk b/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Hi-Scout Drone Carrier (Cunnington).blk
index 1b53963c56c..d6906d6c926 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Hi-Scout Drone Carrier (Cunnington).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Hi-Scout Drone Carrier (Cunnington).blk	
@@ -86,7 +86,7 @@ ISC3RemoteSensorLauncher
 </Rear Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Packrat Gespenst.blk b/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Packrat Gespenst.blk
index b5d073ade10..01d78be8b75 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Packrat Gespenst.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Phantoms/Packrat Gespenst.blk	
@@ -83,7 +83,7 @@ ISLimitedAmphibiousChassis
 </Rear Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Phantoms/SM1 Tank Destroyer Telos.blk b/megamek/data/mechfiles/vehicles/XTRs/Phantoms/SM1 Tank Destroyer Telos.blk
index 3bdebfc24e4..390bc10b04e 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Phantoms/SM1 Tank Destroyer Telos.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Phantoms/SM1 Tank Destroyer Telos.blk	
@@ -89,7 +89,7 @@ Machine Gun
 </Rear Equipment>
 
 <source>
-XTRO Phantoms - Jihad
+XTR: Phantoms - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Pirates/Anhur P-Stealth.blk b/megamek/data/mechfiles/vehicles/XTRs/Pirates/Anhur P-Stealth.blk
index 1903985c83b..c4207098463 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Pirates/Anhur P-Stealth.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Pirates/Anhur P-Stealth.blk	
@@ -98,7 +98,7 @@ CLLRM15
 </Rotor Equipment>
 
 <source>
-XTR Pirates - Jihad
+XTR: Pirates - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Pirates/Myrmidon Medium Tank P (Tate).blk b/megamek/data/mechfiles/vehicles/XTRs/Pirates/Myrmidon Medium Tank P (Tate).blk
index 6b85da68b2b..d680da5ea78 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Pirates/Myrmidon Medium Tank P (Tate).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Pirates/Myrmidon Medium Tank P (Tate).blk	
@@ -97,7 +97,7 @@ ISSNPPC
 </Turret Equipment>
 
 <source>
-XTR Pirates - Jihad
+XTR: Pirates - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Pirates/Ontos Heavy Tank X.blk b/megamek/data/mechfiles/vehicles/XTRs/Pirates/Ontos Heavy Tank X.blk
index 44bab2054a8..faaf2c18e1b 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Pirates/Ontos Heavy Tank X.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Pirates/Ontos Heavy Tank X.blk	
@@ -130,7 +130,7 @@ TARGETING:GuideRite with Laser Coordination Link and Artemis FCS
 </systemManufacturers>
 
 <source>
-XTR Pirates - Jihad
+XTR: Pirates - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Pirates/Striker Light Tank Wet.blk b/megamek/data/mechfiles/vehicles/XTRs/Pirates/Striker Light Tank Wet.blk
index 67fbb6654ca..2b0242a46b4 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Pirates/Striker Light Tank Wet.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Pirates/Striker Light Tank Wet.blk	
@@ -74,5 +74,5 @@ SRM 6
 </Rear Turret Equipment>
 
 <source>
-XTRO Pirates
+XTR: Pirates - Jihad
 </source>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/AC2 Carrier Primitive.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/AC2 Carrier Primitive.blk
index 1ba3f2b9ef8..5cbbd7eac83 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/AC2 Carrier Primitive.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/AC2 Carrier Primitive.blk	
@@ -86,7 +86,7 @@ Autocannon/2
 </Rear Equipment>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/LRM Carrier Primitive.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/LRM Carrier Primitive.blk
index 752d1b69908..29716f88b31 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/LRM Carrier Primitive.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/LRM Carrier Primitive.blk	
@@ -130,7 +130,7 @@ TARGETING:FireScan with IndirecTrack
 </systemManufacturers>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/LTV-4 Hover Tank.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/LTV-4 Hover Tank.blk
index 9190b04befc..e0efda460aa 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/LTV-4 Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/LTV-4 Hover Tank.blk	
@@ -74,7 +74,7 @@ SRM 4
 </Turret Equipment>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Mosquito Light Fighter.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Mosquito Light Fighter.blk
index 08808b96631..c3365221016 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Mosquito Light Fighter.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Mosquito Light Fighter.blk	
@@ -121,7 +121,7 @@ External Stores Hardpoint
 </armor_tech_rating>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Randolph Support Vehicle.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Randolph Support Vehicle.blk
index 5e7803d0132..6ca42c7a74f 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Randolph Support Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Randolph Support Vehicle.blk	
@@ -85,7 +85,7 @@ Machine Gun
 </Rear Equipment>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <transporters>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/SRM Carrier Primitive.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/SRM Carrier Primitive.blk
index 363a86b4417..786a269f2b6 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/SRM Carrier Primitive.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/SRM Carrier Primitive.blk	
@@ -101,7 +101,7 @@ ISSRM4
 </Rear Equipment>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Strike Falcon Attack VTOL.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Strike Falcon Attack VTOL.blk
index 0ab1c9c0197..41410ad6f03 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Strike Falcon Attack VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives II/Strike Falcon Attack VTOL.blk	
@@ -96,7 +96,7 @@ Machine Gun
 </barrating>
 
 <source>
-XTRO Primitives II - Age of War
+XTR: Primitives II - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Alacorn Heavy Tank Mk I.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Alacorn Heavy Tank Mk I.blk
index 8b4838da5c6..e90804e87f2 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Alacorn Heavy Tank Mk I.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Alacorn Heavy Tank Mk I.blk	
@@ -87,7 +87,7 @@ Autocannon/10
 </Turret Equipment>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Alacorn Heavy Tank Mk II.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Alacorn Heavy Tank Mk II.blk
index 1b09fbea512..eabdc9cf1b7 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Alacorn Heavy Tank Mk II.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Alacorn Heavy Tank Mk II.blk	
@@ -85,7 +85,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Caravan Heavy Transport.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Caravan Heavy Transport.blk
index e4f76e33df6..c4c595e6990 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Caravan Heavy Transport.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Caravan Heavy Transport.blk	
@@ -102,7 +102,7 @@ cargobay:60.0:4:1
 </structural_tech_rating>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Carter MERV.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Carter MERV.blk
index 942125b2b48..457a6ac525e 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Carter MERV.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Carter MERV.blk	
@@ -90,7 +90,7 @@ Paramedic Equipment
 </structural_tech_rating>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Korvin KRV-2.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Korvin KRV-2.blk
index edc78487e1b..fdbc0348b50 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Korvin KRV-2.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives III/Korvin KRV-2.blk	
@@ -104,7 +104,7 @@ Armor exceeds point limit for 50.0-ton Tracked support vehicle: 105 points > 104
 </notes>
 
 <source>
-XTRO Primitives III - Age of War
+XTR: Primitives III - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle (Original).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle (Original).blk
index ffc562735be..a3d02e8d446 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle (Original).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle (Original).blk	
@@ -93,7 +93,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle.blk
index 6c5553eecba..fcfdf2a971a 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Chi-Ha Infantry Combat Vehicle.blk	
@@ -93,7 +93,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport (Fusion).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport (Fusion).blk
index a953f3bfba9..747946e62fa 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport (Fusion).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport (Fusion).blk	
@@ -90,7 +90,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport.blk
index deeaafae8e7..a207d790356 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Cobra VTOL Transport.blk	
@@ -94,7 +94,7 @@ Machine Gun
 </Rotor Equipment>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Sturmblitz Assault Gun (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Sturmblitz Assault Gun.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Sturmblitz Assault Gun (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Sturmblitz Assault Gun.blk
index dc28afc159f..cdca055f944 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Sturmblitz Assault Gun (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives IV/Sturmblitz Assault Gun.blk	
@@ -86,7 +86,7 @@ Autocannon/20 Primitive
 </Rear Equipment>
 
 <source>
-XTRO Primitives IV - Age of War
+XTR: Primitives IV - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Apostle Self-Propelled Artillery.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Apostle Self-Propelled Artillery.blk
index cfe3caeb03b..48416900ecc 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Apostle Self-Propelled Artillery.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Apostle Self-Propelled Artillery.blk	
@@ -97,7 +97,7 @@ ISSniper
 </armor_tech_rating>
 
 <source>
-XTRO Primitives V - Age of War
+XTR: Primitives V - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Asher Hover Scout.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Asher Hover Scout.blk
index 015b727bd11..008bd37cfaa 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Asher Hover Scout.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Asher Hover Scout.blk	
@@ -104,7 +104,7 @@ Machine Gun
 </armor_tech_rating>
 
 <source>
-XTRO Primitives V - Age of War
+XTR: Primitives V - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Dunning Mobile Tactical Command Post (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Dunning Mobile Tactical Command Post.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/XTRs/Primitives V/Dunning Mobile Tactical Command Post (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Primitives V/Dunning Mobile Tactical Command Post.blk
index d2108aeb000..1d4a4ca9496 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Dunning Mobile Tactical Command Post (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Dunning Mobile Tactical Command Post.blk	
@@ -93,7 +93,7 @@ ISOffRoadChassis
 </armor_tech_rating>
 
 <source>
-XTRO Primitives V - Age of War
+XTR: Primitives V - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/RR-3 Recovery Vehicle (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/RR-3 Recovery Vehicle.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/XTRs/Primitives V/RR-3 Recovery Vehicle (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Primitives V/RR-3 Recovery Vehicle.blk
index 41d229835cb..b6f5ea4a2f2 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/RR-3 Recovery Vehicle (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/RR-3 Recovery Vehicle.blk	
@@ -95,7 +95,7 @@ Lift Hoist/Arresting Hoist
 </armor_tech_rating>
 
 <source>
-XTRO Primitives V - Age of War
+XTR: Primitives V - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Reaper Self-Propelled Artillery (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Reaper Self-Propelled Artillery.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/XTRs/Primitives V/Reaper Self-Propelled Artillery (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Primitives V/Reaper Self-Propelled Artillery.blk
index d627c34e2cc..98c358c1e64 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Reaper Self-Propelled Artillery (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/Reaper Self-Propelled Artillery.blk	
@@ -96,7 +96,7 @@ ISThumper
 </armor_tech_rating>
 
 <source>
-XTRO Primitives V - Age of War
+XTR: Primitives V - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/UTR-588 Recovery Vehicle.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/UTR-588 Recovery Vehicle.blk
index 09e10f9a155..4018151c181 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives V/UTR-588 Recovery Vehicle.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives V/UTR-588 Recovery Vehicle.blk	
@@ -81,7 +81,7 @@ cargobay:40:1
 </transporters>
 
 <source>
-XTRO Primitives V - Age of War
+XTR: Primitives V - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Hover Primitive).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Hover Primitive).blk
index 7cce38f54d9..fa41b447e34 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Hover Primitive).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Hover Primitive).blk	
@@ -90,7 +90,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Primitives I - Age of War
+XTR: Primitives I - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Tracked Primitive).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Tracked Primitive).blk
index e85d4645e15..2e528f1d140 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Tracked Primitive).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Tracked Primitive).blk	
@@ -91,7 +91,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Primitives I - Age of War
+XTR: Primitives I - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Wheeled Primitive).blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Wheeled Primitive).blk
index 29ad0ff16ec..082df02fc78 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Wheeled Primitive).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Armored Personnel Carrier (Wheeled Primitive).blk	
@@ -92,7 +92,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Primitives I - Age of War
+XTR: Primitives I - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Merkava Heavy Tank MK VI.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Merkava Heavy Tank MK VI.blk
index 80c9fb9bcba..f76a0dfb8d8 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Merkava Heavy Tank MK VI.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Merkava Heavy Tank MK VI.blk	
@@ -104,7 +104,7 @@ Machine Gun
 </armor_tech_rating>
 
 <source>
-XTRO Primitives I - Age of War
+XTR: Primitives I - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Sand Devil Hover Tank.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Sand Devil Hover Tank.blk
index fcfce0cd63d..f80f10b1b32 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Sand Devil Hover Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Sand Devil Hover Tank.blk	
@@ -99,7 +99,7 @@ Small Laser
 </armor_tech_rating>
 
 <source>
-XTRO Primitives I - Age of War
+XTR: Primitives I - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Stoat Scout Car.blk b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Stoat Scout Car.blk
index 588413f470a..0ba9436c7b2 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Primitives/Stoat Scout Car.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Primitives/Stoat Scout Car.blk	
@@ -100,7 +100,7 @@ Machine Gun
 </armor_tech_rating>
 
 <source>
-XTRO Primitives I - Age of War
+XTR: Primitives I - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank (Reactive).blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank (Reactive).blk
index 719e2877b62..9365980ceb7 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank (Reactive).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank (Reactive).blk	
@@ -88,7 +88,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Jiahd
+XTR: Republic I - Jiahd
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank.blk
similarity index 99%
rename from megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank.blk
index 6f133d2b320..80c2f7ed851 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Condor Multi-Purpose Tank.blk	
@@ -80,7 +80,7 @@ LRM 15
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Jihad
+XTR: Republic I - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Diggs Drone Control Tank (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Diggs Drone Control Tank.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/XTRs/Republic I/Diggs Drone Control Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Republic I/Diggs Drone Control Tank.blk
index 35799189cac..5abbc001d66 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Diggs Drone Control Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Diggs Drone Control Tank.blk	
@@ -90,7 +90,7 @@ Light Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Late Republic
+XTR: Republic I - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Hexareme HQ Hovercraft (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Hexareme HQ Hovercraft.blk
similarity index 97%
rename from megamek/data/mechfiles/vehicles/XTRs/Republic I/Hexareme HQ Hovercraft (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Republic I/Hexareme HQ Hovercraft.blk
index e5749f7e8b6..db2e852f702 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Hexareme HQ Hovercraft (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Hexareme HQ Hovercraft.blk	
@@ -104,7 +104,7 @@ ISLBXAC2
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Late Republic
+XTR: Republic I - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Quaestor Mobile Tactical Command HQ (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Quaestor Mobile Tactical Command HQ.blk
similarity index 95%
rename from megamek/data/mechfiles/vehicles/XTRs/Republic I/Quaestor Mobile Tactical Command HQ (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Republic I/Quaestor Mobile Tactical Command HQ.blk
index c0d9878227c..445bd7f269b 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Quaestor Mobile Tactical Command HQ (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Quaestor Mobile Tactical Command HQ.blk	
@@ -73,7 +73,7 @@ Machine Gun(ST)
 </Rear Equipment>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Strix Stealth VTOL (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Strix Stealth VTOL.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/XTRs/Republic I/Strix Stealth VTOL (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Republic I/Strix Stealth VTOL.blk
index 15c7dd9c44f..834e41d24e4 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Strix Stealth VTOL (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Strix Stealth VTOL.blk	
@@ -90,7 +90,7 @@ CLERSmallLaser
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Late Republic
+XTR: Republic I - Late Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) A.blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) A.blk
index 0c2c99c6963..cbf9385077f 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) A.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) A.blk	
@@ -94,7 +94,7 @@ ISTAG:OMNI
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) B.blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) B.blk
index 9f90941b888..fa8a10d094c 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) B.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) B.blk	
@@ -93,7 +93,7 @@ ER Flamer:OMNI
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) C.blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) C.blk
index 063fcad4b17..f22090c3382 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) C.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) C.blk	
@@ -94,7 +94,7 @@ ISMPod:OMNI
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) Prime.blk b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) Prime.blk
index b2f4cfc3d34..133a6d10759 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) Prime.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic I/Zephyr Hovertank (Omnidrone) Prime.blk	
@@ -92,7 +92,7 @@ PPC Capacitor:OMNI
 </Turret Equipment>
 
 <source>
-XTRO Republic I - Early Republic
+XTR: Republic I - Early Republic
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Republic III/Padilla Anti-Missile Tank (Standard).blk b/megamek/data/mechfiles/vehicles/XTRs/Republic III/Padilla Anti-Missile Tank.blk
similarity index 96%
rename from megamek/data/mechfiles/vehicles/XTRs/Republic III/Padilla Anti-Missile Tank (Standard).blk
rename to megamek/data/mechfiles/vehicles/XTRs/Republic III/Padilla Anti-Missile Tank.blk
index dadea605c12..0c3ea0391a0 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Republic III/Padilla Anti-Missile Tank (Standard).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Republic III/Padilla Anti-Missile Tank.blk	
@@ -90,7 +90,7 @@ ISBAAPDS
 </Turret Equipment>
 
 <source>
-XTRO Republic III - Dark Age
+XTR: Republic III - Dark Age
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Barouche Hovercraft.blk b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Barouche Hovercraft.blk
index 053b3a563ae..b6a1324315c 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Barouche Hovercraft.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Barouche Hovercraft.blk	
@@ -27,7 +27,7 @@ Barouche Military Transport
 3078
 </year>
 <source>
-XTRO RetroTech - Jihad
+XTR: RetroTech - Jihad
 </source>
 
 
diff --git a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/HW1 Hwacha.blk b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/HW1 Hwacha.blk
index 4d5e9ff7b15..fc2b06864e6 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/HW1 Hwacha.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/HW1 Hwacha.blk	
@@ -139,7 +139,7 @@ Overweight resolved due to errata. Removed 1 ton of Ammo.
 </notes>
 
 <source>
-XTRO RetroTech - Jihad
+XTR: RetroTech - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Humming Bird Rescue VTOL.blk b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Humming Bird Rescue VTOL.blk
index 84492728e42..79849822406 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Humming Bird Rescue VTOL.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Humming Bird Rescue VTOL.blk	
@@ -90,7 +90,7 @@ Lift Hoist/Arresting Hoist
 </structural_tech_rating>
 
 <source>
-XTRO RetroTech - Jihad
+XTR: RetroTech - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Nike Tank.blk b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Nike Tank.blk
index 9fbe5f51551..f98cf5b77e4 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Nike Tank.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/Nike Tank.blk	
@@ -93,7 +93,7 @@ IS LB 5-X AC
 </Turret Equipment>
 
 <source>
-XTRO RetroTech - Jihad
+XTR: RetroTech - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk
index 8631935d90f..c2861b5a78b 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk	
@@ -118,7 +118,7 @@ ISERMediumLaser
 </structural_tech_rating>
 
 <source>
-XTRO RetroTech - Jihad
+XTR: RetroTech - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Steiner/Centipede Commando.blk b/megamek/data/mechfiles/vehicles/XTRs/Steiner/Centipede Commando.blk
index d74e02ee83d..dc37e651fed 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Steiner/Centipede Commando.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Steiner/Centipede Commando.blk	
@@ -91,7 +91,7 @@ ISMagshotGR
 </Turret Equipment>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Steiner/Demolisher II Heavy Tank II -X.blk b/megamek/data/mechfiles/vehicles/XTRs/Steiner/Demolisher II Heavy Tank II -X.blk
index d2251847b35..0512940306b 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Steiner/Demolisher II Heavy Tank II -X.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Steiner/Demolisher II Heavy Tank II -X.blk	
@@ -94,7 +94,7 @@ CLUltraAC10
 </tonnage>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <capabilities>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Steiner/Rommel Tank (Howitzer) Prototype.blk b/megamek/data/mechfiles/vehicles/XTRs/Steiner/Rommel Tank (Howitzer) Prototype.blk
index d56899262e6..32a7d4c4106 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Steiner/Rommel Tank (Howitzer) Prototype.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Steiner/Rommel Tank (Howitzer) Prototype.blk	
@@ -123,7 +123,7 @@ TARGETING:TharHes Mars5
 </systemManufacturers>
 
 <source>
-XTRO Steiner - Jihad
+XTR: Steiner - Jihad
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Buffalo Drone Bomb.blk b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Buffalo Drone Bomb.blk
index 157956298c1..44dfae26cf4 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Buffalo Drone Bomb.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Buffalo Drone Bomb.blk	
@@ -105,7 +105,7 @@ Cargo Container (10 tons)
 </Rear Equipment>
 
 <source>
-XTRO Succession Wars - Succession Wars - Age of War
+XTR: Succession Wars - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Condor Heavy Hover Tank (Fission).blk b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Condor Heavy Hover Tank (Fission).blk
index 2939508b3b5..6344f69d6ac 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Condor Heavy Hover Tank (Fission).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Condor Heavy Hover Tank (Fission).blk	
@@ -122,7 +122,7 @@ TARGETING:TharHes Mars 1
 </systemManufacturers>
 
 <source>
-XTRO Succession Wars - Succession Wars
+XTR: Succession Wars - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/J. Edgar Light Hover Tank (Cell).blk b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/J. Edgar Light Hover Tank (Cell).blk
index c5accd1680e..b19720f8b57 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/J. Edgar Light Hover Tank (Cell).blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/J. Edgar Light Hover Tank (Cell).blk	
@@ -83,7 +83,7 @@ Machine Gun
 </Turret Equipment>
 
 <source>
-XTRO Succession Wars - Succession Wars
+XTR: Succession Wars - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Kestrel VTOL Scout.blk b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Kestrel VTOL Scout.blk
index a3b417ab816..6c7a30fd2b9 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Kestrel VTOL Scout.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Kestrel VTOL Scout.blk	
@@ -78,7 +78,7 @@ ISMastMount
 </Rotor Equipment>
 
 <source>
-XTRO Succession Wars - Succession Wars
+XTR: Succession Wars - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Soarece Super Heavy MBT.blk b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Soarece Super Heavy MBT.blk
index 1da9fae907a..0146b6fdb34 100644
--- a/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Soarece Super Heavy MBT.blk	
+++ b/megamek/data/mechfiles/vehicles/XTRs/Succession Wars/Soarece Super Heavy MBT.blk	
@@ -103,7 +103,7 @@ Autocannon/20
 </Turret Equipment>
 
 <source>
-XTRO Succession Wars - Succession Wars
+XTR: Succession Wars - Succession Wars
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Aegis Heavy Cruiser (2843).blk b/megamek/data/mechfiles/warship/3057/Clan/Aegis Heavy Cruiser (2843).blk
index a9cf91b9051..641a9b529f8 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Aegis Heavy Cruiser (2843).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Aegis Heavy Cruiser (2843).blk	
@@ -217,7 +217,7 @@ Ammo Barracuda:10
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Early
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Black Lion II Battlecruiser (2843).blk b/megamek/data/mechfiles/warship/3057/Clan/Black Lion II Battlecruiser (2843).blk
index 81ddfe74ec5..864f413e06b 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Black Lion II Battlecruiser (2843).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Black Lion II Battlecruiser (2843).blk	
@@ -215,7 +215,7 @@ Ammo Barracuda:10
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Early
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Cameron Battlecruiser (2851).blk b/megamek/data/mechfiles/warship/3057/Clan/Cameron Battlecruiser (2851).blk
index f3eaa985d8a..f1c238a4967 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Cameron Battlecruiser (2851).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Cameron Battlecruiser (2851).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -70,6 +70,10 @@ crewquarters:1673.0:0
 1
 </engine_type>
 
+<clan_engine>
+false
+</clan_engine>
+
 <armor_type>
 11
 </armor_type>
@@ -185,8 +189,48 @@ Naval Laser 35
 80
 </structural_integrity>
 
+<capabilities>
+The Cameron-class battlecruiser possesses a formidable arsenal, including Series-25 autocannons, naval lasers, and naval PPCs, providing both close-in and long-range firepower. Its anti-fighter defense is augmented by Maelstrom AR-10 missile launchers capable of firing missiles of various sizes. However, the flawed power distribution system of the original design led to critical failures, as illustrated by the loss of the SLS Saint Joan during an attack by Periphery pirates.
+</capabilities>
+
+<overview>
+The Cameron-class battlecruiser was commissioned by the SLDF with the expectation of a swift and powerful WarShip to bridge the gap between cruisers and battleships. However, the actual performance of the Cameron fell short of expectations, with issues in weight, acceleration, and power systems. Despite these shortcomings, the SLDF ordered 40 of the vessels due to budget constraints and the ship's excellent weaponry and armor.
+</overview>
+
+<history>
+The initial Cameron-class ships faced significant challenges due to their design flaws. The failure of the power system during the engagement with Periphery pirates led to the destruction of the SLS Saint Joan, resulting in the resignation of senior admirals and the appropriation of Daussault-Shimmon's shipyards by the Star League. The existing Camerons were then relegated to transport duties. The Clans, along with ComStar, later adopted a modified version of the Cameron. While this improved version addressed some of the original flaws by correcting the power distribution system and adding a lithium-fusion battery system, it still fell short of meeting the performance specifications of the SLDF-commissioned Cameron. Nevertheless, the modified Cameron proved to be an excellent mobile command center for the Clans.
+</history>
+
+<manufacturer>
+refit
+</manufacturer>
+
+<primaryFactory>
+Unknown
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battlecruiser
+</use>
+
+<length>
+839 m
+</length>
+
+<height>
+1450 m Sail
+</height>
+
 <source>
-TRO3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
@@ -210,6 +254,10 @@ TRO3057R - Star League
 75
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 337
 </crew>
@@ -241,3 +289,4 @@ TRO3057R - Star League
 <escape_pod>
 30
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Carrack Transport (Merchant 2985).blk b/megamek/data/mechfiles/warship/3057/Clan/Carrack Transport (Merchant 2985).blk
index 76f4b2d32e2..0721ad0b24c 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Carrack Transport (Merchant 2985).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Carrack Transport (Merchant 2985).blk	
@@ -208,7 +208,7 @@ CLArtemisIV
 </structural_integrity>
 
 <source>
-3057R - Succession Wars - Late Era
+TRO: 3057R - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Congress Frigate (2914).blk b/megamek/data/mechfiles/warship/3057/Clan/Congress Frigate (2914).blk
index 722a1d9e3c4..8b8bf8b30a5 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Congress Frigate (2914).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Congress Frigate (2914).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -48,7 +48,7 @@ dockingcollar
 dockingcollar
 1stclassquarters:430.0:0
 crewquarters:1491.0:0
-cargobay:400.0:1:6
+cargobay:400.0:1:8
 </transporters>
 
 <SafeThrust>
@@ -71,6 +71,10 @@ cargobay:400.0:1:6
 1
 </engine_type>
 
+<clan_engine>
+false
+</clan_engine>
+
 <armor_type>
 11
 </armor_type>
@@ -160,8 +164,48 @@ Ammo White Shark:10
 75
 </structural_integrity>
 
+<capabilities>
+The Congress frigate excelled in its dual mission as a convoy escort and intelligence-gathering vessel. It boasted swiftness, advanced snooping gear, and the ability to endure extended voyages under challenging conditions. With an emphasis on functionality and accessibility, the interior design of the Congress frigates maximized efficiency and ease of maintenance. The ship's primary armament included eight cannons in five turrets, a missile launcher capable of launching Killer Whale missiles, and two additional missile launchers for White Shark missiles. It could also accommodate two DropShips for various purposes, including troop and 'Mech transport. Fighter carriers, such as the Vengeance-class, often accompanied Congress frigates to provide fighter support.
+</capabilities>
+
+<overview>
+The Congress-class frigates emerged as a pivotal asset in both the Terran Hegemony Navy and the Star League Navy. These versatile vessels, designed by Dekirk Aerospace, replaced the outdated Quixote-class frigates and became renowned for their exceptional capabilities. With a dual mission of convoy escort and intelligence gathering, the Congress frigates boasted impressive speed, advanced snooping equipment, and extended voyage endurance, making them an indispensable presence in enemy territory. Their reputation for functionality, accessibility, and crew comfort further solidified the Congress-class frigates' status as an esteemed and reliable fleet unit.
+</overview>
+
+<history>
+Introduced in 2536 as a replacement for the Quixote-class frigates, the Congress-class vessels quickly proved their superiority in the Terran Hegemony and Star League fleets. Despite facing a lawsuit filed by the Federated Suns, a compromise settlement was reached in 2540, leading to the inclusion of Challenge Systems as a partner in construction. The Congress frigates excelled in their role as convoy escorts and information-gathering vessels, featuring advanced reconnaissance equipment and a powerful armament. While their numbers dwindled over time, Congress-class frigates made an appearance in Clan fleets, such as the Fire Rose, which boasted an additional lithium-fusion battery system.
+</history>
+
+<manufacturer>
+Refit
+</manufacturer>
+
+<primaryFactory>
+Unknown
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Frigate
+</use>
+
+<length>
+703 m
+</length>
+
+<height>
+1207 m Sail
+</height>
+
 <source>
-TRO3057R - Succession Wars - Late
+TRO: 3057R - Late Succession War - LosTech
 </source>
 
 <tonnage>
@@ -184,6 +228,10 @@ TRO3057R - Succession Wars - Late
 90
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 301
 </crew>
@@ -215,3 +263,4 @@ TRO3057R - Succession Wars - Late
 <escape_pod>
 8
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Essex II Destroyer (2962).blk b/megamek/data/mechfiles/warship/3057/Clan/Essex II Destroyer (2962).blk
index dc75baedaeb..3f883c971a6 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Essex II Destroyer (2962).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Essex II Destroyer (2962).blk	
@@ -157,7 +157,7 @@ Naval PPC (Medium)
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Early
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Fredasa CorvetteRaider (2962).blk b/megamek/data/mechfiles/warship/3057/Clan/Fredasa (Corvette-Raider) (2962).blk
similarity index 61%
rename from megamek/data/mechfiles/warship/3057/Clan/Fredasa CorvetteRaider (2962).blk
rename to megamek/data/mechfiles/warship/3057/Clan/Fredasa (Corvette-Raider) (2962).blk
index 9f32c7c7053..f79fc59a928 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Fredasa CorvetteRaider (2962).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Fredasa (Corvette-Raider) (2962).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -13,7 +13,7 @@ Warship
 </UnitType>
 
 <Name>
-Fredasa Corvette Raider
+Fredasa (Corvette-Raider)
 </Name>
 
 <Model>
@@ -47,7 +47,7 @@ cargobay:3300.0:1:3
 dockingcollar
 1stclassquarters:190.0:0
 crewquarters:651.0:0
-cargobay:50.0:0:6
+cargobay:50.0:0:7
 </transporters>
 
 <SafeThrust>
@@ -70,6 +70,10 @@ cargobay:50.0:0:6
 1
 </engine_type>
 
+<clan_engine>
+false
+</clan_engine>
+
 <armor_type>
 12
 </armor_type>
@@ -207,6 +211,50 @@ Naval Laser 45
 40
 </structural_integrity>
 
+<capabilities>
+The Fredasa is known for its exceptional speed, capable of reaching 4Gs of acceleration in short bursts. Its agility and low signature enable it to quickly engage targets before facing significant opposition. While it carries less armament and armor compared to the Inner Sphere's corvettes, it excels at hit-and-run tactics. The Fredasa is often deployed as a picket ship but is equally capable of raiding operations. Its arsenal consists of extended-range lasers, Gauss rifles in the nose for forward firepower, and SRMs and LRMs for anti-fighter capabilities.
+</capabilities>
+
+<overview>
+The Fredasa is a small WarShip design introduced by the Clans in the mid-30th century. While the Clans classify it as a corvette, it is often referred to as a raider by Inner Sphere naval officers due to its perceived primary mission. The Fredasa is smaller and more agile than the Inner Sphere's Fox-class corvette, making it a formidable raider vessel. It has a smaller profile and can achieve high acceleration, allowing it to outmaneuver enemy escorts.
+</overview>
+
+<history>
+The Fredasa has primarily been deployed by Clans Nova Cat and Ghost Bear in the Inner Sphere, although intelligence suggests that Clan Steel Viper also possesses vessels of this class. The design's speed and agility, combined with its firepower, make it a versatile asset for Clan forces. Despite its relatively light armor, the Fredasa's Valiant Lamellor ferro-carbide armor provides superior protection compared to similar-sized Star League vessels.
+</history>
+
+<manufacturer>
+Unknown
+</manufacturer>
+
+<primaryFactory>
+Unknown
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Corvette
+</use>
+
+<length>
+415 m
+</length>
+
+<height>
+830 m Sail
+</height>
+
+<source>
+TRO: 3057R - Late Succession War - LosTech
+</source>
+
 <tonnage>
 180000.0
 </tonnage>
@@ -227,6 +275,10 @@ Naval Laser 45
 50
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 162
 </crew>
@@ -258,3 +310,4 @@ Naval Laser 45
 <escape_pod>
 0
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Liberator Cruiser (3024).blk b/megamek/data/mechfiles/warship/3057/Clan/Liberator Cruiser (3024).blk
index e68bd1b19dd..a30a6173bc4 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Liberator Cruiser (3024).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Liberator Cruiser (3024).blk	
@@ -352,3 +352,7 @@ CLERSmallLaser
 <escape_pod>
 60
 </escape_pod>
+
+<source>
+TRO: 3057r - Late Succession War - Renaissance
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Lola III Destroyer (2841).blk b/megamek/data/mechfiles/warship/3057/Clan/Lola III Destroyer (2841).blk
index 1e5b0e2fd07..d12e2a42d9c 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Lola III Destroyer (2841).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Lola III Destroyer (2841).blk	
@@ -166,7 +166,7 @@ Ammo Barracuda:20
 </structural_integrity>
 
 <source>
-TR)3057R - Succession Wars - Early
+TRO: 3057R - Succession Wars - Early
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/McKenna Battleship (2851).blk b/megamek/data/mechfiles/warship/3057/Clan/McKenna Battleship (2851).blk
index 5113a022fc1..196a565ed90 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/McKenna Battleship (2851).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/McKenna Battleship (2851).blk	
@@ -224,7 +224,7 @@ Naval PPC (Heavy)
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Early
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Nightlord Battleship (2932).blk b/megamek/data/mechfiles/warship/3057/Clan/Nightlord Battleship (2932).blk
index 3543f15563d..5a80ee43160 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Nightlord Battleship (2932).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Nightlord Battleship (2932).blk	
@@ -223,7 +223,7 @@ Ammo Medium N-Gauss:30
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Late
+TRO: 3057R - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Potemkin Troop Cruiser (2875).blk b/megamek/data/mechfiles/warship/3057/Clan/Potemkin Troop Cruiser (2875).blk
index 062da62fa08..0d684f7eae1 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Potemkin Troop Cruiser (2875).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Potemkin Troop Cruiser (2875).blk	
@@ -194,7 +194,7 @@ Naval PPC (Heavy)
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Early
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Sovetskii Soyuz Heavy Cruiser (2845).blk b/megamek/data/mechfiles/warship/3057/Clan/Sovetskii Soyuz Heavy Cruiser (2845).blk
index 74c57806ec8..53e9949e069 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Sovetskii Soyuz Heavy Cruiser (2845).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Sovetskii Soyuz Heavy Cruiser (2845).blk	
@@ -164,7 +164,7 @@ Naval PPC (Medium)
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Early
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Sovetskii Soyuz Heavy Cruiser (Dire Wolf) (2845).blk b/megamek/data/mechfiles/warship/3057/Clan/Sovetskii Soyuz Heavy Cruiser (Dire Wolf) (2845).blk
index 25c273a7664..c2a362c454a 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Sovetskii Soyuz Heavy Cruiser (Dire Wolf) (2845).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Sovetskii Soyuz Heavy Cruiser (Dire Wolf) (2845).blk	
@@ -165,7 +165,7 @@ Naval PPC (Medium)
 </structural_integrity>
 
 <source>
-TRO3057U - Succession Wars - Early
+TRO: 3057U - Succession Wars - Early
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Texas Battleship (2835).blk b/megamek/data/mechfiles/warship/3057/Clan/Texas Battleship (2835).blk
index c405b210784..5e7f89c4b51 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Texas Battleship (2835).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Texas Battleship (2835).blk	
@@ -214,7 +214,7 @@ Ammo AR10 White Shark:10
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Early
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Vincent Corvette Mk42.blk b/megamek/data/mechfiles/warship/3057/Clan/Vincent Corvette Mk42.blk
index dbb658c97ab..eb6ad3cfbd6 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Vincent Corvette Mk42.blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Vincent Corvette Mk42.blk	
@@ -138,7 +138,7 @@ CLERLargeLaser
 </structural_integrity>
 
 <source>
-TRO 3057 - Succession War Late
+TRO: 3057 - Succession War Late
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Volga Transport (2836).blk b/megamek/data/mechfiles/warship/3057/Clan/Volga Transport (2836).blk
index 17962b8f634..98ade7271de 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Volga Transport (2836).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Volga Transport (2836).blk	
@@ -221,7 +221,7 @@ Ammo Heavy N-Gauss:100
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Early
+TRO: 3057R - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/Whirlwind Destroyer (2901).blk b/megamek/data/mechfiles/warship/3057/Clan/Whirlwind Destroyer (2901).blk
index 6251347a2a7..fc5bb11ed7d 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/Whirlwind Destroyer (2901).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/Whirlwind Destroyer (2901).blk	
@@ -181,7 +181,7 @@ Clan Streak SRM 6 Ammo:15
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Late
+TRO: 3057R - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/Clan/York DestroyerCarrier (2947).blk b/megamek/data/mechfiles/warship/3057/Clan/York DestroyerCarrier (2947).blk
index 63451195519..5e3cbb8c8e6 100644
--- a/megamek/data/mechfiles/warship/3057/Clan/York DestroyerCarrier (2947).blk	
+++ b/megamek/data/mechfiles/warship/3057/Clan/York DestroyerCarrier (2947).blk	
@@ -222,7 +222,7 @@ Ammo NAC/30:200
 </structural_integrity>
 
 <source>
-TRO3057R - Succession Wars - Late
+TRO: 3057R - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Aegis Heavy Cruiser (2372).blk b/megamek/data/mechfiles/warship/3057/IS/Aegis Heavy Cruiser (2372).blk
index 8a5db770a23..c384dc8c6e1 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Aegis Heavy Cruiser (2372).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Aegis Heavy Cruiser (2372).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -49,7 +49,7 @@ dockingcollar
 dockingcollar
 1stclassquarters:650.0:0
 crewquarters:2275.0:0
-cargobay:128089.5:1:5
+cargobay:128089.5:1:9
 </transporters>
 
 <SafeThrust>
@@ -213,8 +213,48 @@ Ammo White Shark:10
 75
 </structural_integrity>
 
+<capabilities>
+The Aegis-class cruisers were known for their excellent firepower and maneuverability. They incorporated detachable jump sails, allowing for efficient energy collection and faster jumps. The refitted Aegis cruisers featured 18 autocannons housed in six turrets as their main firepower, along with secondary armament consisting of lasers, cannons, and missiles. The interior of the cruisers was relatively spacious, allowing for ample ammunition storage. However, the outdated materials and construction techniques used in their hulls made them weaker and more easily detectable compared to newer ships.
+</capabilities>
+
+<overview>
+The Aegis-class WarShip, launched in 2372, was a powerful heavy cruiser and one of the most sophisticated vessels of its time. Initially phased out in favor of newer designs, the Aegis was later reactivated during the Reunification War. After extensive refits, the Aegis became a highly effective combat craft with impressive firepower and a complement of fighters. Despite being lightly armored, several Aegis cruisers survived the fall of the Star League and found their way into Clan fleets, particularly the Jade Falcon Touman.
+</overview>
+
+<history>
+The Aegis-class WarShip, developed by Di Tron Heavy Industries, was first launched in 2372 and quickly gained acclaim as an excellent heavy cruiser. Incorporating the latest technological innovations, including detachable jump sails, the Aegis showcased the Terran Hegemony's love for tradition and proven designs. With its firepower and mobility, the Aegis served the Hegemony navy for a century and a half, undergoing several refits to take advantage of new equipment and technologies. However, by 2531, the Aegis cruisers started to be phased out in favor of the newer Avatar-class heavy cruisers. The decision to retire the Aegis cruisers was influenced by their design deficiencies and the need for more advanced vessels. A few Aegis cruisers remained in the navy as training vessels, while the rest were mothballed and placed in reserve status. Deborah Cameron, the Director-General of the Terran Hegemony at the time, chose to send them to mothballs instead of scrapping them, guarding against future wars. For the next 30 years, the mothballed Aegis cruisers orbited Sol between Terra and Mars, waiting for a new purpose. The founding of the Star League and the ensuing Reunification War created a critical need for warships, prompting First Lord Ian Cameron to reactivate the Aegis cruisers in 2582. Thirty of the cruisers were distributed among the Star League member states, while the remaining seventy underwent extensive refitting at Hegemony shipyards. Di Tron Heavy Industries took on the task of refitting the Aegis cruisers, utilizing the latest technologies available. The refitted Aegis cruisers, known as Block II ships, underwent significant upgrades. They were armed with a formidable arsenal, including 18 turret-mounted autocannons as their main firepower, along with smaller cannons, naval lasers, and missile systems. These enhancements transformed the aging cruisers into highly effective fighting craft, capable of repelling enemy attacks and carrying a full complement of fighters for defense against enemy aerospace threats. Despite their refits, the Aegis cruisers remained lightly armored, which became a notable weakness. However, their firepower and capabilities made them formidable opponents, and they performed admirably in battle, especially when engaging larger warships. The Aegis cruisers played a vital role in the early years of the Star League Navy, providing a significant boost during its crucial formation. Their revitalized presence added strength to the Navy's ranks, even as more modern ship designs emerged. Following the fall of the Star League, several Aegis cruisers survived the ensuing chaos and departure of Inner Sphere forces during the Exodus. These surviving cruisers found their way into Clan aerospace fleets, notably serving in the Jade Falcon Touman. In the Clan forces, they fulfilled roles such as escort and transport duties, still demonstrating their capabilities even centuries after their initial launch. The Aegis-class cruisers serve as a testament to the Terran Hegemony's tradition and adherence to proven designs. Despite their age, the Aegis cruisers left a lasting impact on the history of WarShips, playing vital roles in the Terran Hegemony and later the Star League Navy, and even finding new life within the Clans.
+</history>
+
+<manufacturer>
+Di Tron Heavy Industries
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+725 m
+</length>
+
+<height>
+1308 m Sail
+</height>
+
 <source>
-3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -234,6 +274,10 @@ Ammo White Shark:10
 90
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 476
 </crew>
@@ -265,3 +309,4 @@ Ammo White Shark:10
 <escape_pod>
 0
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Aegis Heavy Cruiser (2582).blk b/megamek/data/mechfiles/warship/3057/IS/Aegis Heavy Cruiser (2582).blk
index 8b3874e7354..5a5eacace43 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Aegis Heavy Cruiser (2582).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Aegis Heavy Cruiser (2582).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -214,8 +214,44 @@ Ammo Barracuda:10
 75
 </structural_integrity>
 
+<capabilities>
+The Aegis-class cruisers were known for their excellent firepower and maneuverability. They incorporated detachable jump sails, allowing for efficient energy collection and faster jumps. The refitted Aegis cruisers featured 18 autocannons housed in six turrets as their main firepower, along with secondary armament consisting of lasers, cannons, and missiles. The interior of the cruisers was relatively spacious, allowing for ample ammunition storage. However, the outdated materials and construction techniques used in their hulls made them weaker and more easily detectable compared to newer ships.
+</capabilities>
+
+<overview>
+The Aegis-class WarShip, launched in 2372, was a powerful heavy cruiser and one of the most sophisticated vessels of its time. Initially phased out in favor of newer designs, the Aegis was later reactivated during the Reunification War. After extensive refits, the Aegis became a highly effective combat craft with impressive firepower and a complement of fighters. Despite being lightly armored, several Aegis cruisers survived the fall of the Star League and found their way into Clan fleets, particularly the Jade Falcon Touman.
+</overview>
+
+<history>
+The Aegis-class WarShip, developed by Di Tron Heavy Industries, was first launched in 2372 and quickly gained acclaim as an excellent heavy cruiser. Incorporating the latest technological innovations, including detachable jump sails, the Aegis showcased the Terran Hegemony's love for tradition and proven designs. With its firepower and mobility, the Aegis served the Hegemony navy for a century and a half, undergoing several refits to take advantage of new equipment and technologies. However, by 2531, the Aegis cruisers started to be phased out in favor of the newer Avatar-class heavy cruisers. The decision to retire the Aegis cruisers was influenced by their design deficiencies and the need for more advanced vessels. A few Aegis cruisers remained in the navy as training vessels, while the rest were mothballed and placed in reserve status. Deborah Cameron, the Director-General of the Terran Hegemony at the time, chose to send them to mothballs instead of scrapping them, guarding against future wars. For the next 30 years, the mothballed Aegis cruisers orbited Sol between Terra and Mars, waiting for a new purpose. The founding of the Star League and the ensuing Reunification War created a critical need for warships, prompting First Lord Ian Cameron to reactivate the Aegis cruisers in 2582. Thirty of the cruisers were distributed among the Star League member states, while the remaining seventy underwent extensive refitting at Hegemony shipyards. Di Tron Heavy Industries took on the task of refitting the Aegis cruisers, utilizing the latest technologies available. The refitted Aegis cruisers, known as Block II ships, underwent significant upgrades. They were armed with a formidable arsenal, including 18 turret-mounted autocannons as their main firepower, along with smaller cannons, naval lasers, and missile systems. These enhancements transformed the aging cruisers into highly effective fighting craft, capable of repelling enemy attacks and carrying a full complement of fighters for defense against enemy aerospace threats. Despite their refits, the Aegis cruisers remained lightly armored, which became a notable weakness. However, their firepower and capabilities made them formidable opponents, and they performed admirably in battle, especially when engaging larger warships. The Aegis cruisers played a vital role in the early years of the Star League Navy, providing a significant boost during its crucial formation. Their revitalized presence added strength to the Navy's ranks, even as more modern ship designs emerged. Following the fall of the Star League, several Aegis cruisers survived the ensuing chaos and departure of Inner Sphere forces during the Exodus. These surviving cruisers found their way into Clan aerospace fleets, notably serving in the Jade Falcon Touman. In the Clan forces, they fulfilled roles such as escort and transport duties, still demonstrating their capabilities even centuries after their initial launch. The Aegis-class cruisers serve as a testament to the Terran Hegemony's tradition and adherence to proven designs. Despite their age, the Aegis cruisers left a lasting impact on the history of WarShips, playing vital roles in the Terran Hegemony and later the Star League Navy, and even finding new life within the Clans.
+</history>
+
+<primaryFactory>
+Di Tron Heavy Industries
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Templar Steel Plus
+ENGINE:Century 5000s
+ARMOR:Grumman K5
+COMMUNICATIONS:OMP Stratacaster
+TARGETING:KTI 389
+</systemManufacturers>
+
+<use>
+Terra
+</use>
+
+<length>
+725 m
+</length>
+
+<height>
+1308 m Sail
+</height>
+
 <source>
-TRO3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
@@ -239,6 +275,10 @@ TRO3057R - Star League
 90
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 361
 </crew>
@@ -270,3 +310,4 @@ TRO3057R - Star League
 <escape_pod>
 0
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Atreus Battleship (2552).blk b/megamek/data/mechfiles/warship/3057/IS/Atreus Battleship (2552).blk
index 1da62c7238e..1f552ce04fb 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Atreus Battleship (2552).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Atreus Battleship (2552).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -264,8 +264,48 @@ Small Laser
 80
 </structural_integrity>
 
+<capabilities>
+The Atreus-class battleships boasted impressive armor and agility for their mass, capable of sustaining 1.5Gs and achieving 2.5G sprints. Armed with naval autocannons, lasers, and PPCs, they delivered devastating firepower at both close and long ranges. However, a notable weakness lay in the limited ammunition capacity of the main cannons, with only ten rounds per gun. This necessitated swift victories or reliance on energy weapons. The Atreus-class ships had limited anti-fighter and anti-missile defenses, relying on their fighter squadrons for screening against smaller enemy craft.
+</capabilities>
+
+<overview>
+The Atreus-class battleships, designed during the Age of War, became the backbone of several Free Worlds naval battlegroups until their ultimate demise in the First Succession War. These 1.1 million-ton vessels showcased the economic and military prowess of the Free Worlds League, ranking among the largest in existence when they debuted in 2552. With upgrades over time, the Atreus-class matched and surpassed the capabilities of rival factions such as the Lyran Commonwealth, Capellan Confederation, and Terran Hegemony.
+</overview>
+
+<history>
+The Atreus-class battleships entered service in 2552 and quickly asserted their dominance over rival vessels from other factions. Despite some losses in conflicts with neighboring powers and the Reunification War, a significant number of Atreus-class ships remained in service when the Star League collapsed. These battleships played a pivotal role in the Free Worlds League's advances during the First Succession War. However, all remaining Atreus-class ships were ultimately lost during this intense conflict, with the final vessel falling prey to Lyran fighters in 2809, marking the end of the Atreus-class battleships' formidable presence.
+</history>
+
+<manufacturer>
+Technicron Manufacturing Corp. Tamarind Yards
+</manufacturer>
+
+<primaryFactory>
+Tamarind
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battleship
+</use>
+
+<length>
+1100 m
+</length>
+
+<height>
+1200 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -285,6 +325,10 @@ TRO 3057R - Age of War
 55
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 533
 </crew>
@@ -316,3 +360,4 @@ TRO 3057R - Age of War
 <escape_pod>
 25
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Avatar Heavy Cruiser (2531).blk b/megamek/data/mechfiles/warship/3057/IS/Avatar Heavy Cruiser (2531).blk
index ce98bc45595..0025780bad1 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Avatar Heavy Cruiser (2531).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Avatar Heavy Cruiser (2531).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -259,8 +259,48 @@ Naval Laser 35
 85
 </structural_integrity>
 
+<capabilities>
+The Avatar-class cruiser excelled in its weaponry, with a devastating broadside of naval PPCs, autocannons, and supplementary weaponry. The installation of large maneuvering thrusters significantly enhanced the ship's agility and maneuverability. Despite the electrical system problem, the Avatar's combat capabilities made it a formidable presence on the battlefield.
+</capabilities>
+
+<overview>
+The Avatar-class cruiser replaced the Aegis-class Heavy Cruisers in the Terran Hegemony in 2531. Weighing 85,000 tons more than its predecessor, the Avatar boasted heavier armor, weaponry, and improved maneuverability. Its primary strength was its formidable weapons system, combining naval PPCs, autocannons, Killer Whale launchers, and naval lasers. However, the class suffered from electrical system issues that were never resolved, leading to its eventual demise.
+</overview>
+
+<history>
+In the early 28th century, the Avatar-class cruiser was replaced by the Luxor-class cruiser. Many Avatars were either placed in reserve fleets or repurposed as training vessels. During Stephan Amaris' seizure of Terra in 2766, three Avatar-class vessels undergoing refitting at the Ian Cameron yards fell under his control. By the end of the war, six Avatars remained, with five serving in the SLDF and one captured by the Rim Worlds. Despite their obsolescence, General Kerensky chose to include these vessels in the Exodus fleet due to their cargo and DropShip capacities, and they are currently stored in naval caches.
+</history>
+
+<manufacturer>
+Daussault-Shimmon Enterprises
+</manufacturer>
+
+<primaryFactory>
+New Earth
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+855 m
+</length>
+
+<height>
+1250 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -284,6 +324,10 @@ TRO 3057R - Age of War
 145
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 355
 </crew>
@@ -315,3 +359,4 @@ TRO 3057R - Age of War
 <escape_pod>
 40
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Baron Destroyer (2520).blk b/megamek/data/mechfiles/warship/3057/IS/Baron Destroyer (2520).blk
index b29604d0ca7..1d9c5686e49 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Baron Destroyer (2520).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Baron Destroyer (2520).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -167,8 +167,48 @@ Naval Laser 35
 30
 </structural_integrity>
 
+<capabilities>
+The Baron-class Destroyer, constructed in the Terran Hegemony, was intended to support the strategy of "aggressive peacemaking" by providing a technological advantage. However, delays caused by flaws in the Palenkov-Reese engines hindered the class's performance, making it less effective than anticipated. Nevertheless, the Baron-class Destroyers offered generously sized fuel bunkers and extra accommodation for thirty passengers, which made them suitable as armed transports for high-ranking Star League diplomats, officials, and officers during travel, particularly in the Periphery.
+</capabilities>
+
+<overview>
+By the beginning of the twenty-sixth century, the Terran Hegemony adopted a strategy of "aggressive peacemaking" in dealing with other Inner Sphere powers. To support this policy, the Hegemony Armed Forces focused on maintaining technological superiority, even as diplomatic efforts were made to establish trade and peace treaties. However, the rapid pace of technological development often rendered equipment outdated before it could enter service. The Baron-class Destroyer, initially promising, faced significant delays and flaws in its engines, ultimately leading to disappointing performance. Despite this, the Baron-class Destroyers found use as armed transports for high-ranking Star League personnel, especially in the Periphery. The SLDF decommissioned the class in 2720, selling them to member states, and the last remaining Baron-class Destroyer was destroyed in 2853.
+</overview>
+
+<deployment>
+In 2515, construction began on the first Baron-class Destroyer, but flaws in the Palenkov-Reese engines were discovered, leading to a two-year delay for corrections. However, the drive performance of the class remained significantly reduced. Despite their disappointing performance, over half of the existing Baron-class Destroyers were distributed to Star League member states in 2582, while the remainder served in the SLDF. Although the Baron-class Destroyers saw action during the Reunification War, their performance remained lackluster. The SLDF decommissioned the class in 2720, selling the vessels to member states. The last Baron-class Destroyer, the DCS Yedo, was destroyed in 2853 by the battlecruiser LCS Invincible at the nadir jump point of the Hesperus system.
+</deployment>
+
+<manufacturer>
+Krester Ship Construction
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Destroyer
+</use>
+
+<length>
+545.5 m
+</length>
+
+<height>
+1150 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -187,6 +227,10 @@ TRO 3057R - Age of War
 65
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 275
 </crew>
@@ -218,3 +262,4 @@ TRO 3057R - Age of War
 <escape_pod>
 38
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Black Lion II Battlecruiser (2691).blk b/megamek/data/mechfiles/warship/3057/IS/Black Lion II Battlecruiser (2691).blk
index 536d021a2a9..297dace5314 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Black Lion II Battlecruiser (2691).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Black Lion II Battlecruiser (2691).blk	
@@ -214,7 +214,7 @@ Ammo Barracuda:10
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Bonaventure Corvette (2317).blk b/megamek/data/mechfiles/warship/3057/IS/Bonaventure Corvette (2317).blk
index 536c302360e..d5bed0e0b55 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Bonaventure Corvette (2317).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Bonaventure Corvette (2317).blk	
@@ -140,11 +140,11 @@ The Bonaventure was poorly armed, even compared with vessels of similar size dat
 </capabilities>
 
 <overview>
-Among contemporary naval vessels of the day, the Bonaventure-class was superb. The class boasted one of the most (if not the most) sophisticated sensor suites to have been designed by the beginning of the twenty-fifth century.
+The Bonaventure-class corvette was developed during the tumultuous era of the Terran Alliance's decline. Led by Admiral James McKenna, the project continued under the newly formed Terran Hegemony, featuring excellent mobility and advanced sensor capabilities. Initially paired with the Vigilant-class corvette, the Bonaventure served in reconnaissance missions and later transitioned to picket duty, providing early warning and intercepting intruders. However, with the advent of the Vincent-class corvette in 2432, the Bonaventure-class was eventually replaced.
 </overview>
 
 <history>
-The designing of the Bonaventure-class corvette was one of the last acts of the failing Terran Alliance. While Admiral James McKenna was staging his political coup and removing corrupt politicians from the Alliance government, he ordered the design of the Bonaventure as insurance and a means of consolidating his growing power base. Indeed, the Bonaventure-class was instrumental in consolidating the Terran Hegemony after the reorganization that occured in the wake of the McKenna Coup. However, compared with most other vessels, the Bonaventure was not well armed. The weakness of the Bonaventure became apparent after Hegemony operations over Capella. Thereafter, the Bonaventure was relegated to squadron formations of four Bonaventures, or surveillance squadrons composed of paired pairs of Bonaventures and Vigilants. These surveillance squadrons would patrol shipping routes in and out of the Hegemony. Bonaventures were also deployed as picket vessels to garrison the Terran Hegemony border. The Bonaventure-class was replaced in service from 2432 with the introduction of the Vincent Mk. 39-class corvette. During the Star League era the Terran hegemony sold or gifted away a number of outdated warships to the various member states; the Rim Worlds Republic was one beneficiary of this practice, and as at April 2765 had thirty-two Bonaventure-class corvettes openly in service. The Republic's fleet of Bonaventures were primarily manufactured and supported by the Roe Weapon Systems (RWS) production facilities in the Finmark system, along with the Republic's fleet of Pinto-class corvettes.
+The development of the Bonaventure-class corvette began during the final days of the Terran Alliance, spearheaded by Admiral James McKenna. As he rose to power and formed the Terran Hegemony, the project continued uninterrupted, showcasing the corvette's impressive mobility and sophisticated sensor suite. However, during the Capella campaign, it became evident that the Bonaventure lacked sufficient firepower. To address this limitation, the Hegemony Armed Forces (HAF) decided to pair the Bonaventure-class with the heavily armed Vigilant-class corvette, forming four-corvette squadrons for data gathering sweeps before invasions. As the borders of the Terran Hegemony stabilized, the Bonaventure shifted to picket duty, utilizing its exceptional long-range detection capabilities to provide early warnings and coordinate interception efforts. During one notable engagement, a Kurita destroyer squadron attacked a HAF patrol squadron, resulting in the destruction of all but the THS Cochran, which evaded pursuit using the Bonaventure-class corvette's advanced sensors and superior speed. The Cochran's successful resistance led to the christening of the next Monsoon-class Battleship as the Cochran, honoring the valor displayed in the battle. However, the Bonaventure-class corvette was eventually replaced by the more versatile Vincent-class corvette upon its introduction in 2432, marking the end of an era for the Bonaventure-class in the Terran Hegemony's naval forces.
 </history>
 
 <manufacturer>
@@ -172,7 +172,7 @@ Corvette
 </length>
 
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -191,6 +191,10 @@ TRO 3057R - Age of War
 50
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 127
 </crew>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Cameron Battlecruiser (2688).blk b/megamek/data/mechfiles/warship/3057/IS/Cameron Battlecruiser (2688).blk
index 74d1ab70aa8..3d94146bc17 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Cameron Battlecruiser (2688).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Cameron Battlecruiser (2688).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -184,8 +184,48 @@ Naval Laser 35
 80
 </structural_integrity>
 
+<capabilities>
+The Cameron-class battlecruiser possesses a formidable arsenal, including Series-25 autocannons, naval lasers, and naval PPCs, providing both close-in and long-range firepower. Its anti-fighter defense is augmented by Maelstrom AR-10 missile launchers capable of firing missiles of various sizes. However, the flawed power distribution system of the original design led to critical failures, as illustrated by the loss of the SLS Saint Joan during an attack by Periphery pirates.
+</capabilities>
+
+<overview>
+The Cameron-class battlecruiser was commissioned by the SLDF with the expectation of a swift and powerful WarShip to bridge the gap between cruisers and battleships. However, the actual performance of the Cameron fell short of expectations, with issues in weight, acceleration, and power systems. Despite these shortcomings, the SLDF ordered 40 of the vessels due to budget constraints and the ship's excellent weaponry and armor.
+</overview>
+
+<history>
+The initial Cameron-class ships faced significant challenges due to their design flaws. The failure of the power system during the engagement with Periphery pirates led to the destruction of the SLS Saint Joan, resulting in the resignation of senior admirals and the appropriation of Daussault-Shimmon's shipyards by the Star League. The existing Camerons were then relegated to transport duties. The Clans, along with ComStar, later adopted a modified version of the Cameron. While this improved version addressed some of the original flaws by correcting the power distribution system and adding a lithium-fusion battery system, it still fell short of meeting the performance specifications of the SLDF-commissioned Cameron. Nevertheless, the modified Cameron proved to be an excellent mobile command center for the Clans.
+</history>
+
+<manufacturer>
+Daussault-Shimmon Enterprises
+</manufacturer>
+
+<primaryFactory>
+New Earth
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battlecruiser
+</use>
+
+<length>
+839 m
+</length>
+
+<height>
+1450 m Sail
+</height>
+
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
@@ -205,6 +245,10 @@ TRO 3057R - Star League
 75
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 329
 </crew>
@@ -236,3 +280,4 @@ TRO 3057R - Star League
 <escape_pod>
 30
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Carrack Transport (2600).blk b/megamek/data/mechfiles/warship/3057/IS/Carrack Transport (2600).blk
index 7ecf5cb6b05..db1f621fa11 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Carrack Transport (2600).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Carrack Transport (2600).blk	
@@ -247,7 +247,7 @@ ISAMS Ammo:1488
 </structural_integrity>
 
 <source>
-TRO3057U - Star League
+TRO: 3057U - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Carson Destroyer (2632).blk b/megamek/data/mechfiles/warship/3057/IS/Carson Destroyer (2632).blk
index d95ea647baf..6ad55df52c2 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Carson Destroyer (2632).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Carson Destroyer (2632).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -145,8 +145,48 @@ Ammo NAC/30:40
 40
 </structural_integrity>
 
+<capabilities>
+The Carson-class destroyers, manufactured by Thompson's Shipyards, were designed to serve as escort vessels for the expanding Star League Navy. These destroyers incorporated features suitable for extended deployment, including an eighty-meter diameter Grav deck, large cargo capacity, and fuel tank. However, issues arose due to the inexperience of Thompson's Shipyards with WarShip construction. The single Regulis-XII engine, when operated at maximum thrust for extended periods, experienced excessive wear and tear, resulting in reduced maximum thrust and a need for frequent shipyard maintenance. These limitations made the Carson-class destroyers incapable of operating effectively in the new territories, where maintenance yards were scarce.
+</capabilities>
+
+<overview>
+The Carson-class destroyers were a series of escort vessels commissioned by the Star League Navy to cover the expanding territory of the Star League. Manufactured by Thompson's Shipyards, known for their expertise in JumpShip construction, the Carsons featured a generous grav deck, large cargo capacity, and fuel tanks for extended deployment. However, due to engineering oversights, the Carson-class faced challenges with excessive wear and tear on the engines, leading to reduced thrust and a high need for maintenance. Despite their initial role, the introduction of more reliable destroyers eventually led to the retirement of the Carson-class in 2722, marking the end of their service in the Star League Navy.
+</overview>
+
+<history>
+After five years of service, problems with the Carson-class destroyers became evident due to Thompson's Shipyards' oversight in accounting for the engine's wear and tear. The lack of provisions for this issue resulted in reduced thrust and the need for frequent maintenance, making the destroyers unsuitable for operating in the "wilds" of the expanding territories. As a result, a study on replacing the drive deemed it cost-ineffective, leading to the halting of production. The completed Carson-class destroyers were reassigned to patrol more settled regions while more reliable craft, such as the Lola III-class destroyer, became available. The introduction of the Essex-class destroyer in 2722 finally allowed the Navy to retire the Carson-class destroyers from service.
+</history>
+
+<manufacturer>
+Thompson's Shipyards
+</manufacturer>
+
+<primaryFactory>
+Keid
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Destroyer
+</use>
+
+<length>
+582 m
+</length>
+
+<height>
+1080 m Sail
+</height>
+
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
@@ -165,6 +205,10 @@ TRO 3057R - Star League
 80
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 250
 </crew>
@@ -196,3 +240,4 @@ TRO 3057R - Star League
 <escape_pod>
 27
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Congress Frigate (2542).blk b/megamek/data/mechfiles/warship/3057/IS/Congress Frigate (2542).blk
index b036b4277e4..550ee262e8e 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Congress Frigate (2542).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Congress Frigate (2542).blk	
@@ -159,19 +159,15 @@ Ammo White Shark:10
 </structural_integrity>
 
 <capabilities>
-Capable of 1.5 Gs of acceleration, the Congress was swift and well-armed for a convoy escort of the era, also equipped with some of the most advanced and sophisticated sensor systems to perform its secondary role as an information-gathering vessel in enemy territory. Introduced in 2542, the genesis of the Congress was marred by a three year legal battle after Challenge Systems of the Federated Suns world of Galax accused DeKirk Aerospace of industrial espionage and theft of the ship's design, with the Terran Hegemony finally brokering a compromise deal in 2540. While no party admitted liability, Challenge was included as a partner in construction and the Armed Forces of the Federated Suns received a heavy discount on orders for the Congress with the more advanced Hegemony technology absent.
+The Congress frigate excelled in its dual mission as a convoy escort and intelligence-gathering vessel. It boasted swiftness, advanced snooping gear, and the ability to endure extended voyages under challenging conditions. With an emphasis on functionality and accessibility, the interior design of the Congress frigates maximized efficiency and ease of maintenance. The ship's primary armament included eight cannons in five turrets, a missile launcher capable of launching Killer Whale missiles, and two additional missile launchers for White Shark missiles. It could also accommodate two DropShips for various purposes, including troop and 'Mech transport. Fighter carriers, such as the Vengeance-class, often accompanied Congress frigates to provide fighter support.
 </capabilities>
 
 <overview>
-Built to replace the sluggish and outmoded Quixote-class, the Congress-class frigate was one of the swiftest convoy escort and reconnaissance WarShips built in the 26th century.
+The Congress-class frigates emerged as a pivotal asset in both the Terran Hegemony Navy and the Star League Navy. These versatile vessels, designed by Dekirk Aerospace, replaced the outdated Quixote-class frigates and became renowned for their exceptional capabilities. With a dual mission of convoy escort and intelligence gathering, the Congress frigates boasted impressive speed, advanced snooping equipment, and extended voyage endurance, making them an indispensable presence in enemy territory. Their reputation for functionality, accessibility, and crew comfort further solidified the Congress-class frigates' status as an esteemed and reliable fleet unit.
 </overview>
 
-<deployment>
-The Congress's main armament is sixteen Naval Autocannons, eight Armstrong LN-10 Naval Autocannon NAC/10's along the forward angles and eight Oriente-30 NAC/30s mounted in the rear quarters, secondary firepower coming in the form of Capital Missile Launchers with a massive Killer Whale missile tube mounted in the nose, with a White Shark launcher fitted in each broadside. Eight Magna Large Lasers provide scant protection against fighters.
-</deployment>
-
 <history>
-Introduced in 2542, the genesis of the Congress was marred by a three year legal battle after Challenge Systems of the Federated Suns world of Galax accused DeKirk Aerospace of industrial espionage and theft of the ship's design, with the Terran Hegemony finally brokering a compromise deal in 2540. While no party admitted liability, Challenge was included as a partner in construction and the Armed Forces of the Federated Suns received a heavy discount on orders for the Congress with the more advanced Hegemony technology absent.
+The Congress-class frigates entered the scene in 2536, as the admirals of the Terran Hegemony recognized the limitations of the aging Quixote-class frigates. Engagements with foreign warships demonstrated the Quixote's vulnerability and prompted the search for a more capable replacement. Dekirk Aerospace, known for its innovative designs, presented a remarkable proposal that earned swift approval from the Hegemony Navy in the following year. However, the construction of the first Congress frigates faced a significant setback due to a lawsuit filed by the Federated Suns against Dekirk Aerospace and the Hegemony government. Challenge Systems, a shipbuilding firm from the Davion world of Galax, accused Dekirk of industrial espionage, claiming that much of the Congress frigate design was stolen from their own creations. This legal dispute continued for three years, ultimately leading to a compromise agreement in 2540. The agreement involved Challenge Systems becoming a partner in the construction of the Congress frigates, and the Federated Suns acquired some of the frigates at a reduced price, albeit without the advanced Hegemony technology.
 </history>
 
 <manufacturer>
@@ -183,23 +179,27 @@ Galax,Graham IV
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Unknown
-ENGINE:Unknown
-ARMOR:Unknown
-COMMUNICATIONS:Unknown
-TARGETING:Unknown
+CHASSIS:Endo Steel AN
+ENGINE:GM 8050 Starlifters
+ARMOR:Blue Nose 440CL
+COMMUNICATIONS:5T Vargas
+TARGETING:Wolf 157
 </systemManufacturers>
 
 <use>
-Convoy Escort/Reconnaissance
+Frigate
 </use>
 
 <length>
 703 m
 </length>
 
+<height>
+1207 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Dart Light Cruiser (2305).blk b/megamek/data/mechfiles/warship/3057/IS/Dart Light Cruiser (2305).blk
index 5b974d1ea47..ff32e252ca7 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Dart Light Cruiser (2305).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Dart Light Cruiser (2305).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -167,8 +167,48 @@ Naval PPC (Light)
 90
 </structural_integrity>
 
+<capabilities>
+The Dart-class cruiser featured a unique design optimized for independent duty. It had a substantial cargo bay comprising over 15% of the ship's mass, along with six drop collars for handling military and civilian DropShips. The ship's maneuver drives, the Century 4000s, were known for their robustness and reliability. The Dart-class was equipped with a combination of heavy energy weapons and naval autocannons, providing firepower for various combat scenarios.
+</capabilities>
+
+<overview>
+The Dart-class cruiser was developed by Di Tron Heavy Industries in response to the Terran Navy's need for a versatile WarShip that could operate independently in various roles, including combat, exploration, and cargo transport. With its large fuel storage tanks, significant cargo bay, and reinforced structure, the Dart-class was designed to withstand the demands of space exploration and combat in the harsh environments of the Inner Sphere and beyond.
+</overview>
+
+<history>
+The Dart-class cruisers served the Terran Navy for nearly 200 years before being retired and replaced by the new Avatar cruisers. However, many of these retired Darts were purchased by Periphery nations and repurposed for non-military roles. They continued to see service, albeit with their weapons removed, during the Reunification War. The last known Dart-class cruiser, SLS Gettysburg, was destroyed during the New Vandenberg revolt in 2722. It faced an attempt by fanatical Periphery separatists to destroy the newer Essex-class destroyer. By the end of their operational life, the Dart-class cruisers had become a relic, making way for more advanced WarShips in the ever-evolving landscape of naval warfare.
+</history>
+
+<manufacturer>
+Di Tron Heavy Industries, Di Tron Heavy Industries
+</manufacturer>
+
+<primaryFactory>
+Terra, Zebebelgenubi
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Light Cruiser
+</use>
+
+<length>
+703 m
+</length>
+
+<height>
+1135 m Sail
+</height>
+
 <source>
-TRO 3057 - Age of War
+TRO: 3057 - Age of War
 </source>
 
 <tonnage>
@@ -188,6 +228,10 @@ TRO 3057 - Age of War
 145
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 247
 </crew>
@@ -219,3 +263,4 @@ TRO 3057 - Age of War
 <escape_pod>
 29
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Davion Destroyer Block I.blk b/megamek/data/mechfiles/warship/3057/IS/Davion Destroyer Block I.blk
index f449ed1b957..928c418d536 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Davion Destroyer Block I.blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Davion Destroyer Block I.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -176,8 +176,48 @@ IS Ammo SRM-6:300
 55
 </structural_integrity>
 
+<capabilities>
+The Block I Davions lacked sufficient armor protection and firepower for their intended mission. They were not equipped with a full fighter wing, and their original design did not include the ability to dock DropShips. These ships were ill-suited for heavy combat engagements and were primarily assigned to secondary duties such as convoy escort and Periphery patrol.
+</capabilities>
+
+<overview>
+The Block I series of Davion-class destroyers, initially introduced in the early 26th century, faced various issues and shortcomings due to bureaucratic mismanagement. These ships were under-armored, under-armed, and plagued by delays and cost overruns. As a result, their utilization was limited, and they did not become the pride of the navy as originally intended.
+</overview>
+
+<history>
+Despite entering service in 2510, the Block I Davions did not meet the expectations of the AFFS Department of the Army and the Navy. They became the result of bureaucratic kickbacks and administrative issues, bearing little resemblance to the desired specifications. Several ships saw limited service during the Davion Civil War, but plans for further construction were put on hold. The surviving Block I Davions, few in number, found an unexpected future in the hands of the Clans, having been leased to the SLDF and later upgraded by the Clans.
+</history>
+
+<manufacturer>
+Challenge Systems
+</manufacturer>
+
+<primaryFactory>
+Galax
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Destroyer
+</use>
+
+<length>
+685 m
+</length>
+
+<height>
+1120 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -197,6 +237,10 @@ TRO 3057R - Age of War
 65
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 237
 </crew>
@@ -228,3 +272,4 @@ TRO 3057R - Age of War
 <escape_pod>
 0
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Davion Destroyer Block II.blk b/megamek/data/mechfiles/warship/3057/IS/Davion Destroyer Block II.blk
index 6d50da334ce..7fdb5695b5b 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Davion Destroyer Block II.blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Davion Destroyer Block II.blk	
@@ -241,19 +241,15 @@ Medium Laser
 </structural_integrity>
 
 <capabilities>
-The procurement of the original Davions was marred by corruption, administrative incompetence and delays that resulted in a ship that was late into service and underwhelming in comparison to the original requirement. Alexander made sweeping reforms when he came into power, including dismantling the bureaucratic systems that resulted in the Block I Davion. After he authorized the production of the Block II Davions, the resulting heavy destroyers that began entering service forty years after the cancellation of the Block I ships were 60,000 tons heavier and vastly superior in performance; unlike the earlier ships, the Block II Davions had docking points for two DropShips, a full aerospace fighter wing, a substantially revised arsenal of weaponry and significantly more armor. Changing the armor used from standard armor to Ferro-Carbide Armor meant that while a Block II Davion only carried approximately 50 tons more armor in total than its predecessor, the amount of protection offered by that armor was almost double that of the earlier ships. Because of the improvements to the overall design, the Block II Davion was able to serve the navies of the Federated Suns for more than 200 years.
+The Block II Davion-class destroyers were substantially improved compared to their Block I counterparts. They boasted twice the armor protection, increased firepower, and carried a full fighter wing. Notably, they had the ability to dock two DropShips, allowing for additional operational flexibility. These upgrades made the Block II Davions a formidable force in naval engagements.
 </capabilities>
 
 <overview>
-The Block II Davion-class destroyer was commissioned by First Prince Alexander Davion, but despite officially being the second block of Davions, the Block IIs bore relatively little resemblance to the original Davion Block I WarShips.
+The Davion-class destroyer, once the backbone of the Federated Suns' WarShip fleet, had a service life spanning three centuries due to significant modifications. The Block I series of Davions, plagued by bureaucratic issues and underwhelming performance, saw limited use in secondary duties. However, the Block II ships, authorized by Prince Alexander Davion, featured enhanced armor, firepower, and the ability to dock two DropShips, becoming a formidable asset for the Federated Suns' navy.
 </overview>
 
-<deployment>
-Whereas a Block I Davion sported a mix of capital weapons, combining NAC/25s and NAC/30s with NL45s and Light Naval PPCs, the Block II Davion was instead designed to incorporate only naval autocannon. The mix of NAC/25s, NAC/30s and NAC/40s significantly boosted the amount of damage a Block II Davion could inflict with its capital weapons compared to a Block I Davion, but did leave the Block II Davions without weapons that could inflict damage at extreme range. The Block II Davion also incorporated a substantially increased anti-fighter arsenal compared to its predecessor, replacing the earlier ships LRM-20s with a larger number of LRM-15s, adding multiple PPCs to several arcs and boosting the number of lasers substantially. When first fielded, a Davion II would commonly transport a pair of assault DropShips, typically Achilles-class DropShips, but later Vengeance-class DropShips were permanently assigned to Davion IIs.
-</deployment>
-
 <history>
-The Davion II served in the Federated Suns navy throughout the Star League era; in 2765, no less than fifteen Davion IIs were in service across the four active fleets, making it the most numerous class in service with the Federated Suns at that point in time. While all of the Davion I class WarShips had been retired from active service, there were rumors at the time that the navy would reactive some mothballed Davion Is as a part of the rapid rearmament program, which would have resulted in both classes of ship potentially operating alongside each other. No Davion IIs survived the Succession Wars.
+The initial Block I Davions faced numerous setbacks and shortcomings, leading to limited deployment and lackluster performance. However, Prince Alexander Davion revitalized the Davion program, resulting in the development of the Block II ships. The Block II Davions served during the Succession Wars but were eventually destroyed. Surprisingly, several surviving Block I Davions found their way into the service of the Clans. Prince Alexander leased most of the surviving Block I Davions to the SLDF, which were later acquired and upgraded by the Star League and the Clans, becoming known as the Whirlwind-class destroyers.
 </history>
 
 <manufacturer>
@@ -277,11 +273,11 @@ Destroyer
 </use>
 
 <length>
-685
+685 m
 </length>
 
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Essex II Destroyer (2711).blk b/megamek/data/mechfiles/warship/3057/IS/Essex II Destroyer (2711).blk
index fffabddf2b9..7a1e29b1d91 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Essex II Destroyer (2711).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Essex II Destroyer (2711).blk	
@@ -156,15 +156,15 @@ Naval PPC (Medium)
 </structural_integrity>
 
 <capabilities>
-The Essex's main weapons are its twelve Whirlwind-20 Series NAC/20s, manufactured by Karon Naval Armaments of Terra and unmatched for reliability, mounted in four turrets. The Essex carries three missile tubes capable of firing Barracuda missiles, the smallest and smartest of the three standard missile types used by the Star League Navy. The remainder of the vessel's weaponry consists of a mixture of Magna-35 NL35s and Rand-10 Medium NPPCs.
+The SLS Essex was known for its swiftness and reliability, equipped with three compact and dependable InterSystem Class VII engines. It utilized the Diamond Green Combat Computer, valued for its simplicity and reliability. The Essex carried twelve autocannons in four turrets, manufactured by Karon Naval Armaments, and had three missile tubes capable of launching Barracuda missiles. It also had a bay for six AeroSpace Fighters.
 </capabilities>
 
 <overview>
-The second class of WarShip to bear the name, the Essex-class destroyer (also known as Essex II) was designed in response to Star League Navy's request for a quick destroyer that could also make sustained voyages far from support, replacing the older Naga-class which had in turn replaced the original HAF era Essex I-class in 2645.
+The Essex-class destroyers served in the Terran Hegemony Navy during the 25th and 26th centuries. Originally designed for sentinel duty and as command ships for corvette squadrons, the class was later replaced by the Naga Class in 2645. A new version of the Essex-class was developed in 2707 by the Star League Defense Forces to replace the Naga.
 </overview>
 
 <history>
-The modern SLS Essex slipped its moorings from the Mitchell Vehicles shipyards above Graham IV in late 2711. Because its designers had wished to emphasize the vessel's swiftness and reliability, they had given it three compact and dependable lnterSystem Class VII engines, built by the Saro Company of Keid, which produce great thrust. The ship's computer systems were built by the Nirasaki Computers Collective, allowing the Essex's crew to do everything from monitor remote surveillance satellites to orchestrating corvette squadrons. However, the Essex was noted for its ammunition bays, which were too lightly armored to protect its missiles and autocannon shells adequately, and became quite evident with the destruction of Essex destroyers in action against Periphery forces in the 2730s and during the Amaris-Kerensky Civil War. Less than thirty survived the campaign to liberate Terra and the bulk left with the Exodus Fleet, but surviving examples continue to serve in the fleets of ComStar, the Free Worlds League, the Word of Blake as well as various Clan Toumans.
+ne notable Essex-class destroyer was the SLS Gettysburg, launched in 2722, which played a significant role in overseeing the New Vandenberg star system and defeating Periphery separatists. In 2757, Major Evgeny Baratynsky took command of the Gettysburg, leading the ship with skill and courage during isolation in the Taurian Concordat region. Unfortunately, the Gettysburg was destroyed by Caspar drone warships above Terra in 2777.
 </history>
 
 <manufacturer>
@@ -191,8 +191,12 @@ Destroyer
 615 m
 </length>
 
+<height>
+1120 m Sail
+</height>
+
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Farragut Battleship (2448).blk b/megamek/data/mechfiles/warship/3057/IS/Farragut Battleship (2448).blk
index a69c25fcfdc..a276947d723 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Farragut Battleship (2448).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Farragut Battleship (2448).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -261,8 +261,48 @@ Large Laser
 95
 </structural_integrity>
 
+<capabilities>
+The Farragut-class battleship was armed with eighteen naval gauss rifles, fourteen naval autocannons, twenty-two Killer Whale missile launchers, heavy naval PPCs, and an array of large lasers for anti-fighter defense. Its weapons systems were among the largest and most powerful ever mounted on a WarShip. The ship's hull was exceptionally strong and stress-resistant, providing superior protection, thanks to over 1,500 tons of ferro-carbide armor. Additionally, the Farragut carried a full wing of aerospace fighters to enhance its defensive capabilities. It could operate independently or as the flagship of a fleet.
+</capabilities>
+
+<overview>
+The Farragut-class battleship was developed as a replacement for the aging Dreadnought-class and Monsoon-class ships in the Terran Hegemony's navy. It was designed to be a true battleship, capable of defeating any ship used by the House navies. The largest battleship of its time, the Farragut featured a formidable array of weapons, including naval gauss rifles, naval autocannons, Killer Whale missile launchers, heavy naval PPCs, and large lasers for anti-fighter defense. Its robust hull was heavily armored with ferro-carbide, and it also carried a full wing of aerospace fighters.
+</overview>
+
+<history>
+Lord Richard Cameron initiated the development of the Farragut-class battleships in 2430 to upgrade the Hegemony's aging navy. However, he passed away before witnessing the commissioning of the first Farragut. Production of the Farragut-class battleships ceased in 2500 due to high costs. These vessels proved their worth in numerous engagements until changes in the Star League's strategic doctrine led to the development of the McKenna-class Battleship. On December 20, 2766, the last remaining Farragut battleship was dismantled, marking the end of its service
+</history>
+
+<manufacturer>
+Krester Ship Construction
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battleship
+</use>
+
+<length>
+1405 m
+</length>
+
+<height>
+1700 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -282,6 +322,10 @@ TRO 3057R - Age of War
 150
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 580
 </crew>
@@ -313,3 +357,4 @@ TRO 3057R - Age of War
 <escape_pod>
 75
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Fox Corvette (3057).blk b/megamek/data/mechfiles/warship/3057/IS/Fox Corvette (3057).blk
index aeee70e39a1..0e62ec93d4d 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Fox Corvette (3057).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Fox Corvette (3057).blk	
@@ -250,7 +250,7 @@ Corvette
 </length>
 
 <source>
-TRO 3057R - Civil War
+TRO: 3057R - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Impavido Destroyer (3058).blk b/megamek/data/mechfiles/warship/3057/IS/Impavido Destroyer (3058).blk
index 062728c5f4b..0a881c6f308 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Impavido Destroyer (3058).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Impavido Destroyer (3058).blk	
@@ -229,19 +229,15 @@ ISArtemisIV
 </structural_integrity>
 
 <capabilities>
-The Impavidos nose bay anti-fighter weaponry featured twin Gauss rifles, Artemis IV FCS-equipped LRM-20s, and anti-missile systems, along with an ER large laser paired with a standard large laser, while the capital grade firepower consisted of twin NAC/20s, a NAC/10, NL45, and light NPPC. The forward and aft angles each duplicate the nose bay, save for excluding Gauss Rifles, AMS and naval PPC. The Impavidos broadside bays are weak link of the vessel, limited to an ER and standard Large Laser, two LRM-20s, a Large Pulse Laser, two NL45s and light naval PPC on each side. Even directly aft is better armed, removing the Gauss Rifles and naval PPCs but mirroring the impressive nose bays.
+The Impavido-class destroyer boasts formidable capabilities, designed to rival the emerging fleets of other Great Houses. Its advanced maneuvering drive, of particular interest, enables exceptional agility and speed, outmaneuvering most transport vessels. Armed with a combination of naval gauss rifles, naval autocannons, heavy naval PPCs, and an array of lasers and missile launchers, the Impavido possesses a potent offensive arsenal. Its advanced ferro-aluminum armor provides superior protection compared to similar-sized Star League ships. The ship's primary mission is often perceived as raiding, given its agility and firepower. However, it can also serve as a picket ship, fulfilling multiple roles within a fleet. The Impavido-class destroyer's deployment is limited to select factions, including Clan Nova Cat, Clan Ghost Bear, and possibly Clan Steel Viper. Its existence and development are met with concern due to the secretive involvement of the Word of Blake and the potential implications for the balance of power in the Inner Sphere.
 </capabilities>
 
 <overview>
-One of the first generation of post–Succession Wars era WarShip designs produced, the Impavido-class destroyer is a collaboration between the Free Worlds League, Word of Blake and Capellan Confederation.
+The Impavido-class destroyer is a highly secretive and technologically advanced WarShip prototype developed through collaboration between the Free Worlds League, Capellan Confederation, and the Word of Blake. Its production at Technicron Manufacturing in the Free Worlds League has generated intrigue and speculation. The ship's origins and advanced systems remain shrouded in mystery, leading to theories about their source and implications.
 </overview>
 
-<deployment>
-Only six Impavidos were constructed prior to the collapse of détente between both nations, three for each state, where with further Blakist assistance the League and the Confederation turned to producing their own unique WarShip designs.
-</deployment>
-
 <history>
-While much of the driving focus behind the WarShip buildup of the Federated Commonwealth and Draconis Combine was the threat of the Clan fleets, for the League and Confederation it was the Federated Commonwealth and thus they designed the Impavido to primarily combat the Fox corvette. Unable to yet produce WarShips on their own, the Free Worlds League constructed the vessels while the all important interplanetary drives were produced by the Capellan Confederation, both goals made possible with the technical expertise offered by the Word of Blake.
+The history of the Impavido-class destroyer is rooted in the efforts of the Free Worlds League and the Capellan Confederation to establish their own WarShip fleets, aiming to compete with other Great Houses. The collaboration between these factions and the clandestine involvement of the Word of Blake in its development raised suspicions and speculation among intelligence agencies. The exact source of the Impavido's advanced systems remains unknown, with theories ranging from newly discovered Star League caches to salvaging from derelict vessels. As the prototype ship was being constructed at Technicron Manufacturing, its progress and technological advancements garnered attention. The launch of the Impavido-class destroyer was projected for the early months of 3058, but its internal arrangement and capabilities were closely guarded secrets. Concerns were raised about the involvement of the Word of Blake and the potential consequences of unchecked WarShip production. The Impavido-class destroyer stands as a symbol of technological advancement and political intrigue in the ongoing power struggles of the Inner Sphere.
 </history>
 
 <manufacturer>
@@ -268,8 +264,12 @@ Destroyer
 450 m
 </length>
 
+<height>
+1060 m Sail
+</height>
+
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Kimagure Pursuit Cruiser (2582).blk b/megamek/data/mechfiles/warship/3057/IS/Kimagure Pursuit Cruiser (2582).blk
index 4fe073da84d..64dca8a4d82 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Kimagure Pursuit Cruiser (2582).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Kimagure Pursuit Cruiser (2582).blk	
@@ -256,7 +256,7 @@ ISSmallPulseLaser
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Kirishima Cruiser (3061).blk b/megamek/data/mechfiles/warship/3057/IS/Kirishima Cruiser (3061).blk
index 82930ff9f03..54e9d56d4dd 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Kirishima Cruiser (3061).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Kirishima Cruiser (3061).blk	
@@ -330,7 +330,7 @@ Cruiser
 </length>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Kyushu Frigate (3057).blk b/megamek/data/mechfiles/warship/3057/IS/Kyushu Frigate (3057).blk
index 6d06976d386..adbae144832 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Kyushu Frigate (3057).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Kyushu Frigate (3057).blk	
@@ -320,7 +320,7 @@ Frigate
 </length>
 
 <source>
-TRO 3057R - Clan Invasion
+TRO: 3057R - Clan Invasion
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Lola I Destroyer (2345).blk b/megamek/data/mechfiles/warship/3057/IS/Lola I Destroyer (2345).blk
index 78d5118af53..4e8dd617447 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Lola I Destroyer (2345).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Lola I Destroyer (2345).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -187,8 +187,48 @@ Large Laser
 50
 </structural_integrity>
 
+<capabilities>
+The Lola-class destroyers were equipped with an impressive array of armaments, including heavy naval lasers and autocannons. They also carried a squadron of heavy fighters for enhanced escort and picket capabilities. The design prioritized armor protection, which increased the ship's mass and required the use of massive Rolls Le Fay drives. This resulted in cramped living conditions for the crew.
+</capabilities>
+
+<overview>
+The Lola-class destroyers were developed as a direct response to the demands of Rear Admiral Adelaide Lola, known for her emphasis on moral and ethical excellence in addition to military skill. These destroyers served as escort and picket ships for centuries and were highly regarded. However, they faced challenges with their heavy armor and mass, leading to cramped living conditions for the crew.
+</overview>
+
+<history>
+In 2345, the first Lola-class destroyer was launched, addressing the concerns raised by Rear Admiral Adelaide Lola. Over time, design flaws and issues with the fuel system emerged, leading to the decommissioning and scrapping of the remaining vessels by the Star League Navy in 2660. However, several Lola IIs resurfaced in the hands of Taurian rebels during the Second Periphery Uprising, raising doubts about the true fate of these ships.
+</history>
+
+<manufacturer>
+Boeing Interstellar
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Destroyer
+</use>
+
+<length>
+600 m
+</length>
+
+<height>
+100 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -203,6 +243,10 @@ TRO 3057R - Age of War
 1
 </sail>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 243
 </crew>
@@ -234,3 +278,4 @@ TRO 3057R - Age of War
 <escape_pod>
 20
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Lola II Destroyer (2622).blk b/megamek/data/mechfiles/warship/3057/IS/Lola II Destroyer (2622).blk
index fe56a07e370..593c8916028 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Lola II Destroyer (2622).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Lola II Destroyer (2622).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -166,8 +166,48 @@ Ammo Barracuda:40
 50
 </structural_integrity>
 
+<capabilities>
+The Lola II-class destroyers were equipped with a variety of heavy naval lasers and autocannons, showcasing their formidable armament. They also carried a squadron of heavy fighters to enhance their escort and picket capabilities. The design emphasized durability through the use of extensive armor, although this added weight necessitated the installation of oversized drives meant for larger vessels.
+</capabilities>
+
+<overview>
+The Lola-class destroyers were developed in response to the demands of Rear Admiral Adelaide Lola, who prioritized moral and ethical excellence in addition to military skill. The Lola II variant, along with its predecessors, served as escort and picket ships with impressive armaments and heavy armor. However, the inclusion of massive Rolls Le Fay drives and additional armor increased the ship's mass and resulted in cramped living conditions for the crew.
+</overview>
+
+<history>
+In the pursuit of a replacement for the Lola Block I, the Blue Nose Clipperships, under license from Boeing Interstellar, began designing a new destroyer class. However, in their rush to bring the design to production, critical faults in the fuel system were overlooked, leading to additional design flaws. Consequently, the Star League Navy ordered the decommissioning and scrapping of the remaining Lola II vessels in 2660. Despite this, at least four Lola IIs resurfaced in the hands of Taurian rebels during the Second Periphery Uprising, raising questions about their actual fate.
+</history>
+
+<manufacturer>
+Blue Nose Clipperships,Boeing Interstellar
+</manufacturer>
+
+<primaryFactory>
+Mars,Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Destroyer
+</use>
+
+<length>
+626 m
+</length>
+
+<height>
+1000 m Sail
+</height>
+
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
@@ -182,6 +222,10 @@ TRO 3057R - Star League
 1
 </sail>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 244
 </crew>
@@ -213,3 +257,4 @@ TRO 3057R - Star League
 <escape_pod>
 20
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Lola III Destroyer (2662).blk b/megamek/data/mechfiles/warship/3057/IS/Lola III Destroyer (2662).blk
index 63ff7a31ce8..abedeed060f 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Lola III Destroyer (2662).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Lola III Destroyer (2662).blk	
@@ -165,7 +165,7 @@ Ammo Barracuda:20
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Luxor Heavy Cruiser (2727).blk b/megamek/data/mechfiles/warship/3057/IS/Luxor Heavy Cruiser (2727).blk
index e21fee7eaf8..d646ac2391e 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Luxor Heavy Cruiser (2727).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Luxor Heavy Cruiser (2727).blk	
@@ -240,7 +240,7 @@ Heavy Cruiser
 </length>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Mako Corvette (2692).blk b/megamek/data/mechfiles/warship/3057/IS/Mako Corvette (2692).blk
index 274fbcd5dc5..72576c85f75 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Mako Corvette (2692).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Mako Corvette (2692).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -192,8 +192,48 @@ IS Gauss Ammo:80
 50
 </structural_integrity>
 
+<capabilities>
+The Mako-class corvette stands out with its formidable armament, equipped with naval autocannons, naval PPCs, and naval lasers for engaging enemy WarShips. Additionally, it possesses lasers, Gauss rifles, and autocannons to defend against aerospace fighters. However, the true strengths of the Mako lie in its exceptional maneuverability and impressive armor. Weighing 200,000 tons, the Mako boasts nearly 200 tons of armor and can achieve a remarkable acceleration of 4.5 Gs.
+</capabilities>
+
+<overview>
+The Lyran Mako-class corvette, named for its sleek and swift characteristics reminiscent of its shark namesake, boasted impressive maneuverability, capable of sustained 3G maneuvers and sprinting up to 4.5Gs. Despite its compact size, the Mako outperformed most opposing WarShips and many DropShips, featuring a formidable array of weapons and armor. Manufactured by Bolson Shipyards, the Mako served as an escort and performed independent operations, patrolling Lyran Commonwealth borders and serving as picket vessels in isolated systems. Over a hundred Makos were constructed between 2692 and the fall of the Star League, seeing action on both sides during the conflict to liberate Terra. However, devastating losses along the border with the Free Worlds League in 2787, combined with the destruction of Bolson yards, led to attrition and scrapping of the Makos. The last Mako was destroyed in 2841 during the Second Succession War's defense of Caledonia against Kurita forces.
+</overview>
+
+<history>
+The Lyran Mako-class corvette, renowned for its sleek and agile nature, paid homage to its sea-dwelling shark namesake. Manufactured by Bolson Shipyards of New Kyoto, known for their production of conventional JumpShips, the Mako stood out as their sole entry into the combat JumpShip market. The design, deviating from the Lyran doctrine of heavy naval vessels, served as an escort for larger ships, undertaking independent operations, border patrols, and picket duties in remote Lyran systems. During its production period from 2692 to the fall of the Star League, over a hundred Makos were constructed, primarily for the Lyran Commonwealth Armed Forces (LCAF) but also for export. The Star League Defense Force (SLDF) utilized a few Makos as courier vessels, while the Rim Worlds Republic purchased five to reinforce their loyalist fleet. Consequently, Makos found themselves fighting on both sides of the conflict to liberate Terra. It is widely believed that all SLDF and Rim Worlds Makos were destroyed in the war, leaving none remaining with the Clans. The Lyran Makos faced severe devastation during the intense border clashes with the Free Worlds League in 2787. The Bolson yards themselves were shattered in the Marik offensive, leading to the loss of the capability to maintain Mako-class vessels. Attrition gradually diminished the fleet as numerous Makos fell in enemy engagements, and others were decommissioned due to the impossibility of keeping them in service. This cannibalization of resources allowed the Mako corvettes to persist until 2841 when the last Mako was destroyed while attempting to defend Caledonia against Kurita forces during the Second Succession War.
+</history>
+
+<manufacturer>
+Bolson Shipyards
+</manufacturer>
+
+<primaryFactory>
+New Kyoto
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Corvette
+</use>
+
+<length>
+390 m
+</length>
+
+<height>
+260 m Sail
+</height>
+
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
@@ -212,6 +252,10 @@ TRO 3057R - Star League
 55
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 155
 </crew>
@@ -243,3 +287,4 @@ TRO 3057R - Star League
 <escape_pod>
 10
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/McKenna Battleship (2652).blk b/megamek/data/mechfiles/warship/3057/IS/McKenna Battleship (2652).blk
index 9c71969fce4..1bd7656a241 100644
--- a/megamek/data/mechfiles/warship/3057/IS/McKenna Battleship (2652).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/McKenna Battleship (2652).blk	
@@ -223,7 +223,7 @@ Naval PPC (Heavy)
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Monsoon Battleship (2368).blk b/megamek/data/mechfiles/warship/3057/IS/Monsoon Battleship (2368).blk
index 020b0d28d13..bfcc08d1fc4 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Monsoon Battleship (2368).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Monsoon Battleship (2368).blk	
@@ -181,7 +181,7 @@ Ammo NAC/35:40
 </structural_integrity>
 
 <source>
-3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Monsoon Battleship (2574).blk b/megamek/data/mechfiles/warship/3057/IS/Monsoon Battleship (2574).blk
index 22d10e8bc12..be6858e7c6f 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Monsoon Battleship (2574).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Monsoon Battleship (2574).blk	
@@ -181,7 +181,7 @@ Ammo NAC/35:40
 </structural_integrity>
 
 <source>
-TRO3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Naga Destroyer (2645).blk b/megamek/data/mechfiles/warship/3057/IS/Naga Destroyer (2645).blk
index c75bb01371c..703362f91e1 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Naga Destroyer (2645).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Naga Destroyer (2645).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -158,8 +158,48 @@ Naval Laser 35
 68
 </structural_integrity>
 
+<capabilities>
+The Naga-class was designed for close-quarters combat against larger ships, equipped with a concentrated array of light naval autocannons and energy weapons. Its logistical efficiency was enhanced by utilizing only three types of ammunition. The vessel boasted a spacious cargo bay that could be used for extended missions, storing additional supplies or ammunition. Additionally, the Naga carried up to two squadrons of aerospace craft and a pair of heavy combat shuttles for anti-fighter defense.
+</capabilities>
+
+<overview>
+The Naga-class light destroyer was a formidable asset in the Terran Hegemony's fleet, replacing the older Essex-class in 2645. With its blend of heavy armor and firepower, the Naga became the premier destroyer of the Hegemony navy for fifty years. However, advancements in technology eventually rendered it obsolete, leading to its diminished role.
+</overview>
+
+<history>
+Following its introduction in 2645, the Naga-class light destroyer served as the backbone of the Terran Hegemony's fleet. It outshone comparable contemporaries like the Carson- and Baron-classes and remained the premier choice for half a century. However, its decline began when the upgraded Essex-class was commissioned in 2707. Today, only three Nagas remain, mothballed since the fall of the Star League. Despite efforts to reactivate these vessels, their extensive structural fatigue and engine flaws, exacerbated by their age, make restoration a costly and impractical endeavor.
+</history>
+
+<manufacturer>
+Riga Interstellar Shipyards
+</manufacturer>
+
+<primaryFactory>
+Dyev
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Destroyer
+</use>
+
+<length>
+540 m
+</length>
+
+<height>
+1200 m Sail
+</height>
+
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
@@ -178,6 +218,10 @@ TRO 3057R - Star League
 50
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 235
 </crew>
@@ -209,3 +253,4 @@ TRO 3057R - Star League
 <escape_pod>
 10
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Nightwing Surveillance (2447).blk b/megamek/data/mechfiles/warship/3057/IS/Nightwing Surveillance (2447).blk
index ef9e86f8f2b..a71e7c00d6a 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Nightwing Surveillance (2447).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Nightwing Surveillance (2447).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -135,8 +135,44 @@ Ammo NAC/20:10
 65
 </structural_integrity>
 
+<capabilities>
+The Nightwing is a powerful and well-armed surveillance vessel that lacks point defense weaponry, relying on other ships for defense against smaller aerospace assets. Its main asset is a large and discreet sensor array embedded throughout the hull, allowing passive readings and the option to deploy a longer-ranged sensor array or small craft for surveillance. However, the integration of the sensor array presents challenges for refits, repairs, and upgrades.
+</capabilities>
+
+<overview>
+The Nightwing-class WarShip was a surveillance vessel disguised as a civilian JumpShip, equipped with advanced surveillance equipment and superior armament. It operated alongside Tracker-class vessels, appearing as a trade convoy due to their docking collars. However, the Nightwing's complex sensor system ultimately led to its replacement by the Bug-Eye surveillance vessel.
+</overview>
+
+<history>
+The Nightwing, a small WarShip, was often deployed alongside Tracker-class surveillance vessels, resembling civilian JumpShips. Paired Nightwings and Trackers formed squadrons that conducted long-range surveillance upon entering a system and then proceeded on a preestablished patrol. The inclusion of docking collars on the Tracker helped disguise the squadron as a trade convoy, especially when accompanied by DropShips. Ironically, the Nightwing's advanced sensor suite became its downfall. With the increasing sophistication of electronic warfare, the WarShip's interwoven sensor system proved difficult to replace, as it was intricately integrated into the hull. In 2525, the Hegemony sought new surveillance ship designs, leading to the introduction of the Bug-Eye vessel as the successor to the Nightwing.
+</history>
+
+<manufacturer>
+Di Tron Heavy Industries
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Surveilance
+</use>
+
+<length>
+305 m
+</length>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -155,6 +191,10 @@ TRO 3057R - Age of War
 80
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 118
 </crew>
@@ -186,3 +226,4 @@ TRO 3057R - Age of War
 <escape_pod>
 0
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Pinto Corvette (2502).blk b/megamek/data/mechfiles/warship/3057/IS/Pinto Corvette (2502).blk
index b710146e66e..17956464fb4 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Pinto Corvette (2502).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Pinto Corvette (2502).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -298,8 +298,48 @@ IS Ammo AC/5:400
 29
 </structural_integrity>
 
+<capabilities>
+The Pinto-class corvette was built for light duty but possessed superior armor, particularly in the front, compared to the Hegemony's Vincent-class. It boasted a powerful arsenal of capital and conventional weaponry and featured a DropShip transport capability. Additionally, it was supported by two fighter squadrons, making it versatile enough to support small invasions or hold defensive lines.
+</capabilities>
+
+<overview>
+The Pinto-class corvette, originating from the Rim Worlds Republic, was initially developed as a defensive picket ship during the period of Periphery independence. While many were sold to other realms, sales were discontinued during the Reunification War to maintain a facade of loyalty to the Star League. The Pinto proved to be superior to the Hegemony's Vincent-class corvette in terms of armor, weaponry, and versatility, capable of supporting invasions or defending against enemy forces. However, the Pintos met their demise during Kerensky's return and subsequent conflicts, with rumors suggesting that a few crippled vessels may have survived in uncharted regions of the Deep Periphery.
+</overview>
+
+<history>
+The Pinto-class corvette originated in the Rim Worlds Republic as a defensive picket ship during the time of Periphery independence. After discontinuing sales to maintain loyalty to the Star League during the Reunification War, Tedeo Amaris restarted the construction of Pintos in 2650 as part of a military buildup. Despite pressure from the Star League, no demands were made to reduce the RWR fleet, which would later become a regret for the Terran Hegemony. During the Amaris crisis, the Rim Worlds' fleet possessed a significant number of Pintos, ready to strike against the League defenders once Kerensky's attention was diverted. However, the Pinto class faced its downfall when the SLDF WarShips returned under Kerensky's command to overthrow the Republican forces. Throughout the campaigns in the Periphery and the liberation of worlds, the Pinto class was apparently destroyed, along with the destruction of the WarShip's two shipyards in the shattered Rim Worlds Republic. Nevertheless, rumors persist of a few crippled Pintos that may have withdrawn to uncharted regions of the Deep Periphery, where they remain as derelicts to this day.
+</history>
+
+<manufacturer>
+Unknown, Roe Weapon Systems, Rockwell-Vasquez Starcraft Inc.
+</manufacturer>
+
+<primaryFactory>
+Alpheratz, Finmark, Zertarum
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Corvette
+</use>
+
+<length>
+298 m
+</length>
+
+<height>
+505 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -318,6 +358,10 @@ TRO 3057R - Age of War
 45
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 165
 </crew>
@@ -349,3 +393,4 @@ TRO 3057R - Age of War
 <escape_pod>
 10
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Potemkin Troop Cruiser (2611).blk b/megamek/data/mechfiles/warship/3057/IS/Potemkin Troop Cruiser (2611).blk
index 1c5275cd355..35ec61f62a3 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Potemkin Troop Cruiser (2611).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Potemkin Troop Cruiser (2611).blk	
@@ -192,7 +192,7 @@ Naval PPC (Heavy)
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Quixote Frigate (2350).blk b/megamek/data/mechfiles/warship/3057/IS/Quixote Frigate (2350).blk
index 69e058af709..833f2730f8e 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Quixote Frigate (2350).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Quixote Frigate (2350).blk	
@@ -223,7 +223,7 @@ Ammo Barracuda:80
 </structural_integrity>
 
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Riga Frigate (2440).blk b/megamek/data/mechfiles/warship/3057/IS/Riga Frigate (2440).blk
index 9ea27cafd02..3fe10776541 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Riga Frigate (2440).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Riga Frigate (2440).blk	
@@ -165,7 +165,7 @@ Ammo NAC/30:100
 </structural_integrity>
 
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Sovetskii Soyuz Heavy Cruiser (2742).blk b/megamek/data/mechfiles/warship/3057/IS/Sovetskii Soyuz Heavy Cruiser (2742).blk
index 530bfe0c141..e4a0f7488ee 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Sovetskii Soyuz Heavy Cruiser (2742).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Sovetskii Soyuz Heavy Cruiser (2742).blk	
@@ -196,7 +196,7 @@ lets see if anything breaks
 </history>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Suffren Destroyer (3062).blk b/megamek/data/mechfiles/warship/3057/IS/Suffren Destroyer (3062).blk
index e5bff4c6eac..cb24205ca13 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Suffren Destroyer (3062).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Suffren Destroyer (3062).blk	
@@ -251,7 +251,7 @@ Destroyer
 </length>
 
 <source>
-TROR 3057R - Civil War
+TRO: 3057R - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Sylvester Transport (2499).blk b/megamek/data/mechfiles/warship/3057/IS/Sylvester Transport (2499).blk
index 919da2ce63e..372058f2c84 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Sylvester Transport (2499).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Sylvester Transport (2499).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -364,8 +364,48 @@ IS Ammo LRM-10:108
 20
 </structural_integrity>
 
+<capabilities>
+The Sylvester-class merchant ship was renowned for its vast cargo space, accommodating over a quarter of a million tons of cargo. It featured two DropShip docking hardports and four small craft bays for additional vessels and personnel transports. Armed with a mix of capital-class weapons and anti-fighter defenses, the Sylvester was a formidable force, discouraging attacks and prioritizing avoidance of direct confrontation.
+</capabilities>
+
+<overview>
+The Sylvester-class merchant ship, originally conceived by Graf Hans Sylvester of the Lyran Commonwealth, aimed to establish Lyran traders' dominance and protect Commonwealth shipping against piracy. As the most heavily armed civilian craft at the time, it boasted a massive cargo capacity, DropShip docking ports, and formidable weaponry. However, its high price tag and fragile armor contributed to its limited production and eventual cancellation by the Commonwealth.
+</overview>
+
+<history>
+After only 15 years of production and the completion of four vessels, the Sylvester program was officially canceled by the Lyran Commonwealth due to its exorbitant cost. However, the Terran Hegemony later developed its own military version known as the Carrack-class, based on the Sylvester design. Additionally, Graf Hans Sylvester commissioned a smaller, more economically viable version of the vessel called the "baby Sylvester," which saw wider production until the Bolson Shipyards' destruction during the early days of the First Succession War.
+</history>
+
+<manufacturer>
+Di Tron Heavy Industries
+</manufacturer>
+
+<primaryFactory>
+Alarion
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Transport
+</use>
+
+<length>
+905 m
+</length>
+
+<height>
+1200 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -385,6 +425,10 @@ TRO 3057R - Age of War
 98
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 222
 </crew>
@@ -416,3 +460,4 @@ TRO 3057R - Age of War
 <escape_pod>
 10
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Texas Battleship (2618).blk b/megamek/data/mechfiles/warship/3057/IS/Texas Battleship (2618).blk
index 3de549442c6..79c479a28a7 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Texas Battleship (2618).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Texas Battleship (2618).blk	
@@ -213,7 +213,7 @@ Ammo AR10 White Shark:10
 </structural_integrity>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Tracker Surveillance (2407).blk b/megamek/data/mechfiles/warship/3057/IS/Tracker Surveillance (2407).blk
index 8787321e40e..26dc53e7cc5 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Tracker Surveillance (2407).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Tracker Surveillance (2407).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -125,8 +125,48 @@ Ammo Barracuda:24
 36
 </structural_integrity>
 
+<capabilities>
+The Tracker surveillance vessel was designed to mimic a commercial JumpShip's sensor readings. It had the capability to rapidly change its silhouette by attaching special panels to hard points on the hull. The vessel could also modify its transponder, using various aliases to operate covertly. This allowed the Tracker to navigate space lanes without arousing suspicion. With sufficient speed and firepower, including the ability to engage anything short of a capital ship, the Trackers were capable of defending themselves in case their cover was exposed. Additionally, these spy ships often carried innocent DropShips on their docking collars to maintain their cover.
+</capabilities>
+
+<overview>
+Director-General Judith Cameron, concerned about the escalating conflicts with neighboring states, ordered an increase in covert monitoring operations by the Hegemony Intelligence. To fulfill this need, the Tracker surveillance vessel was developed. The Tracker was designed to provide sensor readings similar to a commercial JumpShip and had the ability to quickly alter its silhouette using special panels. It could also change its transponder, operating under different aliases for covert operations. Equipped with speed and firepower, the Trackers could gather intelligence, monitor fleet movements, and defend themselves if their cover was compromised. Despite becoming obsolete over time, some Trackers remained in service until the end of the Reunification War, primarily engaging pirates and Taurian Concordat raiders as Q-Ships.
+</overview>
+
+<history>
+Director-General Judith Cameron directed Hegemony Intelligence to intensify covert monitoring operations due to concerns over the belligerence of the Terran Hegemony's neighbors. The Tracker surveillance vessel was developed as a result, specifically to keep a close watch on the neighboring states. The success of the Tracker's design, with its ability to alter its silhouette and transponder, led to the creation of the Nightwing vessel. During the capture of Terra Firma by the Capellan Confederation in 2409, the THS Marlow, a Tracker, played a crucial role by gathering data on Capellan troop movements. This information enabled the Hegemony Armed Forces to liberate Terra Firma later that year. While the Tracker became obsolete by the beginning of the 26th century, several vessels remained in service until the end of the Reunification War, serving as Q-Ships to combat pirates and Taurian Concordat raiders.
+</history>
+
+<manufacturer>
+Bowie Industries
+</manufacturer>
+
+<primaryFactory>
+Wasat
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Surveillance
+</use>
+
+<length>
+318 m
+</length>
+
+<height>
+1150 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -145,6 +185,10 @@ TRO 3057R - Age of War
 75
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 93
 </crew>
@@ -176,3 +220,4 @@ TRO 3057R - Age of War
 <escape_pod>
 15
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Vigilant Corvette (2320).blk b/megamek/data/mechfiles/warship/3057/IS/Vigilant Corvette (2320).blk
index 160d62944fc..13e91a0fc6d 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Vigilant Corvette (2320).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Vigilant Corvette (2320).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -145,8 +145,48 @@ Large Laser
 33
 </structural_integrity>
 
+<capabilities>
+The Vigilant corvette was equipped with a formidable array of weaponry considering its size, including five small naval autocannons and three White Shark missile systems. Additionally, it had lasers, autocannons, and PPCs. However, the Vigilant faced challenges in effectively utilizing its armament due to limitations in its targeting and tracking system. Furthermore, the corvette had insufficient armor and its acceleration capabilities were underwhelming.
+</capabilities>
+
+<overview>
+The Vigilant-class corvette, together with the Bonaventure corvette and surveillance satellites, served as the Terran Hegemony's initial defense against neighboring invasions. Despite being phased out in the 2400s, the Vigilant remained in service for two more centuries due to its firepower. It was smaller and less armored than conventional JumpShips, with limited acceleration and sensor capabilities, but its raw firepower, fighter squadrons, and small craft made it effective in engaging enemy naval forces. Eventually replaced by the more efficient Vincent-class, the Vigilants were mothballed or sold to various Houses, and most were believed to be destroyed during the early Succession Wars.
+</overview>
+
+<history>
+During the era of the Terran Hegemony, the Vigilant-class corvette played a vital role as the first line of defense against neighboring realm invasions. Alongside the Bonaventure corvette and a network of remote surveillance satellites, the heavily armed yet agile Vigilant-class corvette served its purpose faithfully. Although all three naval assets were eventually phased out in the early 2400s with the introduction of the faster Vincent-class, the Vigilant continued to serve for another two centuries among the navies of various Houses due to its firepower. Despite its effectiveness, the Vigilant faced inherent limitations. Being smaller in size, it was outmassed by conventional JumpShips and offered minimal armor protection comparable to a light military DropShip. Its engines allowed for a maximum acceleration of 2.5 G, which was barely sufficient to keep up with larger WarShips and DropShips in combat. However, the most notable deficiency of the Vigilant was its relatively modest sensor and computer capabilities, resulting in restricted detection range and accuracy. Nevertheless, the Vigilant compensated for its shortcomings through its abundant raw firepower, surpassing that of the Bonaventure corvettes. In addition to heavy weaponry, the Vigilant boasted bays capable of housing a squadron of fighters and a quartet of small craft, enabling it to provide close support and engage invading naval forces effectively. The most common deployment strategy involved pairing Vigilant-class corvettes with two Bonaventure corvettes, enhancing their detection capabilities and providing additional fire support. Although this four-ship "buddy system" was not particularly cost-effective, it proved sufficient until the Hegemony faced a Capellan invasion of Terra Firma in 2409. The resulting conflict prompted the Hegemony navy to develop the more efficient Vincent-class, leading to the retirement of the Vigilant-class corvettes. The Vigilants were subsequently either mothballed or sold off to various Houses as the Vincent-class replaced them. Notably, none of the Vigilants accompanied Kerensky's exodus fleet during the events of the Star League. The few that managed to survive the downfall of the Star League were believed to have been destroyed during the early Succession Wars that followed.
+</history>
+
+<manufacturer>
+Boeing Interstellar
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Corvette
+</use>
+
+<length>
+266 m
+</length>
+
+<height>
+660 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -165,6 +205,10 @@ TRO 3057R - Age of War
 30
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 162
 </crew>
@@ -196,3 +240,4 @@ TRO 3057R - Age of War
 <escape_pod>
 20
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Vincent Corvette Mk39.blk b/megamek/data/mechfiles/warship/3057/IS/Vincent Corvette Mk39.blk
index 3e1e1cd42be..14534029103 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Vincent Corvette Mk39.blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Vincent Corvette Mk39.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -136,8 +136,48 @@ Large Laser
 40
 </structural_integrity>
 
+<capabilities>
+The Vincent corvette's notable features include its increased size and the implementation of "smart modularity." This innovative approach involved collaboration with other contractors to standardize ship fittings and systems, resulting in the adoption of long-lasting components that are still utilized in newer ships. The spacious interior of the Vincent allowed for the accommodation of various technological advancements over time, enabling engineers to replace engines, computers, and weapons as needed. Equipped with the Ulsop Al Surveillance Computer, the Vincent Mark XXXIX boasts enhanced detection capabilities, almost doubling the range compared to its predecessor, the Mark XXXVIII. With its four naval autocannons, eight lasers, and two missile systems, the Vincent possesses credible firepower, making it a formidable asset, particularly in squadron-based combat situations. Additionally, the Vincent Mark XXXIX is powered by two Howser 2G2 "Hotfire" engines, providing exceptional swiftness and maneuverability.
+</capabilities>
+
+<overview>
+The Vincent corvette, commissioned by the Hegemony Armed Forces (HAF) to address the need for a powerful patrol vessel, played a vital role in defending Hegemony worlds. With its larger size and "smart modularity" concept, the Vincent stood out among previous corvettes. Delhi Ships, a manufacturer that later became Delhi Warships, won the contract to build the Vincent due to its design capabilities and strategic location. This marked a significant milestone for Delhi, as the Vincent design became widely produced, serving the HAF and Star League Defense Force (SLDF) for over three centuries and establishing Delhi as a major defense contractor.
+</overview>
+
+<history>
+The need for a capable patrol vessel became evident as the Terran Hegemony found itself surrounded by Inner Sphere realms, prompting the HAF to seek a vessel that could effectively deter intruders. However, compromises in previous corvette designs hindered the Hegemony's defense capabilities, leading to the formation of mixed corvette squadrons. These squadrons consisted of Bonaventure Class ships, renowned for their surveillance capabilities but lacking in armament, and Vigilant Class ships, armed but limited in detection capability. The vulnerability of the Hegemony was exposed when the Capellan army invaded Terra Firma in 2409, catching the HAF off guard. Following the eventual recapture of Terra Firma, a portion of the Liao reparations was allocated to commission a new corvette design. Delhi Ships, based on Capella and willing to accept payment in military reparations, won the contract to build the new corvette, named the Vincent. To maintain secrecy regarding Hegemony technology integrated into the Vincent, Delhi Ships agreed to establish a new facility in the Carver System. The Vincent's design, produced in large numbers, served the HAF and SLDF for over three centuries, contributing significantly to Delhi's ascent as a major Star League defense contractor.
+</history>
+
+<manufacturer>
+Delhi WarShips, Delhi WarShips
+</manufacturer>
+
+<primaryFactory>
+Capella, Carver V
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Corvette
+</use>
+
+<length>
+402 m
+</length>
+
+<height>
+1005 m Sail
+</height>
+
 <source>
-TRO 3057R - Age of War
+TRO: 3057R - Age of War
 </source>
 
 <tonnage>
@@ -156,6 +196,10 @@ TRO 3057R - Age of War
 60
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 191
 </crew>
@@ -187,3 +231,4 @@ TRO 3057R - Age of War
 <escape_pod>
 8
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3057/IS/Volga Transport (2709).blk b/megamek/data/mechfiles/warship/3057/IS/Volga Transport (2709).blk
index 08a351dc973..5950198039d 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Volga Transport (2709).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Volga Transport (2709).blk	
@@ -252,7 +252,7 @@ Transport
 </length>
 
 <source>
-TRO3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Wagon Wheel Frigate (2570).blk b/megamek/data/mechfiles/warship/3057/IS/Wagon Wheel Frigate (2570).blk
index dc3bca3a81c..1cdcec46c86 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Wagon Wheel Frigate (2570).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Wagon Wheel Frigate (2570).blk	
@@ -195,7 +195,7 @@ IS Ammo AC/10:120
 </structural_integrity>
 
 <source>
-TRO 3057 - Star League
+TRO: 3057 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Whirlwind Destroyer (2606).blk b/megamek/data/mechfiles/warship/3057/IS/Whirlwind Destroyer (2606).blk
index 22332a6b2cb..f1fd7babf8f 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Whirlwind Destroyer (2606).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Whirlwind Destroyer (2606).blk	
@@ -214,7 +214,7 @@ Destroyer
 </length>
 
 <source>
-TRO 3057R - Star League
+TRO: 3057R - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/3057/IS/Winchester Cruiser (2364).blk b/megamek/data/mechfiles/warship/3057/IS/Winchester Cruiser (2364).blk
index b77385683ce..32bf8fcc46b 100644
--- a/megamek/data/mechfiles/warship/3057/IS/Winchester Cruiser (2364).blk	
+++ b/megamek/data/mechfiles/warship/3057/IS/Winchester Cruiser (2364).blk	
@@ -233,3 +233,7 @@ Medium Laser
 <escape_pod>
 30
 </escape_pod>
+
+<source>
+TRO: 3057r - Age of War
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/warship/3067/Clan/Conqueror BattlecruiserCarrier.blk b/megamek/data/mechfiles/warship/3067/Clan/Conqueror Battlecruiser Carrier.blk
similarity index 65%
rename from megamek/data/mechfiles/warship/3067/Clan/Conqueror BattlecruiserCarrier.blk
rename to megamek/data/mechfiles/warship/3067/Clan/Conqueror Battlecruiser Carrier.blk
index 137c6693cde..f689e8614ed 100644
--- a/megamek/data/mechfiles/warship/3067/Clan/Conqueror BattlecruiserCarrier.blk	
+++ b/megamek/data/mechfiles/warship/3067/Clan/Conqueror Battlecruiser Carrier.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Conqueror Battlecruiser Carrier
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 3991
@@ -43,12 +43,12 @@ Aerodyne
 <transporters>
 dockingcollar
 dockingcollar
-asfbay:50.0:6:1
-asfbay:50.0:6:2
+asfbay:50.0:6:3
+asfbay:50.0:6:4
 2ndclassquarters:1400.0:0
 1stclassquarters:520.0:0
 crewquarters:1792.0:0
-cargobay:22427.0:1:6
+cargobay:22427.0:1:8
 </transporters>
 
 <SafeThrust>
@@ -71,6 +71,10 @@ cargobay:22427.0:1:6
 1
 </engine_type>
 
+<clan_engine>
+false
+</clan_engine>
+
 <armor_type>
 12
 </armor_type>
@@ -383,6 +387,46 @@ Ammo Barracuda:10
 70
 </structural_integrity>
 
+<capabilities>
+The Conqueror-class battlecruisers feature fighter bays capable of accommodating two aerospace Clusters along with their crew and support staff. This addition led to a slight reduction in acceleration. The vessel's weapons systems have been extensively upgraded, with a focus on enhanced anti-fighter defenses. Barracuda missiles augment the layered laser, autocannon, and point-defense systems, while the ship's energy-based armament has been replaced by devastating naval autocannons. These autocannons provide the Conqueror-class with a substantial offensive capability, comparable to other cruisers of similar size. The Conquerors are primarily designed as carrier-escorts, supporting the operations of the Raven-Ghost Bear Leviathan and its aerospace forces. With their fighter bays, they can launch and recover aerospace Clusters, providing valuable air support during combat engagements. The combination of advanced weaponry, including the powerful naval autocannons, and extensive anti-fighter defenses makes the Conqueror-class formidable in both offensive and defensive roles. Their size and capabilities contribute to their effectiveness as powerful assets within Clan fleets.
+</capabilities>
+
+<overview>
+The Conqueror-class battlecruisers are advanced WarShips developed by the Clans as carrier-escorts for the Raven-Ghost Bear Leviathan. They were based on the hulls of Krester Ship Construction's Kimagure-class pursuit cruisers. With their formidable size and capabilities, the Conquerors are among the newest and most powerful WarShip designs utilized by the Clans.
+</overview>
+
+<history>
+The Conqueror-class battlecruisers were developed alongside the Raven-Ghost Bear Leviathan as part of a joint project. Originally based on the hulls of the Kimagure-class pursuit cruisers, the Conquerors were intended to serve as carrier-escorts for the Leviathan. However, the Ravens decided to complete the two partially assembled Conquerors even after withdrawing from the Leviathan project due to the absence of Inner Sphere WarShips. The first Conqueror-class vessel, named Conqueror, was launched in 3052 and successfully completed trials by June of that year. The second vessel, Ark Royal, faced delays due to technical malfunctions and was launched in 3059. The Conqueror-class underwent significant modifications during their development, particularly in terms of their weapons systems and anti-fighter defenses. These advanced battlecruisers have since become integral components of Clan fleets, serving as carrier-escorts and providing crucial support to Clan aerospace forces. Their capabilities, including the powerful naval autocannons and advanced fighter bays, have made them formidable assets on the battlefield. The Conqueror-class continues to play a significant role in Clan naval operations, demonstrating their effectiveness and contributing to the strength of the Clans in their ongoing conflicts within the Inner Sphere.
+</history>
+
+<manufacturer>
+Refit
+</manufacturer>
+
+<primaryFactory>
+Lum
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battlecruise-Carrier
+</use>
+
+<length>
+720 m
+</length>
+
+<height>
+980 m Sail
+</height>
+
 <source>
 TRO3067 - Clan Invasion
 </source>
@@ -408,6 +452,10 @@ TRO3067 - Clan Invasion
 85
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 508
 </crew>
@@ -439,3 +487,4 @@ TRO3067 - Clan Invasion
 <escape_pod>
 20
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3067/Comstar/Dante Frigate.blk b/megamek/data/mechfiles/warship/3067/Comstar/Dante Frigate.blk
index 556af4d40e7..be381b0553e 100644
--- a/megamek/data/mechfiles/warship/3067/Comstar/Dante Frigate.blk	
+++ b/megamek/data/mechfiles/warship/3067/Comstar/Dante Frigate.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Dante Frigate
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 4047
@@ -45,9 +45,9 @@ dockingcollar
 dockingcollar
 crewquarters:1267.0:0
 1stclassquarters:590.0:0
-asfbay:12.0:4:3
-cargobay:15550.5:1:4
-cargobay:15550.5:1:5
+asfbay:12.0:4:5
+cargobay:15550.5:1:6
+cargobay:15550.5:1:7
 </transporters>
 
 <SafeThrust>
@@ -312,6 +312,46 @@ Ammo NAC/35:50
 50
 </structural_integrity>
 
+<capabilities>
+Despite being smaller than some destroyers, the Dante-class frigates were highly regarded for their combination of speed, firepower, and armor. Their primary role was to serve as command and escort vessels for DropShip flotillas. While the Dante-class design was also capable of raiding tactics, its limited cargo bays and fuel capacity restricted its ability to operate independently.
+</capabilities>
+
+<overview>
+The Dante-class vessels, built by ComStar between 2935 and 2949, were a response to the increased militarism within the organization and the need for a more efficient and automated WarShip. These frigates were intended to support the ComStar Guards and Militia while other vessels were refurbished and new crews trained.
+</overview>
+
+<history>
+The first Dante-class vessel, the Narbonne, entered service in 2941, followed by the Bordeaux in 2944 and the Montpellier in 2948. The renovation of the remaining fleet and the challenges of concealing both the vessels and the sizable naval personnel led to the program being frozen in 2949. Although the design proved successful, further units in the class were not commissioned due to the escalating costs and other priorities within ComStar. The Blakist invasion of 3058 further disrupted any plans for expanding the Dante-class fleet. Despite its limitations, the Dante-class frigates continued to play a vital role in command and escort duties for ComStar's DropShip flotillas, serving as a symbol of ComStar's military presence and capabilities.
+</history>
+
+<manufacturer>
+O'Neil Yards - Titan Yards
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Frigate
+</use>
+
+<length>
+640 m
+</length>
+
+<height>
+610 m Sail
+</height>
+
 <source>
 TRO3067 - Late Succession War - LosTech
 </source>
@@ -336,6 +376,10 @@ TRO3067 - Late Succession War - LosTech
 135
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 240
 </crew>
@@ -367,3 +411,4 @@ TRO3067 - Late Succession War - LosTech
 <escape_pod>
 24
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3067/Davion/Avalon Cruiser.blk b/megamek/data/mechfiles/warship/3067/Davion/Avalon Cruiser.blk
index ab34401ca02..6b734d040a6 100644
--- a/megamek/data/mechfiles/warship/3067/Davion/Avalon Cruiser.blk	
+++ b/megamek/data/mechfiles/warship/3067/Davion/Avalon Cruiser.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Avalon Cruiser
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 3757
@@ -317,10 +317,50 @@ ISArtemisIV
 120
 </structural_integrity>
 
+<capabilities>
+The Avalon-class cruiser was designed to be heavily armed and armored, serving as the focal point of a naval task force. With its substantial fuel capacity, the Avalon could support the operations of an entire task force for extended periods. As per AFFC naval doctrine, each Avalon was accompanied by a dozen or more Assault DropShips, which allowed the cruiser to prioritize its anti-ship capabilities rather than extensive point-defense weaponry.
+</capabilities>
+
+<overview>
+The Avalon-class cruiser, designed during the Clan invasion, underwent significant modifications and evolved into a missile cruiser on orders from the AFFC Admiralty. Intended to be the centerpiece of a naval task force, the Avalon boasted impressive armament, armor, and fuel capacity, allowing it to sustain prolonged operations. However, the FedCom Civil War took a toll on the class, with only a limited number of surviving vessels.
+</overview>
+
+<history>
+Despite initial delays in construction due to the costs of post-invasion rebuilding, the Avalon underwent continuous design modifications during its dormant years. The AFFC Admiralty ordered the transformation of the cruiser into a missile cruiser, aligning it with evolving naval technology. However, the FedCom Civil War took a toll on the class, resulting in only two confirmed surviving vessels. The whereabouts of a third vessel remain unknown.
+</history>
+
+<manufacturer>
+Kathil Shipworks - McKenna Shipyards, Universal Air
+</manufacturer>
+
+<primaryFactory>
+Kathil,Kathil
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
 <notes>
-Unit as constructed in TRO is 4 tons overweight. Removed 4 tons of Cargo to make unit legal.
+Unit as constructed in TRO: is 4 tons overweight. Removed 4 tons of Cargo to make unit legal.
 </notes>
 
+<use>
+Cruiser
+</use>
+
+<length>
+812 m
+</length>
+
+<height>
+1375 m Sail
+</height>
+
 <source>
 TRO3067 - Clan Invasion
 </source>
@@ -346,6 +386,10 @@ TRO3067 - Clan Invasion
 210
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 311
 </crew>
@@ -377,3 +421,4 @@ TRO3067 - Clan Invasion
 <escape_pod>
 35
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3067/Kurita/Inazuma Corvette.blk b/megamek/data/mechfiles/warship/3067/Kurita/Inazuma Corvette.blk
index 0402c0a4401..f176c985333 100644
--- a/megamek/data/mechfiles/warship/3067/Kurita/Inazuma Corvette.blk	
+++ b/megamek/data/mechfiles/warship/3067/Kurita/Inazuma Corvette.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Inazuma Corvette
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 4362
@@ -48,7 +48,7 @@ dockingcollar
 dockingcollar
 1stclassquarters:20.0:0
 2ndclassquarters:735.0:0
-cargobay:2081.0:1:5
+cargobay:2081.0:1:8
 </transporters>
 
 <SafeThrust>
@@ -211,6 +211,46 @@ Ammo NAC/20:50
 46
 </structural_integrity>
 
+<capabilities>
+With its compact size, the Inazuma maximizes its firepower potential while prioritizing space and weight efficiency. Crew quarters are spartan, with most personnel sharing bunks, and the vessel lacks luxuries. However, it can operate independently for extended periods if necessary. The Draconis Combine Admiralty recognizes the strain on crews and implements a two-crew rotation system. The Inazuma's weaponry includes naval PPCs, naval autocannons, lasers, and anti-missile systems.
+</capabilities>
+
+<overview>
+The Inazuma-class Corvette, meaning "lightning" in Japanese, is designed for stealth attacks, swiftly approaching unsuspecting enemy DropShips and armed JumpShips to overwhelm them with superior firepower before rapidly withdrawing. Its high G-Force rating allows for quick insertion of 'Mech forces. Despite its impressive arsenal, the Inazuma sacrifices armor for weight efficiency and has adequate anti-fighter capabilities.
+</overview>
+
+<history>
+The Inazuma-class Corvette represents the third design of the Draconis Combine's post-Succession Wars WarShip fleet. Currently, the Draconis Combine Mustered Soldiery (DCS) operates four Inazuma-class vessels: Night of Agony, Winds of Heaven, Amber Lotus, and Swiping Claw. Unfortunately, an unknown sabotage incident destroyed the section of the Dieron shipyards where a fifth Inazuma-class Corvette was under construction in 3065. Although the line was reopened in 3066, there are no plans for further corvette construction. The Inazuma's mission as a stealth attacker and its limited production make it a unique asset in the Draconis Combine's naval fleet, embodying the Combine's commitment to striking swiftly and decisively in service to the Dragon.
+</history>
+
+<manufacturer>
+Stellar Trek Enterprises - Terada Shipyards, Midway Warship Yard
+</manufacturer>
+
+<primaryFactory>
+Dieron, Midway
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Corvette
+</use>
+
+<length>
+412 m
+</length>
+
+<height>
+800 m Sail
+</height>
+
 <source>
 TRO3067 - Clan Invasion
 </source>
@@ -235,6 +275,10 @@ TRO3067 - Clan Invasion
 75
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 129
 </crew>
@@ -266,3 +310,4 @@ TRO3067 - Clan Invasion
 <escape_pod>
 0
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser Upgrade.blk b/megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser (Upgrade).blk
similarity index 63%
rename from megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser Upgrade.blk
rename to megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser (Upgrade).blk
index 6c44334edc3..95df18c0d97 100644
--- a/megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser Upgrade.blk	
+++ b/megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser (Upgrade).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -53,7 +53,7 @@ dockingcollar
 1stclassquarters:540.0:0
 crewquarters:3941.0:0
 2ndclassquarters:3661.0:0
-cargobay:39639.0:1:7
+cargobay:39639.0:1:13
 </transporters>
 
 <SafeThrust>
@@ -254,6 +254,46 @@ ISERPPC
 90
 </structural_integrity>
 
+<capabilities>
+The Feng Huang-class cruiser, named after the Phoenix, was intended to hold its own against the formidable Thera super-carrier. These cruisers prioritize armor and protection, a departure from the typical WarShip design that sacrifices armor for weaponry. The first cruiser of the class, Elias Jung, faced initial problems but re-entered service after an overhaul. Currently, there are four Feng Huang cruisers in service: Elias Jung, Franco Martell, Aleisha Kris, and Sundermann Rhys. However, the IIsa Hyung recently suffered a catastrophic explosion, causing extensive damage and necessitating repairs.
+</capabilities>
+
+<overview>
+The Impavido-class destroyer was the result of joint efforts between the Capellan Confederation and the Free Worlds League to develop a WarShip fleet. However, Chancellor Sun-Tzu Liao anticipated a future conflict with House Marik and secretly initiated the development of a larger cruiser with assistance from the Word of Blake. The Feng Huang-class cruiser was designed to prioritize armor protection over extensive weaponry, aligning with Sun-Tzu's strategy of maximizing defense capabilities.
+</overview>
+
+<history>
+The Impavido-class destroyer was developed through collaboration between the Capellan Confederation and the Free Worlds League to enhance their WarShip capabilities. Recognizing the growing threat posed by the League fleet, Chancellor Sun-Tzu Liao secretly pursued the construction of the Feng Huang-class cruiser with assistance from the Word of Blake. The first cruiser, Elias Jung, faced initial challenges but returned to service after improvements. The Capellan fleet currently operates four Feng Huang cruisers, while the IIsa Hyung is undergoing repairs following a suspected act of terrorism.
+</history>
+
+<manufacturer>
+Rashpur Owens, Inc. (Refit),Aris Memorial Yards (Refit)
+</manufacturer>
+
+<primaryFactory>
+Capella, Necromo
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+1155 m
+</length>
+
+<height>
+1025 m Sail
+</height>
+
 <source>
 TRO3067 - Jihad
 </source>
@@ -279,6 +319,10 @@ TRO3067 - Jihad
 90
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 705
 </crew>
@@ -310,3 +354,4 @@ TRO3067 - Jihad
 <escape_pod>
 110
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser.blk b/megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser.blk
index 41587bd73de..47f93231298 100644
--- a/megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser.blk	
+++ b/megamek/data/mechfiles/warship/3067/Liao/Feng Huang Cruiser.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Feng Huang Cruiser
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 4160
@@ -50,8 +50,8 @@ dockingcollar
 dockingcollar
 crewquarters:1638.0:0
 1stclassquarters:1740.0:0
-cargobay:77778.0:6:4
-cargobay:39210.0:6:5
+cargobay:77778.0:6:10
+cargobay:39210.0:6:11
 2ndclassquarters:5124.0:0
 </transporters>
 
@@ -225,6 +225,46 @@ Naval PPC (Heavy)
 90
 </structural_integrity>
 
+<capabilities>
+The Feng Huang-class cruiser, named after the Phoenix, was intended to hold its own against the formidable Thera super-carrier. These cruisers prioritize armor and protection, a departure from the typical WarShip design that sacrifices armor for weaponry. The first cruiser of the class, Elias Jung, faced initial problems but re-entered service after an overhaul. Currently, there are four Feng Huang cruisers in service: Elias Jung, Franco Martell, Aleisha Kris, and Sundermann Rhys. However, the IIsa Hyung recently suffered a catastrophic explosion, causing extensive damage and necessitating repairs.
+</capabilities>
+
+<overview>
+The Impavido-class destroyer was the result of joint efforts between the Capellan Confederation and the Free Worlds League to develop a WarShip fleet. However, Chancellor Sun-Tzu Liao anticipated a future conflict with House Marik and secretly initiated the development of a larger cruiser with assistance from the Word of Blake. The Feng Huang-class cruiser was designed to prioritize armor protection over extensive weaponry, aligning with Sun-Tzu's strategy of maximizing defense capabilities.
+</overview>
+
+<history>
+The Impavido-class destroyer was developed through collaboration between the Capellan Confederation and the Free Worlds League to enhance their WarShip capabilities. Recognizing the growing threat posed by the League fleet, Chancellor Sun-Tzu Liao secretly pursued the construction of the Feng Huang-class cruiser with assistance from the Word of Blake. The first cruiser, Elias Jung, faced initial challenges but returned to service after improvements. The Capellan fleet currently operates four Feng Huang cruisers, while the IIsa Hyung is undergoing repairs following a suspected act of terrorism.
+</history>
+
+<manufacturer>
+Aris Memorial Yards
+</manufacturer>
+
+<primaryFactory>
+Necromo
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+1155 m
+</length>
+
+<height>
+1025 m Sail
+</height>
+
 <source>
 TRO3067 - Clan Invasion
 </source>
@@ -250,6 +290,10 @@ TRO3067 - Clan Invasion
 90
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 421
 </crew>
@@ -281,3 +325,4 @@ TRO3067 - Clan Invasion
 <escape_pod>
 24
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3067/Marik/Agamemnon Heavy Cruiser.blk b/megamek/data/mechfiles/warship/3067/Marik/Agamemnon Heavy Cruiser.blk
index fc9b8065404..69b0afc24c1 100644
--- a/megamek/data/mechfiles/warship/3067/Marik/Agamemnon Heavy Cruiser.blk	
+++ b/megamek/data/mechfiles/warship/3067/Marik/Agamemnon Heavy Cruiser.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Agamemnon Heavy Cruiser
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 3680
@@ -393,6 +393,46 @@ ISAMS Ammo:144
 40
 </structural_integrity>
 
+<capabilities>
+With a displacement of 815,000 tons, the Agamemnon-class heavy cruiser packs a significant punch and holds its own against the firepower of the Black Lion. While it may lack the same level of armor protection, the ship compensates through its agility, relying on speed and maneuverability to evade damage. The Agamemnon features robust anti-fighter defenses, making it a daunting adversary for aerospace attacks. Additionally, the cruiser carries its own complement of aerospace fighters, further enhancing its offensive and defensive capabilities.
+</capabilities>
+
+<overview>
+The Agamemnon-class heavy cruiser, named after the legendary Mycenaean king, follows a long lineage of naval vessels bearing the esteemed name. The first Agamemnon, dating back to the pre-stellar age, served as the inaugural command of Horatio Nelson, a renowned naval commander. The FWLM's Agamemnon-class cruisers, with the Menelaus as the first commissioned ship in 3058, boast substantial size, falling between the Star League's Black Lion and the Clan's Sovetskii Soyuz-class WarShips. While the Agamemnon matches the Black Lion in firepower, it trades off armor protection for superior speed and maneuverability. The vessel also possesses formidable anti-fighter defenses and houses its own aerospace wing, making it a challenging target for aerospace attacks.
+</overview>
+
+<history>
+The FWLM's first Agamemnon-class cruiser, the Menelaus, entered service in late 3058. Following its successful deployment, the second vessel of the class, the Aineas, joined the ranks a few months behind schedule in 3060. The third ship, the Hippolyta, was deployed in 3063, adding to the growing fleet of Agamemnon cruisers. Originally, a fourth vessel named the FWLS Troy was scheduled to enter service in early 3069. However, with the assistance of Word of Blake crews, its shakedown trials are expected to commence in the coming months, demonstrating the ongoing development and expansion of the Agamemnon-class heavy cruisers within the Free Worlds League Military.
+</history>
+
+<manufacturer>
+Imstar AeroSpace, Irian Technologies - Irian Naval Systems of Clipperton
+</manufacturer>
+
+<primaryFactory>
+Atreus (FWL), Clipperton
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+720 m
+</length>
+
+<height>
+615 m Sail
+</height>
+
 <source>
 TRO3067 - Clan Invasion
 </source>
@@ -418,6 +458,10 @@ TRO3067 - Clan Invasion
 130
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 396
 </crew>
@@ -449,3 +493,4 @@ TRO3067 - Clan Invasion
 <escape_pod>
 50
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3067/Marik/Eagle Frigate.blk b/megamek/data/mechfiles/warship/3067/Marik/Eagle Frigate.blk
index 9959221802a..124e1067416 100644
--- a/megamek/data/mechfiles/warship/3067/Marik/Eagle Frigate.blk	
+++ b/megamek/data/mechfiles/warship/3067/Marik/Eagle Frigate.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Eagle Frigate
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 4112
@@ -49,7 +49,7 @@ dockingcollar
 dockingcollar
 1stclassquarters:900.0:0
 crewquarters:3150.0:0
-cargobay:34894.0:1:5
+cargobay:34894.0:1:9
 </transporters>
 
 <SafeThrust>
@@ -311,6 +311,46 @@ ISAMS Ammo:300
 45
 </structural_integrity>
 
+<capabilities>
+The Eagle-class frigate is armed with sixteen naval autocannons and a single heavy naval Gauss cannon, providing potent anti-WarShip capabilities. The Gauss cannon, although restricted in firing arc, is capable of destroying a DropShip with a single hit. The frigate also utilizes a significant number of naval lasers for anti-WarShip and anti-DropShip combat. Its anti-fighter arsenal consists of successive weapon batteries, including laser and ballistic point-defense cannons, to effectively engage targets at different ranges. While the frigate lacks advanced armor composites, it compensates with a spacious cargo capacity often utilized for storing ammunition and lithium-fusion battery systems.
+</capabilities>
+
+<overview>
+The Eagle-class frigate was specifically designed as an escort vessel for the Thera super-carrier. It possesses a well-balanced combination of anti-ship and anti-fighter weapons systems. With a main arsenal consisting of naval autocannons and a heavy naval Gauss cannon, the Eagle is capable of engaging both enemy WarShips and DropShips. Additionally, it is equipped with an array of naval lasers and point-defense cannons to combat enemy fighters.
+</overview>
+
+<history>
+Currently, nine Eagle-class frigates are in active service, each assigned to different super-carriers. The Lancelot and Galahad serve with the Santorini, the Tristram and Bedvere are deployed alongside the Sardis, and the Gawain and Mordred operate with the Corinith. The Bors and Kay frigates are part of the Delphi fleet, while the Leodegrance, accompanied by the Percival undergoing trials, is intended for service with Attica. These frigates play a crucial role in escorting and protecting their respective super-carriers in various operations.
+</history>
+
+<manufacturer>
+Illium Naval Engineering - Illium Yard
+</manufacturer>
+
+<primaryFactory>
+Ionus
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Frigate
+</use>
+
+<length>
+640 m
+</length>
+
+<height>
+790 m Sail
+</height>
+
 <source>
 TRO3067 - Clan Invasion
 </source>
@@ -336,6 +376,10 @@ TRO3067 - Clan Invasion
 110
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 552
 </crew>
@@ -367,3 +411,4 @@ TRO3067 - Clan Invasion
 <escape_pod>
 30
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3075/Du Shi Wang Battleship.blk b/megamek/data/mechfiles/warship/3075/Du Shi Wang Battleship.blk
index 036d5aeda17..912076a44bc 100644
--- a/megamek/data/mechfiles/warship/3075/Du Shi Wang Battleship.blk	
+++ b/megamek/data/mechfiles/warship/3075/Du Shi Wang Battleship.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Du Shi Wang Battleship
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 4103
@@ -48,7 +48,7 @@ dockingcollar
 crewquarters:1855.0:0
 1stclassquarters:650.0:0
 steeragequarters:50.0:0
-cargobay:73529.0:4:6
+cargobay:73529.0:4:8
 </transporters>
 
 <SafeThrust>
@@ -145,6 +145,46 @@ Naval Laser 45
 150
 </structural_integrity>
 
+<capabilities>
+The Du Shi Wang battleship was equipped with energy-based weapons, eliminating the need for ammunition storage and reloading systems. Its frontal attack design featured four heavy naval PPCs on the front, delivering devastating firepower. The ship had a pair of grav decks to maintain crew health during long patrols. While its armor and offensive capabilities were impressive, the ship's maneuverability relied on the skill of the navigation crew. However, it was limited to a standard level of thrust and faced challenges in crew distribution and escape provisions.
+</capabilities>
+
+<overview>
+The Du Shi Wang was the first battleship of the Capellan Confederation, designed by the Duchy of Liao as a centerpiece for their expanding fleet. This formidable ship was armed with energy-based weaponry and boasted a frontal attack design, featuring heavy naval PPCs and enhanced armor. However, it suffered from limitations in maneuverability and class-based living arrangements, impacting crew distribution and escape capabilities.
+</overview>
+
+<history>
+The Du Shi Wang battleship played a significant role in the opening engagements of the Age of War and gained recognition for its unique orbital bombardment at Novaya Zemlya in 2399. Despite its early successes, only a small number of Du Shi Wang-class battleships survived into the First Succession War, and by the end of the Second Succession War, they had all been lost. One captured Du Shi Wang, renamed the Quicksilver Mongoose, joined General Kerensky on his Exodus and served Clan Mongoose until its eventual mothballing after near destruction by the Smoke Jaguars. It currently resides in the Strana Mechty system as a part of Clan history.
+</history>
+
+<manufacturer>
+Cynthiana Shipwrights Ltd.
+</manufacturer>
+
+<primaryFactory>
+Aldebaran
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battleship
+</use>
+
+<length>
+870 m
+</length>
+
+<height>
+1300 m Sail
+</height>
+
 <source>
 TRO3075 - Star League
 </source>
@@ -166,6 +206,10 @@ TRO3075 - Star League
 70
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 361
 </crew>
@@ -197,3 +241,4 @@ TRO3075 - Star League
 <escape_pod>
 15
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3075/Samarkand Carrier Block I.blk b/megamek/data/mechfiles/warship/3075/Samarkand Carrier Block I.blk
index 74783dc4dae..d726e4a4cb1 100644
--- a/megamek/data/mechfiles/warship/3075/Samarkand Carrier Block I.blk	
+++ b/megamek/data/mechfiles/warship/3075/Samarkand Carrier Block I.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -215,10 +215,50 @@ IS Ammo MG - Full:100
 71
 </structural_integrity>
 
+<capabilities>
+The Samarkand-class carriers were designed to utilize their large fighter complements to engage enemy DropShips and destroyers. They excelled in their role as carriers and escorts but were not intended for direct frontline combat. However, they were underarmored and outgunned, with vulnerability near the large engine mounts in the limited aft firing arcs. Despite impressive anti-aerospace defenses, the Samarkands could be easily overwhelmed in the absence of sufficient escorts.
+</capabilities>
+
+<overview>
+The Samarkand-class carrier was the brainchild of Coordinator Hehiro Kurita and was fast-tracked into production during the Reunification War. These carriers played a crucial role in boosting the economy of several planets. The Block I Samarkands, including the Benjamin, Dieron, and Alshain, were deployed during the war and later became symbols of the Dragon's prosperity as they supported colonial expansion and delivered supplies and resources.
+</overview>
+
+<history>
+The Samarkand carriers were deployed during the Reunification War, with the first ships, including the Samarkand and Benjamin, entering service in 2581. After the war, the surviving carriers supported the Dragon's economic expansion and became iconic symbols of prosperity. In 2668, newer Block II versions were authorized, taking advantage of advancements in armor and weapons technologies. Many Samarkands served as escorts in the Star League Defense Force but were largely destroyed during the liberation of Terra. Only one Samarkand, the Togura, remains as a museum piece orbiting New Samarkand. During the Succession Wars, the few remaining carriers defended strategic locations along the Lyran and Suns borders but were mostly destroyed. Samarkands were often used in last-ditch delaying tactics to buy time for ground defenders, although they became vulnerable due to limited escorts and shortages of spare parts and fighters.
+</history>
+
+<manufacturer>
+Tengoku no Ken Master Shipwrights Ltd.
+</manufacturer>
+
+<primaryFactory>
+Mizunami
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
 <notes>
-Unit as constructed in TRO is 2 tons overweight. Removed 2 tons of Cargo to make unit legal.
+Unit as constructed in TRO: is 2 tons overweight. Removed 2 tons of Cargo to make unit legal.
 </notes>
 
+<use>
+Carrier
+</use>
+
+<length>
+501 m
+</length>
+
+<height>
+967 m Sail
+</height>
+
 <source>
 TRO3075 - Star League
 </source>
@@ -240,6 +280,10 @@ TRO3075 - Star League
 60
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 384
 </crew>
@@ -271,3 +315,4 @@ TRO3075 - Star League
 <escape_pod>
 25
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/3075/Samarkand Carrier Block II.blk b/megamek/data/mechfiles/warship/3075/Samarkand Carrier Block II.blk
index 489836c80a7..777544012ad 100644
--- a/megamek/data/mechfiles/warship/3075/Samarkand Carrier Block II.blk	
+++ b/megamek/data/mechfiles/warship/3075/Samarkand Carrier Block II.blk	
@@ -233,7 +233,7 @@ IS Ammo MG - Full:100
 </structural_integrity>
 
 <notes>
-Unit as constructed in TRO is 4 tons overweight. Removed 4 tons of Cargo to make unit legal.
+Unit as constructed in TRO: is 4 tons overweight. Removed 4 tons of Cargo to make unit legal.
 </notes>
 
 <source>
diff --git a/megamek/data/mechfiles/warship/ED Golden Centrury/Quicksilver Mongoose Battleship.blk b/megamek/data/mechfiles/warship/ED Golden Centrury/Quicksilver Mongoose Battleship.blk
index 916e7b45f6a..308ba2e38fc 100644
--- a/megamek/data/mechfiles/warship/ED Golden Centrury/Quicksilver Mongoose Battleship.blk	
+++ b/megamek/data/mechfiles/warship/ED Golden Centrury/Quicksilver Mongoose Battleship.blk	
@@ -220,7 +220,7 @@ CLLargePulseLaser
 </structural_integrity>
 
 <source>
-ED: Golden Century - Early Succession War
+Era Digest:Golden Century - Early Succession War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/FR 2765/Capellan/Black Lion I Battlecruiser.blk b/megamek/data/mechfiles/warship/FR 2765/Capellan/Black Lion I Battlecruiser.blk
index 22d6536ef43..705c3d75dea 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Capellan/Black Lion I Battlecruiser.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Capellan/Black Lion I Battlecruiser.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -338,8 +338,48 @@ IS Ammo AC/2:90
 75
 </structural_integrity>
 
+<capabilities>
+The original Black Lion-class battle cruisers were designed to be larger and more massive than contemporary cruisers. They served as command assets and scouting wings, providing maneuverability preferred by Admiral McKenna over the Dreadnought-class. Over time, advancements like docking collars made the original Black Lions outdated, leading to attempts to replace them with newer designs. However, they continued to serve for an extended period until the decision to refit the Aegis-class ships for modern heavy cruisers. The legacy of the original Black Lions lived on in the larger Black Lion-class introduced by Boeing Interstellar for the Star League Navy in the 2600s, featuring heavier armor, weaponry, and the capability to transport supporting DropShips.
+</capabilities>
+
+<overview>
+The Black Lion-class battle cruisers were designed by Admiral McKenna of the Terran Hegemony as a more mobile and affordable complement to the Dreadnought-class battleships. These living WarShips incorporated numerous features requested by Admiral McKenna and shared components with the Dreadnought-class to keep costs down. Serving as command assets for cruiser squadrons and scouting wings for battleships, the Black Lion-class defined the nature of the Hegemony battle cruiser.
+</overview>
+
+<history>
+Admiral McKenna's desire for more mobile and affordable vessels led to the design of the Black Lion-class battle cruisers. These ships served as command assets and scouting wings, but their initial designs quickly became outdated with the introduction of new innovations. The original Black Lions were gradually replaced by newer designs like the Quixote-class, and most of them were sold to the Great Houses prior to the Reunification War. While serving the Great House navies, some were eventually mothballed or stripped for germanium cores during the Golden Age and Succession Wars. However, in the 2600s, Boeing Interstellar revived the Black Lion-class for the Star League Navy, based on the specifications of the original ship, creating a larger version with enhanced capabilities and a distinguished reputation.
+</history>
+
+<manufacturer>
+Boeing Interstellar
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battlecruiser
+</use>
+
+<length>
+743 m
+</length>
+
+<height>
+1105 m Sail
+</height>
+
 <source>
-FR2765-CCAF - Star League
+Field Report 2765 CCAF - Star League
 </source>
 
 <tonnage>
@@ -359,6 +399,10 @@ FR2765-CCAF - Star League
 150
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 717
 </crew>
@@ -390,3 +434,4 @@ FR2765-CCAF - Star League
 <escape_pod>
 36
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/FR 2765/Capellan/Soyal Heavy Cruiser.blk b/megamek/data/mechfiles/warship/FR 2765/Capellan/Soyal Heavy Cruiser.blk
index 874681e4b72..fff9c8d9bde 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Capellan/Soyal Heavy Cruiser.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Capellan/Soyal Heavy Cruiser.blk	
@@ -178,7 +178,7 @@ Ammo Killer Whale:60
 </structural_integrity>
 
 <source>
-FR2765-CCAF - Star League
+Field Report 2765 CCAF - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/FR 2765/Davion/Congress D Frigate.blk b/megamek/data/mechfiles/warship/FR 2765/Davion/Congress D Frigate.blk
index 447c6c6927c..bf17ba2d95f 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Davion/Congress D Frigate.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Davion/Congress D Frigate.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Congress D Frigate
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 6987
@@ -157,8 +157,48 @@ Ammo White Shark:10
 75
 </structural_integrity>
 
+<capabilities>
+The Congress frigates, both the Hegemony and Davion variants, possessed formidable firepower, with the Davion Congresses having thirty percent more broadside firepower than their Hegemony counterparts. While lacking some advanced sensors and technologies, the Davion Congresses compensated with their enhanced armament. They primarily served as escorts for New Syrtis carriers and led destroyer squadrons, proving effective in their roles.
+</capabilities>
+
+<overview>
+The Congress-class frigates were introduced as a replacement for the outdated Quixote-class frigates in the Terran Hegemony. However, legal complications and allegations of stolen designs delayed their construction. Eventually, a compromise settlement was reached, involving the shipbuilding firm Challenge Systems, which resulted in the production of variant Congress frigates for the Federated Suns. Despite lacking some advanced features of the Hegemony's Congress ships, the Davion Congresses offered increased firepower.
+</overview>
+
+<history>
+Following their introduction, the Congress-class frigates saw action in the Reunification War, serving alongside other warships of the Terran Hegemony. However, as the centuries of the Star League progressed, the Congress frigates gradually diminished in numbers within fleet rosters. By the start of the Succession Wars, only a handful remained, and they faced losses against various factions. The last Davion Congress D was lost during the Second Succession War, falling victim to a Capellan minefield, which highlighted the vulnerability of these frigates compared to their Hegemony counterparts. Over time, the Congress-class frigates faded into obscurity, symbolizing the changing tides of warfare and technological advancements in the Inner Sphere.
+</history>
+
+<manufacturer>
+Challenge Systems
+</manufacturer>
+
+<primaryFactory>
+Galax
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Frigate
+</use>
+
+<length>
+703 m
+</length>
+
+<height>
+1207 m Sail
+</height>
+
 <source>
-FR2765-AFFS - Star League
+Field Report 2765 AFFS - Star League
 </source>
 
 <tonnage>
@@ -177,6 +217,10 @@ FR2765-AFFS - Star League
 90
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 288
 </crew>
@@ -208,3 +252,4 @@ FR2765-AFFS - Star League
 <escape_pod>
 8
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/FR 2765/Davion/Defender Battlecruiser.blk b/megamek/data/mechfiles/warship/FR 2765/Davion/Defender Battlecruiser.blk
index 93e08d6f264..4224f71031d 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Davion/Defender Battlecruiser.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Davion/Defender Battlecruiser.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Defender Battlecruiser
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 6988
@@ -269,8 +269,48 @@ IS Ammo AC/5:80
 40
 </structural_integrity>
 
+<capabilities>
+The Defender-class battlecruisers were known for their impressive maneuverability and firepower. With their advanced maneuvering drives, they could outmaneuver the Terran Hegemony's Dreadnoughts. They were armed with a heavy battery of naval autocannons, allowing them to engage enemy WarShips effectively. However, their limited aftward firepower and reduced armor protection were drawbacks. The internal cargo space and shuttle bays were also limited, affecting their operating range and logistical capabilities.
+</capabilities>
+
+<overview>
+The Defender-class battlecruisers were part of the ambitious program of the Federated Suns to challenge the Terran Hegemony's Dreadnought-class. These battlecruisers were designed to outmaneuver and outgun the enemy with their large maneuvering drives and heavy naval autocannons. However, their size and design limitations hindered their overall effectiveness.
+</overview>
+
+<history>
+he launch of the Defender-class battlecruisers initially shocked the Inner Sphere, showcasing the growing martial power of the Terran Hegemony. However, the Hegemony soon introduced more advanced and heavily armed ships, such as the Monsoon-class, which outclassed and outnumbered the Defenders. Despite their limitations, the Defender-class ships served in various conflicts, including the Reunification War and the Succession Wars. Some of them earned fame, like the FSS Golden Lion, for their roles in pivotal battles. However, none of the ancient Defenders survived the First Succession War.
+</history>
+
+<manufacturer>
+Challenge Systems
+</manufacturer>
+
+<primaryFactory>
+Galax
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battlecruiser
+</use>
+
+<length>
+870 m
+</length>
+
+<height>
+1300 m Sail
+</height>
+
 <source>
-FR2765-AFFS - Star League
+Field Report 2765 AFFS - Star League
 </source>
 
 <tonnage>
@@ -290,6 +330,10 @@ FR2765-AFFS - Star League
 120
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 430
 </crew>
@@ -321,3 +365,4 @@ FR2765-AFFS - Star League
 <escape_pod>
 35
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Cruiser.blk b/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Cruiser.blk
index 3fa4846dd48..3558a8b15ec 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Cruiser.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Cruiser.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Cruiser
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 6989
@@ -221,8 +221,48 @@ Ammo Barracuda:30
 75
 </structural_integrity>
 
+<capabilities>
+The Cruiser was a missile cruiser armed with bow-mounted White Shark missile launchers and Barracuda arrays for anti-fighter defense. However, the decision to use conventional kinetic-kill warheads instead of nuclear warheads limited its offensive power. The ship also had tertiary naval autocannons to deal with smaller craft and DropShuttles. Its design included interconnected large nose bays for DropShuttles, small craft, and cargo, but the shifting center of mass between empty and full bays caused maneuverability issues.
+</capabilities>
+
+<overview>
+The Cruiser-class cruiser, also known as the "Beercan Battleship" due to its squat and compact design, was originally a Terran ship class contemporary to the Dreadnought. It served as a vanguard vessel during James McKenna's campaigns in the early days of the Hegemony. However, its career with the Hegemony navy was relatively short-lived, and the last Cruisers were mothballed in 2405 before being sold to the Great Houses.
+</overview>
+
+<history>
+The Cruiser's service in the Terran navy was marked by operational and design deficiencies that led to its retirement. Crews and admirals found the ship's design unappealing, earning it nicknames like "Beercan Battleship" and "Killer Space Keg." Despite its flaws, the Cruiser performed adequately in its era, particularly in high-speed closing engagements against contemporary WarShips and armed merchant vessels. After its retirement from Terran service, several Cruisers found new life after being sold to the Great Houses, while the rest were mothballed.
+</history>
+
+<manufacturer>
+Boeing Interstellar
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+240 m
+</length>
+
+<height>
+1200 m Sail
+</height>
+
 <source>
-FR2765-DCMS - Star League
+Field Report 2765 DCMS - Star League
 </source>
 
 <tonnage>
@@ -241,6 +281,10 @@ FR2765-DCMS - Star League
 100
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 320
 </crew>
@@ -272,3 +316,4 @@ FR2765-DCMS - Star League
 <escape_pod>
 150
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Narukami Block I.blk b/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Narukami Block I.blk
index 663eb517279..111b7f75a90 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Narukami Block I.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Narukami Block I.blk	
@@ -236,7 +236,7 @@ Medium Laser
 </structural_integrity>
 
 <source>
-FR2765-DCMS - Star League
+Field Report 2765 DCMS - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Narukami Block II.blk b/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Narukami Block II.blk
index 7b56d4d2fab..adf5ca16583 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Narukami Block II.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Draconis Combine/Narukami Block II.blk	
@@ -237,7 +237,7 @@ Large Laser
 </structural_integrity>
 
 <source>
-FR2765-DCMS - Star League
+Field Report 2765 DCMS - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/FR 2765/FWL/League Block I.blk b/megamek/data/mechfiles/warship/FR 2765/FWL/League Block I.blk
index c6112a0e66b..7dad96a3fd1 100644
--- a/megamek/data/mechfiles/warship/FR 2765/FWL/League Block I.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/FWL/League Block I.blk	
@@ -210,7 +210,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-FR2765-FWLM - Star League
+Field Report 2765 FWLM - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/FR 2765/FWL/League Block II.blk b/megamek/data/mechfiles/warship/FR 2765/FWL/League Block II.blk
index d6f5a61c769..638d4f5da8c 100644
--- a/megamek/data/mechfiles/warship/FR 2765/FWL/League Block II.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/FWL/League Block II.blk	
@@ -211,7 +211,7 @@ Small Laser
 </structural_integrity>
 
 <source>
-FR2765-FWLM - Star League
+Field Report 2765 FWLM - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/FR 2765/Periphery/Athena Cruiser.blk b/megamek/data/mechfiles/warship/FR 2765/Periphery/Athena Cruiser.blk
index 1952494f74f..955a58a4693 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Periphery/Athena Cruiser.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Periphery/Athena Cruiser.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -237,8 +237,48 @@ Naval Laser 55
 90
 </structural_integrity>
 
+<capabilities>
+The Athena-class cruiser, born from brainstorming and simulations rather than practical deep space warfare experience, was designed for space-to-space nuclear warfare and support for Alliance troops. It featured heavy capital missile batteries, potent laser batteries for anti-fighter and anti-shipping roles, and supplementary autocannons for high-speed engagements. The stern-heavy weaponry reflected its bombardment platform role, while the lack of docking collars indicated its original design to house large drop shuttles and smaller shuttles. The redesigned docking bays of the Magistracy version could accommodate aerospace fighters and shuttles, providing a moderate fighter screen and independent transport capability.
+</capabilities>
+
+<overview>
+The Athena-class cruiser, considered an outgrowth of James McKenna's naval construction programs, shares its roots with the Aegis-class. However, the concept of the Athena was actually conceived nearly a century before McKenna's time, during the Terran Alliance era. Originally designed as a combat JumpShip, the Athena evolved into an iconic heavy cruiser for the Terrans and later underwent modifications by the Magistracy of Canopus, resulting in a version that closely adhered to the original blueprints.
+</overview>
+
+<history>
+The Athena-class cruiser originated from the Terran Alliance's fear of separatists establishing their own colonies or engaging in nuclear terrorism. James McKenna discovered the dormant plans for the Athena during his time at Annapolis Academy and developed an infatuation with the concept. As other interstellar powers began developing armed JumpShips, the Hegemony revised the Athena's blueprints, leading to the creation of the Aegis-class. The original Athena concept remained a footnote until the Magistracy of Canopus implemented a more faithful version, aligning closely with the original blueprints and incorporating local component availability. The Athenas served as flagships, offering spacious quarters and gravity decks for personnel and passengers.
+</history>
+
+<manufacturer>
+Carmen Shipwrights, Ltd./Athena Corporation
+</manufacturer>
+
+<primaryFactory>
+Harminous
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+625 m
+</length>
+
+<height>
+1208 m Sail
+</height>
+
 <source>
-FR2765:Periphery- Star League
+Field Report 2765 Periphery - Star League
 </source>
 
 <tonnage>
@@ -258,6 +298,10 @@ FR2765:Periphery- Star League
 225
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 512
 </crew>
@@ -289,3 +333,4 @@ FR2765:Periphery- Star League
 <escape_pod>
 100
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/FR 2765/Periphery/Essex I Destroyer.blk b/megamek/data/mechfiles/warship/FR 2765/Periphery/Essex I Destroyer.blk
index 940556150e4..a73fc01c066 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Periphery/Essex I Destroyer.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Periphery/Essex I Destroyer.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -160,8 +160,48 @@ Naval Laser 35
 30
 </structural_integrity>
 
+<capabilities>
+The Essex-class destroyers were known for their light frame and relatively simple design. While not as rugged as later ships, they introduced key features that defined Hegemony destroyers. Throughout their service, they underwent gradual replacements and enhancements. However, by the time of the Succession Wars, the Essex-class was outmatched and proved vulnerable targets.
+</capabilities>
+
+<overview>
+The Essex-class served as the Terran Hegemony's initial major destroyer class, playing a significant role in the Hegemony's early WarShip fleet. Although comparatively small and simple by Star League standards, these vessels pioneered features that became characteristic of Hegemony destroyers. They gradually gave way to more advanced ship classes like the Carson and Baron, eventually being decommissioned in favor of the Naga-class in 2645.
+</overview>
+
+<history>
+nitially decommissioned and acquired as military surplus, the Essex I-class experienced a unique revival during the turmoil of the Amaris Coup in the 2760s. With the Capellan Confederation facing naval infrastructure challenges, Delhi WarShips clandestinely smuggled the plans for the Vincent and Essex classes to Capellan shipyards, resuming production. These outdated and underweight ships bolstered the Capellan Confederation's navy during the Succession Wars, providing some operational flexibility early on. However, as the conflicts progressed, the aged Essexes became easy prey and none survived beyond 2830.
+</history>
+
+<manufacturer>
+Delhi WarShips, Delhi WarShips, Daussault-Shimmon Enterprises
+</manufacturer>
+
+<primaryFactory>
+Carver V, Capella, New Earth
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Destroyer
+</use>
+
+<length>
+602 m
+</length>
+
+<height>
+1003 m Sail
+</height>
+
 <source>
-FR2765-P - Star League
+Field Report 2765 Periphery - Star League
 </source>
 
 <tonnage>
@@ -180,6 +220,10 @@ FR2765-P - Star League
 60
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 300
 </crew>
@@ -211,3 +255,4 @@ FR2765-P - Star League
 <escape_pod>
 25
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/FR 2765/Periphery/Riga II Destroyer Carrier.blk b/megamek/data/mechfiles/warship/FR 2765/Periphery/Riga II Destroyer Carrier.blk
index 7fb485ebd7c..13fcd29a0a5 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Periphery/Riga II Destroyer Carrier.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Periphery/Riga II Destroyer Carrier.blk	
@@ -154,7 +154,7 @@ Ammo NAC/30:200
 </structural_integrity>
 
 <source>
-FR2765-P - Star League
+Field Report 2765 Periphery - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/FR 2765/Steiner/Commonwealth Light Cruiser Block I.blk b/megamek/data/mechfiles/warship/FR 2765/Steiner/Commonwealth Light Cruiser Block I.blk
index a7216ff7bd8..8f8e8cde3b0 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Steiner/Commonwealth Light Cruiser Block I.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Steiner/Commonwealth Light Cruiser Block I.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -52,7 +52,7 @@ dockingcollar
 1stclassquarters:500.0:0
 crewquarters:1680.0:0
 steeragequarters:600.0:0
-cargobay:8464.0:1:6
+cargobay:8464.0:1:12
 </transporters>
 
 <SafeThrust>
@@ -280,8 +280,48 @@ IS Ammo MG - Full:800
 50
 </structural_integrity>
 
+<capabilities>
+The Commonwealth-class light cruiser excelled in several key capabilities. Its extensive missile battery allowed it to outrange many adversaries, providing a significant tactical advantage. Supported by a heavy laser system and autocannons, it possessed formidable offensive capabilities in both long-range and close-range engagements. The cruiser's six docking collars enabled seamless integration with DropShips, ensuring flexibility and adaptability in various operational scenarios. With larger engines and advanced armor, the Commonwealth-class cruiser demonstrated enhanced speed, maneuverability, and protection compared to most non-Terran ships.
+</capabilities>
+
+<overview>
+The Commonwealth-class light cruiser, developed by Di Tron Industries in response to the Lyran Commonwealth's need for domestic WarShip construction, showcased technological advancements and impressive armament. It was slightly heavier and more compact than its predecessor, the Dart-class cruiser, featuring larger engines and sophisticated armor. With its extensive missile battery, reinforced by a heavy laser system and autocannons, the Commonwealth-class cruiser possessed long-range firepower and the capability to discourage enemy vessels from approaching. Its incorporation of six docking collars also reflected the growing trend of DropShip utilization.
+</overview>
+
+<history>
+When the Lyran Commonwealth sought assistance with its initial ventures into domestic WarShip construction, Di Tron Industries, renowned for its Dart-class cruiser, took up the challenge. Ioto Galactic Enterprises emerged through financial manipulation, defying Terran Hegemony legal restrictions on restricted technology sales. The Commonwealth-class light cruiser, slightly heavier but more compact than its predecessor, became a mainstay of the Lyran Navy, produced at the Port Sydney Naval Yards. However, like many vessels of its time, most Commonwealth-class cruisers did not survive long past the Reunification War, as scarce resources led to their scrapping during an era of peace. In the years leading up to Stefan Amaris seizing the throne, the Lyran Commonwealth, facing the need to reinforce its WarShip fleets, returned to the Commonwealth-class design. The newer version, launched in 2765, featured upgraded technologies and played a crucial role as escorts for Tharkad-class battle cruisers during the early Succession Wars. However, powerful adversaries on multiple fronts and the destruction of the Commonwealth's heavy aerospace industries eventually led to the decline and near extinction of the Lyran fleet, including the Commonwealth-class cruisers.
+</history>
+
+<manufacturer>
+Ioto Galactic Enterprises - Port Sydney Naval Yards
+</manufacturer>
+
+<primaryFactory>
+Alarion
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+694 m
+</length>
+
+<height>
+1003 m Sail
+</height>
+
 <source>
-FR2765-LCAF - Star League
+Field Report 2765 LCAF - Star League
 </source>
 
 <tonnage>
@@ -301,6 +341,10 @@ FR2765-LCAF - Star League
 145
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 400
 </crew>
@@ -332,3 +376,4 @@ FR2765-LCAF - Star League
 <escape_pod>
 30
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/FR 2765/Steiner/Commonwealth Light Cruiser Block II.blk b/megamek/data/mechfiles/warship/FR 2765/Steiner/Commonwealth Light Cruiser Block II.blk
index 7bb662691b5..c48553f8676 100644
--- a/megamek/data/mechfiles/warship/FR 2765/Steiner/Commonwealth Light Cruiser Block II.blk	
+++ b/megamek/data/mechfiles/warship/FR 2765/Steiner/Commonwealth Light Cruiser Block II.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -262,8 +262,48 @@ Ammo Barracuda:135
 50
 </structural_integrity>
 
+<capabilities>
+The Commonwealth-class light cruiser excelled in several key capabilities. Its extensive missile battery allowed it to outrange many adversaries, providing a significant tactical advantage. Supported by a heavy laser system and autocannons, it possessed formidable offensive capabilities in both long-range and close-range engagements. The cruiser's six docking collars enabled seamless integration with DropShips, ensuring flexibility and adaptability in various operational scenarios. With larger engines and advanced armor, the Commonwealth-class cruiser demonstrated enhanced speed, maneuverability, and protection compared to most non-Terran ships.
+</capabilities>
+
+<overview>
+The Commonwealth-class light cruiser, developed by Di Tron Industries in response to the Lyran Commonwealth's need for domestic WarShip construction, showcased technological advancements and impressive armament. It was slightly heavier and more compact than its predecessor, the Dart-class cruiser, featuring larger engines and sophisticated armor. With its extensive missile battery, reinforced by a heavy laser system and autocannons, the Commonwealth-class cruiser possessed long-range firepower and the capability to discourage enemy vessels from approaching. Its incorporation of six docking collars also reflected the growing trend of DropShip utilization.
+</overview>
+
+<history>
+When the Lyran Commonwealth sought assistance with its initial ventures into domestic WarShip construction, Di Tron Industries, renowned for its Dart-class cruiser, took up the challenge. Ioto Galactic Enterprises emerged through financial manipulation, defying Terran Hegemony legal restrictions on restricted technology sales. The Commonwealth-class light cruiser, slightly heavier but more compact than its predecessor, became a mainstay of the Lyran Navy, produced at the Port Sydney Naval Yards. However, like many vessels of its time, most Commonwealth-class cruisers did not survive long past the Reunification War, as scarce resources led to their scrapping during an era of peace. In the years leading up to Stefan Amaris seizing the throne, the Lyran Commonwealth, facing the need to reinforce its WarShip fleets, returned to the Commonwealth-class design. The newer version, launched in 2765, featured upgraded technologies and played a crucial role as escorts for Tharkad-class battle cruisers during the early Succession Wars. However, powerful adversaries on multiple fronts and the destruction of the Commonwealth's heavy aerospace industries eventually led to the decline and near extinction of the Lyran fleet, including the Commonwealth-class cruisers.
+</history>
+
+<manufacturer>
+Ioto Galactic Enterprises - Port Sydney Naval Yards
+</manufacturer>
+
+<primaryFactory>
+Alarion
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Cruiser
+</use>
+
+<length>
+694 m
+</length>
+
+<height>
+1003 m Sail
+</height>
+
 <source>
-FR2765-LCAF - Star League
+Field Report 2765 LCAF - Star League
 </source>
 
 <tonnage>
@@ -283,6 +323,10 @@ FR2765-LCAF - Star League
 145
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 346
 </crew>
@@ -314,3 +358,4 @@ FR2765-LCAF - Star League
 <escape_pod>
 30
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/Golden Century/Corone Corvette.blk b/megamek/data/mechfiles/warship/Golden Century/Corone Corvette.blk
index d2cf4744945..87048d7b995 100644
--- a/megamek/data/mechfiles/warship/Golden Century/Corone Corvette.blk	
+++ b/megamek/data/mechfiles/warship/Golden Century/Corone Corvette.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -47,7 +47,7 @@ dockingcollar
 dockingcollar
 dockingcollar
 dockingcollar
-cargobay:35810.0:1:3
+cargobay:35810.0:1:7
 crewquarters:168.0:0
 2ndclassquarters:1162.0:0
 </transporters>
@@ -185,6 +185,46 @@ ISERLargeLaser
 47
 </structural_integrity>
 
+<capabilities>
+Despite its relatively lighter tonnage, the Corone-class destroyer boasted impressive armor and carried a fighter and DropShip capacity more akin to a larger cruiser. Unlike Star League-era destroyers that were designed to operate in squadrons, the Corone was built to operate independently, jumping alone to its objectives and deploying its forces for decisive strikes. With its significant DropShip capacity and large fighter wing, the Corone excelled as a deep-penetration vessel, operating effectively throughout Clan space. Equipped with an attached HPG, the Corone also served as a fleet support vessel, providing advanced communications capabilities to larger fleet formations.
+</capabilities>
+
+<overview>
+The Corone-class destroyer, developed toward the end of the Golden Century by the Snow Raven Clan, represented the future of Clan naval warfare. As a light raider, the Corone was designed for independent operations and trial warfare, reflecting the evolving tactics and strategies of Clan space.
+</overview>
+
+<history>
+Only six Corone-class destroyers were constructed at the Lum Naval Yards due to the substantial resources required. These vessels quickly found themselves at the forefront of Snow Raven trials during the 2900s, showcasing their capabilities in the new trial-based society. In 2917, the Corone-class Eternal Flight participated in numerous trials over Hellgate, slowing down the Steel Vipers' hold on the planet. In 2920, the Corones proved their combat value when the Raven's Wing engaged Clan Steel Viper forces to prevent the takeover of Strato Domingo. The Corone destroyer played a crucial role in damaging the Viper ships and forcing the Martial Legacy to withdraw. However, the Corones' early successes eventually led to their downfall. Other Clans capitalized on the lessons learned from the Corone's design, developing faster vessels with greater firepower and fighter capacity. The Corone-class was ultimately superseded by more advanced designs such as the York refit destroyer and the Fredasa corvette. The Snow Ravens, however, used the Corone as the basis for the larger Nightlord-class before retiring the remaining Corones to mothball in 2946. One notable incident involving a Corone-class destroyer occurred in 2926 when the CSR Regal Claw retaliated against a Clan Ghost Bear raid on the Lum Naval Yards. The Regal Claw engaged a Ghost Bear cruiser in the Bearclaw system, and despite the Raven pilots' skill, the heavier Bear's Den ship ultimately destroyed the Claw in battle.
+</history>
+
+<manufacturer>
+Lum Naval Yards
+</manufacturer>
+
+<primaryFactory>
+Lum
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Destroyer
+</use>
+
+<length>
+670 m
+</length>
+
+<height>
+1000 m Sail
+</height>
+
 <tonnage>
 290000.0
 </tonnage>
@@ -206,6 +246,10 @@ ISERLargeLaser
 75
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 286
 </crew>
@@ -237,3 +281,7 @@ ISERLargeLaser
 <escape_pod>
 30
 </escape_pod>
+
+<source>
+TRO: Golden Century - Late Succession War - LosTech
+</source>
\ No newline at end of file
diff --git a/megamek/data/mechfiles/warship/Golden Century/Molniya Corvette.blk b/megamek/data/mechfiles/warship/Golden Century/Molniya Corvette.blk
index c1dd95633c1..475896aad9f 100644
--- a/megamek/data/mechfiles/warship/Golden Century/Molniya Corvette.blk	
+++ b/megamek/data/mechfiles/warship/Golden Century/Molniya Corvette.blk	
@@ -282,12 +282,8 @@ Ammo NAC/10:40
 40
 </structural_integrity>
 
-<imagepath>
-.\data\images\fluff\Aero\Molinya Corvette.png
-</imagepath>
-
 <source>
-Succession War
+TRO: Golden Century - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/Golden Century/Peregrine Corvette.blk b/megamek/data/mechfiles/warship/Golden Century/Peregrine Corvette.blk
index 207ea993889..8b6577874f1 100644
--- a/megamek/data/mechfiles/warship/Golden Century/Peregrine Corvette.blk	
+++ b/megamek/data/mechfiles/warship/Golden Century/Peregrine Corvette.blk	
@@ -143,12 +143,8 @@ ISMobileHPG
 30
 </structural_integrity>
 
-<imagepath>
-.\data\images\fluff\Aero\Peregrine (2969).png
-</imagepath>
-
 <source>
-Succession Wars
+TRO: Golden Century - Late Succession War - LosTech
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/Hist LOT I/Capital Drone M-5 'Caspar'.blk b/megamek/data/mechfiles/warship/Hist LOT I/Capital Drone M-5 'Caspar'.blk
index 4899442adb7..904fdd24fea 100644
--- a/megamek/data/mechfiles/warship/Hist LOT I/Capital Drone M-5 'Caspar'.blk	
+++ b/megamek/data/mechfiles/warship/Hist LOT I/Capital Drone M-5 'Caspar'.blk	
@@ -181,11 +181,11 @@ Ammo AR10 Killer Whale:20
 </structural_integrity>
 
 <capabilities>
-The Caspar has four Class-55 Naval Lasers, two Heavy NPPCs, and one Killer Whale (20 missiles), which gives it lots of long-range armament and contributes to the deadly nature of its slicing strikes. Almost every ship of the day may be destroyed by two Class-55 Naval Lasers, three NAC/20's (300 rounds), and one AR-10 Launcher (with 10 Killer Whale and 20 Barracuda missiles), positioned in the forward quarters facing to give the maximum shooting arc. With one Class-55 Naval Laser, four Class-25 Naval Autocannons (200 rounds per pairing, split into groups of two to help concentrate firepower against enemies), and two AR-10 Launchers (with 20 Killer Whale and 20 Barracuda missiles), the Caspar was able to dive into enemy formations and rip them to pieces. To complete up its powerful armament, the rear quarters are equipped with two Class-55 Naval Lasers, three Class-20 Naval Autocannons, and two Barracuda Launchers, each of which can fire 40 missiles. [5] The self-destruct system that was integrated into the engine compartment was thought to be the single weakness of this ideal WarShip. The WarShip drone might be destroyed if the drone received a lucky blow to the aft. Ferro-Carbide armour weighing 322.5 tonnes encased the hull of the Caspar.
+The M-5 Caspars had a formidable array of weapons, including naval lasers, heavy naval PPCs, and autocannon broadsides. Their advanced neural network, the Autonomous Tactical Analysis Computer (ATAC), allowed for precise coordination and efficient attacks. The M-5C variant, equipped with the ATAC, could direct up to fifty other SDS drones and relied on the network for targeting assistance. Although the M-5C downgraded its own SDS Drone computer, the additional naval PPCs significantly improved its bow armament.
 </capabilities>
 
 <overview>
-Considered the pinnacle of the SDS network, the M-5 drones were named after an ancient Terran commander and would go on to become the thing of legends after the Star League fell and is still talked about in revered tones to this day.
+The M-5 drones, known as Caspars, were the pinnacle of the SDS network and became legendary in the Inner Sphere. Designed as capital-class drones, the M-5 Caspars featured heavily modified Lola block II hulls and advanced drone control systems. They possessed firepower comparable to larger WarShips while maintaining the agility of destroyer-class ships. With their slashing assaults and superior coordination, the Caspars were considered the perfect WarShips, although they had a self-destruct system as a flaw.
 </overview>
 
 <deployment>
@@ -193,7 +193,7 @@ The SDS Drone Control System provides for (Gunnery 3, Piloting 4).
 </deployment>
 
 <history>
-The Caspar was the primary capital-class SDS drone. The M-5 was based upon the Lola block II hull, which was heavily modifying to make it a nightmare for any opponent. The design of the M-5 allowed it to nearly mount the firepower of a battleship-class ship while maintaining the thrust of a destroyer-class ship. Most worlds of the Hegemony were protected by at least a handful of M-5 drones while key worlds had multiple squadrons. Terra itself was defended by two hundred and fifty of these drones and if not for Kerensky's technicians devising a jamming system against them, the Inner Sphere today might still have the Amaris Empire sitting at its center.
+The M-5 Caspar drones, as the pinnacle of the SDS network, played a pivotal role during the tumultuous period of the Amaris Civil War. Most worlds within the Terran Hegemony possessed at least a handful of M-5 drones, with key worlds fielding multiple squadrons. However, it was Terra itself that housed the largest concentration of these formidable WarShip drones, with estimates suggesting that there were at least two hundred and fifty stationed there. The M-5 Caspars, named after an ancient Terran commander, were designed to be the primary capital-class drones within the SDS network. Using the unequipped Lola block II hull as a starting point, the M-5 underwent extensive modifications to achieve its final form. Although not intended for extended deployments and requiring external support for major repairs, the M-5 sacrificed cargo space to accommodate advanced drone control systems. This allowed it to possess firepower nearly equivalent to the larger Texas-class WarShip while maintaining the agility of a destroyer-class vessel. With a battery of naval lasers and paired heavy naval PPCs mounted in the nose, the Caspars had the ability to execute slashing assaults that often struck from outside an opponent's effective attack range. The extensive array of heat sinks enabled the drones to dive into enemy formations, unleashing their autocannon broadsides without fear of overheating. Considered by many as the perfect WarShip, the only notable flaw in the design was the self-destruct system built into the engine compartment. A well-placed hit to the aft section could trigger this system and destroy the M-5 drone. Despite their formidable capabilities, the M-5 Caspars were not invincible. General Aleksandr Kerensky and his forces faced the daunting task of devising a strategy to defeat the waves of M-5 drones guarding Terra. Recognizing the coordination network of the Caspars as their greatest strength, Kerensky's technicians developed a jamming system to disrupt their communication and coordination capabilities. This countermeasure proved crucial in turning the tide of the conflict and ultimately defeating the drones. Following the fall of Amaris and the Exodus of Kerensky's forces from the Inner Sphere, the M-5 Caspars were left behind. Some of the surviving drones were likely mothballed in naval caches, serving as reminders of their once-dominant presence. The Inner Sphere would continue to recount tales of the legendary M-5 Caspar drones, acknowledging their significant impact on the outcome of the Amaris Civil War and the shaping of history.
 </history>
 
 <manufacturer>
@@ -204,10 +204,6 @@ Nicholas Spacecraft/Ulsop Robotics
 New Earth
 </primaryFactory>
 
-<notes>
-SDS Drone Control System (Gunnery 3, Piloting 4).
-</notes>
-
 <use>
 Capital Drone
 </use>
@@ -217,7 +213,7 @@ Capital Drone
 </length>
 
 <source>
-LofT Vol 1 - Star League
+Historical:Liberation of Terra I - Star League
 </source>
 
 <tonnage>
@@ -236,6 +232,10 @@ LofT Vol 1 - Star League
 1
 </sail>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 229
 </crew>
diff --git a/megamek/data/mechfiles/warship/Hist LOT I/Capital Drone M-5C 'Caspar'.blk b/megamek/data/mechfiles/warship/Hist LOT I/Capital Drone M-5C 'Caspar'.blk
index 98577631c3f..f933197ca19 100644
--- a/megamek/data/mechfiles/warship/Hist LOT I/Capital Drone M-5C 'Caspar'.blk	
+++ b/megamek/data/mechfiles/warship/Hist LOT I/Capital Drone M-5C 'Caspar'.blk	
@@ -182,11 +182,11 @@ Ammo AR10 Killer Whale:20
 </structural_integrity>
 
 <capabilities>
-The Caspar has four Class-55 Naval Lasers, two Heavy NPPCs, and one Killer Whale (20 missiles), which gives it lots of long-range armament and contributes to the deadly nature of its slicing strikes. Almost every ship of the day may be destroyed by two Class-55 Naval Lasers, three NAC/20's (300 rounds), and one AR-10 Launcher (with 10 Killer Whale and 20 Barracuda missiles), positioned in the forward quarters facing to give the maximum shooting arc. With one Class-55 Naval Laser, four Class-25 Naval Autocannons (200 rounds per pairing, split into groups of two to help concentrate firepower against enemies), and two AR-10 Launchers (with 20 Killer Whale and 20 Barracuda missiles), the Caspar was able to dive into enemy formations and rip them to pieces. To complete up its powerful armament, the rear quarters are equipped with two Class-55 Naval Lasers, three Class-20 Naval Autocannons, and two Barracuda Launchers, each of which can fire 40 missiles. [5] The self-destruct system that was integrated into the engine compartment was thought to be the single weakness of this ideal WarShip. The WarShip drone might be destroyed if the drone received a lucky blow to the aft. Ferro-Carbide armour weighing 322.5 tonnes encased the hull of the Caspar.
+The M-5 Caspars had a formidable array of weapons, including naval lasers, heavy naval PPCs, and autocannon broadsides. Their advanced neural network, the Autonomous Tactical Analysis Computer (ATAC), allowed for precise coordination and efficient attacks. The M-5C variant, equipped with the ATAC, could direct up to fifty other SDS drones and relied on the network for targeting assistance. Although the M-5C downgraded its own SDS Drone computer, the additional naval PPCs significantly improved its bow armament.
 </capabilities>
 
 <overview>
-Considered the pinnacle of the SDS network, the M-5 drones were named after an ancient Terran commander and would go on to become the thing of legends after the Star League fell and is still talked about in revered tones to this day.
+The M-5 drones, known as Caspars, were the pinnacle of the SDS network and became legendary in the Inner Sphere. Designed as capital-class drones, the M-5 Caspars featured heavily modified Lola block II hulls and advanced drone control systems. They possessed firepower comparable to larger WarShips while maintaining the agility of destroyer-class ships. With their slashing assaults and superior coordination, the Caspars were considered the perfect WarShips, although they had a self-destruct system as a flaw.
 </overview>
 
 <deployment>
@@ -194,7 +194,7 @@ The SDS Drone Control System provides for (Gunnery 3, Piloting 4).
 </deployment>
 
 <history>
-The Caspar was the primary capital-class SDS drone. The M-5 was based upon the Lola block II hull, which was heavily modifying to make it a nightmare for any opponent. The design of the M-5 allowed it to nearly mount the firepower of a battleship-class ship while maintaining the thrust of a destroyer-class ship. Most worlds of the Hegemony were protected by at least a handful of M-5 drones while key worlds had multiple squadrons. Terra itself was defended by two hundred and fifty of these drones and if not for Kerensky's technicians devising a jamming system against them, the Inner Sphere today might still have the Amaris Empire sitting at its center.
+The M-5 Caspar drones, as the pinnacle of the SDS network, played a pivotal role during the tumultuous period of the Amaris Civil War. Most worlds within the Terran Hegemony possessed at least a handful of M-5 drones, with key worlds fielding multiple squadrons. However, it was Terra itself that housed the largest concentration of these formidable WarShip drones, with estimates suggesting that there were at least two hundred and fifty stationed there. The M-5 Caspars, named after an ancient Terran commander, were designed to be the primary capital-class drones within the SDS network. Using the unequipped Lola block II hull as a starting point, the M-5 underwent extensive modifications to achieve its final form. Although not intended for extended deployments and requiring external support for major repairs, the M-5 sacrificed cargo space to accommodate advanced drone control systems. This allowed it to possess firepower nearly equivalent to the larger Texas-class WarShip while maintaining the agility of a destroyer-class vessel.With a battery of naval lasers and paired heavy naval PPCs mounted in the nose, the Caspars had the ability to execute slashing assaults that often struck from outside an opponent's effective attack range. The extensive array of heat sinks enabled the drones to dive into enemy formations, unleashing their autocannon broadsides without fear of overheating. Considered by many as the perfect WarShip, the only notable flaw in the design was the self-destruct system built into the engine compartment. A well-placed hit to the aft section could trigger this system and destroy the M-5 drone. Despite their formidable capabilities, the M-5 Caspars were not invincible. General Aleksandr Kerensky and his forces faced the daunting task of devising a strategy to defeat the waves of M-5 drones guarding Terra. Recognizing the coordination network of the Caspars as their greatest strength, Kerensky's technicians developed a jamming system to disrupt their communication and coordination capabilities. This countermeasure proved crucial in turning the tide of the conflict and ultimately defeating the drones. Following the fall of Amaris and the Exodus of Kerensky's forces from the Inner Sphere, the M-5 Caspars were left behind. Some of the surviving drones were likely mothballed in naval caches, serving as reminders of their once-dominant presence. The Inner Sphere would continue to recount tales of the legendary M-5 Caspar drones, acknowledging their significant impact on the outcome of the Amaris Civil War and the shaping of history
 </history>
 
 <manufacturer>
@@ -209,12 +209,16 @@ New Earth
 SDS Drone Control System (Gunnery 3, Piloting 4).
 </notes>
 
+<use>
+Capital Drone
+</use>
+
 <length>
 628 meters
 </length>
 
 <source>
-LofT Vol 1 - Star League
+Historical:Liberation of Terra I - Star League
 </source>
 
 <tonnage>
@@ -233,6 +237,10 @@ LofT Vol 1 - Star League
 1
 </sail>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 229
 </crew>
diff --git a/megamek/data/mechfiles/warship/Hist LOT II/Stefan Amaris Battleship.blk b/megamek/data/mechfiles/warship/Hist LOT II/Stefan Amaris Battleship.blk
index 12bba322095..6af69fa4285 100644
--- a/megamek/data/mechfiles/warship/Hist LOT II/Stefan Amaris Battleship.blk	
+++ b/megamek/data/mechfiles/warship/Hist LOT II/Stefan Amaris Battleship.blk	
@@ -349,7 +349,7 @@ BattleShip
 </length>
 
 <source>
-LofT Vol II - Star League
+Historical:Liberation of Terra II - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/Hist Reunification War/Concordat Frigate (2506).blk b/megamek/data/mechfiles/warship/Hist Reunification War/Concordat Frigate (2506).blk
index eed2a934fde..ab6d2f46a77 100644
--- a/megamek/data/mechfiles/warship/Hist Reunification War/Concordat Frigate (2506).blk	
+++ b/megamek/data/mechfiles/warship/Hist Reunification War/Concordat Frigate (2506).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -239,8 +239,48 @@ IS Ammo LRM-15:80
 60
 </structural_integrity>
 
+<capabilities>
+The Concordat frigate fulfilled multiple roles with its impressive capabilities. Its heavy naval lasers positioned at the fore provided effective long-range engagement, while the medium-caliber naval autocannons delivered devastating firepower against even Star League battleships. Equipped with LRM and laser turrets covering each quarter, the Concordat possessed formidable defense against fighters and DropShips. It could accommodate a single squadron of fighters or small craft, and up to four DropShips, typically carrying fighters, could dock with the WarShip. The Concordat also carried shuttles and small craft for routine inspections and boarding actions, supported by its two platoons of marines.
+</capabilities>
+
+<overview>
+The TCS Concordat, developed by the Taurian Concordat in response to the expanding borders of neighboring realms, served as a versatile frigate bridging the gap between corvettes and destroyers. Its primary role was to patrol Periphery space lanes, commanding task forces and engaging enemy WarShips. With a combination of heavy naval lasers and medium-caliber naval autocannons, the Concordat excelled in long-range engagements and anti-WarShip firepower. It also boasted a robust defense system against fighters and DropShips, with multiple turrets and screen launchers.
+</overview>
+
+<history>
+The Taurian Concordat commenced the construction of the TCS Concordat in the early 26th century amidst the expansion of the Capellan Confederation and the Federated Suns. The frigate was designed to patrol Periphery space lanes, serve as a command ship for task forces, and directly engage enemy WarShips. Throughout the 26th century, the Concordat proved instrumental to the Taurian Navy and the Magistracy of Canopus, forming the backbone of their WarShip fleets. With over four dozen frigates in operation, the Taurian Navy held the largest WarShip fleet in the Periphery. While achieving remarkable successes against Inner Sphere fleets during the Reunification War, the Taurian Navy ultimately succumbed to the might of the Star League. Although no more Concordats were built after the war, a few of them survived until the First Succession War.
+</history>
+
+<manufacturer>
+Liberty Naval Yards, Concordat Aerospace Limited
+</manufacturer>
+
+<primaryFactory>
+Horsham,Taurus
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Frigate
+</use>
+
+<length>
+485 m
+</length>
+
+<height>
+1220 m Sail
+</height>
+
 <source>
-Hist:RW - Age of War
+Historical:Reunification War - Age of War
 </source>
 
 <tonnage>
@@ -259,6 +299,10 @@ Hist:RW - Age of War
 130
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 327
 </crew>
@@ -290,3 +334,4 @@ Hist:RW - Age of War
 <escape_pod>
 25
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/Hist Reunification War/Dreadnought Battleship (2330).blk b/megamek/data/mechfiles/warship/Hist Reunification War/Dreadnought Battleship (2330).blk
index e898948e590..2a276476efe 100644
--- a/megamek/data/mechfiles/warship/Hist Reunification War/Dreadnought Battleship (2330).blk	
+++ b/megamek/data/mechfiles/warship/Hist Reunification War/Dreadnought Battleship (2330).blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -331,8 +331,48 @@ IS Ammo AC/2:90
 60
 </structural_integrity>
 
+<capabilities>
+Designed to operate independently, the Dreadnought-class ships were equipped with a vast array of naval autocannons, both naval-grade and fighter-scale. These vessels had the ability to repulse fighter assaults and carried their own complement of fighters or small craft. With a cargo capacity of over 100,000 tons, the Dreadnought required frequent resupply due to its heavy-bore cannon consuming ammunition at a significant rate.
+</capabilities>
+
+<overview>
+The TAS Dreadnought, launched in 2300, was the first true combat vessel and the lead ship of its class. It played a crucial role in establishing the Terran Hegemony under the leadership of James McKenna. While initially perceived as mere playthings, the Dreadnought-class ships proved their worth through firepower demonstrations. Several ships of the class served the Hegemony Navy and were later surpassed by newer designs, eventually being retired and preserved as museum exhibits.
+</overview>
+
+<history>
+The Dreadnought class played a significant role in the Reunification War, performing admirably in the campaign. However, it marked the last major engagement for the class. By 2602, the Dreadnoughts were formally retired, with the remaining vessels either scrapped or gifted to Inner Sphere museums. The SLS Dreadnought, the last operational ship of the class, met its end during the Amaris Coup while escorting refugee vessels out of the occupied Hegemony before being scuttled due to catastrophic damage.
+</history>
+
+<manufacturer>
+Krester Ship Construction
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Battleship
+</use>
+
+<length>
+890 m
+</length>
+
+<height>
+1050 m Sail
+</height>
+
 <source>
-Hist:Rw - Age of War
+Historical:Reunification War - Age of War
 </source>
 
 <tonnage>
@@ -352,6 +392,10 @@ Hist:Rw - Age of War
 150
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 882
 </crew>
@@ -383,3 +427,4 @@ Hist:Rw - Age of War
 <escape_pod>
 60
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/Hist Reunification War/New Syrtis Carrier (2557).blk b/megamek/data/mechfiles/warship/Hist Reunification War/New Syrtis Carrier (2557).blk
index 8853462a1f5..d8f8560f59c 100644
--- a/megamek/data/mechfiles/warship/Hist Reunification War/New Syrtis Carrier (2557).blk	
+++ b/megamek/data/mechfiles/warship/Hist Reunification War/New Syrtis Carrier (2557).blk	
@@ -291,7 +291,7 @@ IS Ammo MG - Full:200
 </structural_integrity>
 
 <source>
-Hist:RW - Age of War
+Historical:Reunification War - Age of War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/IE3/Bug Eye Surveillance Ship.blk b/megamek/data/mechfiles/warship/IE3/Bug Eye Surveillance Ship.blk
index deb2f487b76..c06eae66fe8 100644
--- a/megamek/data/mechfiles/warship/IE3/Bug Eye Surveillance Ship.blk	
+++ b/megamek/data/mechfiles/warship/IE3/Bug Eye Surveillance Ship.blk	
@@ -16,9 +16,9 @@ Warship
 Bug-Eye Surveillance Ship
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 5801
@@ -37,13 +37,12 @@ IS Level 4
 </type>
 
 <motion_type>
-Aerodyne
+None
 </motion_type>
 
 <transporters>
-cargobay:270.5:1:4
-steeragequarters:310.0:0
-2ndclassquarters:70.0:0
+steeragequarters:360.0:0
+cargobay:41.5:1:1
 </transporters>
 
 <SafeThrust>
@@ -62,10 +61,6 @@ steeragequarters:310.0:0
 960
 </fuel>
 
-<engine_type>
-1
-</engine_type>
-
 <armor_type>
 13
 </armor_type>
@@ -74,6 +69,10 @@ steeragequarters:310.0:0
 5
 </armor_tech>
 
+<internal_type>
+-1
+</internal_type>
+
 <armor>
 2
 3
@@ -88,9 +87,11 @@ steeragequarters:310.0:0
 </Nose Equipment>
 
 <Left Front Side Equipment>
+(B) Large Laser
 </Left Front Side Equipment>
 
 <Right Front Side Equipment>
+(B) Large Laser
 </Right Front Side Equipment>
 
 <Aft Equipment>
@@ -106,17 +107,15 @@ IS Ammo AC/20:30
 
 <Hull Equipment>
 ISLargeNavalCommScannerSuite
-ISLookDownRadar
-ISInfraredImager
 ISHighResImager
+ISInfraredImager
+ISLookDownRadar
 </Hull Equipment>
 
 <Left Broadsides Equipment>
-(B) Large Laser
 </Left Broadsides Equipment>
 
 <Right Broadsides Equipment>
-(B) Large Laser
 </Right Broadsides Equipment>
 
 <structural_integrity>
@@ -136,8 +135,7 @@ With little solid information about the class ever revealed, no variants are kno
 </deployment>
 
 <history>
-Commissioned by the HAF to replace the aging Nightwing and Tracker vessels in 2524, the distinguished service record of the compact and highly complex Bug-Eye continued when it entered service with the Star League Navy in 2620. The Bug-Eye was effectively obsolete in the Inner Sphere from 2770 onwards, although at least one vessel would find her way into service with the company Interstellar Expeditions as late as the thirty-first century. While a few examples survived the liberation of Terra and accompanied the Exodus fleet, the tactical role of the Bug-Eye has no place among the Clans who mothballed the design. The Terran Hegemony continued to operate Bug-Eye ships throughout the Star League era, keeping a watching eye on its neighbors and the Periphery states. The Hegemony Armed Forces spared no expense in equipping the Bug-Eye to be a premiere spy ship, giving over almost a tenth of the total mass of the ship to advanced equipment such as a large naval communications scanner suite, as well as a lookdown radar and hyperspectral scanner for observing locations on the ground. The Bug-Eye was kept intentionally to the size of common aerodyne DropShips of the era such as the Buccaneer and Baby Sylvester and was designed in such a fashion that with just a few weeks of work inside a shipyard, modular fittings could be installed onto the Bug-Eye that would make it resemble other vessels both optically and thermally. This allowed the crew of the Bug-Eye to convincingly explain why the supposed DropShip didn't land on planets, by instead masquerading as DropShip designs such as passenger or luxury liners that didn't need to land. Common deployment tactics for the Bug-Eye included either jumping into a system alongside a civilian JumpShip, arriving approximately twenty-eight kilometers apart - the minimum safe separation between vessels - or instead jumping into the outer fringes of the system and then maneuvering to pass through a safe jump point as the JumpShip arrived.
-Bug-Eyes were considered to be spartan vessels despite the generous amount of crew space aboard; the lack of any grav decks meant that personnel had to follow zero-g exercise regimens and undergo medical treatments to prevent bone deterioration, in addition to dealing with the constant stress of operating as the crew of a dedicated spyship.
+Commissioned by the HAF to replace the aging Nightwing and Tracker vessels in 2524, the distinguished service record of the compact and highly complex Bug-Eye continued when it entered service with the Star League Navy in 2620. The Bug-Eye was effectively obsolete in the Inner Sphere from 2770 onwards, although at least one vessel would find her way into service with the company Interstellar Expeditions as late as the thirty-first century. While a few examples survived the liberation of Terra and accompanied the Exodus fleet, the tactical role of the Bug-Eye has no place among the Clans who mothballed the design. The Terran Hegemony continued to operate Bug-Eye ships throughout the Star League era, keeping a watching eye on its neighbors and the Periphery states. The Hegemony Armed Forces spared no expense in equipping the Bug-Eye to be a premiere spy ship, giving over almost a tenth of the total mass of the ship to advanced equipment such as a large naval communications scanner suite, as well as a lookdown radar and hyperspectral scanner for observing locations on the ground. The Bug-Eye was kept intentionally to the size of common aerodyne DropShips of the era such as the Buccaneer and Baby Sylvester and was designed in such a fashion that with just a few weeks of work inside a shipyard, modular fittings could be installed onto the Bug-Eye that would make it resemble other vessels both optically and thermally. This allowed the crew of the Bug-Eye to convincingly explain why the supposed DropShip didn't land on planets, by instead masquerading as DropShip designs such as passenger or luxury liners that didn't need to land. Common deployment tactics for the Bug-Eye included either jumping into a system alongside a civilian JumpShip, arriving approximately twenty-eight kilometers apart - the minimum safe separation between vessels - or instead jumping into the outer fringes of the system and then maneuvering to pass through a safe jump point as the JumpShip arrived. Bug-Eyes were considered to be spartan vessels despite the generous amount of crew space aboard; the lack of any grav decks meant that personnel had to follow zero-g exercise regimens and undergo medical treatments to prevent bone deterioration, in addition to dealing with the constant stress of operating as the crew of a dedicated spyship.
 </history>
 
 <manufacturer>
@@ -173,7 +171,7 @@ Surveillance
 </width>
 
 <source>
-IE3 - Star League
+Intersteller Players 3 - Star League
 </source>
 
 <tonnage>
@@ -181,13 +179,17 @@ IE3 - Star League
 </tonnage>
 
 <kf_core>
-1
+2
 </kf_core>
 
 <sail>
 1
 </sail>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 60
 </crew>
diff --git a/megamek/data/mechfiles/warship/IE3/Faslane Yard Ship.blk b/megamek/data/mechfiles/warship/IE3/Faslane Yard Ship.blk
index 81fe3c567e2..70ba0351c91 100644
--- a/megamek/data/mechfiles/warship/IE3/Faslane Yard Ship.blk	
+++ b/megamek/data/mechfiles/warship/IE3/Faslane Yard Ship.blk	
@@ -3,7 +3,7 @@
 1
 </BlockVersion>
 
-# Write the version number just in case...
+##Write the version number just in case...
 <Version>
 MAM0
 </Version>
@@ -16,9 +16,9 @@ Warship
 Faslane Yardship
 </Name>
 
-<model>
+<Model>
 
-</model>
+</Model>
 
 <mul id:>
 5802
@@ -46,9 +46,9 @@ dockingcollar
 dockingcollar
 1stclassquarters:250.0:0
 2ndclassquarters:630.0:0
-navalrepairunpressurized:2000000.0:1:4:f0
+navalrepairunpressurized:2000000.0:1:6:f0
 crewquarters:1190.0:0
-cargobay:128610.0:1:6
+cargobay:128610.0:1:8
 </transporters>
 
 <SafeThrust>
@@ -248,8 +248,48 @@ ISArtemisIV
 30
 </structural_integrity>
 
+<capabilities>
+Faslanes serve as ship-repair yards in space and support operations of the Com Guards and Explorer Corps. They are armed with anti-fighter lasers, LRM launchers, medium naval PPCs, and autocannons for defensive purposes. The presence of weaponry and armor allows them to defend against potential threats while conducting their repair and maintenance tasks. While not designed for direct combat, their weapons systems provide a respectable level of defense.
+</capabilities>
+
+<overview>
+The Faslane-class yardships are specialized WarShips constructed around ship-repair yards. Despite their relatively small size of 550,000 tons, these vessels are nearly three times the length of a Clan Whirlwind destroyer. Originally based on the Star League Newgrange class, six Faslanes were constructed by the Com Guards between 2882 and 2949. While primarily non-combat vessels, Faslanes are equipped with respectable weapon and defensive systems to protect themselves. They carry anti-fighter lasers, LRM launchers, medium naval PPCs, and autocannons. The Faslanes also feature 100 tons of ferro-aluminum armor primarily designed to withstand accidental collisions.
+</overview>
+
+<history>
+Six Faslane-class yardships were constructed by the Com Guards between 2882 and 2949, with two vessels dispatched to the Periphery to support Explorer Corps operations. The remaining Faslanes were docked at holding facilities in Luyten 68-28 and Ross 248, carefully protected from pirates and concealed from the Clans. After assisting in the search for the Clan homeworlds, most of the Faslanes were destroyed by the Word of Blake. The surviving three ships eventually merged into the naval forces of the Republic of the Sphere and are currently stationed in the Terran system. They now serve as repair tenders, aiding in the recovery and restoration of the Titan shipyards damaged during the wartime conflicts.
+</history>
+
+<manufacturer>
+O'Neil Yards - Titan Yards
+</manufacturer>
+
+<primaryFactory>
+Terra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
+<use>
+Yardship
+</use>
+
+<length>
+1810 m
+</length>
+
+<height>
+920 m Sail
+</height>
+
 <source>
-IE3 - Early Succession War
+Intersteller Players 3 - Early Succession War
 </source>
 
 <tonnage>
@@ -269,6 +309,10 @@ IE3 - Early Succession War
 110
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 205
 </crew>
@@ -300,3 +344,4 @@ IE3 - Early Succession War
 <escape_pod>
 10
 </escape_pod>
+
diff --git a/megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship Eyrines.blk b/megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship Eyrines.blk
index 5d01c14a36b..d7494ecb36e 100644
--- a/megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship Eyrines.blk	
+++ b/megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship Eyrines.blk	
@@ -233,7 +233,7 @@ No Stats available for this unit. Reduced Cargo Space and add Heavy Mass Driver.
 </notes>
 
 <source>
-JHS3076 - Star League
+Jihad Hot Spots:3076 - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship (Standard).blk b/megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship.blk
similarity index 99%
rename from megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship (Standard).blk
rename to megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship.blk
index 92a6dbd8bb2..5d4e2393cb8 100644
--- a/megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship (Standard).blk	
+++ b/megamek/data/mechfiles/warship/JHS 3076/Newgrange Yardship.blk	
@@ -227,7 +227,7 @@ ISAMS Ammo:240
 </structural_integrity>
 
 <source>
-JHS3076 - Star League
+Jihad Hot Spots:3076 - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/JHS Terra/Naga Caspar II Control Ship.blk b/megamek/data/mechfiles/warship/JHS Terra/Naga Caspar II Control Ship.blk
index 8ba7354a5db..feccb4f4e0c 100644
--- a/megamek/data/mechfiles/warship/JHS Terra/Naga Caspar II Control Ship.blk	
+++ b/megamek/data/mechfiles/warship/JHS Terra/Naga Caspar II Control Ship.blk	
@@ -300,11 +300,11 @@ Ammo Screen:10
 </structural_integrity>
 
 <notes>
-Rebult to match TRO but unit is illegal. Due to number of pressurized bays and facings.
+Rebult to match TRO: but unit is illegal. Due to number of pressurized bays and facings.
 </notes>
 
 <source>
-JHSTerra - Civil War
+Jihad Hot Spots:Terra - Civil War
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/ToS Valencia/Conestoga_Transport_Jumpship.blk b/megamek/data/mechfiles/warship/ToS Valencia/Conestoga_Transport_Jumpship.blk
index 89e066c48a0..1c24ac7eafe 100644
--- a/megamek/data/mechfiles/warship/ToS Valencia/Conestoga_Transport_Jumpship.blk	
+++ b/megamek/data/mechfiles/warship/ToS Valencia/Conestoga_Transport_Jumpship.blk	
@@ -154,10 +154,54 @@ Medium Laser
 20
 </structural_integrity>
 
+<capabilities>
+The Conestoga boasted expansive cargo bays that could accommodate different configurations, ranging from colonist transport to dedicated cargo vessels. It could transport up to 10,000 steerage-class passengers and over 90,000 tons of cargo simultaneously. The vessel featured four large grav decks to provide planetary gravity during short transports. For longer trips and colony startups, the cylindrical design allowed for easy spinning, creating artificial gravity in the cargo bays. Additionally, the Conestoga incorporated weaponry, including large and medium lasers, primarily for meteor defense and anti-boarding measures.
+</capabilities>
+
+<overview>
+The Conestoga Transport JumpShip, launched by Boeing Interstellar in 2310, was a notable example of early interstellar transport vessels. Based on the Cruiser-class frame and engines, the Conestoga featured a simple design with vast cargo bays that could be easily reconfigured for various purposes. It was renowned for its ruggedness and versatility, capable of transporting large numbers of passengers and substantial amounts of cargo.
+</overview>
+
+<history>
+As a product of the early Age of War era, the Conestoga served as a representative example of primitive JumpShips built by the Terran Alliance, Terran Hegemony, and other factions. Despite its utility and success in various roles, advancements in production techniques and the introduction of the DropShip/JumpShip combination eventually rendered the Conestoga obsolete. The Reunification War marked the decline of such primitive vessels, as the Periphery states' attempts to employ upgraded versions against the powerful Star League navy proved unsuccessful. By 2600, these early relics of interstellar travel had become nearly extinct, with only occasional derelicts found in orbital junkyards or abandoned in distant Periphery stars. The last remaining Conestogas were scrapped from Nueva Castilian service in 2935, as modern replacements became more readily available.
+</history>
+
+<manufacturer>
+Boeing Interstellar
+</manufacturer>
+
+<primaryFactory>
+Terrra
+</primaryFactory>
+
+<systemManufacturers>
+CHASSIS:Unknown
+ENGINE:Unknown
+ARMOR:Unknown
+COMMUNICATIONS:Unknown
+TARGETING:Unknown
+</systemManufacturers>
+
 <imagepath>
 .\data\images\fluff\Aero\Conestoga Transport Jumpship.png
 </imagepath>
 
+<use>
+Transport
+</use>
+
+<length>
+400 m
+</length>
+
+<height>
+1097 m Sail
+</height>
+
+<source>
+ToS - Valencia - Age of War
+</source>
+
 <tonnage>
 700000.0
 </tonnage>
@@ -181,6 +225,10 @@ Medium Laser
 250
 </grav_decks>
 
+<designtype>
+1
+</designtype>
+
 <crew>
 230
 </crew>
diff --git a/megamek/data/mechfiles/warship/XTR/Gunslingers/Kimagure Pursuit Cruiser Surprise.blk b/megamek/data/mechfiles/warship/XTR/Gunslingers/Kimagure Pursuit Cruiser Surprise.blk
index 5a2463598fe..35b761e4e1a 100644
--- a/megamek/data/mechfiles/warship/XTR/Gunslingers/Kimagure Pursuit Cruiser Surprise.blk	
+++ b/megamek/data/mechfiles/warship/XTR/Gunslingers/Kimagure Pursuit Cruiser Surprise.blk	
@@ -194,7 +194,7 @@ Naval PPC (Medium)
 </structural_integrity>
 
 <source>
-XTRO Gunslingers - Star League
+XTR: Gunslingers - Star League
 </source>
 
 <tonnage>
diff --git a/megamek/data/mechfiles/warship/XTR/Republic III/Leviathan III Battleship.blk b/megamek/data/mechfiles/warship/XTR/Republic III/Leviathan III Battleship.blk
index 0edecba523a..1a7a9c432b2 100644
--- a/megamek/data/mechfiles/warship/XTR/Republic III/Leviathan III Battleship.blk	
+++ b/megamek/data/mechfiles/warship/XTR/Republic III/Leviathan III Battleship.blk	
@@ -774,7 +774,7 @@ Clan Ammo ATM-12:900
 </structural_integrity>
 
 <source>
-XTR RotS 3 - Dark Ages
+XTR: Republic III -Dark Ages
 </source>
 
 <tonnage>
diff --git a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Liao/Mech/Light/3055 House Liao - Light.txt b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Liao/Mech/Light/3055 House Liao - Light.txt
index 8bc3a7b9451..2c446dcfc8a 100644
--- a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Liao/Mech/Light/3055 House Liao - Light.txt	
+++ b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Liao/Mech/Light/3055 House Liao - Light.txt	
@@ -7,6 +7,6 @@ Raven RVN-3L,5
 Raven RVN-3L,6
 Spider SDR-5V,5
 UrbanMech UM-R60,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Wasp WSP-1L,2
 Cossack C-SK1,1
diff --git a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Liao/Mech/Light/3062 House Liao - Light.txt b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Liao/Mech/Light/3062 House Liao - Light.txt
index c3afeb69926..cb755a41569 100644
--- a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Liao/Mech/Light/3062 House Liao - Light.txt	
+++ b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Liao/Mech/Light/3062 House Liao - Light.txt	
@@ -7,6 +7,6 @@ Raven RVN-3L,5
 Raven RVN-3L,6
 Spider SDR-7M,5
 UrbanMech UM-R63,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Wasp WSP-3M,2
 Cossack C-SK1,1
diff --git a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Marik/Mech/Light/3055 House Marik - Light.txt b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Marik/Mech/Light/3055 House Marik - Light.txt
index 2540c819101..2b4c4f9b882 100644
--- a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Marik/Mech/Light/3055 House Marik - Light.txt	
+++ b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Marik/Mech/Light/3055 House Marik - Light.txt	
@@ -1,5 +1,5 @@
 3055 House Marik - Light
-Tarantula ZPH-1A,1
+Tarantula ZPH-1,1
 Eagle EGL-1M,2
 Jackal JA-KL-1532,3
 Hermes HER-1A,4
diff --git a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Marik/Mech/Light/3062 House Marik - Light.txt b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Marik/Mech/Light/3062 House Marik - Light.txt
index 8677aa786d8..2d991b940c6 100644
--- a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Marik/Mech/Light/3062 House Marik - Light.txt	
+++ b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/House Marik/Mech/Light/3062 House Marik - Light.txt	
@@ -1,5 +1,5 @@
 3062 House Marik - Light
-Tarantula ZPH-1A,1
+Tarantula ZPH-1,1
 Eagle EGL-1M,2
 Jackal JA-KL-1532,3
 Hermes HER-3S,4
diff --git a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/St Ives Compact/Mech/Light/3055 Saint Ives Compact - Light.txt b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/St Ives Compact/Mech/Light/3055 Saint Ives Compact - Light.txt
index f7fccaaf88f..2d9b973a1df 100644
--- a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/St Ives Compact/Mech/Light/3055 Saint Ives Compact - Light.txt	
+++ b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/St Ives Compact/Mech/Light/3055 Saint Ives Compact - Light.txt	
@@ -7,6 +7,6 @@ Raven RVN-3L,5
 Raven RVN-3L,6
 Spider SDR-5V,5
 UrbanMech UM-R60,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Wasp WSP-1L,2
 Cossack C-SK1,1
diff --git a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/St Ives Compact/Mech/Light/3062 Saint Ives Compact - Light.txt b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/St Ives Compact/Mech/Light/3062 Saint Ives Compact - Light.txt
index 8d0d5563872..a822c35e21d 100644
--- a/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/St Ives Compact/Mech/Light/3062 Saint Ives Compact - Light.txt	
+++ b/megamek/data/rat/(3053 - 3062) - Era Report 3062/Inner Sphere/St Ives Compact/Mech/Light/3062 Saint Ives Compact - Light.txt	
@@ -7,6 +7,6 @@ Raven RVN-3L,5
 Raven RVN-3L,6
 Spider SDR-7M,5
 UrbanMech UM-R63,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Wasp WSP-3M,2
 Cossack C-SK1,1
diff --git a/megamek/data/rat/(3055 - 3085) - Total Warfare/Inner Sphere/Liao/House Liao Light Mech.txt b/megamek/data/rat/(3055 - 3085) - Total Warfare/Inner Sphere/Liao/House Liao Light Mech.txt
index 13cd310da1c..72542d12605 100644
--- a/megamek/data/rat/(3055 - 3085) - Total Warfare/Inner Sphere/Liao/House Liao Light Mech.txt	
+++ b/megamek/data/rat/(3055 - 3085) - Total Warfare/Inner Sphere/Liao/House Liao Light Mech.txt	
@@ -7,7 +7,7 @@ Firestarter FS9-S,5
 Raven RVN-3L,6
 Spider SDR-5V,5
 Cossack C-SK1,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Javelin JVN-10N,2
 UrbanMech UM-R60,1
 #Edited by Harold "BATTLEMASTER" N.
diff --git a/megamek/data/rat/(3055 - 3085) - Total Warfare/Inner Sphere/Marik/House Marik Light Mech.txt b/megamek/data/rat/(3055 - 3085) - Total Warfare/Inner Sphere/Marik/House Marik Light Mech.txt
index a5abdc8fc21..0596f5c46a3 100644
--- a/megamek/data/rat/(3055 - 3085) - Total Warfare/Inner Sphere/Marik/House Marik Light Mech.txt	
+++ b/megamek/data/rat/(3055 - 3085) - Total Warfare/Inner Sphere/Marik/House Marik Light Mech.txt	
@@ -1,6 +1,6 @@
 House Marik Light 'Mech
-Tarantula ZPH-1A,1
-Tarantula ZPH-1A,2
+Tarantula ZPH-1,1
+Tarantula ZPH-1,2
 Jackal JA-KL-1532,3
 Hermes HER-3S,4
 Spider SDR-7M,5
@@ -9,6 +9,6 @@ Hammer HMR-3M,5
 Jenner JR7-D,4
 Hermes HER-3S,3
 Falcon Hawk FNHK-9K,2
-Tarantula ZPH-1A,1
+Tarantula ZPH-1,1
 #Edited by Harold "BATTLEMASTER" N.
 #3/2/2011
\ No newline at end of file
diff --git a/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs A.txt b/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs A.txt
index 5d6cc6523e8..fb1c8af8eca 100644
--- a/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs A.txt	
+++ b/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs A.txt	
@@ -1,7 +1,7 @@
 3059 Free Worlds League Light Mechs, Tech Level A
 Firestarter FS9-S1,1
 Falcon Hawk FNHK-9K,2
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Wasp WSP-3M,4
 Locust LCT-3M,5
 Stinger STG-5M,6
diff --git a/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs B.txt b/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs B.txt
index 426e267dbd3..3f3740f5f63 100644
--- a/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs B.txt	
+++ b/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs B.txt	
@@ -1,7 +1,7 @@
 3059 Free Worlds League Light Mechs, Tech Level B
 Firestarter FS9-S1,1
-Tarantula ZPH-1A,2
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,2
+Tarantula ZPH-1,3
 Wasp WSP-3M,4
 Stinger STG-5M,5
 Locust LCT-3M,6
diff --git a/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs C.txt b/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs C.txt
index 664a75cd0c0..0647e6b3c58 100644
--- a/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs C.txt	
+++ b/megamek/data/rat/(3058) - FM Free Worlds League/Mechs/Light/FWLM Light Mechs C.txt	
@@ -1,5 +1,5 @@
 3059 Free Worlds League Light Mechs, Tech Level C
-Tarantula ZPH-1A,1
+Tarantula ZPH-1,1
 Ostscout OTT-7J,2
 Stinger STG-5M,3
 Javelin JVN-10P,4
diff --git a/megamek/data/rat/(3059) - Battleforce 2/(3059) - Battleforce 2/Inner Sphere/Capellan Confederation/Mechs/3059 CCAF Light Mechs.txt b/megamek/data/rat/(3059) - Battleforce 2/(3059) - Battleforce 2/Inner Sphere/Capellan Confederation/Mechs/3059 CCAF Light Mechs.txt
index 31bf8f4a230..507bfa564f1 100644
--- a/megamek/data/rat/(3059) - Battleforce 2/(3059) - Battleforce 2/Inner Sphere/Capellan Confederation/Mechs/3059 CCAF Light Mechs.txt	
+++ b/megamek/data/rat/(3059) - Battleforce 2/(3059) - Battleforce 2/Inner Sphere/Capellan Confederation/Mechs/3059 CCAF Light Mechs.txt	
@@ -7,6 +7,6 @@ Firestarter FS9-S,5
 Raven RVN-3L,6
 Spider SDR-5V,5
 UrbanMech UM-R63,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Javelin JVN-10N,2
 UrbanMech UM-R60,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3059) - Battleforce 2/(3059) - Battleforce 2/Inner Sphere/Free Worlds League/Mechs/3059 FWLM Light Mechs.txt b/megamek/data/rat/(3059) - Battleforce 2/(3059) - Battleforce 2/Inner Sphere/Free Worlds League/Mechs/3059 FWLM Light Mechs.txt
index 3880c3c2834..60bbfed4505 100644
--- a/megamek/data/rat/(3059) - Battleforce 2/(3059) - Battleforce 2/Inner Sphere/Free Worlds League/Mechs/3059 FWLM Light Mechs.txt	
+++ b/megamek/data/rat/(3059) - Battleforce 2/(3059) - Battleforce 2/Inner Sphere/Free Worlds League/Mechs/3059 FWLM Light Mechs.txt	
@@ -1,6 +1,6 @@
 3059 Free Worlds League Light Mechs
-Tarantula ZPH-1A,1
-Tarantula ZPH-1A,2
+Tarantula ZPH-1,1
+Tarantula ZPH-1,2
 Jackal JA-KL-1532,3
 Hermes HER-3S,4
 Spider SDR-7M,5
@@ -9,4 +9,4 @@ Hammer HMR-3M,5
 Jenner JR7-D,4
 Hermes HER-3S,3
 Falcon Hawk FNHK-9K,2
-Tarantula ZPH-1A,1
\ No newline at end of file
+Tarantula ZPH-1,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3062) - FM Comstar/Inner Sphere/Word of Blake/Mechs/Light Mechs/Word of Blake A.txt b/megamek/data/rat/(3062) - FM Comstar/Inner Sphere/Word of Blake/Mechs/Light Mechs/Word of Blake A.txt
index eb268bedf7c..d9ffe73c48b 100644
--- a/megamek/data/rat/(3062) - FM Comstar/Inner Sphere/Word of Blake/Mechs/Light Mechs/Word of Blake A.txt	
+++ b/megamek/data/rat/(3062) - FM Comstar/Inner Sphere/Word of Blake/Mechs/Light Mechs/Word of Blake A.txt	
@@ -6,7 +6,7 @@ Mongoose MON-66,4
 Mercury MCY-99,5
 Mongoose MON-66,6
 Mercury MCY-97,5
-Tarantula ZPH-1A,4
+Tarantula ZPH-1,4
 Falcon Hawk FNHK-9K,3
 Hussar HSR-400-D,2
 Nexus NXS1-A,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3062) - FM Federated Suns/Mechs/Light/Late 3062 Light Mechs C.txt b/megamek/data/rat/(3062) - FM Federated Suns/Mechs/Light/Late 3062 Light Mechs C.txt
index 3dc72f1afaa..22273d23f98 100644
--- a/megamek/data/rat/(3062) - FM Federated Suns/Mechs/Light/Late 3062 Light Mechs C.txt	
+++ b/megamek/data/rat/(3062) - FM Federated Suns/Mechs/Light/Late 3062 Light Mechs C.txt	
@@ -1,5 +1,5 @@
 Late 3062 AFFS Light Mechs, Tech Level C
-Tarantula ZPH-1A,1
+Tarantula ZPH-1,1
 Raven RVN-3L,2
 Wolfhound WLF-2,3
 Firestarter FS9-S,4
diff --git a/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Capellan Confederation/Mechs/Light Mechs.txt b/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Capellan Confederation/Mechs/Light Mechs.txt
index b1eaf0c8743..83711104052 100644
--- a/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Capellan Confederation/Mechs/Light Mechs.txt	
+++ b/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Capellan Confederation/Mechs/Light Mechs.txt	
@@ -7,6 +7,6 @@ Firestarter FS9-S,5
 Raven RVN-3L,6
 Spider SDR-5V,5
 UrbanMech UM-R63,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Javelin JVN-10N,2
 UrbanMech UM-R60,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Free Worlds League/Mechs/Light Mechs.txt b/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Free Worlds League/Mechs/Light Mechs.txt
index 0fed9639151..4882bd24bd6 100644
--- a/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Free Worlds League/Mechs/Light Mechs.txt	
+++ b/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Free Worlds League/Mechs/Light Mechs.txt	
@@ -1,5 +1,5 @@
 Free Worlds League Light Mechs - 3063
-Tarantula ZPH-1A,1
+Tarantula ZPH-1,1
 Eagle EGL-1M,2
 Jackal JA-KL-1532,3
 Hermes HER-3S,4
@@ -9,4 +9,4 @@ Hammer HMR-3M,5
 Jenner JR7-D,4
 Eagle EGL-2M,3
 Falcon Hawk FNHK-9K,2
-Tarantula ZPH-1A,1
\ No newline at end of file
+Tarantula ZPH-1,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Word of Blake/Mechs/3063 Word of Blake Light Mechs.txt b/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Word of Blake/Mechs/3063 Word of Blake Light Mechs.txt
index ee8ae46dff4..021749ce75e 100644
--- a/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Word of Blake/Mechs/3063 Word of Blake Light Mechs.txt	
+++ b/megamek/data/rat/(3063 - 3075) - Mechwarrior 3rd Ed RATs/Inner Sphere/Word of Blake/Mechs/3063 Word of Blake Light Mechs.txt	
@@ -6,7 +6,7 @@ Mongoose MON-66,4
 Mercury MCY-99,5
 Mongoose MON-66,6
 Mercury MCY-97,5
-Tarantula ZPH-1A,4
+Tarantula ZPH-1,4
 Falcon Hawk FNHK-9K,3
 Hussar HSR-400-D,2
 Nexus NXS1-A,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3063) - FM Capellan Confederation/CCAF/Mechs/Light/3063 CCAF Light Mechs A.txt b/megamek/data/rat/(3063) - FM Capellan Confederation/CCAF/Mechs/Light/3063 CCAF Light Mechs A.txt
index b5658308b50..16d2c7d02ce 100644
--- a/megamek/data/rat/(3063) - FM Capellan Confederation/CCAF/Mechs/Light/3063 CCAF Light Mechs A.txt	
+++ b/megamek/data/rat/(3063) - FM Capellan Confederation/CCAF/Mechs/Light/3063 CCAF Light Mechs A.txt	
@@ -2,7 +2,7 @@
 Owens OW-1D,1
 Falcon Hawk FNHK-9K,2
 Duan Gung D9-G9,3
-Tarantula ZPH-1A,4
+Tarantula ZPH-1,4
 Spider SDR-7M,5
 Raven RVN-3L,6
 Raven RVN-4L,5
diff --git a/megamek/data/rat/(3063) - FM Capellan Confederation/CCAF/Mechs/Light/3063 CCAF Light Mechs B.txt b/megamek/data/rat/(3063) - FM Capellan Confederation/CCAF/Mechs/Light/3063 CCAF Light Mechs B.txt
index bf12acbab28..d48e1a40266 100644
--- a/megamek/data/rat/(3063) - FM Capellan Confederation/CCAF/Mechs/Light/3063 CCAF Light Mechs B.txt	
+++ b/megamek/data/rat/(3063) - FM Capellan Confederation/CCAF/Mechs/Light/3063 CCAF Light Mechs B.txt	
@@ -8,5 +8,5 @@ UrbanMech UM-R63,6
 Raven RVN-3L,5
 Raven RVN-3L,4
 Jenner JR7-F,3
-Tarantula ZPH-1A,2
+Tarantula ZPH-1,2
 Duan Gung D9-G9,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3064) - FM Periphery/Inner Sphere/Magistracy of Canopus/Mechs/Light/3064 MAF Light Mechs A.txt b/megamek/data/rat/(3064) - FM Periphery/Inner Sphere/Magistracy of Canopus/Mechs/Light/3064 MAF Light Mechs A.txt
index db8fb954d18..c01622b196c 100644
--- a/megamek/data/rat/(3064) - FM Periphery/Inner Sphere/Magistracy of Canopus/Mechs/Light/3064 MAF Light Mechs A.txt	
+++ b/megamek/data/rat/(3064) - FM Periphery/Inner Sphere/Magistracy of Canopus/Mechs/Light/3064 MAF Light Mechs A.txt	
@@ -3,7 +3,7 @@ Eagle EGL-2M,1
 Duan Gung D9-G9,2
 Jenner JR7-K,3
 Anubis ABS-3L,4
-Tarantula ZPH-1A,5
+Tarantula ZPH-1,5
 Spider SDR-7M,6
 Raven RVN-3L,5
 Javelin JVN-10P,4
diff --git a/megamek/data/rat/(3067 - 3085) - Strategic Operations/Inner Sphere/Mechs/Magistracy of Canopus/Late 3075 Canopian Light Mechs.txt b/megamek/data/rat/(3067 - 3085) - Strategic Operations/Inner Sphere/Mechs/Magistracy of Canopus/Late 3075 Canopian Light Mechs.txt
index c08e03011a3..ec6a581cba4 100644
--- a/megamek/data/rat/(3067 - 3085) - Strategic Operations/Inner Sphere/Mechs/Magistracy of Canopus/Late 3075 Canopian Light Mechs.txt	
+++ b/megamek/data/rat/(3067 - 3085) - Strategic Operations/Inner Sphere/Mechs/Magistracy of Canopus/Late 3075 Canopian Light Mechs.txt	
@@ -2,7 +2,7 @@ Magistracy of Canopus Light Mechs Late 3075
 Wasp WSP-3L,1
 Stinger STG-6L,2
 Eagle EGL-2M,3
-Tarantula ZPH-1A,4
+Tarantula ZPH-1,4
 Duan Gung D9-G9,5
 Anubis ABS-3R,6
 Raven RVN-3L,5
diff --git a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Magistracy of Canopus/Mech/Light/Magistracy of Canopus Light Mech A.txt b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Magistracy of Canopus/Mech/Light/Magistracy of Canopus Light Mech A.txt
index 112e445df92..a9f2ec3481f 100644
--- a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Magistracy of Canopus/Mech/Light/Magistracy of Canopus Light Mech A.txt	
+++ b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Magistracy of Canopus/Mech/Light/Magistracy of Canopus Light Mech A.txt	
@@ -3,7 +3,7 @@ Wasp WSP-3L,1
 Stinger STG-6L,2
 Eagle EGL-2M,3
 Anubis ABS-3L,4
-Tarantula ZPH-1A,5
+Tarantula ZPH-1,5
 Spider SDR-7M,6
 Javelin JVN-10P,5
 Anubis ABS-3R,4
diff --git a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Mercenaries/Mech/Light/Mercenaries Light 'Mech B.txt b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Mercenaries/Mech/Light/Mercenaries Light 'Mech B.txt
index 44582440a5b..3a70a4674bd 100644
--- a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Mercenaries/Mech/Light/Mercenaries Light 'Mech B.txt	
+++ b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Mercenaries/Mech/Light/Mercenaries Light 'Mech B.txt	
@@ -3,7 +3,7 @@ Cossack C-SK1,1
 Night Hawk NTK-2Q,2
 Talon TLN-5W,3
 Dart DRT-3S,4
-Tarantula ZPH-1A,5
+Tarantula ZPH-1,5
 Battle Hawk BH-K305,6
 Jackal JA-KL-1532,5
 Hammer HMR-3M,4
diff --git a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Mercenaries/Mech/Light/Mercenaries Light 'Mech C.txt b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Mercenaries/Mech/Light/Mercenaries Light 'Mech C.txt
index 72bff18a7d2..9c68d2c46cc 100644
--- a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Mercenaries/Mech/Light/Mercenaries Light 'Mech C.txt	
+++ b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Mercenaries/Mech/Light/Mercenaries Light 'Mech C.txt	
@@ -1,5 +1,5 @@
 Mercenaries Light C 'Mech
-Tarantula ZPH-1A,1
+Tarantula ZPH-1,1
 Battle Hawk BH-K305,2
 Spider SDR-7M,3
 Panther PNT-10K,4
diff --git a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Periphery/Mech/Magistracy of Canopus Light Mech A.txt b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Periphery/Mech/Magistracy of Canopus Light Mech A.txt
index 112e445df92..a9f2ec3481f 100644
--- a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Periphery/Mech/Magistracy of Canopus Light Mech A.txt	
+++ b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Periphery/Mech/Magistracy of Canopus Light Mech A.txt	
@@ -3,7 +3,7 @@ Wasp WSP-3L,1
 Stinger STG-6L,2
 Eagle EGL-2M,3
 Anubis ABS-3L,4
-Tarantula ZPH-1A,5
+Tarantula ZPH-1,5
 Spider SDR-7M,6
 Javelin JVN-10P,5
 Anubis ABS-3R,4
diff --git a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Word of Blake/Mech/Light/WoB (FMU) Light Mech A.txt b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Word of Blake/Mech/Light/WoB (FMU) Light Mech A.txt
index caa1df2b0e0..5c231261bbf 100644
--- a/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Word of Blake/Mech/Light/WoB (FMU) Light Mech A.txt	
+++ b/megamek/data/rat/(3067) - FM Updates/Inner Sphere/Word of Blake/Mech/Light/WoB (FMU) Light Mech A.txt	
@@ -8,5 +8,5 @@ Gurkha GUR-2G,6
 Mercury MCY-97,5
 Locust LCT-5M,4
 Nexus NXS1-B,3
-Tarantula ZPH-1A,2
+Tarantula ZPH-1,2
 Ostscout OTT-9CS,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Capellan Confederation/Mechs/Light Mechs.txt b/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Capellan Confederation/Mechs/Light Mechs.txt
index 8bef8cf8962..46b7f4d5d95 100644
--- a/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Capellan Confederation/Mechs/Light Mechs.txt	
+++ b/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Capellan Confederation/Mechs/Light Mechs.txt	
@@ -7,6 +7,6 @@ Firestarter FS9-S,5
 Raven RVN-3L,6
 Spider SDR-5V,5
 Cossack C-SK1,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Javelin JVN-10N,2
 UrbanMech UM-R60,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Free Worlds League/Mechs/Light Mechs.txt b/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Free Worlds League/Mechs/Light Mechs.txt
index efe1f0eca2b..7b7118b18f8 100644
--- a/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Free Worlds League/Mechs/Light Mechs.txt	
+++ b/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Free Worlds League/Mechs/Light Mechs.txt	
@@ -1,6 +1,6 @@
 3075 Light Mechs - Free Worlds League
 Eagle EGL-2M,1
-Tarantula ZPH-1A,2
+Tarantula ZPH-1,2
 Jackal JA-KL-1532,3
 Hermes HER-3S,4
 Spider SDR-7M,5
@@ -9,4 +9,4 @@ Hammer HMR-3M,5
 Jenner JR7-D,4
 Hermes HER-3S,3
 Falcon Hawk FNHK-9K1B,2
-Tarantula ZPH-1A,1
\ No newline at end of file
+Tarantula ZPH-1,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Major Periphery/Mechs/Light Mechs.txt b/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Major Periphery/Mechs/Light Mechs.txt
index 927a7437a36..a3e8f0a6178 100644
--- a/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Major Periphery/Mechs/Light Mechs.txt	
+++ b/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Major Periphery/Mechs/Light Mechs.txt	
@@ -7,6 +7,6 @@ UrbanMech UM-R63,5
 Commando COM-2D,6
 Spider SDR-7M,5
 Raven RVN-3L,4
-Tarantula ZPH-1A,3
+Tarantula ZPH-1,3
 Anubis ABS-3R,2
 Raptor RTX1-O,1
\ No newline at end of file
diff --git a/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Mercenaries/Mechs/Light Mechs.txt b/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Mercenaries/Mechs/Light Mechs.txt
index 4cf6cc53fa7..ffa77b2db7c 100644
--- a/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Mercenaries/Mechs/Light Mechs.txt	
+++ b/megamek/data/rat/(3075 - 3085) - A Time of War/Inner Sphere/Mercenaries/Mechs/Light Mechs.txt	
@@ -3,7 +3,7 @@ Arctic Fox AF1,1
 Eagle EGL-2M,2
 Locust LCT-5M,3
 Dart DRT-4S,4
-Tarantula ZPH-1A,5
+Tarantula ZPH-1,5
 Battle Hawk BH-K305,6
 Jackal JA-KL-1532,5
 Hammer HMR-3M,4
diff --git a/megamek/data/rat/(3130 on) - FM 3145/Inner Sphere/Lyran Commonwealth/Tanks/Medium/Medium D.txt b/megamek/data/rat/(3130 on) - FM 3145/Inner Sphere/Lyran Commonwealth/Tanks/Medium/Medium D.txt
index 07007f02202..b4a0c1673f0 100644
--- a/megamek/data/rat/(3130 on) - FM 3145/Inner Sphere/Lyran Commonwealth/Tanks/Medium/Medium D.txt	
+++ b/megamek/data/rat/(3130 on) - FM 3145/Inner Sphere/Lyran Commonwealth/Tanks/Medium/Medium D.txt	
@@ -1,5 +1,5 @@
 3145 LCAF Medium Vehicles D
-Schildkröte Line Tank,1
+Schildkrote Line Tank,1
 Vedette Medium Tank (NETC), 2
 Drillson Heavy Hover Tank (Standard), 3
 Fulcrum Heavy Hovertank (Standard), 4
diff --git a/megamek/data/rat/(3130 on) - FM 3145/Inner Sphere/Lyran Commonwealth/Tanks/Medium/Medium F.txt b/megamek/data/rat/(3130 on) - FM 3145/Inner Sphere/Lyran Commonwealth/Tanks/Medium/Medium F.txt
index 52580dc9b76..bc7a8daa393 100644
--- a/megamek/data/rat/(3130 on) - FM 3145/Inner Sphere/Lyran Commonwealth/Tanks/Medium/Medium F.txt	
+++ b/megamek/data/rat/(3130 on) - FM 3145/Inner Sphere/Lyran Commonwealth/Tanks/Medium/Medium F.txt	
@@ -1,7 +1,7 @@
 3145 LCAF Medium Vehicles F
 Hetzer Wheeled Assault Gun (LB-X), 1
 Glaive Medium Tank (Standard), 2
-Schildkröte Line Tank,3
+Schildkrote Line Tank,3
 Vedette Medium Tank (NETC), 4
 Drillson Heavy Hover Tank (Standard), 5
 Fulcrum Heavy Hovertank (Standard), 6
diff --git a/megamek/data/unit_roles.txt b/megamek/data/unit_roles.txt
index f858dd82279..cf58fe64f25 100644
--- a/megamek/data/unit_roles.txt
+++ b/megamek/data/unit_roles.txt
@@ -6541,7 +6541,7 @@ Tamerlane Strike Sled:SCOUT
 Taranis Battle Armor (Sqd4):AMBUSHER
 Taranis Battle Armor (Sqd5):AMBUSHER
 Taranis Battle Armor (Sqd6):AMBUSHER
-Tarantula ZPH-1A:SCOUT
+Tarantula ZPH-1:SCOUT
 Tarantula ZPH-2A:SCOUT
 Tarantula ZPH-3A:STRIKER
 Tarantula ZPH-4A:STRIKER
diff --git a/megamek/docs/OfficialUnitList.txt b/megamek/docs/OfficialUnitList.txt
index 92218e767b1..7568f40e284 100644
--- a/megamek/docs/OfficialUnitList.txt
+++ b/megamek/docs/OfficialUnitList.txt
@@ -1,8792 +1,9061 @@
-MegaMek Official Unit List
-This file can be regenerated with java -jar MegaMek.jar -oul
-Format is: Chassis Model|
-Achileus Light Battle Armor [David](Sqd4)|
-Achileus Light Battle Armor [Flamer](Sqd4)|
-Achileus Light Battle Armor [Laser](Sqd4)|
-Achileus Light Battle Armor [MG](Sqd4)|
-Achileus Light Battle Armor [TAG](Sqd4)|
-Achileus Light Battle Armor (WoB)(Sqd4)|
-Achileus Light Battle Armor [David](Sqd5)|
-Achileus Light Battle Armor [Flamer](Sqd5)|
-Achileus Light Battle Armor [Laser](Sqd5)|
-Achileus Light Battle Armor [MG](Sqd5)|
-Achileus Light Battle Armor [TAG](Sqd5)|
-Achileus Light Battle Armor (WoB)(Sqd5)|
-Achileus Light Battle Armor [David](Sqd6)|
-Achileus Light Battle Armor [Flamer](Sqd6)|
-Achileus Light Battle Armor [Laser](Sqd6)|
-Achileus Light Battle Armor [MG](Sqd6)|
-Achileus Light Battle Armor [TAG](Sqd6)|
-Achileus Light Battle Armor (WoB)(Sqd6)|
-Cavalier Battle Armor [Flamer](Sqd4)|
-Cavalier Battle Armor [Flamer](Sqd5)|
-Cavalier Battle Armor [Flamer](Sqd6)|
-Cavalier Battle Armor [Laser](Sqd4)|
-Cavalier Battle Armor [Laser](Sqd5)|
-Cavalier Battle Armor [Laser](Sqd6)|
-Cavalier Battle Armor [MG](Sqd4)|
-Cavalier Battle Armor [MG](Sqd5)|
-Cavalier Battle Armor [MG](Sqd6)|
-Cavalier Battle Armor [SRM](Sqd4)|
-Cavalier Battle Armor [SRM](Sqd5)|
-Cavalier Battle Armor [SRM](Sqd6)|
-Elemental Battle Armor (Headhunter)(Sqd4)|
-Elemental Battle Armor (Headhunter)(Sqd5)|
-Elemental Battle Armor (Headhunter)(Sqd6)|
-Elemental Battle Armor [AP Gauss](Sqd3)|
-Elemental Battle Armor [AP Gauss](Sqd4)|
-Elemental Battle Armor [AP Gauss](Sqd5)|
-Elemental Battle Armor [AP Gauss](Sqd6)|
-Elemental Battle Armor [ER Laser](Sqd3)|
-Elemental Battle Armor [ER Laser](Sqd4)|
-Elemental Battle Armor [ER Laser](Sqd5)|
-Elemental Battle Armor [ER Laser](Sqd6)|
-Elemental Battle Armor [Flamer](Sqd3)|
-Elemental Battle Armor [Flamer](Sqd4)|
-Elemental Battle Armor [Flamer](Sqd5)|
-Elemental Battle Armor [Flamer](Sqd6)|
-Elemental Battle Armor [HMG](Sqd3)|
-Elemental Battle Armor [HMG](Sqd4)|
-Elemental Battle Armor [HMG](Sqd5)|
-Elemental Battle Armor [HMG](Sqd6)|
-Elemental Battle Armor [Laser](Sqd3)|
-Elemental Battle Armor [Laser](Sqd4)|
-Elemental Battle Armor [Laser](Sqd5)|
-Elemental Battle Armor [Laser](Sqd6)|
-Elemental Battle Armor [MG](Sqd3)|
-Elemental Battle Armor [MG](Sqd4)|
-Elemental Battle Armor [MG](Sqd5)|
-Elemental Battle Armor [MG](Sqd6)|
-Elemental Battle Armor [MicroPL](Sqd3)|
-Elemental Battle Armor [MicroPL](Sqd4)|
-Elemental Battle Armor [MicroPL](Sqd5)|
-Elemental Battle Armor [MicroPL](Sqd6)|
-Fa Shih Battle Armor [Flamer](Sqd4)|
-Fa Shih Battle Armor [Flamer](Sqd5)|
-Fa Shih Battle Armor [Flamer](Sqd6)|
-Fa Shih Battle Armor [Laser](Sqd4)|
-Fa Shih Battle Armor [Laser](Sqd5)|
-Fa Shih Battle Armor [Laser](Sqd6)|
-Fa Shih Battle Armor [LRR](Sqd4)|
-Fa Shih Battle Armor [LRR](Sqd5)|
-Fa Shih Battle Armor [LRR](Sqd6)|
-Fa Shih Battle Armor [MG](Sqd4)|
-Fa Shih Battle Armor [MG](Sqd5)|
-Fa Shih Battle Armor [MG](Sqd6)|
-Fa Shih Battle Armor [TAG](Sqd4)|
-Fa Shih Battle Armor [TAG](Sqd5)|
-Fa Shih Battle Armor [TAG](Sqd6)|
-Fenrir Battle Armor [ERML](Sqd4)|
-Fenrir Battle Armor [ERML](Sqd5)|
-Fenrir Battle Armor [ERML](Sqd6)|
-Fenrir Battle Armor [MG](Sqd4)|
-Fenrir Battle Armor [MG](Sqd5)|
-Fenrir Battle Armor [MG](Sqd6)|
-Fenrir Battle Armor [Mortar](Sqd4)|
-Fenrir Battle Armor [Mortar](Sqd5)|
-Fenrir Battle Armor [Mortar](Sqd6)|
-Fenrir Battle Armor [MPL](Sqd4)|
-Fenrir Battle Armor [MPL](Sqd5)|
-Fenrir Battle Armor [MPL](Sqd6)|
-Fenrir Battle Armor [SL](Sqd4)|
-Fenrir Battle Armor [SL](Sqd5)|
-Fenrir Battle Armor [SL](Sqd6)|
-Fenrir Battle Armor [SPL](Sqd4)|
-Fenrir Battle Armor [SPL](Sqd5)|
-Fenrir Battle Armor [SPL](Sqd6)|
-Fenrir Battle Armor [SRM](Sqd4)|
-Fenrir Battle Armor [SRM](Sqd5)|
-Fenrir Battle Armor [SRM](Sqd6)|
-Fenrir Battle Armor [VSP](Sqd4)|
-Fenrir Battle Armor [VSP](Sqd5)|
-Fenrir Battle Armor [VSP](Sqd6)|
-Gnome Battle Armor (Standard)(Sqd3)|
-Gnome Battle Armor (Standard)(Sqd4)|
-Gnome Battle Armor (Standard)(Sqd5)|
-Gnome Battle Armor (Standard)(Sqd6)|
-Gnome Battle Armor (Upgrade) [Bearhunter](Sqd4)|
-Gnome Battle Armor (Upgrade) [Bearhunter](Sqd5)|
-Gnome Battle Armor (Upgrade) [Bearhunter](Sqd6)|
-Gnome Battle Armor (Upgrade) [MRR](Sqd4)|
-Gnome Battle Armor (Upgrade) [MRR](Sqd5)|
-Gnome Battle Armor (Upgrade) [MRR](Sqd6)|
-Gnome Battle Armor (Upgrade) [Pulse Laser](Sqd4)|
-Gnome Battle Armor (Upgrade) [Pulse Laser](Sqd5)|
-Gnome Battle Armor (Upgrade) [Pulse Laser](Sqd6)|
-Gray Death Scout Suit (Standard)(Sqd4)|
-Gray Death Scout Suit (Standard)(Sqd5)|
-Gray Death Scout Suit (Standard)(Sqd6)|
-Gray Death Standard Suit [Flamer](Sqd4)|
-Gray Death Standard Suit [Flamer](Sqd5)|
-Gray Death Standard Suit [Flamer](Sqd6)|
-Gray Death Standard Suit [Laser](Sqd4)|
-Gray Death Standard Suit [Laser](Sqd5)|
-Gray Death Standard Suit [Laser](Sqd6)|
-Gray Death Standard Suit [LRR](Sqd4)|
-Gray Death Standard Suit [LRR](Sqd5)|
-Gray Death Standard Suit [LRR](Sqd6)|
-Gray Death Standard Suit [MG](Sqd4)|
-Gray Death Standard Suit [MG](Sqd5)|
-Gray Death Standard Suit [MG](Sqd6)|
-Gray Death Standard Suit [SRM](Sqd4)|
-Gray Death Standard Suit [SRM](Sqd5)|
-Gray Death Standard Suit [SRM](Sqd6)|
-Infiltrator Mk. I Battle Armor (Special Ops)(Sqd4)|
-Infiltrator Mk. I Battle Armor (Special Ops)(Sqd5)|
-Infiltrator Mk. I Battle Armor (Special Ops)(Sqd6)|
-Infiltrator Mk. I Battle Armor 'Waddle'(Sqd4)|
-Infiltrator Mk. I Battle Armor 'Waddle'(Sqd5)|
-Infiltrator Mk. I Battle Armor 'Waddle'(Sqd6)|
-Infiltrator Mk. II Battle Armor (Sensor)(Sqd4)|
-Infiltrator Mk. II Battle Armor (Sensor)(Sqd5)|
-Infiltrator Mk. II Battle Armor (Sensor)(Sqd6)|
-Infiltrator Mk. II Battle Armor 'Puma'(Sqd4)|
-Infiltrator Mk. II Battle Armor 'Puma'(Sqd5)|
-Infiltrator Mk. II Battle Armor 'Puma'(Sqd6)|
-IS Standard Battle Armor [Flamer](Sqd4)|
-IS Standard Battle Armor [Flamer](Sqd5)|
-IS Standard Battle Armor [Flamer](Sqd6)|
-IS Standard Battle Armor [Laser](Sqd4)|
-IS Standard Battle Armor [Laser](Sqd5)|
-IS Standard Battle Armor [Laser](Sqd6)|
-IS Standard Battle Armor [LRR](Sqd4)|
-IS Standard Battle Armor [LRR](Sqd5)|
-IS Standard Battle Armor [LRR](Sqd6)|
-IS Standard Battle Armor [MG](Sqd4)|
-IS Standard Battle Armor [MG](Sqd5)|
-IS Standard Battle Armor [MG](Sqd6)|
-IS Standard Battle Armor [SRM](Sqd4)|
-IS Standard Battle Armor [SRM](Sqd5)|
-IS Standard Battle Armor [SRM](Sqd6)|
-Kage Light Battle Armor (DEST)(Sqd4)|
-Kage Light Battle Armor (DEST)(Sqd5)|
-Kage Light Battle Armor (DEST)(Sqd6)|
-Kage Light Battle Armor (Vibro-Claw)(Sqd4)|
-Kage Light Battle Armor (Vibro-Claw)(Sqd5)|
-Kage Light Battle Armor (Vibro-Claw)(Sqd6)|
-Kage Light Battle Armor [ECM](Sqd4)|
-Kage Light Battle Armor [ECM](Sqd5)|
-Kage Light Battle Armor [ECM](Sqd6)|
-Kage Light Battle Armor [Flamer](Sqd4)|
-Kage Light Battle Armor [Flamer](Sqd5)|
-Kage Light Battle Armor [Flamer](Sqd6)|
-Kage Light Battle Armor [Laser](Sqd4)|
-Kage Light Battle Armor [Laser](Sqd5)|
-Kage Light Battle Armor [Laser](Sqd6)|
-Kage Light Battle Armor [MG](Sqd4)|
-Kage Light Battle Armor [MG](Sqd5)|
-Kage Light Battle Armor [MG](Sqd6)|
-Kage Light Battle Armor [TAG](Sqd4)|
-Kage Light Battle Armor [TAG](Sqd5)|
-Kage Light Battle Armor [TAG](Sqd6)|
-Kanazuchi Assault Battle Armor (Upgrade) [Battle Claw](Sqd4)|
-Kanazuchi Assault Battle Armor (Upgrade) [Battle Claw](Sqd5)|
-Kanazuchi Assault Battle Armor (Upgrade) [Battle Claw](Sqd6)|
-Kanazuchi Assault Battle Armor [Battle Claw](Sqd4)|
-Kanazuchi Assault Battle Armor [Battle Claw](Sqd5)|
-Kanazuchi Assault Battle Armor [Battle Claw](Sqd6)|
-Kanazuchi Assault Battle Armor [Industrial Drill](Sqd4)|
-Kanazuchi Assault Battle Armor [Industrial Drill](Sqd5)|
-Kanazuchi Assault Battle Armor [Industrial Drill](Sqd6)|
-Kanazuchi Assault Battle Armor [Salvage Arm](Sqd4)|
-Kanazuchi Assault Battle Armor [Salvage Arm](Sqd5)|
-Kanazuchi Assault Battle Armor [Salvage Arm](Sqd6)|
-Longinus Battle Armor [David](Sqd4)|
-Longinus Battle Armor [David](Sqd5)|
-Longinus Battle Armor [David](Sqd6)|
-Longinus Battle Armor [Flamer](Sqd4)|
-Longinus Battle Armor [Flamer](Sqd5)|
-Longinus Battle Armor [Flamer](Sqd6)|
-Longinus Battle Armor [Laser](Sqd4)|
-Longinus Battle Armor [Laser](Sqd5)|
-Longinus Battle Armor [Laser](Sqd6)|
-Longinus Battle Armor [MG](Sqd4)|
-Longinus Battle Armor [MG](Sqd5)|
-Longinus Battle Armor [MG](Sqd6)|
-Purifier Adaptive Battle Armor [Laser](Sqd4)|
-Purifier Adaptive Battle Armor [Laser](Sqd5)|
-Purifier Adaptive Battle Armor [Laser](Sqd6)|
-Purifier Adaptive Battle Armor [Narc](Sqd4)|
-Purifier Adaptive Battle Armor [Narc](Sqd5)|
-Purifier Adaptive Battle Armor [Narc](Sqd6)|
-Purifier Adaptive Battle Armor [PPC](Sqd4)|
-Purifier Adaptive Battle Armor [PPC](Sqd5)|
-Purifier Adaptive Battle Armor [PPC](Sqd6)|
-Purifier Adaptive Battle Armor [TAG](Sqd4)|
-Purifier Adaptive Battle Armor [TAG](Sqd5)|
-Purifier Adaptive Battle Armor [TAG](Sqd6)|
-Raiden Battle Armor (Original)(Sqd4)|
-Raiden Battle Armor (Original)(Sqd5)|
-Raiden Battle Armor (Original)(Sqd6)|
-Raiden Battle Armor [Flamer](Sqd4)|
-Raiden Battle Armor [Flamer](Sqd5)|
-Raiden Battle Armor [Flamer](Sqd6)|
-Raiden Battle Armor [Laser](Sqd4)|
-Raiden Battle Armor [Laser](Sqd5)|
-Raiden Battle Armor [Laser](Sqd6)|
-Raiden Battle Armor [MG](Sqd4)|
-Raiden Battle Armor [MG](Sqd5)|
-Raiden Battle Armor [MG](Sqd6)|
-Raiden Battle Armor [MRM](Sqd4)|
-Raiden Battle Armor [MRM](Sqd5)|
-Raiden Battle Armor [MRM](Sqd6)|
-Raiden Battle Armor [Tsunami](Sqd4)|
-Raiden Battle Armor [Tsunami](Sqd5)|
-Raiden Battle Armor [Tsunami](Sqd6)|
-Salamander Battle Armor (Anti-Infantry)(Sqd4)|
-Salamander Battle Armor (Anti-Infantry)(Sqd5)|
-Salamander Battle Armor (Anti-Infantry)(Sqd6)|
-Salamander Battle Armor (Laser)(Sqd4)|
-Salamander Battle Armor (Laser)(Sqd5)|
-Salamander Battle Armor (Laser)(Sqd6)|
-Salamander Battle Armor (Standard)(Sqd3)|
-Salamander Battle Armor (Standard)(Sqd4)|
-Salamander Battle Armor (Standard)(Sqd5)|
-Salamander Battle Armor (Standard)(Sqd6)|
-Sloth Battle Armor (Standard)(Sqd4)|
-Sloth Battle Armor (Standard)(Sqd5)|
-Sloth Battle Armor (Standard)(Sqd6)|
-Sylph Battle Armor (Standard)(Sqd4)|
-Sylph Battle Armor (Standard)(Sqd5)|
-Sylph Battle Armor (Standard)(Sqd6)|
-Sylph Battle Armor (Upgrade)(Sqd4)|
-Sylph Battle Armor (Upgrade)(Sqd5)|
-Sylph Battle Armor (Upgrade)(Sqd6)|
-Undine Battle Armor (Standard)(Sqd4)|
-Undine Battle Armor (Standard)(Sqd5)|
-Undine Battle Armor (Standard)(Sqd6)|
-Undine Battle Armor (Upgrade)(Sqd4)|
-Undine Battle Armor (Upgrade)(Sqd5)|
-Undine Battle Armor (Upgrade)(Sqd6)|
-Aerie PA(L) (Salvage)(Sqd4)|
-Aerie PA(L) (Salvage)(Sqd5)|
-Aerie PA(L) (Salvage)(Sqd6)|
-Aerie PA(L) (Standard)(Sqd4)|
-Aerie PA(L) (Standard)(Sqd5)|
-Aerie PA(L) (Standard)(Sqd6)|
-Afreet Medium Battle Armor (Hell's Horses)(Sqd4)|
-Afreet Medium Battle Armor (Hell's Horses)(Sqd5)|
-Afreet Medium Battle Armor (Hell's Horses)(Sqd6)|
-Afreet Medium Battle Armor (Jade Falcon)(Sqd4)|
-Afreet Medium Battle Armor (Jade Falcon)(Sqd5)|
-Afreet Medium Battle Armor (Jade Falcon)(Sqd6)|
-Afreet Medium Battle Armor (Standard)(Sqd4)|
-Afreet Medium Battle Armor (Standard)(Sqd5)|
-Afreet Medium Battle Armor (Standard)(Sqd6)|
-Asura Medium Battle Armor (Anti-Infantry)(Sqd4)|
-Asura Medium Battle Armor (Anti-Infantry)(Sqd5)|
-Asura Medium Battle Armor (Anti-Infantry)(Sqd6)|
-Asura Medium Battle Armor (SRM)(Sqd4)|
-Asura Medium Battle Armor (SRM)(Sqd5)|
-Asura Medium Battle Armor (SRM)(Sqd6)|
-Asura Medium Battle Armor (Standard)(Sqd4)|
-Asura Medium Battle Armor (Standard)(Sqd5)|
-Asura Medium Battle Armor (Standard)(Sqd6)|
-Clan Medium Battle Armor (Naval) 'Bar' (Sqd4)|
-Clan Medium Battle Armor (Naval) 'Bar' (Sqd5)|
-Clan Medium Battle Armor (Naval) 'Bar' (Sqd6)|
-Clan Medium Battle Armor (Rabid)(Sqd4)|
-Clan Medium Battle Armor (Rabid)(Sqd5)|
-Clan Medium Battle Armor (Rabid)(Sqd6)|
-Clan Medium Battle Armor (Laser) 'Volk' (Sqd4)|
-Clan Medium Battle Armor (Laser) 'Volk' (Sqd5)|
-Clan Medium Battle Armor (Laser) 'Volk' (Sqd6)|
-Corona Heavy Battle Armor (Standard) (Sqd4)|
-Corona Heavy Battle Armor (Standard) (Sqd5)|
-Corona Heavy Battle Armor (Standard) (Sqd6)|
-Corona Heavy Battle Armor (SRM) (Sqd4)|
-Corona Heavy Battle Armor (SRM) (Sqd5)|
-Corona Heavy Battle Armor (SRM) (Sqd6)|
-Djinn Battle Armor (Standard) (Sqd4)|
-Djinn Battle Armor (Standard) (Sqd5)|
-Djinn Battle Armor (Standard) (Sqd6)|
-Djinn Battle Armor (Stealth) (Sqd4)|
-Djinn Battle Armor (Stealth) (Sqd5)|
-Djinn Battle Armor (Stealth) (Sqd6)|
-Golem Assault Armor (Fast Assault)(Sqd4)|
-Golem Assault Armor (Fast Assault)(Sqd5)|
-Golem Assault Armor (Fast Assault)(Sqd6)|
-Golem Assault Armor (Rock Golem)(Sqd4)|
-Golem Assault Armor (Rock Golem)(Sqd5)|
-Golem Assault Armor (Rock Golem)(Sqd6)|
-Golem Assault Armor (Standard)(Sqd4)|
-Golem Assault Armor (Standard)(Sqd5)|
-Golem Assault Armor (Standard)(Sqd6)|
-Grenadier Battle Armor (Hunter-Killer) [MagShot](Sqd4)|
-Grenadier Battle Armor (Hunter-Killer) [MagShot](Sqd5)|
-Grenadier Battle Armor (Hunter-Killer) [MagShot](Sqd6)|
-Grenadier Battle Armor (Hunter-Killer) [NARC](Sqd4)|
-Grenadier Battle Armor (Hunter-Killer) [NARC](Sqd5)|
-Grenadier Battle Armor (Hunter-Killer) [NARC](Sqd6)|
-Grenadier Battle Armor [Flamer](Sqd4)|
-Grenadier Battle Armor [Flamer](Sqd5)|
-Grenadier Battle Armor [Flamer](Sqd6)|
-Grenadier Battle Armor [LRR](Sqd4)|
-Grenadier Battle Armor [LRR](Sqd5)|
-Grenadier Battle Armor [LRR](Sqd6)|
-Grenadier Battle Armor [MagShot](Sqd4)|
-Grenadier Battle Armor [MagShot](Sqd5)|
-Grenadier Battle Armor [MagShot](Sqd6)|
-Grenadier Battle Armor [SRM/SL](Sqd4)|
-Grenadier Battle Armor [SRM/SL](Sqd5)|
-Grenadier Battle Armor [SRM/SL](Sqd6)|
-Grenadier Battle Armor [TAG](Sqd4)|
-Grenadier Battle Armor [TAG](Sqd5)|
-Grenadier Battle Armor [TAG](Sqd6)|
-Hauberk Battle Armor (Standard)(Sqd4)|
-Hauberk Battle Armor (Standard)(Sqd5)|
-Hauberk Battle Armor (Standard)(Sqd6)|
-Hauberk II Battle Armor (Standard)(Sqd4)|
-Hauberk II Battle Armor (Standard)(Sqd5)|
-Hauberk II Battle Armor (Standard)(Sqd6)|
-Kobold Battle Armor [MicroGL/Flamer](Sqd4)|
-Kobold Battle Armor [MicroGL/Flamer](Sqd5)|
-Kobold Battle Armor [MicroGL/Flamer](Sqd6)|
-Kobold Battle Armor [MicroGL/SPL](Sqd4)|
-Kobold Battle Armor [MicroGL/SPL](Sqd5)|
-Kobold Battle Armor [MicroGL/SPL](Sqd6)|
-Kobold Battle Armor [MicroGL/TAG](Sqd4)|
-Kobold Battle Armor [MicroGL/TAG](Sqd5)|
-Kobold Battle Armor [MicroGL/TAG](Sqd6)|
-Kobold Battle Armor [SL/Flamer](Sqd4)|
-Kobold Battle Armor [SL/Flamer](Sqd5)|
-Kobold Battle Armor [SL/Flamer](Sqd6)|
-Kobold Battle Armor [SL/TAG](Sqd6)|
-Kobold Battle Armor [SL/TAG](Sqd4)|
-Kobold Battle Armor [SL/TAG](Sqd5)|
-Nephilim Assault Battle Armor (Capture Team)[HMG](Sqd4)|
-Nephilim Assault Battle Armor (Capture Team)[HMG](Sqd5)|
-Nephilim Assault Battle Armor (Capture Team)[HMG](Sqd6)|
-Nephilim Assault Battle Armor (Gauss)(Sqd4)|
-Nephilim Assault Battle Armor (Gauss)(Sqd5)|
-Nephilim Assault Battle Armor (Gauss)(Sqd6)|
-Nephilim Assault Battle Armor (Narc)(Sqd4)|
-Nephilim Assault Battle Armor (Narc)(Sqd5)|
-Nephilim Assault Battle Armor (Narc)(Sqd6)|
-Nephilim Assault Battle Armor (Seeker) [MG](Sqd4)|
-Nephilim Assault Battle Armor (Seeker) [MG](Sqd5)|
-Nephilim Assault Battle Armor (Seeker) [MG](Sqd6)|
-Nephilim Assault Battle Armor (Support)(Sqd4)|
-Nephilim Assault Battle Armor (Support)(Sqd5)|
-Nephilim Assault Battle Armor (Support)(Sqd6)|
-Nephilim Assault Battle Armor (Plasma)(Sqd4)|
-Nephilim Assault Battle Armor (Plasma)(Sqd5)|
-Nephilim Assault Battle Armor (Plasma)(Sqd6)|
-Nighthawk PA(L) Mk. XXI(Sqd4)|
-Nighthawk PA(L) Mk. XXI(Sqd5)|
-Nighthawk PA(L) Mk. XXI(Sqd6)|
-Nighthawk PA(L) Mk. XXII(Sqd4)|
-Nighthawk PA(L) Mk. XXII(Sqd5)|
-Nighthawk PA(L) Mk. XXII(Sqd6)|
-Phalanx Battle Armor (A)(Sqd4)|
-Phalanx Battle Armor (A)(Sqd5)|
-Phalanx Battle Armor (A)(Sqd6)|
-Phalanx Battle Armor (B)(Sqd4)|
-Phalanx Battle Armor (B)(Sqd5)|
-Phalanx Battle Armor (B)(Sqd6)|
-Phalanx Battle Armor (C)(Sqd4)|
-Phalanx Battle Armor (C)(Sqd5)|
-Phalanx Battle Armor (C)(Sqd6)|
-Rogue Bear Heavy Battle Armor (Standard)(Sqd4)|
-Rogue Bear Heavy Battle Armor (Standard)(Sqd5)|
-Rogue Bear Heavy Battle Armor (Standard)(Sqd6)|
-Rottweiler Battle Armor (Close Combat)(Sqd4)|
-Rottweiler Battle Armor (Close Combat)(Sqd5)|
-Rottweiler Battle Armor (Close Combat)(Sqd6)|
-Rottweiler Battle Armor (Standard)(Sqd4)|
-Rottweiler Battle Armor (Standard)(Sqd5)|
-Rottweiler Battle Armor (Standard)(Sqd6)|
-Rottweiler Battle Armor (Upgrade)(Sqd4)|
-Rottweiler Battle Armor (Upgrade)(Sqd5)|
-Rottweiler Battle Armor (Upgrade)(Sqd6)|
-Se'irim Medium Battle Armor (Anti-Infantry)(Sqd4)|
-Se'irim Medium Battle Armor (Anti-Infantry)(Sqd5)|
-Se'irim Medium Battle Armor (Anti-Infantry)(Sqd6)|
-Se'irim Medium Battle Armor (Capture Team)(Sqd4)|
-Se'irim Medium Battle Armor (Capture Team)(Sqd5)|
-Se'irim Medium Battle Armor (Capture Team)(Sqd6)|
-Se'irim Medium Battle Armor (Standard)(Sqd4)|
-Se'irim Medium Battle Armor (Standard)(Sqd5)|
-Se'irim Medium Battle Armor (Standard)(Sqd6)|
-Shedu Assault Battle Armor (Capture Team)(Sqd4)|
-Shedu Assault Battle Armor (Capture Team)(Sqd5)|
-Shedu Assault Battle Armor (Capture Team)(Sqd6)|
-Shedu Assault Battle Armor (PPC)(Sqd4)|
-Shedu Assault Battle Armor (PPC)(Sqd5)|
-Shedu Assault Battle Armor (PPC)(Sqd6)|
-Shedu Assault Battle Armor (Recon)(Sqd4)|
-Shedu Assault Battle Armor (Recon)(Sqd5)|
-Shedu Assault Battle Armor (Recon)(Sqd6)|
-Shedu Assault Battle Armor (Standard)(Sqd4)|
-Shedu Assault Battle Armor (Standard)(Sqd5)|
-Shedu Assault Battle Armor (Standard)(Sqd6)|
-Shedu Assault Battle Armor (Support)(Sqd4)|
-Shedu Assault Battle Armor (Support)(Sqd5)|
-Shedu Assault Battle Armor (Support)(Sqd6)|
-Tengu Heavy Battle Armor [C3i](Sqd4)|
-Tengu Heavy Battle Armor [C3i](Sqd5)|
-Tengu Heavy Battle Armor [C3i](Sqd6)|
-Tengu Heavy Battle Armor [ML](Sqd4)|
-Tengu Heavy Battle Armor [ML](Sqd5)|
-Tengu Heavy Battle Armor [ML](Sqd6)|
-Tengu Heavy Battle Armor [Plasma](Sqd4)|
-Tengu Heavy Battle Armor [Plasma](Sqd5)|
-Tengu Heavy Battle Armor [Plasma](Sqd6)|
-Tengu Heavy Battle Armor [RL](Sqd4)|
-Tengu Heavy Battle Armor [RL](Sqd5)|
-Tengu Heavy Battle Armor [RL](Sqd6)|
-Tengu Heavy Battle Armor (Support)[LRR](Sqd4)|
-Tengu Heavy Battle Armor (Support)[LRR](Sqd5)|
-Tengu Heavy Battle Armor (Support)[LRR](Sqd6)|
-Tengu Heavy Battle Armor (SVSP)(Sqd4)|
-Tengu Heavy Battle Armor (SVSP)(Sqd5)|
-Tengu Heavy Battle Armor (SVSP)(Sqd6)|
-Tornado PA(L) G12(Sqd4)|
-Tornado PA(L) G12(Sqd5)|
-Tornado PA(L) G12(Sqd6)|
-Tornado PA(L) G13 [David Light Gauss](Sqd4)|
-Tornado PA(L) G13 [David Light Gauss](Sqd5)|
-Tornado PA(L) G13 [David Light Gauss](Sqd6)|
-Tornado PA(L) G13 [Flamer](Sqd4)|
-Tornado PA(L) G13 [Flamer](Sqd5)|
-Tornado PA(L) G13 [Flamer](Sqd6)|
-Tornado PA(L) G13 [Grenade Launcher](Sqd4)|
-Tornado PA(L) G13 [Grenade Launcher](Sqd5)|
-Tornado PA(L) G13 [Grenade Launcher](Sqd6)|
-Tornado PA(L) G13 [Machine Gun](Sqd4)|
-Tornado PA(L) G13 [Machine Gun](Sqd5)|
-Tornado PA(L) G13 [Machine Gun](Sqd6)|
-Tornado PA(L) G13 [Small Laser](Sqd4)|
-Tornado PA(L) G13 [Small Laser](Sqd5)|
-Tornado PA(L) G13 [Small Laser](Sqd6)|
-Tornado PA(L) G14(Sqd4)|
-Tornado PA(L) G14(Sqd5)|
-Tornado PA(L) G14(Sqd6)|
-Tornado PA(L) P12 'Hurricane'(Sqd4)|
-Tornado PA(L) P12 'Hurricane'(Sqd5)|
-Tornado PA(L) P12 'Hurricane'(Sqd6)|
-Trinity Medium Battle Armor (Asterion)[MRR](Sqd4)|
-Trinity Medium Battle Armor (Asterion)[MRR](Sqd5)|
-Trinity Medium Battle Armor (Asterion)[MRR](Sqd6)|
-Trinity Medium Battle Armor (Asterion)[PPC](Sqd4)|
-Trinity Medium Battle Armor (Asterion)[PPC](Sqd5)|
-Trinity Medium Battle Armor (Asterion)[PPC](Sqd6)|
-Trinity Medium Battle Armor (Theseus RL)[LRR](Sqd4)|
-Trinity Medium Battle Armor (Theseus RL)[LRR](Sqd5)|
-Trinity Medium Battle Armor (Theseus RL)[LRR](Sqd6)|
-Trinity Medium Battle Armor (Theseus)[MRR](Sqd4)|
-Trinity Medium Battle Armor (Theseus)[MRR](Sqd5)|
-Trinity Medium Battle Armor (Theseus)[MRR](Sqd6)|
-Trinity Medium Battle Armor (Ying Long)(Plasma)(Sqd4)|
-Trinity Medium Battle Armor (Ying Long)(Plasma)(Sqd5)|
-Trinity Medium Battle Armor (Ying Long)(Plasma)(Sqd6)|
-Void Medium Battle Armor (DCA)(Sqd4)|
-Void Medium Battle Armor (DCA)(Sqd5)|
-Void Medium Battle Armor (DCA)(Sqd6)|
-Void Medium Battle Armor (Nova Cat)(Sqd4)|
-Void Medium Battle Armor (Nova Cat)(Sqd5)|
-Void Medium Battle Armor (Nova Cat)(Sqd6)|
-Void Medium Battle Armor (Standard)(Sqd4)|
-Void Medium Battle Armor (Standard)(Sqd5)|
-Void Medium Battle Armor (Standard)(Sqd6)|
-Angerona Scout Suit (Recon)(Sqd4)|
-Angerona Scout Suit (Recon)(Sqd5)|
-Angerona Scout Suit (Recon)(Sqd6)|
-Angerona Scout Suit (Standard)(Sqd4)|
-Angerona Scout Suit (Standard)(Sqd5)|
-Angerona Scout Suit (Standard)(Sqd6)|
-Ironhold Assault Battle Armor (Fire)(Sqd4)|
-Ironhold Assault Battle Armor (Fire)(Sqd5)|
-Ironhold Assault Battle Armor (Fire)(Sqd6)|
-Ironhold Assault Battle Armor (Standard)(Sqd4)|
-Ironhold Assault Battle Armor (Standard)(Sqd5)|
-Ironhold Assault Battle Armor (Standard)(Sqd6)|
-Kopis Assault Battle Armor (Anti-Infantry)(Sqd4)|
-Kopis Assault Battle Armor (Anti-Infantry)(Sqd5)|
-Kopis Assault Battle Armor (Anti-Infantry)(Sqd6)|
-Kopis Assault Battle Armor 'The Dark Alley'(Sqd4)|
-Kopis Assault Battle Armor 'The Dark Alley'(Sqd5)|
-Kopis Assault Battle Armor 'The Dark Alley'(Sqd6)|
-Ravager Assault Battle Armor (Standard)(Sqd4)|
-Ravager Assault Battle Armor (Standard)(Sqd5)|
-Ravager Assault Battle Armor (Standard)(Sqd6)|
-Thunderbird Battle Armor [AP Gauss](Sqd4)|
-Thunderbird Battle Armor [AP Gauss](Sqd5)|
-Thunderbird Battle Armor [AP Gauss](Sqd6)|
-Thunderbird Battle Armor [ER Laser](Sqd4)|
-Thunderbird Battle Armor [ER Laser](Sqd5)|
-Thunderbird Battle Armor [ER Laser](Sqd6)|
-Thunderbird Battle Armor [Pulse Laser](Sqd4)|
-Thunderbird Battle Armor [Pulse Laser](Sqd5)|
-Thunderbird Battle Armor [Pulse Laser](Sqd6)|
-Warg Assault Battle Armor (Standard)(Sqd4)|
-Warg Assault Battle Armor (Standard)(Sqd5)|
-Warg Assault Battle Armor (Standard)(Sqd6)|
-Afreet Medium Battle Armor (Interdictor)(Sqd4)|
-Afreet Medium Battle Armor (Interdictor)(Sqd5)|
-Afreet Medium Battle Armor (Interdictor)(Sqd6)|
-Clan Medium Battle Armor (Rache)(Sqd4)|
-Clan Medium Battle Armor (Rache)(Sqd5)|
-Clan Medium Battle Armor (Rache)(Sqd6)|
-Elemental Battle Armor (Fire) [AP Gauss](Sqd4)|
-Elemental Battle Armor (Fire) [AP Gauss](Sqd5)|
-Elemental Battle Armor (Fire) [AP Gauss](Sqd6)|
-Elemental Battle Armor (Fire) [Flamer](Sqd4)|
-Elemental Battle Armor (Fire) [Flamer](Sqd5)|
-Elemental Battle Armor (Fire) [Flamer](Sqd6)|
-Elemental Battle Armor (Fire) [MicroPL](Sqd4)|
-Elemental Battle Armor (Fire) [MicroPL](Sqd5)|
-Elemental Battle Armor (Fire) [MicroPL](Sqd6)|
-Elemental Battle Armor (Space) [Flamer](Sqd4)|
-Elemental Battle Armor (Space) [Flamer](Sqd5)|
-Elemental Battle Armor (Space) [Flamer](Sqd6)|
-Elemental Battle Armor (Space) [MG](Sqd4)|
-Elemental Battle Armor (Space) [MG](Sqd5)|
-Elemental Battle Armor (Space) [MG](Sqd6)|
-Elemental Battle Armor (Space) [MicroPL](Sqd4)|
-Elemental Battle Armor (Space) [MicroPL](Sqd5)|
-Elemental Battle Armor (Space) [MicroPL](Sqd6)|
-Fa Shih Battle Armor (Support) [King David](Sqd6)|
-Fa Shih Battle Armor (Support) [King David](Sqd4)|
-Fa Shih Battle Armor (Support) [King David](Sqd5)|
-Fa Shih Battle Armor (Support) [Plasma](Sqd6)|
-Fa Shih Battle Armor (Support) [Plasma](Sqd4)|
-Fa Shih Battle Armor (Support) [Plasma](Sqd5)|
-Gnome Battle Armor (LRM)(Sqd4)|
-Gnome Battle Armor (LRM)(Sqd5)|
-Gnome Battle Armor (LRM)(Sqd6)|
-Golem Assault Armor (Support)(Sqd4)|
-Golem Assault Armor (Support)(Sqd5)|
-Golem Assault Armor (Support)(Sqd6)|
-Gray Death Heavy Suit (Standard)(Sqd4)|
-Gray Death Heavy Suit (Standard)(Sqd5)|
-Gray Death Heavy Suit (Standard)(Sqd6)|
-Infiltrator Mk. II Battle Armor (Magnetic)(Sqd4)|
-Infiltrator Mk. II Battle Armor (Magnetic)(Sqd5)|
-Infiltrator Mk. II Battle Armor (Magnetic)(Sqd6)|
-Kage Light Battle Armor (Space)(Sqd4)|
-Kage Light Battle Armor (Space)(Sqd5)|
-Kage Light Battle Armor (Space)(Sqd6)|
-Longinus Battle Armor (Magnetic)(Sqd4)|
-Longinus Battle Armor (Magnetic)(Sqd5)|
-Longinus Battle Armor (Magnetic)(Sqd6)|
-Nighthawk PA(L) Mk. XXX(Bountry Hunter)(Restored)|
-Nighthawk PA(L) Mk. XXX (Bounty Hunter)(Non-Functional)|
-Nighthawk PA(L) Mk. XXX(Sqd4)|
-Nighthawk PA(L) Mk. XXX(Sqd5)|
-Nighthawk PA(L) Mk. XXX(Sqd6)|
-Raiden Battle Armor (Anti-Infantry)(Sqd4)|
-Raiden Battle Armor (Anti-Infantry)(Sqd5)|
-Raiden Battle Armor (Anti-Infantry)(Sqd6)|
-Rottweiler Battle Armor (Firedrake)(Sqd4)|
-Rottweiler Battle Armor (Firedrake)(Sqd5)|
-Rottweiler Battle Armor (Firedrake)(Sqd6)|
-Sloth Battle Armor (Interdictor)(Sqd4)|
-Sloth Battle Armor (Interdictor)(Sqd5)|
-Sloth Battle Armor (Interdictor)(Sqd6)|
-Trinity Medium Battle Armor (Asterion Upgrade)[MRR](Sqd4)|
-Trinity Medium Battle Armor (Asterion Upgrade)[MRR](Sqd5)|
-Trinity Medium Battle Armor (Asterion Upgrade)[MRR](Sqd6)|
-Trinity Medium Battle Armor (Asterion Upgrade)[PPC](Sqd4)|
-Trinity Medium Battle Armor (Asterion Upgrade)[PPC](Sqd5)|
-Trinity Medium Battle Armor (Asterion Upgrade)[PPC](Sqd6)|
-Trinity Medium Battle Armor (Theseus Support)'Killshot'(Sqd4)|
-Trinity Medium Battle Armor (Theseus Support)'Killshot'(Sqd5)|
-Trinity Medium Battle Armor (Theseus Support)'Killshot'(Sqd6)|
-Black Wolf Battle Armor [ERSPL](Sqd4)|
-Black Wolf Battle Armor [ERSPL](Sqd5)|
-Black Wolf Battle Armor [ERSPL](Sqd6)|
-Black Wolf Battle Armor [Heavy Flamer](Sqd4)|
-Black Wolf Battle Armor [Heavy Flamer](Sqd5)|
-Black Wolf Battle Armor [Heavy Flamer](Sqd6)|
-Black Wolf Battle Armor [Heavy Mortar](Sqd4)|
-Black Wolf Battle Armor [Heavy Mortar](Sqd5)|
-Black Wolf Battle Armor [Heavy Mortar](Sqd6)|
-Black Wolf Battle Armor [LBX](Sqd4)|
-Black Wolf Battle Armor [LBX](Sqd5)|
-Black Wolf Battle Armor [LBX](Sqd6)|
-Black Wolf Battle Armor [Plasma](Sqd4)|
-Black Wolf Battle Armor [Plasma](Sqd5)|
-Black Wolf Battle Armor [Plasma](Sqd6)|
-Buraq Fast Battle Armor (Hunter-Killer)(Sqd4)|
-Buraq Fast Battle Armor (Hunter-Killer)(Sqd5)|
-Buraq Fast Battle Armor (Hunter-Killer)(Sqd6)|
-Buraq Fast Battle Armor (Standard)(Sqd4)|
-Buraq Fast Battle Armor (Standard)(Sqd5)|
-Buraq Fast Battle Armor (Standard)(Sqd6)|
-Buraq Fast Battle Armor (Support)(Sqd4)|
-Buraq Fast Battle Armor (Support)(Sqd5)|
-Buraq Fast Battle Armor (Support)(Sqd6)|
-Constable Pacification Suit [ECM] (Sqd4)|
-Constable Pacification Suit [ECM] (Sqd5)|
-Constable Pacification Suit [ECM] (Sqd6)|
-Constable Pacification Suit [Sensor] (Sqd4)|
-Constable Pacification Suit [Sensor] (Sqd5)|
-Constable Pacification Suit [Sensor] (Sqd6)|
-Constable Pacification Suit [LMG] (Sqd4)|
-Constable Pacification Suit [LMG] (Sqd5)|
-Constable Pacification Suit [LMG] (Sqd6)|
-Constable Pacification Suit [SRM] (Sqd4)|
-Constable Pacification Suit [SRM] (Sqd5)|
-Constable Pacification Suit [SRM] (Sqd6)|
-Constable Pacification Suit [TAG] (Sqd4)|
-Constable Pacification Suit [TAG] (Sqd5)|
-Constable Pacification Suit [TAG] (Sqd6)|
-Wraith Battle Armor (Anti-Infantry)(Sqd4)|
-Wraith Battle Armor (Anti-Infantry)(Sqd5)|
-Wraith Battle Armor (Anti-Infantry)(Sqd6)|
-Wraith Battle Armor (Standard)(Sqd4)|
-Wraith Battle Armor (Standard)(Sqd5)|
-Wraith Battle Armor (Standard)(Sqd6)|
-Fusilier Battle Armor (Standard)(Sqd4)|
-Fusilier Battle Armor (Standard)(Sqd5)|
-Fusilier Battle Armor (Standard)(Sqd6)|
-Fusilier Battle Armor (Upgrade)(Sqd4)|
-Fusilier Battle Armor (Upgrade)(Sqd5)|
-Fusilier Battle Armor (Upgrade)(Sqd6)|
-PAB-28 Sniper Suit (Standard)(Sqd4)|
-PAB-28 Sniper Suit (Standard)(Sqd5)|
-PAB-28 Sniper Suit (Standard)(Sqd6)|
-Sea Fox Amphibious Armor (Standard)(Sqd4)|
-Sea Fox Amphibious Armor (Standard)(Sqd5)|
-Sea Fox Amphibious Armor (Standard)(Sqd6)|
-Kishi Ceremonial Armor (Standard)(Sqd4)|
-Kishi Ceremonial Armor (Standard)(Sqd5)|
-Kishi Ceremonial Armor (Standard)(Sqd6)|
-Oni Battle Armor [Bearhunter](Sqd4)|
-Oni Battle Armor [Bearhunter](Sqd5)|
-Oni Battle Armor [Bearhunter](Sqd6)|
-Oni Battle Armor [MRR](Sqd4)|
-Oni Battle Armor [MRR](Sqd5)|
-Oni Battle Armor [MRR](Sqd6)|
-Oni Battle Armor [PPC](Sqd4)|
-Oni Battle Armor [PPC](Sqd5)|
-Oni Battle Armor [PPC](Sqd6)|
-Oni Battle Armor [Narc](Sqd4)|
-Oni Battle Armor [Narc](Sqd5)|
-Oni Battle Armor [Narc](Sqd6)|
-Zou Heavy Battle Armor (C3)(Sqd4)|
-Zou Heavy Battle Armor (C3)(Sqd5)|
-Zou Heavy Battle Armor (C3)(Sqd6)|
-Zou Heavy Battle Armor (Standard)(Sqd4)|
-Zou Heavy Battle Armor (Standard)(Sqd5)|
-Zou Heavy Battle Armor (Standard)(Sqd6)|
-Amazon Battle Armor [MRR](Sqd4)|
-Amazon Battle Armor [MRR](Sqd5)|
-Amazon Battle Armor [MRR](Sqd6)|
-Amazon Battle Armor [Support PPC](Sqd4)|
-Amazon Battle Armor [Support PPC](Sqd5)|
-Amazon Battle Armor [Support PPC](Sqd6)|
-Shen Long Battle Armor [David Light Gauss](Sqd4)|
-Shen Long Battle Armor [David Light Gauss](Sqd5)|
-Shen Long Battle Armor [David Light Gauss](Sqd6)|
-Shen Long Battle Armor [Interdictor](Sqd4)|
-Shen Long Battle Armor [Interdictor](Sqd5)|
-Shen Long Battle Armor [Interdictor](Sqd6)|
-Shen Long Battle Armor [MG](Sqd4)|
-Shen Long Battle Armor [MG](Sqd5)|
-Shen Long Battle Armor [MG](Sqd6)|
-Shen Long Battle Armor [MRM](Sqd4)|
-Shen Long Battle Armor [MRM](Sqd5)|
-Shen Long Battle Armor [MRM](Sqd6)|
-Shen Long Battle Armor [Pop-Up Mine](Sqd4)|
-Shen Long Battle Armor [Pop-Up Mine](Sqd5)|
-Shen Long Battle Armor [Pop-Up Mine](Sqd6)|
-Shen Long Battle Armor [SRM](Sqd4)|
-Shen Long Battle Armor [SRM](Sqd5)|
-Shen Long Battle Armor [SRM](Sqd6)|
-Leonidas Battle Armor (David)(Sqd4)|
-Leonidas Battle Armor (David)(Sqd5)|
-Leonidas Battle Armor (David)(Sqd6)|
-Leonidas Battle Armor (FireDrake)(Sqd4)|
-Leonidas Battle Armor (FireDrake)(Sqd5)|
-Leonidas Battle Armor (FireDrake)(Sqd6)|
-Leonidas Battle Armor (Sensor)(Sqd4)|
-Leonidas Battle Armor (Sensor)(Sqd5)|
-Leonidas Battle Armor (Sensor)(Sqd6)|
-Leonidas Battle Armor (TAG)(Sqd4)|
-Leonidas Battle Armor (TAG)(Sqd5)|
-Leonidas Battle Armor (TAG)(Sqd6)|
-Leonidas Battle Armor (MG)(Sqd4)|
-Leonidas Battle Armor (MG)(Sqd5)|
-Leonidas Battle Armor (MG)(Sqd6)|
-Ogre Battle Armor (Standard)(Sqd5)|
-Ogre Battle Armor (Standard)(Sqd6)|
-Ogre Battle Armor (Interdictor)(Sqd5)|
-Ogre Battle Armor (Interdictor)(Sqd6)|
-Ogre Battle Armor (Interdictor)(Sqd4)|
-Ogre Battle Armor (Standard)(Sqd4)|
-Xiphos Assault Battle Armor A(Sqd4)|
-Xiphos Assault Battle Armor A(Sqd5)|
-Xiphos Assault Battle Armor A(Sqd6)|
-Xiphos Assault Battle Armor B(Sqd4)|
-Xiphos Assault Battle Armor B(Sqd5)|
-Xiphos Assault Battle Armor B(Sqd6)|
-Xiphos Assault Battle Armor C(Sqd4)|
-Xiphos Assault Battle Armor C(Sqd5)|
-Xiphos Assault Battle Armor C(Sqd6)|
-Marauder Battle Armor (Standard)(Sqd4)|
-Marauder Battle Armor (Standard)(Sqd5)|
-Marauder Battle Armor (Standard)(Sqd6)|
-Spectre Stealth Battle Armor (Standard)(Sqd4)|
-Spectre Stealth Battle Armor (Standard)(Sqd5)|
-Spectre Stealth Battle Armor (Standard)(Sqd6)|
-Gray Death Strike Suit (HarJel)(Sqd4)|
-Gray Death Strike Suit (HarJel)(Sqd5)|
-Gray Death Strike Suit (HarJel)(Sqd6)|
-Grenadier Battle Armor [Heavy Flamer](Sqd4)|
-Grenadier Battle Armor [Heavy Flamer](Sqd5)|
-Grenadier Battle Armor [Heavy Flamer](Sqd6)|
-Grenadier Battle Armor (Hunter-Killer) [C3/HRR](Sqd4)|
-Grenadier Battle Armor (Hunter-Killer) [C3/HRR](Sqd5)|
-Grenadier Battle Armor (Hunter-Killer) [C3/HRR](Sqd6)|
-Grenadier Battle Armor (Hunter-Killer) [SVSP/Magshot](Sqd4)|
-Grenadier Battle Armor (Hunter-Killer) [SVSP/Magshot](Sqd5)|
-Grenadier Battle Armor (Hunter-Killer) [SVSP/Magshot](Sqd6)|
-Infiltrator Mk. II Battle Armor (Marine)(Sqd4)|
-Infiltrator Mk. II Battle Armor (Marine)(Sqd5)|
-Infiltrator Mk. II Battle Armor (Marine)(Sqd6)|
-Ironhold Assault Battle Armor (Anti-Tank)(Sqd4)|
-Ironhold Assault Battle Armor (Anti-Tank)(Sqd5)|
-Ironhold Assault Battle Armor (Anti-Tank)(Sqd6)|
-Kobold Battle Armor IIC (Sqd4)|
-Kobold Battle Armor IIC (Sqd5)|
-Kobold Battle Armor IIC (Sqd6)|
-Kopis Assault Battle Armor (AI Mk II)(Sqd4)|
-Kopis Assault Battle Armor (AI Mk II)(Sqd5)|
-Kopis Assault Battle Armor (AI Mk II)(Sqd6)|
-Kopis Assault Battle Armor (Mortar)(Sqd4)|
-Kopis Assault Battle Armor (Mortar)(Sqd5)|
-Kopis Assault Battle Armor (Mortar)(Sqd6)|
-Kopis Assault Battle Armor (AI Mk IIr)(Sqd4)|
-Kopis Assault Battle Armor (AI Mk IIr)(Sqd5)|
-Kopis Assault Battle Armor (AI Mk IIr)(Sqd6)|
-Phalanx Battle Armor (D)(Sqd4)|
-Phalanx Battle Armor (D)(Sqd5)|
-Phalanx Battle Armor (D)(Sqd6)|
-Raiden II Battle Armor [Flamer](Sqd4)|
-Raiden II Battle Armor [Flamer](Sqd5)|
-Raiden II Battle Armor [Flamer](Sqd6)|
-Raiden II Battle Armor [HMG](Sqd4)|
-Raiden II Battle Armor [HMG](Sqd5)|
-Raiden II Battle Armor [HMG](Sqd6)|
-Ravager Assault Battle Armor (LRM)(Sqd4)|
-Ravager Assault Battle Armor (LRM)(Sqd5)|
-Ravager Assault Battle Armor (LRM)(Sqd6)|
-Rogue Bear Heavy Battle Armor (Upgrade)(Sqd4)|
-Rogue Bear Heavy Battle Armor (Upgrade)(Sqd5)|
-Rogue Bear Heavy Battle Armor (Upgrade)(Sqd6)|
-Sloth Battle Armor 'Huntsman'(Sqd4)|
-Sloth Battle Armor 'Huntsman'(Sqd5)|
-Sloth Battle Armor 'Huntsman'(Sqd6)|
-Thunderbird Battle Armor (Upgrade)[ER Laser](Sqd4)|
-Thunderbird Battle Armor (Upgrade)[ER Laser](Sqd5)|
-Thunderbird Battle Armor (Upgrade)[ER Laser](Sqd6)|
-Thunderbird Battle Armor (Upgrade)[LB-X](Sqd4)|
-Thunderbird Battle Armor (Upgrade)[LB-X](Sqd5)|
-Thunderbird Battle Armor (Upgrade)[LB-X](Sqd6)|
-Thunderbird Battle Armor (Upgrade)[Pulse Laser](Sqd4)|
-Thunderbird Battle Armor (Upgrade)[Pulse Laser](Sqd5)|
-Thunderbird Battle Armor (Upgrade)[Pulse Laser](Sqd6)|
-Warg Assault Battle Armor (Reactive)(Sqd4)|
-Warg Assault Battle Armor (Reactive)(Sqd5)|
-Warg Assault Battle Armor (Reactive)(Sqd6)|
-Centaur Battle Armor (Standard)(Sqd4)|
-Centaur Battle Armor (Standard)(Sqd5)|
-Centaur Battle Armor (Standard)(Sqd6)|
-Quirinus Battle Armor [David](Sqd4)|
-Quirinus Battle Armor [David](Sqd5)|
-Quirinus Battle Armor [David](Sqd6)|
-Quirinus Battle Armor [GL](Sqd4)|
-Quirinus Battle Armor [GL](Sqd5)|
-Quirinus Battle Armor [GL](Sqd6)|
-Quirinus Battle Armor [MG](Sqd4)|
-Quirinus Battle Armor [MG](Sqd5)|
-Quirinus Battle Armor [MG](Sqd6)|
-Simian Battle Armor [Flamer](Sqd4)|
-Simian Battle Armor [Flamer](Sqd5)|
-Simian Battle Armor [Flamer](Sqd6)|
-Simian Battle Armor [Heavy MG](Sqd4)|
-Simian Battle Armor [Heavy MG](Sqd5)|
-Simian Battle Armor [Heavy MG](Sqd6)|
-Simian Battle Armor [LRR](Sqd4)|
-Simian Battle Armor [LRR](Sqd5)|
-Simian Battle Armor [LRR](Sqd6)|
-Simian Battle Armor [SL](Sqd4)|
-Simian Battle Armor [SL](Sqd5)|
-Simian Battle Armor [SL](Sqd6)|
-Taranis Battle Armor (Standard)(Sqd4)|
-Taranis Battle Armor (Standard)(Sqd5)|
-Taranis Battle Armor (Standard)(Sqd6)|
-Cuchulainn Support Armor (Standard) (Sqd4)|
-Cuchulainn Support Armor (Standard) (Sqd5)|
-Cuchulainn Support Armor (Standard) (Sqd6)|
-Fenrir II Assault Battle Armor (AI)(Sqd4)|
-Fenrir II Assault Battle Armor (AI)(Sqd5)|
-Fenrir II Assault Battle Armor (AI)(Sqd6)|
-Fenrir II Assault Battle Armor (LRM)(Sqd4)|
-Fenrir II Assault Battle Armor (LRM)(Sqd5)|
-Fenrir II Assault Battle Armor (LRM)(Sqd6)|
-Fenrir II Assault Battle Armor (Med. Laser)(Sqd4)|
-Fenrir II Assault Battle Armor (Med. Laser)(Sqd5)|
-Fenrir II Assault Battle Armor (Med. Laser)(Sqd6)|
-Fenrir II Assault Battle Armor (MRR)(Sqd4)|
-Fenrir II Assault Battle Armor (MRR)(Sqd5)|
-Fenrir II Assault Battle Armor (MRR)(Sqd6)|
-Fenrir II Assault Battle Armor (SRM)(Sqd4)|
-Fenrir II Assault Battle Armor (SRM)(Sqd5)|
-Fenrir II Assault Battle Armor (SRM)(Sqd6)|
-Gray Death Infiltrator Suit (Firedrake)(Sqd4)|
-Gray Death Infiltrator Suit (Firedrake)(Sqd5)|
-Gray Death Infiltrator Suit (Firedrake)(Sqd6)|
-Gray Death Infiltrator Suit (Sensors)(Sqd4)|
-Gray Death Infiltrator Suit (Sensors)(Sqd5)|
-Gray Death Infiltrator Suit (Sensors)(Sqd6)|
-Gray Death Infiltrator Suit (TAG)(Sqd4)|
-Gray Death Infiltrator Suit (TAG)(Sqd5)|
-Gray Death Infiltrator Suit (TAG)(Sqd6)|
-Gray Death Infiltrator Suit (Mines)(Sqd4)|
-Gray Death Infiltrator Suit (Mines)(Sqd5)|
-Gray Death Infiltrator Suit (Mines)(Sqd6)|
-Gray Death Infiltrator Suit (Remote Sensors)(Sqd4)|
-Gray Death Infiltrator Suit (Remote Sensors)(Sqd5)|
-Gray Death Infiltrator Suit (Remote Sensors)(Sqd6)|
-Cavalier II Battle Armor [Flamer](Sqd4)|
-Cavalier II Battle Armor [MRR](Sqd4)|
-Cavalier II Battle Armor [PPC](Sqd4)|
-Cavalier II Battle Armor [SRM](Sqd4)|
-IS Standard Battle Armor (Baka) [LRR](Sqd4)|
-IS Standard Battle Armor (Baka) [LRR](Sqd5)|
-IS Standard Battle Armor (Baka) [LRR](Sqd6)|
-IS Standard Battle Armor (Baka) [SL](Sqd4)|
-IS Standard Battle Armor (Baka) [SL](Sqd5)|
-IS Standard Battle Armor (Baka) [SL](Sqd6)|
-IS Standard Battle Armor (Fa Sure) [David](Sqd4)|
-IS Standard Battle Armor (Fa Sure) [David](Sqd5)|
-IS Standard Battle Armor (Fa Sure) [David](Sqd6)|
-IS Standard Battle Armor (Fa Sure) [MG](Sqd4)|
-IS Standard Battle Armor (Fa Sure) [MG](Sqd5)|
-IS Standard Battle Armor (Fa Sure) [MG](Sqd6)|
-Kanazuchi Assault Battle Armor (Support)(Sqd4)|
-Kanazuchi Assault Battle Armor (Support)(Sqd5)|
-Kanazuchi Assault Battle Armor (Support)(Sqd6)|
-Longinus C Battle Armor [MRR]|
-Longinus C Battle Armor [MRR]|
-Longinus C Battle Armor [PPC]|
-Longinus C Battle Armor [PPC]|
-Rhino Battle Armor (Standard)(Sqd4)|
-Rhino Battle Armor (Standard)(Sqd5)|
-Rhino Battle Armor (Standard)(Sqd6)|
-Water Elemental Mining Suit (Standard)(Sqd4)|
-Water Elemental Mining Suit (Standard)(Sqd5)|
-Water Elemental Mining Suit (Standard)(Sqd6)|
-Machina Domini Interface Armor (Standard)(Sqd1)|
-TinStar BattleArmor (Standard)(Sqd4)|
-TinStar BattleArmor (Standard)(Sqd5)|
-TinStar BattleArmor (Standard)(Sqd6)|
-Elemental II Battle Armor (Standard)(Sqd4)|
-Elemental II Battle Armor (Standard)(Sqd5)|
-Elemental II Battle Armor (Standard)(Sqd6)|
-Gladiator Battle Armor S (Sqd4)|
-Gladiator Battle Armor S (Sqd5)|
-Gladiator Battle Armor S (Sqd6)|
-Gray Death Strike Suit (Standard)(Sqd4)|
-Gray Death Strike Suit (Standard)(Sqd5)|
-Gray Death Strike Suit (Standard)(Sqd6)|
-Hauberk Battle Armor Commando(Sqd4)|
-Hauberk Battle Armor Commando(Sqd5)|
-Hauberk Battle Armor Commando(Sqd6)|
-Rogue Bear Heavy Battle Armor (Hybrid)(Sqd4)|
-Rogue Bear Heavy Battle Armor (Hybrid)(Sqd5)|
-Rogue Bear Heavy Battle Armor (Hybrid)(Sqd6)|
-Sylph Battle Armor (Enhanced)(Sqd4)|
-Sylph Battle Armor (Enhanced)(Sqd5)|
-Sylph Battle Armor (Enhanced)(Sqd6)|
-Void Medium Battle Armor (Minelayer)(Sqd4)|
-Void Medium Battle Armor (Minelayer)(Sqd5)|
-Void Medium Battle Armor (Minelayer)(Sqd6)|
-Elemental III Battle Armor [AP Gauss](Sqd4)|
-Elemental III Battle Armor [AP Gauss](Sqd5)|
-Elemental III Battle Armor [AP Gauss](Sqd6)|
-Elemental III Battle Armor [Flamer](Sqd4)|
-Elemental III Battle Armor [Flamer](Sqd5)|
-Elemental III Battle Armor [Flamer](Sqd6)|
-Elemental III Battle Armor [MicroPL](Sqd4)|
-Elemental III Battle Armor [MicroPL](Sqd5)|
-Elemental III Battle Armor [MicroPL](Sqd6)|
-Gray Death Scout Suit (Reaper)(Sqd4)|
-Hantu AIX-210(Sqd4)|
-Hantu AIX-210(Sqd5)|
-Hantu AIX-210(Sqd6)|
-Ailette Zero-G Engineering Exoskeleton (Standard)(Sqd4)|
-Ailette Zero-G Engineering Exoskeleton (Standard)(Sqd5)|
-Ailette Zero-G Engineering Exoskeleton (Standard)(Sqd6)|
-Gladiator Exoskeleton (Standard) [AG](Sqd5)|
-Gladiator Exoskeleton (Standard) [AG](Sqd4)|
-Gladiator Exoskeleton (Standard) [AG](Sqd6)|
-Gladiator Exoskeleton (Standard) [BC/ID](Sqd5)|
-Gladiator Exoskeleton (Standard) [BC/ID](Sqd4)|
-Gladiator Exoskeleton (Standard) [BC/ID](Sqd6)|
-Gorilla Exoskeleton 'Falcata'(Sqd4)|
-Gorilla Exoskeleton 'Falcata'(Sqd5)|
-Gorilla Exoskeleton 'Falcata'(Sqd6)|
-Gorilla Exoskeleton PEX-2B(Sqd4)|
-Gorilla Exoskeleton PEX-2B(Sqd5)|
-Gorilla Exoskeleton PEX-2B(Sqd6)|
-Groundhog Exoskeleton CEX-205 [Armored Glove](Sqd4)|
-Groundhog Exoskeleton CEX-205 [Armored Glove](Sqd5)|
-Groundhog Exoskeleton CEX-205 [Armored Glove](Sqd6)|
-Groundhog Exoskeleton CEX-205 [Basic Manipulator](Sqd4)|
-Groundhog Exoskeleton CEX-205 [Basic Manipulator](Sqd5)|
-Groundhog Exoskeleton CEX-205 [Basic Manipulator](Sqd6)|
-Groundhog Exoskeleton CEX-205 [Cargo Lifter](Sqd4)|
-Groundhog Exoskeleton CEX-205 [Cargo Lifter](Sqd5)|
-Groundhog Exoskeleton CEX-205 [Cargo Lifter](Sqd6)|
-Groundhog Exoskeleton CEX-205 [Industrial Drill](Sqd4)|
-Groundhog Exoskeleton CEX-205 [Industrial Drill](Sqd5)|
-Groundhog Exoskeleton CEX-205 [Industrial Drill](Sqd6)|
-Groundhog Exoskeleton CEX-205 [Mine Clearance](Sqd4)|
-Groundhog Exoskeleton CEX-205 [Mine Clearance](Sqd5)|
-Groundhog Exoskeleton CEX-205 [Mine Clearance](Sqd6)|
-Groundhog Exoskeleton CEX-205 [Salvage Arm](Sqd4)|
-Groundhog Exoskeleton CEX-205 [Salvage Arm](Sqd5)|
-Groundhog Exoskeleton CEX-205 [Salvage Arm](Sqd6)|
-HeavyHauler Exoskeleton (Standard)(Sqd4)|
-HeavyHauler Exoskeleton (Standard)(Sqd5)|
-HeavyHauler Exoskeleton (Standard)(Sqd6)|
-Krise PA(L) (Standard)(Sqd4)|
-Krise PA(L) (Standard)(Sqd5)|
-Krise PA(L) (Standard)(Sqd6)|
-PowerLoader Exoskeleton P-5000(Sqd4)|
-PowerLoader Exoskeleton P-5000(Sqd5)|
-PowerLoader Exoskeleton P-5000(Sqd6)|
-Resgate PA(L) (Interdictor)(Sqd4)|
-Resgate PA(L) (Interdictor)(Sqd5)|
-Resgate PA(L) (Interdictor)(Sqd6)|
-Resgate PA(L) (Scout)(Sqd4)|
-Resgate PA(L) (Scout)(Sqd5)|
-Resgate PA(L) (Scout)(Sqd6)|
-Resgate PA(L) (Spotter)(Sqd4)|
-Resgate PA(L) (Spotter)(Sqd5)|
-Resgate PA(L) (Spotter)(Sqd6)|
-Resgate PA(L) (Standard)(Sqd4)|
-Resgate PA(L) (Standard)(Sqd5)|
-Resgate PA(L) (Standard)(Sqd6)|
-Resgate PA(L) (Support)(Sqd4)|
-Resgate PA(L) (Support)(Sqd5)|
-Resgate PA(L) (Support)(Sqd6)|
-Salrilla Exoskeleton [Mine Clearance](Sqd4)|
-Salrilla Exoskeleton [Mine Clearance](Sqd5)|
-Salrilla Exoskeleton [Mine Clearance](Sqd6)|
-Salrilla Exoskeleton [Salvage Arm](Sqd4)|
-Salrilla Exoskeleton [Salvage Arm](Sqd5)|
-Salrilla Exoskeleton [Salvage Arm](Sqd6)|
-Smoothdavid PA(L) II(Sqd4)|
-Smoothdavid PA(L) II(Sqd5)|
-Smoothdavid PA(L) II(Sqd6)|
-Smoothdavid PA(L) III(Sqd4)|
-Smoothdavid PA(L) III(Sqd5)|
-Smoothdavid PA(L) III(Sqd6)|
-Smoothgoliath PA(L) II(Sqd4)|
-Smoothgoliath PA(L) II(Sqd5)|
-Smoothgoliath PA(L) II(Sqd6)|
-Tunnel Rat I Mining Exoskeleton [Armored Glove](Sqd4)|
-Tunnel Rat I Mining Exoskeleton [Armored Glove](Sqd5)|
-Tunnel Rat I Mining Exoskeleton [Armored Glove](Sqd6)|
-Tunnel Rat I Mining Exoskeleton [Industrial Drill](Sqd4)|
-Tunnel Rat I Mining Exoskeleton [Industrial Drill](Sqd5)|
-Tunnel Rat I Mining Exoskeleton [Industrial Drill](Sqd6)|
-Tunnel Rat II Mining Exoskeleton [Armored Glove](Sqd4)|
-Tunnel Rat II Mining Exoskeleton [Armored Glove](Sqd5)|
-Tunnel Rat II Mining Exoskeleton [Armored Glove](Sqd6)|
-Tunnel Rat II Mining Exoskeleton [Industrial Drill](Sqd4)|
-Tunnel Rat II Mining Exoskeleton [Industrial Drill](Sqd5)|
-Tunnel Rat II Mining Exoskeleton [Industrial Drill](Sqd6)|
-Tunnel Rat III Mining Exoskeleton [Armored Glove](Sqd4)|
-Tunnel Rat III Mining Exoskeleton [Armored Glove](Sqd5)|
-Tunnel Rat III Mining Exoskeleton [Armored Glove](Sqd6)|
-Tunnel Rat III Mining Exoskeleton [Industrial Drill](Sqd4)|
-Tunnel Rat III Mining Exoskeleton [Industrial Drill](Sqd5)|
-Tunnel Rat III Mining Exoskeleton [Industrial Drill](Sqd6)|
-Tunnel Rat IV Mining Exoskeleton [Armored Glove/GL](Sqd4)|
-Tunnel Rat IV Mining Exoskeleton [Armored Glove/GL](Sqd5)|
-Tunnel Rat IV Mining Exoskeleton [Armored Glove/GL](Sqd6)|
-Tunnel Rat IV Mining Exoskeleton [Armored Glove/LMG](Sqd4)|
-Tunnel Rat IV Mining Exoskeleton [Armored Glove/LMG](Sqd5)|
-Tunnel Rat IV Mining Exoskeleton [Armored Glove/LMG](Sqd6)|
-Tunnel Rat IV Mining Exoskeleton [Battle Claw/GL](Sqd4)|
-Tunnel Rat IV Mining Exoskeleton [Battle Claw/GL](Sqd5)|
-Tunnel Rat IV Mining Exoskeleton [Battle Claw/GL](Sqd6)|
-Tunnel Rat IV Mining Exoskeleton [Battle Claw/LMG](Sqd4)|
-Tunnel Rat IV Mining Exoskeleton [Battle Claw/LMG](Sqd5)|
-Tunnel Rat IV Mining Exoskeleton [Battle Claw/LMG](Sqd6)|
-Elemental II Battle Armor X(Sqd4)|
-Elemental II Battle Armor X(Sqd5)|
-Elemental II Battle Armor X(Sqd6)|
-Rogue Bear Heavy Battle Armor HR(Sqd4)|
-Rogue Bear Heavy Battle Armor HR(Sqd5)|
-Rogue Bear Heavy Battle Armor HR(Sqd6)|
-Sylph Battle Armor XR(Sqd4)|
-Sylph Battle Armor XR(Sqd5)|
-Sylph Battle Armor XR(Sqd6)|
-Tornado PA(L) P17 'Hurricane'(Sqd4)|
-Tornado PA(L) P17 'Hurricane'(Sqd5)|
-Tornado PA(L) P17 'Hurricane'(Sqd6)|
-Kobold Battle Armor X-C3(Sqd4)|
-Kobold Battle Armor X-C3(Sqd5)|
-Kobold Battle Armor X-C3(Sqd6)|
-Hauberk Battle Armor U15(Sqd4)|
-Hauberk Battle Armor U15(Sqd5)|
-Hauberk Battle Armor U15(Sqd6)|
-Infiltrator Mk. II Battle Armor Coral Intent(Sqd4)|
-Infiltrator Mk. II Battle Armor Coral Intent(Sqd5)|
-Infiltrator Mk. II Battle Armor Coral Intent(Sqd6)|
-Gladiator Exoskeleton 'The Spider'(Sqd4)|
-Gladiator Exoskeleton 'The Spider'(Sqd5)|
-Gladiator Exoskeleton 'The Spider'(Sqd6)|
-Gray Death Scout Suit 'The Willow Wisps'(Sqd4)|
-Gray Death Scout Suit 'The Willow Wisps'(Sqd5)|
-Gray Death Scout Suit 'The Willow Wisps'(Sqd6)|
-IS Standard Battle Armor 'Hive'(Sqd4)|
-IS Standard Battle Armor 'Hive'(Sqd5)|
-IS Standard Battle Armor 'Hive'(Sqd6)|
-Kanazuchi Assault Battle Armor 'Cyclops'(Sqd4)|
-Kanazuchi Assault Battle Armor 'Cyclops'(Sqd5)|
-Kanazuchi Assault Battle Armor 'Cyclops'(Sqd6)|
-Kage Light Battle Armor C(Sqd4)|
-Kage Light Battle Armor C(Sqd5)|
-Kage Light Battle Armor C(Sqd6)|
-Void Medium Battle Armor Caltrop(Sqd4)|
-Void Medium Battle Armor Caltrop(Sqd5)|
-Void Medium Battle Armor Caltrop(Sqd6)|
-Fa Shih Battle Armor 2 [MG](Sqd4)|
-Fa Shih Battle Armor 2 [MG](Sqd5)|
-Fa Shih Battle Armor 2 [MG](Sqd6)|
-Trinity Medium Battle Armor (Ying Long BC3)[David](Sqd4)|
-Trinity Medium Battle Armor (Ying Long BC3)[David](Sqd5)|
-Trinity Medium Battle Armor (Ying Long BC3)[David](Sqd6)|
-Longinus Battle Armor 'Hacked' [David](Sqd4)|
-Longinus Battle Armor 'Hacked' [David](Sqd5)|
-Longinus Battle Armor 'Hacked' [David](Sqd6)|
-Longinus Battle Armor 'Hacked' [MG](Sqd4)|
-Longinus Battle Armor 'Hacked' [MG](Sqd5)|
-Longinus Battle Armor 'Hacked' [MG](Sqd6)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [Flamer] (Sqd4)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [Flamer] (Sqd5)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [Flamer] (Sqd6)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [MG] (Sqd4)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [MG] (Sqd5)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [MG] (Sqd6)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [Laser] (Sqd4)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [Laser] (Sqd5)|
-Djinn Battle Armor (Reflective) 'Terrorizer' [Laser] (Sqd6)|
-Groundhog Exoskeleton 'Master Thief'(Sqd1)|
-Ailette Rescue PA(L) (Sqd4)|
-Ailette Rescue PA(L) (Sqd5)|
-Ailette Rescue PA(L) (Sqd6)|
-Purifier Battle Armor Terra [AP Gauss](Sqd4)|
-Purifier Battle Armor Terra [AP Gauss](Sqd5)|
-Purifier Battle Armor Terra [AP Gauss](Sqd6)|
-Purifier Battle Armor Terra [ERSL](Sqd4)|
-Purifier Battle Armor Terra [ERSL](Sqd5)|
-Purifier Battle Armor Terra [ERSL](Sqd6)|
-Purifier Battle Armor Terra [MRR](Sqd4)|
-Purifier Battle Armor Terra [MRR](Sqd5)|
-Purifier Battle Armor Terra [MRR](Sqd6)|
-Purifier Battle Armor Terra [SPL](Sqd4)|
-Purifier Battle Armor Terra [SPL](Sqd5)|
-Purifier Battle Armor Terra [SPL](Sqd6)|
-Tornado PA(L) G17(Sqd4)|
-Tornado PA(L) G17(Sqd5)|
-Tornado PA(L) G17(Sqd6)|
-Surat (Gray Death) Solahma Suit (Standard)(Sqd4)|
-Surat (Gray Death) Solahma Suit (Standard)(Sqd5)|
-Surat (Gray Death) Solahma Suit (Standard)(Sqd6)|
-Thunderbird II Battle Armor (Standard)(Sqd4)|
-Thunderbird II Battle Armor (Standard)(Sqd5)|
-Thunderbird II Battle Armor (Standard)(Sqd6)|
-Tortoise II (aSRM)(Sqd4)|
-Tortoise II (aSRM)(Sqd5)|
-Tortoise II (aSRM)(Sqd6)|
-Tortoise II (C3)(Sqd4)|
-Tortoise II (C3)(Sqd5)|
-Tortoise II (C3)(Sqd6)|
-Tortoise II (LRM)(Sqd4)|
-Tortoise II (LRM)(Sqd5)|
-Tortoise II (LRM)(Sqd6)|
-Tortoise II (SRM)(Sqd4)|
-Tortoise II (SRM)(Sqd5)|
-Tortoise II (SRM)(Sqd6)|
-Aegis Point Defense Suit (Standard)(Sqd4)|
-Aegis Point Defense Suit (Standard)(Sqd5)|
-Aegis Point Defense Suit (Standard)(Sqd6)|
-Clan Interface Armor (Standard)(Sqd1)|
-Grenadier II Battle Armor A(Sqd4)|
-Grenadier II Battle Armor A(Sqd5)|
-Grenadier II Battle Armor A(Sqd6)|
-Grenadier II Battle Armor B(Sqd4)|
-Grenadier II Battle Armor B(Sqd5)|
-Grenadier II Battle Armor B(Sqd6)|
-Grenadier II Battle Armor C(Sqd4)|
-Grenadier II Battle Armor C(Sqd5)|
-Grenadier II Battle Armor C(Sqd6)|
-Grenadier II Battle Armor D(Sqd4)|
-Grenadier II Battle Armor D(Sqd5)|
-Grenadier II Battle Armor D(Sqd6)|
-Gnome Battle Armor 'Dwarf'(Sqd4)|
-Sylph Battle Armor 'TinkerBelle'(Sqd4)|
-Undine Battle Armor 'Sebastian'(Sqd4)|
-Fenrir Battle Armor 'Longshot' (Sqd4)|
-Fenrir Battle Armor 'Longshot' (Sqd5)|
-Fenrir Battle Armor 'Longshot' (Sqd6)|
-Gray Death Strike Suit (Prototype)(Sqd4)|
-Gray Death Strike Suit (Prototype)(Sqd5)|
-Gray Death Strike Suit (Prototype)(Sqd6)|
-Boeing Jump Bomber (Standard)|
-Boomerang Spotter Plane (Standard)|
-Guardian Fighter B|
-Guardian Fighter C|
-Guardian Fighter D|
-Guardian Fighter (Standard)|
-Heavy Strike Fighter Bat Hawk|
-Heavy Strike Fighter Inseki II|
-Heavy Strike Fighter Inseki|
-Heavy Strike Fighter Meteor-G|
-Heavy Strike Fighter Meteor-U|
-Heavy Strike Fighter Meteor|
-Light Strike Fighter Andurien|
-Light Strike Fighter Angel (Upgrade)|
-Light Strike Fighter Angel|
-Light Strike Fighter Comet|
-Light Strike Fighter Owl II|
-Light Strike Fighter Owl III|
-Light Strike Fighter Owl|
-Light Strike Fighter Suzume ('Sparrow')|
-Mechbuster (Laser)|
-Mechbuster (LB-X)|
-Mechbuster (SRM)|
-Mechbuster (Standard)|
-Medium Strike Fighter Crane|
-Medium Strike Fighter Defender II|
-Medium Strike Fighter Defender|
-Medium Strike Fighter Kaiseradler (Imperial Eagle)|
-Medium Strike Fighter Steinadler (Golden Eagle)|
-Planetlifter Air Transport 'SuperPelican' aka 'Waddle'|
-Planetlifter Air Transport (Standard)|
-Stork Light Refueling Craft (Original)|
-Stork Light Refueling Craft (Standard)|
-Saroyan Jump Bomber (Standard)|
-Katya Ground Assault Craft C-906(RL10)|
-Katya Ground Assault Craft C-904(RL15)|
-Katya Ground Assault Craft C-905(RL20)|
-Raubvogel Aerobomber AB-18C|
-Bluehawk Combat Support Fighter MSF-42|
-Protector Combat Support Fighter ASF-23|
-Bullet Suicide Drone (Standard)|
-Drake Medium Stealth Fighter (Standard)|
-Planetlifter Tactical Support (Standard)|
-Seabuster Strike Fighter (Standard)|
-Avanti Aerospace Airliner ACL-800|
-Chariot High-Speed Medevac (Standard)|
-Delta Air Cruiser MA-80|
-Federated-Boeing Longhaul FB-335|
-Jetta Coruna 4X (Standard)|
-King Karnov Transport KC-6|
-King Karnov Transport KC-9|
-Mosquito Radar Plane IX (Standard)|
-Protector High-Speed Medevac C-790|
-S 2772 Airplane (Standard)|
-Torrent Heavy Bomber (Original)|
-Torrent Heavy Bomber (Standard)|
-Zanadu Air Bus (Standard)|
-Drake Medium Strike Fighter (Standard)|
-Planetlifter Support Aircraft (Standard)|
-Seabuster Strike Fighter (Early)|
-Hurricane Conventional Fighter (Standard)|
-Vendetta Medium Fighter (Standard)|
-Mustang Fighter (Standard)|
-Colt Medium Fighter (LRM)|
-Colt Medium Fighter (SRM)|
-Tsuru VIP Aircraft (Standard)|
-Gaajian System Patrol Boat (2485)|
-Gaajian System Patrol Boat (3060)|
-Hoshiryokou (Standard)|
-Hoshiryokou (Tug Boat)|
-Aqueduct Liquid Carrier (Standard)|
-Princess Luxury Liner (Cargo)|
-Princess Luxury Liner (Standard)|
-Lee (Cargo Carrier)|
-Lee (Aerospace Carrier)|
-Lee (Armor Carrier)|
-Lee (BattleMech Carrier)|
-Drone M-3|
-Model 96C “Howdah” SDS Command Ship|
-Pueblo (2673)|
-Jumbo (Standard)|
-Polaris (Standard)|
-Cockatrice Monitor Platform (Drone)|
-Dragau Assault Interceptor (CASPAR II Drone)|
-Tiamat Pocket Warship (CASPAR II Drone)|
-Danais (Standard)|
-Trojan (Blockade Runner)|
-Lion (3052) (WD)|
-Rose (Bara no Ryu) (Hive)|
-Outpost (Defender)|
-Titan (Monitor)|
-Claymore V3|
-Lung Wang P2|
-Merlin R1|
-Vengeance DC|
-Behemoth C (2848)|
-Behemoth C (Arcship)|
-Broadsword (2979)|
-Carrier (2882)|
-Confederate C (3048)|
-Lion (2835)|
-Lion (3005) (WD)|
-Miraborg (3053)|
-Mule C (2842)|
-Noruff (3056)|
-Overlord C (2818) (Tank)|
-Overlord C (2818)|
-Sassanid (2875)|
-Titan (2953)|
-Union C (2829) (Tank)|
-Union C (2829)|
-Union C (2840) (Cargo)|
-Achilles (2582)|
-Achilles (2721)|
-Achilles (2721b)|
-Achilles (3055)|
-Avenger (2816)|
-Avenger (3048)|
-Behemoth (2658)|
-Behemoth (2782)|
-Buccaneer (2708)|
-Buccaneer (2709) (Vehicle)|
-Buccaneer (2792)|
-Cargo King (2790)|
-Cargomaster (2790)|
-Claymore (3054)|
-Condor (2801)|
-Condor (3035) Dove|
-Condor (3054)|
-Condor (3079)|
-Confederate (2602)|
-Confederate (2602) (Mech)|
-Excalibur (2786)|
-Excalibur (3056)|
-Fortress (2613)|
-Fortress (3058)|
-Fury (2638)|
-Fury (3056)|
-Gazelle (2531)|
-Gazelle (3055)|
-Gazelle (Heavy Vehicle)|
-Hamilcar (3054)|
-Hamilcar (3084)|
-Hannibal (3055)|
-Hercules (3053)|
-Intruder (2655)|
-Intruder (3056)|
-Kuan Ti (3055)|
-Leopard (2537)|
-Leopard (3056)|
-Leopard CV (2581)|
-Leopard CV (3054)|
-Lion (2595)|
-Lung Wang (3055)|
-Mammoth (2658)|
-Model 97 'Octopus' (3051)|
-Monarch (2759)|
-Mule (2737)|
-Nagumo (3056)|
-Okinawa (3055)|
-Okinawa (3056)|
-Overlord (2762)|
-Overlord (2762b)|
-Overlord (2775) (Combined Arms)|
-Overlord (2809) (Klondike)|
-Overlord (2817) (Command)|
-Overlord (3056)|
-Rose (Bara no Ryu) (3054)|
-Seeker (2815)|
-Seeker (2815) (Mech)|
-Seeker (3054)|
-Titan (2647)|
-Titan (2647b)|
-Triumph (2593)|
-Triumph (2593b)|
-Triumph (3057)|
-Union (2708) (Cargo)|
-Union (2708)|
-Union (2708b)|
-Union (2709) (Combined Arms)|
-Union (2710) (CV)|
-Union (3055)|
-Vengeance (2682)|
-Vengeance (3056)|
-Arcadia (3066)|
-Arcadia (3080)|
-Mercer (3065)|
-Outpost (3063)|
-Outpost (3070)|
-Assault Triumph (3062)|
-Assault Triumph (3082)|
-Conquistador (3063)|
-Conquistador (Avalon One)|
-Merlin (3063)|
-Nekohono'o (Standard)|
-Overlord A3|
-Overlord A3A|
-Union-X (3065)|
-Union-X (3071)|
-Colossus (Standard)|
-Colossus Mk I|
-Dictator (Command)|
-Dictator (Standard)|
-Manatee (Cargo)|
-Manatee (Standard)|
-Model 96 'Elephant' (Standard)|
-Model 96 'Elephant' Mk I|
-Mule (Star League Pocket Warship)|
-Pentagon 'Pocket Warship'|
-Pentagon (2751)|
-Pentagon (Standard)|
-Pentagon Mk I|
-Vampire (Standard)|
-Vulture (2312)|
-Vulture (2405)|
-Vulture (Cargo)|
-Aurora (BA)|
-Aurora (Cargo)|
-Aurora (Combined Arms)|
-Aurora (CV)|
-Aurora (Gunship)|
-Aurora (Standard)|
-Aurora (Tanker)|
-Aurora (Vehicle)|
-Excalibur 'Pocket Warship'|
-Leopard 'Pocket Warship'|
-Mule 'Pocket Warship'|
-Mule (Armored Pocket Warship)|
-Union 'Pocket Warship'|
-Aesir Assault Dropship (Standard)|
-Isegrim Assault DropShip (Standard)|
-Vanir Assault Dropship (Standard)|
-Arondight Pocket Warship (Refit)|
-Arondight Pocket Warship (SCC)|
-Arondight Pocket Warship (Standard)|
-Interdictor Pocket Warship (SCC)|
-Interdictor Pocket Warship (Standard)|
-Interdictor Pocket Warship (Sub-Capital)|
-Taihou Assault Dropship (Standard)|
-Nekohono'o (SCL)|
-Dragau II Assault Interceptor (Standard)|
-Tiamat Pocket Warship (Standard)|
-Gorgon Carrier (Standard)|
-Seleucus Infantry Transport (Standard)|
-Nagasawa (Standard)|
-Achilles (3088)|
-Dragau II (3097)|
-Interdictor Pocket Warship (3115)|
-Tiamat II (3112)|
-Duat Military Transport (Standard)|
-Trutzburg (Standard)|
-Castrum Pocket WarShip (Standard)|
-Conquistador 'Blockade Runner'|
-Nekohono'o (HQ)|
-Lung Wang 'Predator'|
-Merlin Ngake|
-Vengeance (Danai Centrella)|
-Vampire II (Standard)|
-Leopard PA-Class Dropship|
-Black Eagle (Standard)|
-Czar Dropship (Armored Carrier)|
-Czar Dropship (Mech Carrier)|
-Czar Dropship (Standard)|
-DroST IIa Transport (2445)|
-DroST IIa Transport (2470)|
-DroST IIb Transport (2445)|
-DroST IIb Transport (2470)|
-Saturn Patrol Ship (Standard)|
-Claymore Interceptor|
-Firebird FR-1|
-Star Dagger S-2B|
-Thrush TR-5|
-Transit TR-9|
-Chippewa IIC 2|
-Chippewa IIC (Standard)|
-Goth A|
-Goth B|
-Goth C|
-Goth D|
-Goth Prime|
-Ironsides IRN-SD1b-EC|
-Issedone A|
-Issedone B|
-Issedone C|
-Issedone D|
-Issedone Prime|
-Kublai E|
-Kublai F|
-Kublai G|
-Ogotai A|
-Ogotai B|
-Ogotai Prime|
-Pella (Standard)|
-Qasar A|
-Qasar B|
-Qasar C|
-Qasar D|
-Qasar Prime|
-Rapier RPR-100b-EC|
-Sabre SB-27b-EC|
-Tomahawk THK-63-EC|
-Voidseeker Mk 39-004 Interceptor|
-Voidseeker Mk 39-007 Striker|
-DragonFly MM-1|
-Blackwasp Mk. 30|
-Aeshna Heavy Drone Fighter (Standard)|
-Scarab Medium Drone Fighter (Standard)|
-Tabanid Light Drone Fighter (Standard)|
-Chippewa CHP-W5b|
-Corsair CSR-V12b|
-Eagle EGL-R6b|
-Hellcat II HCT-213C|
-Lightning LTN-G15b|
-Sabre SB-27b|
-Stuka STU-K5b2|
-Stuka STU-K5b2|
-Thunderbird TRB-D36b|
-Zero ZRO-116b|
-Cheetah OF-17A-R|
-Corax C|
-Corsair CSR-12D|
-Hydaspes 3|
-Lucifer III LCR-3|
-Persepolis (Standard)|
-Rapier RPR-300S|
-Sabre SB-31D|
-Suzaku SU-14|
-Transit TR-13G|
-Tyre 3|
-Umbra RF-1|
-Wildkatze WKT-1S|
-Wildkatze WKT-2S|
-Chippewa CHP-W7 (Manfred)|
-Corsair (Bob) 'Roswell'|
-Hydaspes (Algar)|
-Issus (Erika)|
-Mechbuster (Mary)|
-Seydlitz (Mary) 'Yari'|
-Slayer SL-15 (Eric)|
-Stingray F-92 (Michael)|
-Thrush (Maximilian)'C-1247'|
-Tyre (Michiko)|
-Banshee BSE-X2|
-Cheetah F-10|
-Cheetah F-11-R|
-Cheetah F-11-RR|
-Cheetah F-11|
-Cheetah F-12-S|
-Cheetah F-13|
-Cheetah F-14-S|
-Chippewa CHP-W10|
-Chippewa CHP-W5|
-Chippewa CHP-W7|
-Chippewa CHP-W7T|
-Chippewa CHP-W8|
-Corsair CSR-V12|
-Corsair CSR-V12M 'Regulus'|
-Corsair CSR-V14|
-Corsair CSR-V18|
-Corsair CSR-V20|
-Lucifer II LCF-R16K|
-Lucifer II LCF-R16KR|
-Lucifer LCF-R15|
-Lucifer LCF-R16|
-Lucifer LCF-R20|
-Riever F-100|
-Riever F-100a|
-Riever F-100b|
-Riever F-700|
-Riever F-700a|
-Riever F-700b|
-Sai S-3|
-Sai S-4|
-Sai S-4C|
-Sai S-4X|
-Sai S-7|
-Sai S-8|
-Samurai SL-25|
-Samurai SL-26|
-Samurai SL-27|
-Seydlitz SYD-21|
-Seydlitz SYD-Z1|
-Seydlitz SYD-Z2|
-Seydlitz SYD-Z2A|
-Seydlitz SYD-Z2B|
-Seydlitz SYD-Z3|
-Seydlitz SYD-Z3A|
-Seydlitz SYD-Z4|
-Shilone SL-17|
-Shilone SL-17AC|
-Shilone SL-17R|
-Shilone SL-18|
-Sholagar SL-21|
-Sholagar SL-21L|
-Sholagar SL-22|
-Slayer SL-15|
-Slayer SL-15A|
-Slayer SL-15B|
-Slayer SL-15C|
-Slayer SL-15K|
-Slayer SL-15R|
-Sparrowhawk SPR-6D|
-Sparrowhawk SPR-7D|
-Sparrowhawk SPR-8H|
-Sparrowhawk SPR-H5|
-Sparrowhawk SPR-H5K|
-Stingray F-90|
-Stingray F-90S|
-Stingray F-92|
-Stingray F-94|
-Stingray F-95|
-Stuka STU-D6|
-Stuka STU-D7|
-Stuka STU-K10|
-Stuka STU-K15|
-Stuka STU-K5|
-Thrush TR-7|
-Thrush TR-7p|
-Thrush TR-8|
-Transgressor TR-13|
-Transgressor TR-13A|
-Transgressor TR-14 'AC'|
-Transgressor TR-15|
-Transgressor TR-16|
-Transit TR-10|
-Transit TR-11|
-Transit TR-12|
-Swift C|
-Tomahawk 'C'|
-Tomahawk CH|
-Ahab AHB-443|
-Ahab AHB-643|
-Ahab AHB-MD|
-Ahab AHB-X|
-Gotha GTHA-100|
-Gotha GTHA-300|
-Gotha GTHA-400|
-Gotha GTHA-500|
-Gotha GTHA-600|
-Hammerhead HMR-HD|
-Hammerhead HMR-HE|
-Hammerhead HMR-HF|
-Hammerhead HMR-HG|
-Hellcat II HCT-212|
-Hellcat II HCT-213B|
-Hellcat II HCT-214|
-Hellcat II HCT-215|
-Ironsides IRN-SD1|
-Ironsides IRN-SD2|
-Ironsides IRN-SD3|
-Rapier RPR-100|
-Rapier RPR-101|
-Rapier RPR-102|
-Rapier RPR-200|
-Rapier RPR-300|
-Rogue RGU-133E|
-Rogue RGU-133F|
-Rogue RGU-133L|
-Rogue RGU-133LP|
-Rogue RGU-133P|
-Spad SPD-502|
-Spad SPD-503|
-Spad SPD-504|
-Swift SWF-606|
-Swift SWF-606R|
-Tomahawk THK-33|
-Tomahawk THK-43|
-Tomahawk THK-53|
-Tomahawk THK-63|
-Tomahawk THK-63CS|
-Trident TRN-3T|
-Trident TRN-3U|
-Trident TRN-3V|
-Zero ZRO-114|
-Zero ZRO-115|
-Avar A|
-Avar B|
-Avar C|
-Avar D|
-Avar E|
-Avar Prime|
-Bashkir A|
-Bashkir B|
-Bashkir C|
-Bashkir D|
-Bashkir E|
-Bashkir Prime|
-Batu A|
-Batu B|
-Batu C|
-Batu D|
-Batu E|
-Batu Prime|
-Jagatai A|
-Jagatai B|
-Jagatai C|
-Jagatai D|
-Jagatai E|
-Jagatai Prime|
-Jagatai X|
-Jengiz A|
-Jengiz B|
-Jengiz C|
-Jengiz D|
-Jengiz E|
-Jengiz Prime|
-Jengiz X|
-Kirghiz A|
-Kirghiz B|
-Kirghiz C|
-Kirghiz D|
-Kirghiz E|
-Kirghiz Prime|
-Sabutai A|
-Sabutai B|
-Sabutai C|
-Sabutai D|
-Sabutai E|
-Sabutai Prime|
-Sabutai X|
-Scytha A|
-Scytha B|
-Scytha C|
-Scytha D|
-Scytha E|
-Scytha Prime|
-Scytha X|
-Sulla A|
-Sulla B|
-Sulla C|
-Sulla D|
-Sulla E|
-Sulla Prime|
-Turk A|
-Turk B|
-Turk C|
-Turk D|
-Turk E|
-Turk Prime|
-Vandal A|
-Vandal B|
-Vandal C|
-Vandal D|
-Vandal E|
-Vandal Prime|
-Visigoth A|
-Visigoth B|
-Visigoth C|
-Visigoth D|
-Visigoth E|
-Visigoth Prime|
-Ammon (Standard)|
-Chaeronea (Standard)|
-Hydaspes (Standard)|
-Issus (Standard)|
-Tyre 2|
-Tyre (Standard)|
-Corax CRX-O|
-Corax CRX-OA|
-Corax CRX-OB|
-Corax CRX-OC|
-Dagger DARO-1|
-Dagger DARO-1A|
-Dagger DARO-1B|
-Defiance DFC-O|
-Defiance DFC-OA|
-Defiance DFC-OB|
-Defiance DFC-OC|
-Eisensturm EST-O|
-Eisensturm EST-OA|
-Eisensturm EST-OB|
-Eisensturm EST-OC|
-Eisensturm EST-R3|
-Huscarl HSCL-1-O|
-Huscarl HSCL-1-OA|
-Huscarl HSCL-1-OB|
-Huscarl HSCL-1-OC|
-Lancer LX-2|
-Lancer LX-2A|
-Oni ON-1|
-Oni ON-2|
-Shiva SHV-O|
-Shiva SHV-OA|
-Shiva SHV-OB|
-Shiva SHV-OC|
-Tatsu MIK-O|
-Tatsu MIK-OA|
-Tatsu MIK-OB|
-Tatsu MIK-OC|
-Troika CMT-3T|
-Troika CMT-4U|
-Ammon 2|
-Chaeronea 2|
-Chaeronea 3|
-Chaeronea 4|
-Hydaspes 2|
-Issus 2|
-Issus 3|
-Xerxes 2|
-Xerxes 3|
-Xerxes (Standard)|
-Corax CRX-OD|
-Corax CRX-OR|
-Dagger DARO-1C|
-Dagger DARO-1D|
-Defiance DFC-OD|
-Eisensturm EST-OD|
-Huscarl HSCL-1-OD|
-Huscarl HSCL-1-OR|
-Lancer LX-3|
-Shiva SHV-OD|
-Tatsu MIK-OD|
-Tatsu MIK-OE|
-Troika CMT-6T|
-Centurion CNT-1A|
-Centurion CNT-1D|
-Centurion CNT-2D|
-Centurion CNT-3S|
-Deathstalker F-77|
-Deathstalker F-77A|
-Eagle EGL-R1|
-Eagle EGL-R10|
-Eagle EGL-R11|
-Eagle EGL-R4|
-Eagle EGL-R6|
-Eagle EGL-R9|
-Hellcat HCT-213|
-Hellcat HCT-213D|
-Hellcat HCT-213R|
-Hellcat HCT-213S|
-Hellcat HCT-313|
-Lightning LTN-G14|
-Lightning LTN-G15|
-Lightning LTN-G16D|
-Lightning LTN-G16L|
-Lightning LTN-G16O|
-Lightning LTN-G16S|
-Lightning LTN-G16T|
-Ahab AHB-443b|
-Gotha GTHA-500b|
-Hammerhead HMR-HDb|
-Ironsides IRN-SD1b|
-Rapier RPR-100b|
-Rogue RGU-133Eb|
-Tomahawk THK-63b|
-Trident TRN-3Tb|
-Sabre SB-26|
-Sabre SB-27|
-Sabre SB-28|
-Sabre SB-29|
-Rusalka S-RSL-O Invictus|
-Rusalka S-RSL-OA Dominus|
-Rusalka S-RSL-OB Infernus|
-Rusalka S-RSL-OC Comminus|
-Rusalka S-RSL-OD Luminos|
-Rusalka S-RSL-OE Eminus|
-Shade S-HA-O Invictus|
-Shade S-HA-OA Dominus|
-Shade S-HA-OB Infernus|
-Shade S-HA-OC Comminus|
-Shade S-HA-OD Luminos|
-Shade S-HA-OE Eminus|
-Striga S-STR-O Invictus|
-Striga S-STR-OA Dominus|
-Striga S-STR-OB Infernus|
-Striga S-STR-OC Comminus|
-Striga S-STR-OD Luminos|
-Striga S-STR-OE Eminus|
-Starfire SF-1X|
-Thunderbird TRB-D36|
-Thunderbird TRB-D46|
-Thunderbird TRB-D50|
-Thunderbird TRB-D56|
-Typhoon TFN-2A|
-Typhoon TFN-3A|
-Typhoon TFN-3M|
-Typhoon TFN-5H|
-Vulcan VLC-5N|
-Vulcan VLC-6N|
-Vulcan VLC-8N|
-Mengqin MNG-8L|
-Morgenstern MR-1S|
-Morgenstern MR-1SA|
-Morgenstern MR-1SB|
-Morgenstern MR-1SC|
-Morgenstern MR-1SD|
-Ostrogoth A|
-Ostrogoth B|
-Ostrogoth C|
-Ostrogoth Prime|
-Poignard PGD-L3|
-Poignard PGD-R3|
-Poignard PGD-Y3|
-Sagittarii SGT-2R|
-Sagittarii SGT-3R|
-Wusun A|
-Wusun B|
-Wusun C|
-Wusun Prime|
-Cutlass CUT-01D|
-Cutlass CUT-01E|
-Rondel RDL-01C|
-Koroshiya KOS-1A|
-Yun Y-2|
-Aquila AQA-1M|
-Picaroon CSR-F100|
-Shikra SKR-4M|
-Jengiz F|
-Morgenstern MR-1SE|
-Ostrogoth D|
-Sagittarii SGT-4R|
-Scytha F|
-Sparrowhawk SPR-7Dr|
-Stingray F-96R|
-Sulla F|
-Tatsu MIK-OF|
-Troika CMT-7T|
-Wusun D|
-Schrack SCK-O|
-Schrack SCK-OA|
-Schrack SCK-OB|
-Simurgh SMG-O|
-Simurgh SMG-OA|
-Simurgh SMG-OB|
-Sternensturm STM-O|
-Sternensturm STM-OA|
-Sternensturm STM-OB|
-Bashkir Z|
-Batu Z|
-Sabutai Z|
-Sangihe Shrike-Thrush 'Nanook'|
-Cheetah II F-12A|
-Ammon XR|
-Scytha XR|
-Ironsides CX-19|
-Tomahawk CX-11|
-Zero ZRO-CX-3|
-Sabre SB-31 'Defense Special'|
-Sholagar SL-27X|
-Corsair CSR-X12 Rigid Night|
-Dagger DAR4-XP|
-Hellcat II HCT-213BC (Herman)|
-Swift SWF-606CA (Aaron)|
-Oni ON-2X|
-Shilone SL-17X|
-Transit TR-13X 'Glare'|
-Troika CMT-3TV (Viktor)|
-Cheetah OF-17|
-Shiva SHV-S|
-Lucifer LCF-X30|
-Seydlitz SYD-45X 'Starling'|
-Slayer SL-CX1|
-Thunderbird TRB-XTS|
-Battle Taxi NL-43|
-Deathstalker XF-78|
-Chippewa CHP-X-P (Gladstone)|
-Lightning LTN-G16-P (Branson)|
-Vulcan VLC-3N|
-Hammerhead HMR-HA|
-Hammerhead HMR-HC|
-Persepolis 2|
-Malaika BAM-1A1|
-Sparrowhawk SPR-DH|
-Star Dagger S-2|
-Rapier RPR-300X|
-Starfire SF-1X (Prototype)|
-Arrow IV Artillery Turret (Dual)|
-Arrow IV Artillery Turret (Quad)|
-Arrow IV Artillery Turret (Triple)|
-Arrow IV Artillery Turret (Single)|
-Long Tom Artillery Cannon Turret (Dual)|
-Long Tom Artillery Cannon Turret (Quad)|
-Long Tom Artillery Cannon Turret (Triple)|
-Long Tom Artillery Cannon Turret (Single)|
-Long Tom Artillery Turret (Dual)|
-Long Tom Artillery Turret (Quad)|
-Long Tom Artillery Turret (Triple)|
-Long Tom Artillery Turret (Single)|
-'Mech Mortar/1 Battery (Dual)|
-'Mech Mortar/1 Battery (Quad)|
-'Mech Mortar/1 Battery (Single)|
-'Mech Mortar/1 Battery (Triple)|
-'Mech Mortar/2 Battery (Dual)|
-'Mech Mortar/2 Battery (Quad)|
-'Mech Mortar/2 Battery (Single)|
-'Mech Mortar/2 Battery (Triple)|
-'Mech Mortar/4 Battery (Dual)|
-'Mech Mortar/4 Battery (Quad)|
-'Mech Mortar/4 Battery (Triple)|
-'Mech Mortar/4 Battery (Single)|
-'Mech Mortar/8 Battery (Dual)|
-'Mech Mortar/8 Battery (Quad)|
-'Mech Mortar/8 Battery (Triple)|
-'Mech Mortar/8 Battery (Single)|
-Sniper Artillery Cannon Turret (Dual)|
-Sniper Artillery Cannon Turret (Quad)|
-Sniper Artillery Cannon Turret (Triple)|
-Sniper Artillery Cannon Turret (Single)|
-Sniper Artillery Turret (Dual)|
-Sniper Artillery Turret (Quad)|
-Sniper Artillery Turret (Triple)|
-Sniper Artillery Turret (Single)|
-Thumper Artillery Cannon Turret (Dual)|
-Thumper Artillery Cannon Turret (Quad)|
-Thumper Artillery Cannon Turret (Triple)|
-Thumper Artillery Cannon Turret (Single)|
-Thumper Artillery Turret (Dual)|
-Thumper Artillery Turret (Quad)|
-Thumper Artillery Turret (Triple)|
-Thumper Artillery Turret (Single)|
-ATM/12 Turret (Dual)|
-ATM/12 Turret (Quad)|
-ATM/12 Turret (Triple)|
-ATM/12 Turret (Single)|
-ATM/3 Turret (Dual)|
-ATM/3 Turret (Quad)|
-ATM/3 Turret (Triple)|
-ATM/3 Turret (Single)|
-ATM/6 Turret (Dual)|
-ATM/6 Turret (Quad)|
-ATM/6 Turret (Triple)|
-ATM/6 Turret (Single)|
-ATM/9 Turret (Dual)|
-ATM/9 Turret (Quad)|
-ATM/9 Turret (Triple)|
-ATM/9 Turret (Single)|
-Improved ATM/12 Turret (Dual)|
-Improved ATM/12 Turret (Quad)|
-Improved ATM/12 Turret (Triple)|
-Improved ATM/12 Turret (Single)|
-Improved ATM/3 Turret (Dual)|
-Improved ATM/3 Turret (Quad)|
-Improved ATM/3 Turret (Triple)|
-Improved ATM/3 Turret (Single)|
-Improved ATM/6 Turret (Dual)|
-Improved ATM/6 Turret (Quad)|
-Improved ATM/6 Turret (Triple)|
-Improved ATM/6 Turret (Single)|
-Improved ATM/9 Turret (Dual)|
-Improved ATM/9 Turret (Quad)|
-Improved ATM/9 Turret (Triple)|
-Improved ATM/9 Turret (Single)|
-LB-10-X Turret (Dual)|
-LB-10-X Turret (Quad)|
-LB-10-X Turret (Single)|
-LB-10-X Turret (Triple)|
-LB-20-X Turret (Dual)|
-LB-20-X Turret (Quad)|
-LB-20-X Turret (Single)|
-LB-20-X Turret (Triple)|
-LB-2-X Turret (Dual)|
-LB-2-X Turret (Quad)|
-LB-2-X Turret (Single)|
-LB-2-X Turret (Triple)|
-LB-5-X Turret (Dual)|
-LB-5-X Turret (Quad)|
-LB-5-X Turret (Single)|
-LB-5-X Turret (Triple)|
-ProtoMech AC/2 Turret (Dual)|
-ProtoMech AC/2 Turret (Quad)|
-ProtoMech AC/2 Turret (Single)|
-ProtoMech AC/2 Turret (Triple)|
-ProtoMech AC/4 Turret (Dual)|
-ProtoMech AC/4 Turret (Quad)|
-ProtoMech AC/4 Turret (Single)|
-ProtoMech AC/4 Turret (Triple)|
-ProtoMech AC/8 Turret (Dual)|
-ProtoMech AC/8 Turret (Quad)|
-ProtoMech AC/8 Turret (Single)|
-ProtoMech AC/8 Turret (Triple)|
-RAC/2 Turret (Dual)|
-RAC/2 Turret (Quad)|
-RAC/2 Turret (Single)|
-RAC/2 Turret (Triple)|
-RAC/5 Turret (Dual)|
-RAC/5 Turret (Quad)|
-RAC/5 Turret (Single)|
-RAC/5 Turret (Triple)|
-UAC/10 Turret (Dual)|
-UAC/10 Turret (Quad)|
-UAC/10 Turret (Single)|
-UAC/10 Turret (Triple)|
-UAC/2 Turret (Dual)|
-UAC/2 Turret (Quad)|
-UAC/2 Turret (Single)|
-UAC/2 Turret (Triple)|
-UAC/20 Turret (Dual)|
-UAC/20 Turret (Quad)|
-UAC/20 Turret (Single)|
-UAC/20 Turret (Triple)|
-UAC/5 Turret (Dual)|
-UAC/5 Turret (Quad)|
-UAC/5 Turret (Single)|
-UAC/5 Turret (Triple)|
-ER Flamer Turret (Dual)|
-ER Flamer Turret (Quad)|
-ER Flamer Turret (Single)|
-ER Flamer Turret (Triple)|
-Flamer Turret (Dual)|
-Flamer Turret (Quad)|
-Flamer Turret (Single)|
-Flamer Turret (Triple)|
-Heavy Flamer Turret (Dual)|
-Heavy Flamer Turret (Quad)|
-Heavy Flamer Turret (Single)|
-Heavy Flamer Turret (Triple)|
-AP Gauss Turret (Dual)|
-AP Gauss Turret (Quad)|
-AP Gauss Turret (Triple)|
-AP Gauss Turret (Single)|
-Gauss Turret (Dual)|
-Gauss Turret (Quad)|
-Gauss Turret (Triple)|
-Gauss Turret (Single)|
-HAG/20 Turret (Dual)|
-HAG/20 Turret (Quad)|
-HAG/20 Turret (Triple)|
-HAG/20 Turret (Single)|
-HAG/30 Turret (Dual)|
-HAG/30 Turret (Quad)|
-HAG/30 Turret (Triple)|
-HAG/30 Turret (Single)|
-HAG/40 Turret (Dual)|
-HAG/40 Turret (Quad)|
-HAG/40 Turret (Triple)|
-HAG/40 Turret (Single)|
-Large Chemical Laser Turret (Dual)|
-Large Chemical Laser Turret (Quad)|
-Large Chemical Laser Turret (Single)|
-Large Chemical Laser Turret (Triple)|
-Medium Chemical Laser Turret (Dual)|
-Medium Chemical Laser Turret (Quad)|
-Medium Chemical Laser Turret (Single)|
-Medium Chemical Laser Turret (Triple)|
-Small Chemical Laser Turret (Dual)|
-Small Chemical Laser Turret (Quad)|
-Small Chemical Laser Turret (Single)|
-Small Chemical Laser Turret (Triple)|
-ER Large Laser Turret (Dual)|
-ER Large Laser Turret (Quad)|
-ER Large Laser Turret (Single)|
-ER Large Laser Turret (Triple)|
-ER Large Laser Turret (w/ Targeting) (Dual)|
-ER Large Laser Turret (w/ Targeting) (Quad)|
-ER Large Laser Turret (w/ Targeting) (Single)|
-ER Large Laser Turret (w/ Targeting) (Triple)|
-ER Micro Laser Turret (Dual)|
-ER Micro Laser Turret (Quad)|
-ER Micro Laser Turret (Single)|
-ER Micro Laser Turret (Triple)|
-ER Medium Laser Turret (Dual)|
-ER Medium Laser Turret (Quad)|
-ER Medium Laser Turret (Single)|
-ER Medium Laser Turret (Triple)|
-ER Small Laser Turret (Dual)|
-ER Small Laser Turret (Quad)|
-ER Small Laser Turret (Single)|
-ER Small Laser Turret (Triple)|
-Large ER Pulse Laser Turret (Dual)|
-Large ER Pulse Laser Turret (Quad)|
-Large ER Pulse Laser Turret (Single)|
-Large ER Pulse Laser Turret (Triple)|
-Medium ER Pulse Laser Turret (Dual)|
-Medium ER Pulse Laser Turret (Quad)|
-Medium ER Pulse Laser Turret (Single)|
-Medium ER Pulse Laser Turret (Triple)|
-Small ER Pulse Laser Turret (Dual)|
-Small ER Pulse Laser Turret (Quad)|
-Small ER Pulse Laser Turret (Single)|
-Small ER Pulse Laser Turret (Triple)|
-Heavy Large Laser Turret (Dual)|
-Heavy Large Laser Turret (Quad)|
-Heavy Large Laser Turret (Single)|
-Heavy Large Laser Turret (Triple)|
-Heavy Large Laser Turret(w/ Targeting) (Dual)|
-Heavy Large Laser Turret(w/ Targeting) (Quad)|
-Heavy Large Laser Turret(w/ Targeting) (Single)|
-Heavy Large Laser Turret(w/ Targeting) (Triple)|
-Heavy Medium Laser Turret (Dual)|
-Heavy Medium Laser Turret (Quad)|
-Heavy Medium Laser Turret (Single)|
-Heavy Medium Laser Turret (Triple)|
-Heavy Small Laser Turret (Dual)|
-Heavy Small Laser Turret (Quad)|
-Heavy Small Laser Turret (Single)|
-Heavy Small Laser Turret (Triple)|
-Improved Heavy Large Laser Turret (Dual)|
-Improved Heavy Large Laser Turret (Quad)|
-Improved Heavy Large Laser Turret (Single)|
-Improved Heavy Large Laser Turret (Triple)|
-Improved Heavy Large Laser Turret (w/ Targeting) (Dual)|
-Improved Heavy Large Laser Turret (w/ Targeting) (Quad)|
-Improved Heavy Large Laser Turret (w/ Targeting) (Single)|
-Improved Heavy Large Laser Turret (w/ Targeting) (Triple)|
-Improved Heavy Medium Laser Turret (Dual)|
-Improved Heavy Medium Laser Turret (Quad)|
-Improved Heavy Medium Laser Turret (Single)|
-Improved Heavy Medium Laser Turret (Triple)|
-Improved Heavy Small Laser Turret (Dual)|
-Improved Heavy Small Laser Turret (Quad)|
-Improved Heavy Small Laser Turret (Single)|
-Improved Heavy Small Laser Turret (Triple)|
-Micro Pulse Laser Turret (Dual)|
-Micro Pulse Laser Turret (Quad)|
-Micro Pulse Laser Turret (Single)|
-Micro Pulse Laser Turret (Triple)|
-Large Pulse Laser Turret (Dual)|
-Large Pulse Laser Turret (Quad)|
-Large Pulse Laser Turret (Single)|
-Large Pulse Laser Turret (Triple)|
-Micro Pulse Laser Turret (Dual)|
-Micro Pulse Laser Turret (Quad)|
-Micro Pulse Laser Turret (Single)|
-Micro Pulse Laser Turret (Triple)|
-Medium Pulse Laser Turret (Dual)|
-Medium Pulse Laser Turret (Quad)|
-Medium Pulse Laser Turret (Single)|
-Medium Pulse Laser Turret (Triple)|
-Small Pulse Laser Turret (Dual)|
-Small Pulse Laser Turret (Quad)|
-Small Pulse Laser Turret (Single)|
-Small Pulse Laser Turret (Triple)|
-LRM/10 Turret (w/ Artemis IV) (Dual)|
-LRM/10 Turret (w/ Artemis IV) (Quad)|
-LRM/10 Turret (w/ Artemis IV) (Triple)|
-LRM/10 Turret (w/ Artemis IV) (Single)|
-LRM/15 Turret (w/ Artemis IV) (Dual)|
-LRM/15 Turret (w/ Artemis IV) (Quad)|
-LRM/15 Turret (w/ Artemis IV) (Triple)|
-LRM/15 Turret (w/ Artemis IV) (Single)|
-LRM/20 Turret (w/ Artemis IV) (Dual)|
-LRM/20 Turret (w/ Artemis IV) (Quad)|
-LRM/20 Turret (w/ Artemis IV) (Triple)|
-LRM/20 Turret (w/ Artemis IV) (Single)|
-LRM/5 Turret (w/ Artemis IV) (Dual)|
-LRM/5 Turret (w/ Artemis IV) (Quad)|
-LRM/5 Turret (w/ Artemis IV) (Triple)|
-LRM/5 Turret (w/ Artemis IV) (Single)|
-LRM/10 Turret (w/ Artemis V) (Dual)|
-LRM/10 Turret (w/ Artemis V) (Quad)|
-LRM/10 Turret (w/ Artemis V) (Triple)|
-LRM/10 Turret (w/ Artemis V) (Single)|
-LRM/15 Turret (w/ Artemis V) (Dual)|
-LRM/15 Turret (w/ Artemis V) (Quad)|
-LRM/15 Turret (w/ Artemis V) (Triple)|
-LRM/15 Turret (w/ Artemis V) (Single)|
-LRM/20 Turret (w/ Artemis V) (Dual)|
-LRM/20 Turret (w/ Artemis V) (Quad)|
-LRM/20 Turret (w/ Artemis V) (Triple)|
-LRM/20 Turret (w/ Artemis V) (Single)|
-LRM/5 Turret (w/ Artemis V) (Dual)|
-LRM/5 Turret (w/ Artemis V) (Quad)|
-LRM/5 Turret (w/ Artemis V) (Triple)|
-LRM/5 Turret (w/ Artemis V) (Single)|
-LRM/10 Turret (Dual)|
-LRM/10 Turret (Quad)|
-LRM/10 Turret (Triple)|
-LRM/10 Turret (Single)|
-LRM/15 Turret (Dual)|
-LRM/15 Turret (Quad)|
-LRM/15 Turret (Triple)|
-LRM/15 Turret (Single)|
-LRM/20 Turret (Dual)|
-LRM/20 Turret (Quad)|
-LRM/20 Turret (Triple)|
-LRM/20 Turret (Single)|
-LRM/5 Turret (Dual)|
-LRM/5 Turret (Quad)|
-LRM/5 Turret (Triple)|
-LRM/5 Turret (Single)|
-Streak LRM/10 Turret (Dual)|
-Streak LRM/10 Turret (Quad)|
-Streak LRM/10 Turret (Triple)|
-Streak LRM/10 Turret (Single)|
-Streak LRM/15 Turret (Dual)|
-Streak LRM/15 Turret (Quad)|
-Streak LRM/15 Turret (Triple)|
-Streak LRM/15 Turret (Single)|
-Streak LRM/20 Turret (Dual)|
-Streak LRM/20 Turret (Quad)|
-Streak LRM/20 Turret (Triple)|
-Streak LRM/20 Turret (Single)|
-Streak LRM/5 Turret (Dual)|
-Streak LRM/5 Turret (Quad)|
-Streak LRM/5 Turret (Triple)|
-Streak LRM/5 Turret (Single)|
-Heavy MG Turret (Dual)|
-Heavy MG Turret (Quad)|
-Heavy MG Turret (Triple)|
-Heavy MG Turret w/ Array (Dual)|
-Heavy MG Turret w/ Array (Quad)|
-Heavy MG Turret w/ Array (Triple)|
-Heavy MG Turret (Single)|
-Light MG Turret (Dual)|
-Light MG Turret (Quad)|
-Light MG Turret (Triple)|
-Light MG Turret w/ Array (Dual)|
-Light MG Turret w/ Array (Quad)|
-Light MG Turret w/ Array (Triple)|
-Light MG Turret (Single)|
-MG Turret (Dual)|
-MG Turret (Quad)|
-MG Turret (Triple)|
-MG Turret w/ Array (Dual)|
-MG Turret w/ Array (Quad)|
-MG Turret w/ Array (Triple)|
-MG Turret (Single)|
-Enhanced PPC Turret (Dual)|
-Enhanced PPC Turret (Quad)|
-Enhanced PPC Turret (Single)|
-Enhanced PPC Turret (Triple)|
-ER PPC Turret (Dual)|
-ER PPC Turret (Quad)|
-ER PPC Turret (Single)|
-ER PPC Turret (Triple)|
-ER PPC w Capacitor Turret (Single)|
-ER PPC w Capacitor Turret (Quad)|
-ER PPC w Capacitor Turret (Triple)|
-ER PPC w Capacitor Turret (Dual)|
-Plasma Cannon Turret (Triple)|
-Plasma Cannon Turret (Dual)|
-Plasma Cannon Turret (Quad)|
-Plasma Cannon Turret (Single)|
-Active Probe Bunker|
-AMS Turret (Dual)|
-AMS Turret (Single)|
-Angel ECM Bunker|
-ECM Suite Bunker|
-Laser AMS Turret (Dual)|
-Laser AMS Turret (Single)|
-Light Active Probe Bunker|
-Narc Turret (Dual)|
-Narc Turret (Single)|
-TAG Turret (Dual)|
-TAG Turret (Single)|
-Grenade Launcher Turret (Dual)|
-Grenade Launcher Turret (Quad)|
-Grenade Launcher Turret (Single)|
-Grenade Launcher Turret (Triple)|
-Watchdog ECM Bunker|
-SRM/2 Turret (w/ Artemis IV) (Dual)|
-SRM/2 Turret (w/ Artemis IV) (Quad)|
-SRM/2 Turret (w/ Artemis IV) (Single)|
-SRM/2 Turret (w/ Artemis IV) (Triple)|
-SRM/4 Turret (w/ Artemis IV) (Dual)|
-SRM/4 Turret (w/ Artemis IV) (Quad)|
-SRM/4 Turret (w/ Artemis IV) (Single)|
-SRM/4 Turret (w/ Artemis IV) (Triple)|
-SRM/6 Turret (w/ Artemis IV) (Dual)|
-SRM/6 Turret (w/ Artemis IV) (Quad)|
-SRM/6 Turret (w/ Artemis IV) (Single)|
-SRM/6 Turret (w/ Artemis IV) (Triple)|
-SRM/2 Turret (w/ Artemis V) (Dual)|
-SRM/2 Turret (w/ Artemis V) (Quad)|
-SRM/2 Turret (w/ Artemis V) (Single)|
-SRM/2 Turret (w/ Artemis V) (Triple)|
-SRM/4 Turret (w/ Artemis V) (Dual)|
-SRM/4 Turret (w/ Artemis V) (Quad)|
-SRM/4 Turret (w/ Artemis V) (Single)|
-SRM/4 Turret (w/ Artemis V) (Triple)|
-SRM/6 Turret (w/ Artemis V) (Dual)|
-SRM/6 Turret (w/ Artemis V) (Quad)|
-SRM/6 Turret (w/ Artemis V) (Single)|
-SRM/6 Turret (w/ Artemis V) (Triple)|
-SRM/2 Turret (Dual)|
-SRM/2 Turret (Quad)|
-SRM/2 Turret (Single)|
-SRM/2 Turret (Triple)|
-SRM/4 Turret (Dual)|
-SRM/4 Turret (Quad)|
-SRM/4 Turret (Single)|
-SRM/4 Turret (Triple)|
-SRM/6 Turret (Dual)|
-SRM/6 Turret (Quad)|
-SRM/6 Turret (Single)|
-SRM/6 Turret (Triple)|
-Streak SRM/2 Turret (Dual)|
-Streak SRM/2 Turret (Quad)|
-Streak SRM/2 Turret (Single)|
-Streak SRM/2 Turret (Triple)|
-Streak SRM/4 Turret (Dual)|
-Streak SRM/4 Turret (Quad)|
-Streak SRM/4 Turret (Single)|
-Streak SRM/4 Turret (Triple)|
-Streak SRM/6 Turret (Dual)|
-Streak SRM/6 Turret (Quad)|
-Streak SRM/6 Turret (Single)|
-Streak SRM/6 Turret (Triple)|
-Arrow IV Artillery Turret (Dual)|
-Arrow IV Artillery Turret (Quad)|
-Arrow IV Artillery Turret (Triple)|
-Arrow IV Artillery Turret (Single)|
-Cruise Missile/120 Launcher (Dual)|
-Cruise Missile/120 Launcher (Quad)|
-Cruise Missile/120 Launcher (Triple)|
-Cruise Missile/120 Launcher (Single)|
-Cruise Missile/50 Launcher (Dual)|
-Cruise Missile/50 Launcher (Quad)|
-Cruise Missile/50 Launcher (Triple)|
-Cruise Missile/50 Launcher (Single)|
-Cruise Missile/70 Launcher (Dual)|
-Cruise Missile/70 Launcher (Quad)|
-Cruise Missile/70 Launcher (Triple)|
-Cruise Missile/70 Launcher (Single)|
-Cruise Missile/90 Launcher (Dual)|
-Cruise Missile/90 Launcher (Quad)|
-Cruise Missile/90 Launcher (Triple)|
-Cruise Missile/90 Launcher (Single)|
-Long Tom Artillery Cannon Turret (Dual)|
-Long Tom Artillery Cannon Turret (Triple)|
-Long Tom Artillery Cannon Turret (Triple)|
-Long Tom Artillery Cannon Turret (Single)|
-Long Tom Artillery Turret (Dual)|
-Long Tom Artillery Turret (Quad)|
-Long Tom Artillery Turret (Triple)|
-Long Tom Artillery Turret (Single)|
-'Mech Mortar/1 Battery (Dual)|
-'Mech Mortar/1 Battery (Quad)|
-'Mech Mortar/1 Battery (Triple)|
-'Mech Mortar/1 Battery (Single)|
-'Mech Mortar/2 Battery (Dual)|
-'Mech Mortar/2 Battery (Quad)|
-'Mech Mortar/2 Battery (Triple)|
-'Mech Mortar/2 Battery (Single)|
-'Mech Mortar/4 Battery (Dual)|
-'Mech Mortar/4 Battery (Quad)|
-'Mech Mortar/4 Battery (Triple)|
-'Mech Mortar/4 Battery (Single)|
-'Mech Mortar/8 Battery (Dual)|
-'Mech Mortar/8 Battery (Quad)|
-'Mech Mortar/8 Battery (Triple)|
-'Mech Mortar/8 Battery (Single)|
-Sniper Artillery Cannon Turret (Dual)|
-Sniper Artillery Cannon Turret (Quad)|
-Sniper Artillery Cannon Turret (Triple)|
-Sniper Artillery Cannon Turret (Single)|
-Sniper Artillery Turret (Dual)|
-Sniper Artillery Turret (Quad)|
-Sniper Artillery Turret (Triple)|
-Sniper Artillery Turret (Single)|
-Thumper Artillery Cannon Turret (Dual)|
-Thumper Artillery Cannon Turret (Quad)|
-Thumper Artillery Cannon Turret (Triple)|
-Thumper Artillery Cannon Turret (Single)|
-Thumper Artillery Turret (Dual)|
-Thumper Artillery Turret (Quad)|
-Thumper Artillery Turret (Triple)|
-Thumper Artillery Turret (Single)|
-HV Autocannon/10 Turret (Dual)|
-HV Autocannon/10 Turret (Quad)|
-HV Autocannon/10 Turret (Single)|
-HV Autocannon/10 Turret (Triple)|
-HV Autocannon/2 Turret (Dual)|
-HV Autocannon/2 Turret (Quad)|
-HV Autocannon/2 Turret (Single)|
-HV Autocannon/2 Turret (Triple)|
-HV Autocannon/5 Turret (Dual)|
-HV Autocannon/5 Turret (Quad)|
-HV Autocannon/5 Turret (Single)|
-HV Autocannon/5 Turret (Triple)|
-LB-10-X Turret (Dual)|
-LB-10-X Turret (Quad)|
-LB-10-X Turret (Single)|
-LB-10-X Turret (Triple)|
-LB-20-X Turret (Dual)|
-LB-20-X Turret (Quad)|
-LB-20-X Turret (Single)|
-LB-20-X Turret (Triple)|
-LB-2-X Turret (Dual)|
-LB-2-X Turret (Quad)|
-LB-2-X Turret (Single)|
-LB-2-X Turret (Triple)|
-LB-5-X Turret (Dual)|
-LB-5-X Turret (Quad)|
-LB-5-X Turret (Single)|
-LB-5-X Turret (Triple)|
-Light AC/2 Turret (Dual)|
-Light AC/2 Turret (Quad)|
-Light AC/2 Turret (Single)|
-Light AC/2 Turret (Triple)|
-Light AC/5 Turret (Dual)|
-Light AC/5 Turret (Quad)|
-Light AC/5 Turret (Single)|
-Light AC/5 Turret (Triple)|
-RAC/2 Turret (Dual)|
-RAC/2 Turret (Quad)|
-RAC/2 Turret (Single)|
-RAC/2 Turret (Triple)|
-RAC/5 Turret (Dual)|
-RAC/5 Turret (Quad)|
-RAC/5 Turret (Single)|
-RAC/5 Turret (Triple)|
-Heavy Rifle Turret (Dual)|
-Heavy Rifle Turret (Quad)|
-Heavy Rifle Turret (Single)|
-Heavy Rifle Turret (Triple)|
-Light Rifle Turret (Dual)|
-Light Rifle Turret (Quad)|
-Light Rifle Turret (Single)|
-Light Rifle Turret (Triple)|
-Medium Rifle Turret (Dual)|
-Medium Rifle Turret (Quad)|
-Medium Rifle Turret (Single)|
-Medium Rifle Turret (Triple)|
-AC/10 Turret (Dual)|
-AC/10 Turret (Quad)|
-AC/10 Turret (Single)|
-AC/10 Turret (Triple)|
-AC/2 Turret (Dual)|
-AC/2 Turret (Quad)|
-AC/2 Turret (Single)|
-AC/2 Turret (Triple)|
-AC/20 Turret (Dual)|
-AC/20 Turret (Quad)|
-AC/20 Turret (Single)|
-AC/20 Turret (Triple)|
-AC/5 Turret (Dual)|
-AC/5 Turret (Quad)|
-AC/5 Turret (Single)|
-AC/5 Turret (Triple)|
-UAC/10 Turret (Dual)|
-UAC/10 Turret (Quad)|
-UAC/10 Turret (Single)|
-UAC/10 Turret (Triple)|
-UAC/2 Turret (Dual)|
-UAC/2 Turret (Quad)|
-UAC/2 Turret (Single)|
-UAC/2 Turret (Triple)|
-UAC/20 Turret (Dual)|
-UAC/20 Turret (Quad)|
-UAC/20 Turret (Single)|
-UAC/20 Turret (Triple)|
-UAC/5 Turret (Dual)|
-UAC/5 Turret (Quad)|
-UAC/5 Turret (Single)|
-UAC/5 Turret (Triple)|
-ER Flamer Turret (Dual)|
-ER Flamer Turret (Quad)|
-ER Flamer Turret (Single)|
-ER Flamer Turret (Triple)|
-Flamer Turret (Dual)|
-Flamer Turret (Quad)|
-Flamer Turret (Single)|
-Flamer Turret (Triple)|
-Heavy Flamer Turret (Dual)|
-Heavy Flamer Turret (Quad)|
-Heavy Flamer Turret (Single)|
-Heavy Flamer Turret (Triple)|
-Gauss Turret (Dual)|
-Gauss Turret (Quad)|
-Gauss Turret (Triple)|
-Gauss Turret (Single)|
-Heavy Gauss Turret (Dual)|
-Heavy Gauss Turret (Quad)|
-Heavy Gauss Turret (Triple)|
-Heavy Gauss Turret (Single)|
-Imp.Heavy Gauss Turret (Dual)|
-Imp.Heavy Gauss Turret (Quad)|
-Imp.Heavy Gauss Turret (Triple)|
-Imp.Heavy Gauss Turret (Single)|
-Light Gauss Turret (Dual)|
-Light Gauss Turret (Quad)|
-Light Gauss Turret (Triple)|
-Light Gauss Turret (Single)|
-Magshot Gauss Turret (Dual)|
-Magshot Gauss Turret (Quad)|
-Magshot Gauss Turret (Triple)|
-Magshot Gauss Turret (Single)|
-Silver Bullet Gauss Turret (Dual)|
-Silver Bullet Gauss Turret (Quad)|
-Silver Bullet Gauss Turret (Triple)|
-Silver Bullet Gauss Turret (Single)|
-Blazer Cannon Turret (Dual)|
-Blazer Cannon Turret (Quad)|
-Blazer Cannon Turret (Single)|
-Blazer Cannon Turret (Triple)|
-Bombast Laser Turret (Dual)|
-Bombast Laser Turret (Quad)|
-Bombast Laser Turret (Single)|
-Bombast Laser Turret (Triple)|
-ER Large Laser Turret (Dual)|
-ER Large Laser Turret (Quad)|
-ER Large Laser Turret (Single)|
-ER Large Laser Turret (Triple)|
-ER Medium Laser Turret (Dual)|
-ER Medium Laser Turret (Quad)|
-ER Medium Laser Turret (Single)|
-ER Medium Laser Turret (Triple)|
-ER Small Laser Turret (Dual)|
-ER Small Laser Turret (Quad)|
-ER Small Laser Turret (Single)|
-ER Small Laser Turret (Triple)|
-Large Pulse Laser Turret (Dual)|
-Large Pulse Laser Turret (Quad)|
-Large Pulse Laser Turret (Single)|
-Large Pulse Laser Turret (Triple)|
-Medium Pulse Laser Turret (Dual)|
-Medium Pulse Laser Turret (Quad)|
-Medium Pulse Laser Turret (Single)|
-Medium Pulse Laser Turret (Triple)|
-Small Pulse Laser Turret (Dual)|
-Small Pulse Laser Turret (Quad)|
-Small Pulse Laser Turret (Single)|
-Small Pulse Laser Turret (Triple)|
-Large Re-engineered Laser Turret (Dual)|
-Large Re-engineered Laser Turret (Quad)|
-Large Re-engineered Laser Turret (Single)|
-Large Re-engineered Laser Turret (Triple)|
-Medium Re-engineered Laser Turret Turret (Dual)|
-Medium Re-engineered Laser Turret Turret (Quad)|
-Medium Re-engineered Laser Turret Turret (Single)|
-Medium Re-engineered Laser Turret Turret (Triple)|
-Small Re-Engineered Laser Turret (Dual)|
-Small Re-Engineered Laser Turret (Quad)|
-Small Re-Engineered Laser Turret (Single)|
-Small Re-Engineered Laser Turret (Triple)|
-Large Laser Turret (Dual)|
-Large Laser Turret (Quad)|
-Large Laser Turret (Single)|
-Large Laser Turret (Triple)|
-Medium Laser Turret (Dual)|
-Medium Laser Turret (Quad)|
-Medium Laser Turret (Single)|
-Medium Laser Turret (Triple)|
-Small Laser Turret (Dual)|
-Small Laser Turret (Quad)|
-Small Laser Turret (Single)|
-Small Laser Turret (Triple)|
-TSEMP Cannon Turret (Dual)|
-TSEMP Cannon Turret (Single)|
-Large VSP Laser Turret (Dual)|
-Large VSP Laser Turret (Quad)|
-Large VSP Laser Turret (Single)|
-Large VSP Laser Turret (Triple)|
-Medium VSP Laser Turret (Dual)|
-Medium VSP Laser Turret (Quad)|
-Medium VSP Laser Turret (Single)|
-Medium VSP Laser Turret (Triple)|
-Small VSP Laser Turret (Dual)|
-Small VSP Laser Turret (Quad)|
-Small VSP Laser Turret (Single)|
-Small VSP Laser Turret (Triple)|
-Large X-Pulse Laser Turret (Dual)|
-Large X-Pulse Laser Turret (Quad)|
-Large X-Pulse Laser Turret (Single)|
-Large X-Pulse Laser Turret (Triple)|
-Medium X-Pulse Laser Turret (Dual)|
-Medium X-Pulse Laser Turret (Quad)|
-Medium X-Pulse Laser Turret (Single)|
-Medium X-Pulse Laser Turret (Triple)|
-Small X-Pulse Laser Turret (Dual)|
-Small X-Pulse Laser Turret (Quad)|
-Small X-Pulse Laser Turret (Single)|
-Small X-Pulse Laser Turret (Triple)|
-Enhanced LRM/10 Turret (Dual)|
-Enhanced LRM/10 Turret (Quad)|
-Enhanced LRM/10 Turret (Triple)|
-Enhanced LRM/10 Turret (Single)|
-Enhanced LRM/15 Turret (Dual)|
-Enhanced LRM/15 Turret (Quad)|
-Enhanced LRM/15 Turret (Triple)|
-Enhanced LRM/15 Turret (Single)|
-Enhanced LRM/20 Turret (Dual)|
-Enhanced LRM/20 Turret (Quad)|
-Enhanced LRM/20 Turret (Triple)|
-Enhanced LRM/20 Turret (Single)|
-Enhanced LRM/5 Turret (Dual)|
-Enhanced LRM/5 Turret (Quad)|
-Enhanced LRM/5 Turret (Triple)|
-Enhanced LRM/5 Turret (Single)|
-Extended LRM/10 Turret (Dual)|
-Extended LRM/10 Turret (Quad)|
-Extended LRM/10 Turret (Triple)|
-Extended LRM/10 Turret (Single)|
-Extended LRM/15 Turret (Dual)|
-Extended LRM/15 Turret (Quad)|
-Extended LRM/15 Turret (Triple)|
-Extended LRM/15 Turret (Single)|
-Extended LRM/20 Turret (Dual)|
-Extended LRM/20 Turret (Quad)|
-Extended LRM/20 Turret (Triple)|
-Extended LRM/20 Turret (Single)|
-Extended LRM/5 Turret (Dual)|
-Extended LRM/5 Turret (Quad)|
-Extended LRM/5 Turret (Triple)|
-Extended LRM/5 Turret (Single)|
-LRM/10 Turret (w/ Artemis IV) (Dual)|
-LRM/10 Turret (Dual)|
-LRM/10 Turret (w/ Artemis IV) (Quad)|
-LRM/10 Turret (Quad)|
-LRM/10 Turret (w/ Artemis IV) (Triple)|
-LRM/10 Turret (Triple)|
-LRM/10 Turret (w/ Artemis IV) (Single)|
-LRM/10 Turret (Single)|
-LRM/15 Turret (w/ Artemis IV) (Dual)|
-LRM/15 Turret (Dual)|
-LRM/15 Turret (w/ Artemis IV) (Quad)|
-LRM/15 Turret (Quad)|
-LRM/15 Turret (w/ Artemis IV) (Triple)|
-LRM/15 Turret (Triple)|
-LRM/15 Turret (w/ Artemis IV) (Single)|
-LRM/15 Turret (Single)|
-LRM/20 Turret (w/ Artemis IV) (Dual)|
-LRM/20 Turret (Dual)|
-LRM/20 Turret (w/ Artemis IV) (Quad)|
-LRM/20 Turret (Quad)|
-LRM/20 Turret (w/ Artemis IV) (Triple)|
-LRM/20 Turret (Triple)|
-LRM/20 Turret (w/ Artemis IV) (Single)|
-LRM/20 Turret (Single)|
-LRM/5 Turret (w/ Artemis IV) (Dual)|
-LRM/5 Turret (Dual)|
-LRM/5 Turret (w/ Artemis IV) (Quad)|
-LRM/5 Turret (Quad)|
-LRM/5 Turret (w/ Artemis IV) (Triple)|
-LRM/5 Turret (Triple)|
-LRM/5 Turret (w/ Artemis IV) (Single)|
-LRM/5 Turret (Single)|
-Heavy MG Turret (Dual)|
-Heavy MG Turret (Quad)|
-Heavy MG Turret (Triple)|
-Heavy MG Turret w/ Array (Dual)|
-Heavy MG Turret w/ Array (Quad)|
-Heavy MG Turret w/ Array (Triple)|
-Heavy MG Turret (Single)|
-Light MG Turret (Dual)|
-Light MG Turret (Quad)|
-Light MG Turret (Triple)|
-Light MG Turret w/ Array (Dual)|
-Light MG Turret w/ Array (Quad)|
-Light MG Turret w/ Array (Triple)|
-Light MG Turret (Single)|
-MG Turret (Dual)|
-MG Turret (Quad)|
-MG Turret (Triple)|
-MG Turret w/ Array (Dual)|
-MG Turret w/ Array (Quad)|
-MG Turret w/ Array (Triple)|
-MG Turret (Single)|
-MML/3 Turret (w/ Artemis IV) (Dual)|
-MML/3 Turret (Dual)|
-MML/3 Turret (w/ Artemis IV) (Quad)|
-MML/3 Turret (Quad)|
-MML/3 Turret (w/ Artemis IV) (Triple)|
-MML/3 Turret (Triple)|
-MML/3 Turret (w/ Artemis IV) (Single)|
-MML/3 Turret (Single)|
-MML/5 Turret (w/ Artemis IV) (Dual)|
-MML/5 Turret (Dual)|
-MML/5 Turret (w/ Artemis IV) (Quad)|
-MML/5 Turret (Quad)|
-MML/5 Turret (w/ Artemis IV) (Triple)|
-MML/5 Turret (Triple)|
-MML/5 Turret (w/ Artemis IV) (Single)|
-MML/5 Turret (Single)|
-MML/7 Turret (w/ Artemis IV) (Dual)|
-MML/7 Turret (Dual)|
-MML/7 Turret (w/ Artemis IV) (Quad)|
-MML/7 Turret (Quad)|
-MML/7 Turret (w/ Artemis IV) (Triple)|
-MML/7 Turret (Triple)|
-MML/7 Turret (w/ Artemis IV) (Single)|
-MML/7 Turret (Single)|
-MML/9 Turret (w/ Artemis IV) (Dual)|
-MML/9 Turret (Dual)|
-MML/9 Turret (w/ Artemis IV) (Quad)|
-MML/9 Turret (Quad)|
-MML/9 Turret (w/ Artemis IV) (Triple)|
-MML/9 Turret (Triple)|
-MML/9 Turret (w/ Artemis IV) (Single)|
-MML/9 Turret (Single)|
-MRM 10 Turret (Dual)|
-MRM 10 Turret (Quad)|
-MRM 10 Turret (Triple)|
-MRM 10 Turret w/ Apollo FCS (Dual)|
-MRM 10 Turret w/ Apollo FCS (Quad)|
-MRM 10 Turret w/ Apollo FCS (Triple)|
-MRM 10 Turret w/ Apollo FCS (Single)|
-MRM 10 Turret (Single)|
-MRM 20 Turret (Dual)|
-MRM 20 Turret (Quad)|
-MRM 20 Turret (Triple)|
-MRM 20 Turret w/ Apollo FCS (Dual)|
-MRM 20 Turret w/ Apollo FCS (Quad)|
-MRM 20 Turret w/ Apollo FCS (Triple)|
-MRM 20 Turret w/ Apollo FCS (Single)|
-MRM 20 Turret (Single)|
-MRM 30 Turret (Dual)|
-MRM 30 Turret (Quad)|
-MRM 30 Turret (Triple)|
-MRM 30 Turret w/ Apollo FCS (Dual)|
-MRM 30 Turret w/ Apollo FCS (Quad)|
-MRM 30 Turret w/ Apollo FCS (Triple)|
-MRM 30 Turret w/ Apollo FCS (Single)|
-MRM 30 Turret (Single)|
-MRM 40 Turret (Dual)|
-MRM 40 Turret (Quad)|
-MRM 40 Turret (Triple)|
-MRM 40 Turret w/ Apollo FCS (Dual)|
-MRM 40 Turret w/ Apollo FCS (Quad)|
-MRM 40 Turret w/ Apollo FCS (Triple)|
-MRM 40 Turret w/ Apollo FCS (Single)|
-MRM 40 Turret (Single)|
-ER PPC Turret (Dual)|
-ER PPC Turret (Quad)|
-ER PPC Turret (Single)|
-ER PPC Turret (Triple)|
-ER PPC w Capacitor Turret (Quad)|
-ER PPC w Capacitor Turret (Single)|
-ER PPC w Capacitor Turret (Triple)|
-ER PPC w Capacitor Turret (Dual)|
-Heavy PPC Turret (Dual)|
-Heavy PPC Turret (Quad)|
-Heavy PPC Turret (Single)|
-Heavy PPC Turret (Triple)|
-Heavy PPC w Capacitor Turret (Single)|
-Heavy PPC w Capacitor Turret (Quad)|
-Heavy PPC w Capacitor Turret (Triple)|
-Heavy PPC w Capacitor Turret (Dual)|
-Light PPC Turret (Dual)|
-Light PPC Turret (Quad)|
-Light PPC Turret (Single)|
-Light PPC Turret (Triple)|
-Light PPC w Capacitor Turret (Quad)|
-Light PPC w Capacitor Turret (Single)|
-Light PPC w Capacitor Turret (Dual)|
-Light PPC w Capacitor Turret (Triple)|
-Plasma Rifle Turret (Triple)|
-Plasma Rifle Turret (Quad)|
-Plasma Rifle Turret (Dual)|
-Plasma Rifle Turret (Single)|
-PPC Turret (Dual)|
-PPC Turret (Quad)|
-PPC Turret (Single)|
-PPC Turret (Triple)|
-PPC w Capacitor Turret (Dual)|
-PPC w Capacitor Turret (Quad)|
-PPC w Capacitor Turret (Single)|
-PPC w Capacitor Turret (Triple)|
-Snub-Nosed PPC (Dual)|
-Snub-Nosed PPC (Quad)|
-Snub-Nosed PPC (Single)|
-Snub-Nosed PPC (Triple)|
-Snub-Nosed PPC w Capacitor Turret (Dual)|
-Snub-Nosed PPC w Capacitor Turret (Quad)|
-Snub-Nosed PPC w Capacitor Turret (Single)|
-Snub-Nosed PPC w Capacitor Turret (Triple)|
-Rocket Launcher/1 Turret (Single)|
-Rocket Launcher/10 Turret (Single)|
-Rocket Launcher/15 Turret (Single)|
-Rocket Launcher/2 Turret (Single)|
-Rocket Launcher/20 Turret (Single)|
-Rocket Launcher/3 Turret (Single)|
-Rocket Launcher/4 Turret (Single)|
-Rocket Launcher/5 Turret (Single)|
-Beagle Active Probe Bunker|
-AMS Turret (Dual)|
-AMS Turret (Single)|
-Angel ECM Bunker|
-Bloodhound Active Probe Bunker|
-C3 (Boosted) Command Bunker (Dual)|
-C3 (Boosted) Command Bunker (Single)|
-C3 (Boosted) Command Bunker (Triple)|
-C3 Command Bunker (Dual)|
-C3 Command Bunker (Single)|
-C3 Command Bunker (Triple)|
-C3i Bunker|
-Calliope Turret (Standard)|
-ECM Turret (Guardian)|
-Improved Narc Turret (Dual)|
-Improved Narc Turret (Single)|
-Laser AMS Turret (Dual)|
-Laser AMS Turret (Single)|
-Narc Turret (Dual)|
-Narc Turret (Single)|
-RISC APDS Turret (Dual)|
-RISC APDS Turret (Single)|
-TAG Turret (Dual)|
-TAG Turret (Single)|
-Grenade Launcher Turret (Dual)|
-Grenade Launcher Turret (Quad)|
-Grenade Launcher Turret (Single)|
-Grenade Launcher Turret (Triple)|
-SRM/2 Turret (w/ Artemis IV) (Dual)|
-SRM/2 Turret (Dual)|
-SRM/2 Turret (w/ Artemis IV) (Quad)|
-SRM/2 Turret (Quad)|
-SRM/2 Turret (w/ Artemis IV) (Single)|
-SRM/2 Turret (Single)|
-SRM/2 Turret (w/ Artemis IV) (Triple)|
-SRM/2 Turret (Triple)|
-SRM/4 Turret (w/ Artemis IV) (Dual)|
-SRM/4 Turret (Dual)|
-SRM/4 Turret (w/ Artemis IV) (Quad)|
-SRM/4 Turret (Quad)|
-SRM/4 Turret (w/ Artemis IV) (Single)|
-SRM/4 Turret (Single)|
-SRM/4 Turret (w/ Artemis IV) (Triple)|
-SRM/4 Turret (Triple)|
-SRM/6 Turret (w/ Artemis IV) (Dual)|
-SRM/6 Turret (Dual)|
-SRM/6 Turret (w/ Artemis IV) (Quad)|
-SRM/6 Turret (Quad)|
-SRM/6 Turret (w/ Artemis IV) (Single)|
-SRM/6 Turret (Single)|
-SRM/6 Turret (w/ Artemis IV) (Triple)|
-SRM/6 Turret (Triple)|
-Streak SRM/2 Turret (Dual)|
-Streak SRM/2 Turret (Quad)|
-Streak SRM/2 Turret (Single)|
-Streak SRM/2 Turret (Triple)|
-Streak SRM/4 Turret (Dual)|
-Streak SRM/4 Turret (Quad)|
-Streak SRM/4 Turret (Single)|
-Streak SRM/4 Turret (Triple)|
-Streak SRM/6 Turret (Dual)|
-Streak SRM/6 Turret (Quad)|
-Streak SRM/6 Turret (Single)|
-Streak SRM/6 Turret (Triple)|
-Thunderbolt 10 Turret (Dual)|
-Thunderbolt 10 Turret (Quad)|
-Thunderbolt 10 Turret (Triple)|
-Thunderbolt 10 Turret (Single)|
-Thunderbolt 15 Turret (Dual)|
-Thunderbolt 15 Turret (Quad)|
-Thunderbolt 15 Turret (Triple)|
-Thunderbolt 15 Turret (Single)|
-Thunderbolt 20 Turret (Dual)|
-Thunderbolt 20 Turret (Quad)|
-Thunderbolt 20 Turret (Triple)|
-Thunderbolt 20 Turret (Single)|
-Thunderbolt 5 Turret (Dual)|
-Thunderbolt 5 Turret (Quad)|
-Thunderbolt 5 Turret (Triple)|
-Thunderbolt 5 Turret (Single)|
-Clan Anti-Infantry Clan Jade Falcon Police|
-Clan Heavy Foot Infantry Ebon Keshik Point|
-Clan Space Marine Clan Snow Raven Space Marines|
-Motorized Infantry Dark Caste Bandits|
-Bridge-builder Engineers Take the Time III-chi; Forty-eighth Division|
-Motorized XCT Infantry Explorer Corps Hostile Environment|
-Space Marine Com Guards Warship Fleet Marine|
-Heavy Support Infantry Irian Technologies SWAT Team|
-Hover Assault Infantry Johnston Industries Rapid Response Force|
-Jump Support Infantry Star Corps Jump Assault Infantry|
-VTOL Infantry Hachiman Taro Enterprise Extraction Force|
-Firefighter Twenty-fourth Hellfire Firefighting Battalion; 84th Avalon LI; 17th Avalon Hussars|
-Frogmen Blue Water Marine Response Teams (Frogmen)|
-Mountaineer 45th Cerulean Mountain Infantry; 3rd Davion Guards|
-SpecOps Paratrooper MI6 Extraction Team|
-Anti-'Mech Jump Infantry Third Ueda Infantry|
-Clan Assault Infantry Ghost Bear Heavy Solahma Infantry|
-Clan Mechanized Infantry Mimir/Watch Counter Insurgency Point|
-Motorized Heavy Infantry Motstand/Mimir Troop|
-AA Mechanized Infantry Mechanized AA Infantry|
-Clan Foot Infantry Ad Hoc Point|
-Clan Heavy Jump Infantry Heavy Infantry Point|
-Fast Recon Cavalry Point|
-Ceremonial Guard Otomo Guard|
-Heavy Jump Infantry DEST Heavy Response Platoon|
-Mechanized Field Artillery 71st Mechanized|
-Recon Infantry Recon Battalion; 201st Pesht Assault Team; 3rd Proserpina Hussars|
-Commando Battlefield Infiltration Units|
-Missile Artillery Infantry Kommando Special Forces|
-Sniper House Dai Da Chi Snipers|
-AA Jump Infantry 292nd League Regulars|
-Heavy Jump Infantry Royal Gurkha Battalion|
-Xenoplanetary Infantry Eagle Corps Eyrie Defense Force|
-Heavy Foot LRM Infantry Stalwart Support - Heavy LRM Infantry|
-Scout Infantry The Battle Corps - Baker Street Irregulars|
-Submersible Mechanized Infantry Kraken Unleashed - The Mermen|
-TAG Spotter Infantry Stalwart Support - Spotter Infantry|
-Assault Commando Ebon Magistrate Shock Troops|
-Field Medic Magistracy Medical Corp|
-Foot Infantry Raventhir's Infantry Guard|
-Heavy Mountain Infantry Cavalier 'Mountain Men' Infantry Guard; Magistracy Cavaliers|
-Skaret Assassins JàrnFòlk|
-Ceremonial Guard Caesar's Royal Guard; Marion Hegemony|
-Pirate Lady Death's 'Pacification' Squads|
-Foot Ballistic Rifle Hastati V|
-Jump Laser Infantry Principes III 103rd Jump Battalion|
-Motorized MG Galatean Support Wheels|
-Special Forces Stone's Trackers|
-Anti-Infantry Unit Second Lyran Armored Infantry|
-Combat Engineer Royal Engineers; 1st Lyran Royal Guards RCT|
-HALO Paratrooper Lyran Paratrooper Corps|
-Heavy Infantry Heavy Urban Response Platoon|
-Field Gun Infantry (Motorized Batteries)|
-Minesweepers Thirty-fifth Cluster Support Force; Red Chasseurs|
-SRM Foot Infantry Taurian Citizens' Militia|
-XCT Marine Special Asteroid Support Forces|
-Mechanized Assault XCT Word of Blake Militia NBC|
-Riot Police Word of Blake Protectorate Militia Pacification Unit|
-Manei Domini Recon Squad 'Tau Wraith'|
-Manei Domini Attack Squad 'Tau Zombie'|
-Clan Field Artillery (Arrow IV)|
-Clan Field Artillery (Sniper)|
-Clan Field Artillery (Thumper)|
-Clan Field Gunners (Gauss)|
-Clan Field Gunners (LBX10)|
-Clan Field Gunners (LBX2)|
-Clan Field Gunners (LBX20)|
-Clan Field Gunners (LBX5)|
-Clan Field Gunners (RAC2)|
-Clan Field Gunners (RAC5)|
-Clan Field Gunners (UAC10)|
-Clan Field Gunners (UAC2)|
-Clan Field Gunners (UAC20)|
-Clan Field Gunners (UAC5)|
-Field Artillery (Arrow IV)|
-Field Artillery (Sniper)|
-Field Artillery (Thumper)|
-Field Gunners (AC10)|
-Field Gunners (AC2)|
-Field Gunners (AC20)|
-Field Gunners (AC5)|
-Field Gunners (Gauss)|
-Field Gunners (LAC2)|
-Field Gunners (LAC5)|
-Field Gunners (LBX10)|
-Field Gunners (LBX2)|
-Field Gunners (LBX20)|
-Field Gunners (LBX5)|
-Field Gunners (Light Gauss)|
-Field Gunners (RAC2)|
-Field Gunners (RAC5)|
-Field Gunners (UAC10)|
-Field Gunners (UAC2)|
-Field Gunners (UAC20)|
-Field Gunners (UAC5)|
-Foot Platoon (Gauss)|
-Jump Platoon (Gauss)|
-Motorized Platoon (Gauss)|
-Foot Platoon (Rifle AA)|
-Jump Platoon (Rifle AA)|
-Mechanized Hover Platoon (Rifle AA)|
-Mechanized Tracked Platoon (Rifle AA)|
-Mechanized Wheeled Platoon (Rifle AA)|
-Motorized Platoon (Rifle AA)|
-Foot Platoon (Flechette)|
-Motorized Platoon (Flechette)|
-Foot Platoon, Taurian (Flamer)|
-Foot Platoon, Taurian (Laser)|
-Foot Platoon, Taurian (LRM)|
-Foot Platoon, Taurian (MG)|
-Foot Platoon, Taurian (Rifle)|
-Foot Platoon, Taurian (SRM)|
-Jump Platoon, Taurian (Flamer)|
-Jump Platoon, Taurian (Laser)|
-Jump Platoon, Taurian (LRM)|
-Jump Platoon, Taurian (MG)|
-Jump Platoon, Taurian (Rifle)|
-Jump Platoon, Taurian (SRM)|
-Motorized Platoon, Taurian (Flamer)|
-Motorized Platoon, Taurian (Laser)|
-Motorized Platoon, Taurian (LRM)|
-Motorized Platoon, Taurian (MG)|
-Motorized Platoon, Taurian (Rifle)|
-Motorized Platoon, Taurian (SRM)|
-Field Gun Infantry Platoon (AC/10) (Standard)|
-Clan Foot Point (Anti-'Mech) (Flamer)|
-Clan Foot Point (Anti-'Mech) (Laser)|
-Clan Foot Point (Anti-'Mech) (LRM)|
-Clan Foot Point (Anti-'Mech) (MG)|
-Clan Foot Point (Anti-'Mech) (Rifle)|
-Clan Foot Point (Anti-'Mech) (SRM)|
-Clan Foot Squad (Anti-'Mech) (Flamer)|
-Clan Foot Squad (Anti-'Mech) (Laser)|
-Clan Foot Squad (Anti-'Mech) (LRM)|
-Clan Foot Squad (Anti-'Mech) (MG)|
-Clan Foot Squad (Anti-'Mech) (Rifle)|
-Clan Foot Squad (Anti-'Mech) (SRM)|
-Foot Platoon (Anti-'Mech) (Flamer)|
-Foot Platoon (Anti-'Mech) (Laser)|
-Foot Platoon (Anti-'Mech) (LRM)|
-Foot Platoon (Anti-'Mech) (MG)|
-Foot Platoon (Anti-'Mech) (Rifle)|
-Foot Platoon (Anti-'Mech) (SRM)|
-Foot Squad (Anti-'Mech) (Flamer)|
-Foot Squad (Anti-'Mech) (Laser)|
-Foot Squad (Anti-'Mech) (LRM)|
-Foot Squad (Anti-'Mech) (MG)|
-Foot Squad (Anti-'Mech) (Rifle)|
-Foot Squad (Anti-'Mech) (SRM)|
-Clan Foot Point (Flamer)|
-Clan Foot Point (Laser)|
-Clan Foot Point (LRM)|
-Clan Foot Point (MG)|
-Clan Foot Point (Rifle)|
-Clan Foot Point (SRM)|
-Clan Jump Point (Flamer)|
-Clan Jump Point (Laser)|
-Clan Jump Point (LRM)|
-Clan Jump Point (MG)|
-Clan Jump Point (Rifle)|
-Clan Jump Point (SRM)|
-Clan Mechanized Hover Point (Flamer)|
-Clan Mechanized Hover Point (Laser)|
-Clan Mechanized Hover Point (LRM)|
-Clan Mechanized Hover Point (MG)|
-Clan Mechanized Hover Point (Rifle)|
-Clan Mechanized Hover Point (SRM)|
-Clan Mechanized Tracked Point (Flamer)|
-Clan Mechanized Tracked Point (Laser)|
-Clan Mechanized Tracked Point (LRM)|
-Clan Mechanized Tracked Point (MG)|
-Clan Mechanized Tracked Point (Rifle)|
-Clan Mechanized Tracked Point (SRM)|
-Clan Mechanized Wheeled Point (Flamer)|
-Clan Mechanized Wheeled Point (Laser)|
-Clan Mechanized Wheeled Point (LRM)|
-Clan Mechanized Wheeled Point (MG)|
-Clan Mechanized Wheeled Point (Rifle)|
-Clan Mechanized Wheeled Point (SRM)|
-Clan Motorized Point (Flamer)|
-Clan Motorized Point (Laser)|
-Clan Motorized Point (LRM)|
-Clan Motorized Point (MG)|
-Clan Motorized Point (Rifle)|
-Clan Motorized Point (SRM)|
-Clan Foot Squad (Flamer)|
-Clan Foot Squad (Laser)|
-Clan Foot Squad (LRM)|
-Clan Foot Squad (MG)|
-Clan Foot Squad (Rifle)|
-Clan Foot Squad (SRM)|
-Clan Jump Squad (Flamer)|
-Clan Jump Squad (Laser)|
-Clan Jump Squad (LRM)|
-Clan Jump Squad (MG)|
-Clan Jump Squad (Rifle)|
-Clan Jump Squad (SRM)|
-Clan Mechanized Hover Squad (Flamer)|
-Clan Mechanized Hover Squad (Laser)|
-Clan Mechanized Hover Squad (LRM)|
-Clan Mechanized Hover Squad (MG)|
-Clan Mechanized Hover Squad (Rifle)|
-Clan Mechanized Hover Squad (SRM)|
-Clan Mechanized Tracked Squad (Flamer)|
-Clan Mechanized Tracked Squad (Laser)|
-Clan Mechanized Tracked Squad (LRM)|
-Clan Mechanized Tracked Squad (MG)|
-Clan Mechanized Tracked Squad (Rifle)|
-Clan Mechanized Tracked Squad (SRM)|
-Clan Mechanized Wheeled Squad (Flamer)|
-Clan Mechanized Wheeled Squad (Laser)|
-Clan Mechanized Wheeled Squad (LRM)|
-Clan Mechanized Wheeled Squad (MG)|
-Clan Mechanized Wheeled Squad (Rifle)|
-Clan Mechanized Wheeled Squad (SRM)|
-Clan Motorized Squad (Flamer)|
-Clan Motorized Squad (Laser)|
-Clan Motorized Squad (LRM)|
-Clan Motorized Squad (MG)|
-Clan Motorized Squad (Rifle)|
-Clan Motorized Squad (SRM)|
-Bandit Motorized Point (Rifle)|
-Ceremonial Platoon (Close Combat)|
-Ceremonial Platoon (MG Heavy)|
-Foot Platoon (Laser Heavy XCT)|
-Foot Platoon (Laser Marine)|
-Foot Platoon (Laser TAG)|
-Foot Platoon (Laser XCT)|
-Foot Platoon (Light Scout)|
-Foot Platoon (LRM Heavy)|
-Foot Platoon (Rifle Light)|
-Foot Platoon (Rifle Mountain)|
-Foot Platoon (Rifle Paratrooper)|
-Foot Squad (Medic)|
-Foot Stealth Platoon (Rifle Paratrooper)|
-Foot Stealth Squad (Sniper Paratrooper)|
-Jump Platoon (Anti-Mech) (Laser)|
-Jump Platoon (Grenade Launcher)|
-Jump Platoon (Laser Heavy)|
-Jump Stealth Platoon (Laser)|
-Jump Stealth Platoon (Needler Demolition)|
-Mechanized Hover Platoon (Demolition)|
-Mechanized Sub Platoon (SRM SCUBA)|
-Mechanized Tracked Platoon (Bridging)|
-Mechanized Wheeled Platoon (Laser XCT)|
-Motorized Platoon (Fieldworks)|
-Motorized Platoon (Firefighters)|
-Motorized Platoon (Gauss Heavy)|
-Motorized Platoon (Laser XCT)|
-Motorized Platoon (Needler Heavy)|
-Motorized Platoon (Nonlethal)|
-Motorized Platoon (Plasma Heavy)|
-Motorized Sub Platoon (Laser SCUBA)|
-Foot Platoon (Flamer)|
-Foot Platoon (Laser)|
-Foot Platoon (LRM)|
-Foot Platoon (MG)|
-Foot Platoon (Rifle)|
-Foot Platoon (SRM)|
-Jump Platoon (Flamer)|
-Jump Platoon (Laser)|
-Jump Platoon (LRM)|
-Jump Platoon (MG)|
-Jump Platoon (Rifle)|
-Jump Platoon (SRM)|
-Mechanized Hover Platoon (Flamer)|
-Mechanized Hover Platoon (Laser)|
-Mechanized Hover Platoon (LRM)|
-Mechanized Hover Platoon (MG)|
-Mechanized Hover Platoon (Rifle)|
-Mechanized Hover Platoon (SRM)|
-Mechanized Tracked Platoon (Flamer)|
-Mechanized Tracked Platoon (Laser)|
-Mechanized Tracked Platoon (LRM)|
-Mechanized Tracked Platoon (MG)|
-Mechanized Tracked Platoon (Rifle)|
-Mechanized Tracked Platoon (SRM)|
-Mechanized Wheeled Platoon (Flamer)|
-Mechanized Wheeled Platoon (Laser)|
-Mechanized Wheeled Platoon (LRM)|
-Mechanized Wheeled Platoon (MG)|
-Mechanized Wheeled Platoon (Rifle)|
-Mechanized Wheeled Platoon (SRM)|
-Motorized Platoon (Flamer)|
-Motorized Platoon (Laser)|
-Motorized Platoon (LRM)|
-Motorized Platoon (MG)|
-Motorized Platoon (Rifle)|
-Motorized Platoon (SRM)|
-Foot Squad (Flamer)|
-Foot Squad (Laser)|
-Foot Squad (LRM)|
-Foot Squad (MG)|
-Foot Squad (Rifle)|
-Foot Squad (SRM)|
-Jump Squad (Flamer)|
-Jump Squad (Laser)|
-Jump Squad (LRM)|
-Jump Squad (MG)|
-Jump Squad (Rifle)|
-Jump Squad (SRM)|
-Mechanized Hover Squad (Flamer)|
-Mechanized Hover Squad (Laser)|
-Mechanized Hover Squad (LRM)|
-Mechanized Hover Squad (MG)|
-Mechanized Hover Squad (Rifle)|
-Mechanized Hover Squad (SRM)|
-Mechanized Tracked Squad (Flamer)|
-Mechanized Tracked Squad (Laser)|
-Mechanized Tracked Squad (LRM)|
-Mechanized Tracked Squad (MG)|
-Mechanized Tracked Squad (Rifle)|
-Mechanized Tracked Squad (SRM)|
-Mechanized Wheeled Squad (Flamer)|
-Mechanized Wheeled Squad (Laser)|
-Mechanized Wheeled Squad (LRM)|
-Mechanized Wheeled Squad (MG)|
-Mechanized Wheeled Squad (Rifle)|
-Mechanized Wheeled Squad (SRM)|
-Motorized Squad (Flamer)|
-Motorized Squad (Laser)|
-Motorized Squad (LRM)|
-Motorized Squad (MG)|
-Motorized Squad (Rifle)|
-Motorized Squad (SRM)|
-Comitatus JumpShip (2995)|
-Hunter Jumpship (2832)|
-Hunter Jumpship (2948) (LF)|
-Invader Jumpship (2850)|
-Merchant Jumpship (2901)|
-Monolith Jumpship (2839)|
-Odyssey Jumpship (2887)|
-Scout JumpShip (2895)|
-Star Lord JumpShip (2841)|
-Chimeisho JumpShip (3056)|
-Invader Jumpship (2631) (LF)|
-Invader Jumpship (2631 PPC)|
-Invader Jumpship (2631)|
-Magellan Jumpship (2960)|
-Merchant Jumpship (2503)|
-Merchant Jumpship (2602)|
-Merchant Jumpship (2602)(Passenger)|
-Monolith Jumpship (2776)|
-Quetzalcoatl-Scout JumpShip (Standard)|
-Scout JumpShip (2712)|
-Star Lord JumpShip (2590) (LF)|
-Star Lord JumpShip (2590)|
-Tramp JumpShip (2754)|
-Tramp JumpShip (2755) (LF)|
-Tramp JumpShip (3071)|
-Explorer JumpShip (HPG)|
-Explorer JumpShip (Standard)|
-Aquilla Transport Jumpship (Standard)|
-Liberty Jumpship (Standard)|
-Leviathan Jumpship (Standard)|
-Archer ARC-2K|
-Archer ARC-2R|
-Archer ARC-2S|
-Archer ARC-2W|
-Assassin ASN-101|
-Assassin ASN-21|
-Atlas AS7-D-DC|
-Atlas AS7-D|
-Atlas AS7-RS|
-Awesome AWS-8Q|
-Awesome AWS-8R|
-Awesome AWS-8T|
-Awesome AWS-8V|
-Banshee BNC-3E|
-Banshee BNC-3M|
-Banshee BNC-3MC|
-Banshee BNC-3Q|
-Banshee BNC-3S (Reinesblatt)|
-Banshee BNC-3S|
-BattleMaster BLR-1D|
-BattleMaster BLR-1G-DC|
-BattleMaster BLR-1G|
-BattleMaster BLR-1S|
-Black Knight BL-7-KNT-L|
-Black Knight BL-7-KNT|
-Blackjack BJ-1|
-Blackjack BJ-1DB|
-Blackjack BJ-1DC|
-Blackjack BJ-1X|
-Bombardier BMB-10D|
-Cataphract CTF-1X|
-Cataphract CTF-2X|
-Catapult CPLT-A1|
-Catapult CPLT-C1 (Jenny) 'Butterbee'|
-Catapult CPLT-C1|
-Catapult CPLT-C1b|
-Catapult CPLT-C4|
-Catapult CPLT-K2|
-Centurion CN9-A|
-Centurion CN9-AH|
-Centurion CN9-AL|
-Centurion CN9-YLW 'Yen Lo Wang'|
-Champion CHP-1N2|
-Champion CHP-2N|
-Charger CGR-1A1|
-Charger CGR-1A5|
-Charger CGR-1A9|
-Charger CGR-1L|
-Charger CGR-SB 'Challenger'|
-Cicada CDA-2A|
-Cicada CDA-2B|
-Cicada CDA-3C|
-Clint CLNT-1-2R|
-Clint CLNT-2-3T (Denton)|
-Clint CLNT-2-3T|
-Clint CLNT-2-4T|
-Commando COM-1D|
-Commando COM-2D|
-Commando COM-3A|
-Crab CRB-20|
-Crockett CRK-5003-0|
-Crusader CRD-3D|
-Crusader CRD-3K|
-Crusader CRD-3L|
-Crusader CRD-3R|
-Cyclops CP-10-HQ|
-Cyclops CP-10-Q|
-Cyclops CP-10-Z|
-Daboku DCMS-MX90-D|
-Dervish DV-6M|
-Dragon DRG-1C|
-Dragon DRG-1N|
-Enforcer ENF-4R|
-Falcon FLC-4N|
-Firestarter FS9-A|
-Firestarter FS9-H|
-Firestarter FS9-K|
-Firestarter FS9-M 'Mirage'|
-Flashman FLS-7K|
-Flea FLE-15|
-Flea FLE-4|
-Goliath GOL-1H|
-Grand Dragon DRG-1G|
-Grasshopper GHR-5H|
-Griffin GRF-1E 'Sparky'|
-Griffin GRF-1N|
-Griffin GRF-1S|
-Guillotine GLT-4L|
-Guillotine GLT-4P|
-Hatamoto-Chi HTM-26T|
-Hatchetman HCT-3F|
-Hermes HER-1A|
-Hermes HER-1B|
-Hermes II HER-2M 'Mercury'|
-Hermes II HER-2S|
-Hermes II HER-4K 'Hermes III'|
-Highlander HGN-733|
-Highlander HGN-733C|
-Highlander HGN-733P|
-Hornet HNT-151|
-Hornet HNT-152|
-Hunchback HBK-4G|
-Hunchback HBK-4H|
-Hunchback HBK-4J|
-Hunchback HBK-4N|
-Hunchback HBK-4P|
-Hunchback HBK-4SP|
-Hussar HSR-300-D|
-Hussar HSR-350-D|
-JagerMech JM6-A|
-JagerMech JM6-S|
-Javelin JVN-10F 'Fire Javelin'|
-Javelin JVN-10N|
-Jenner JR7-A|
-Jenner JR7-D|
-Jenner JR7-F|
-King Crab KGC-0000|
-King Crab KGC-010|
-Kintaro KTO-18|
-Lancelot LNC25-01X|
-Lancelot LNC25-02|
-Locust LCT-1E|
-Locust LCT-1L|
-Locust LCT-1M|
-Locust LCT-1S|
-Locust LCT-1V|
-Locust LCT-3V|
-Longbow LGB-0W|
-Marauder II MAD-4A|
-Marauder MAD-3D|
-Marauder MAD-3L|
-Marauder MAD-3M|
-Marauder MAD-3R|
-Mercury MCY-98|
-Mongoose MON-67|
-Mongoose MON-68|
-Orion ON1-K|
-Orion ON1-V-DC|
-Orion ON1-V|
-Orion ON1-VA|
-Ostroc OSR-2C|
-Ostroc OSR-2L|
-Ostroc OSR-2M|
-Ostroc OSR-3C|
-Ostscout OTT-7J|
-Ostsol OTL-4D|
-Ostsol OTL-4F|
-Panther PNT-8Z|
-Panther PNT-9R|
-Phoenix Hawk PXH-1|
-Phoenix Hawk PXH-1D|
-Phoenix Hawk PXH-1K|
-Quickdraw QKD-4G|
-Quickdraw QKD-4H|
-Quickdraw QKD-5A|
-Raven RVN-1X|
-Raven RVN-2X|
-Raven RVN-3X|
-Raven RVN-4X|
-Rifleman RFL-3C|
-Rifleman RFL-3N|
-Rifleman RFL-4D|
-Scorpion SCP-1N (Wendall)|
-Scorpion SCP-1N|
-Sentinel STN-1S|
-Sentinel STN-3K|
-Sentinel STN-3KA|
-Sentinel STN-3KB|
-Shadow Hawk SHD-2D|
-Shadow Hawk SHD-2H|
-Shadow Hawk SHD-2K|
-Spider SDR-5D|
-Spider SDR-5K|
-Spider SDR-5V|
-Stalker STK-3F|
-Stalker STK-3H|
-Stalker STK-4N|
-Stalker STK-4P|
-Stinger STG-3G|
-Stinger STG-3R|
-Thorn THE-F|
-Thorn THE-S|
-Thorn THE-T|
-Thug THG-10E|
-Thunderbolt TDR-5S|
-Thunderbolt TDR-5SE|
-Thunderbolt TDR-5SS|
-Trebuchet TBT-5J|
-Trebuchet TBT-5N|
-Trebuchet TBT-5S|
-Trebuchet TBT-7K|
-UrbanMech UM-R60|
-UrbanMech UM-R60L|
-Valkyrie VLK-QA|
-Valkyrie VLK-QF|
-Victor VTR-9A|
-Victor VTR-9A1|
-Victor VTR-9B|
-Victor VTR-9S|
-Vindicator VND-1AA 'Avenging Angel'|
-Vindicator VND-1R (Vong)|
-Vindicator VND-1R|
-Vindicator VND-1SIC|
-Vindicator VND-1X|
-Vulcan VL-2T|
-Vulcan VL-5T|
-Warhammer WHM-6D|
-Warhammer WHM-6K|
-Warhammer WHM-6L|
-Warhammer WHM-6R|
-Wasp WSP-1A|
-Wasp WSP-1D|
-Wasp WSP-1K|
-Wasp WSP-1L|
-Wasp WSP-1W|
-Whitworth WTH-0|
-Whitworth WTH-1|
-Whitworth WTH-1S|
-Wolfhound WLF-1|
-Wolfhound WLF-1A|
-Wolfhound WLF-1B|
-Wolverine WVR-6K|
-Wolverine WVR-6M|
-Wolverine WVR-6R|
-Wyvern WVE-6N|
-Zeus ZEU-5S|
-Zeus ZEU-5T|
-Zeus ZEU-6S|
-Zeus ZEU-6T|
-Annihilator ANH-1A|
-Annihilator ANH-2A|
-Annihilator ANH-3A|
-Annihilator ANH-4A|
-Annihilator C|
-Assassin ASN-23|
-Assassin ASN-30|
-Assassin ASN-99|
-Assassin 'Servitor'|
-Atlas AS7-C|
-Atlas AS7-CM|
-Atlas AS7-K|
-Atlas AS7-S|
-Atlas AS7-S2|
-Awesome AWS-10KM|
-Awesome AWS-9M|
-Awesome AWS-9Ma|
-Awesome AWS-9Q (Klatt)|
-Awesome AWS-9Q|
-Axman AXM-1N|
-Axman AXM-2N|
-Axman AXM-4D|
-Banshee BNC-5S (Sawyer)|
-Banshee BNC-5S (Vandergriff)|
-Banshee BNC-5S|
-Banshee BNC-6S|
-Banshee BNC-7S|
-Banshee BNC-8S|
-Black Hawk (Nova) A|
-Black Hawk (Nova) B|
-Black Hawk (Nova) C|
-Black Hawk (Nova) D|
-Black Hawk (Nova) E|
-Black Hawk (Nova) F|
-Black Hawk (Nova) H|
-Black Hawk (Nova) Prime|
-Black Hawk (Nova) S|
-Black Knight BL-12-KNT|
-Black Knight BL-6-KNT|
-Black Knight BL-6-RR|
-Black Knight BL-6b-KNT|
-Blackjack BJ-2|
-Blackjack BJ-3|
-Blackjack BJ-4|
-Bombardier BMB-05A|
-Bombardier BMB-12D|
-Bombardier BMB-14C|
-Bombardier BMB-14K|
-Caesar CES-3R 'Archangel'|
-Caesar CES-3R (Gertrude)|
-Caesar CES-3R|
-Caesar CES-3S|
-Caesar CES-4R|
-Caesar CES-4S|
-Cataphract CTF-3D|
-Cataphract CTF-3L|
-Cataphract CTF-3LL|
-Cataphract CTF-4L|
-Cataphract CTF-4X|
-Cataphract CTF-5D|
-Catapult CPLT-C2|
-Catapult CPLT-C3|
-Catapult CPLT-C4C|
-Catapult CPLT-C5|
-Catapult CPLT-C6|
-Catapult CPLT-H2|
-Catapult CPLT-K2K|
-Catapult CPLT-K3|
-Catapult CPLT-K4|
-Catapult CPLT-K5|
-Centurion CN10-B|
-Centurion CN9-D|
-Centurion CN9-D3|
-Centurion CN9-D3D|
-Centurion CN9-D4D|
-Centurion CN9-D5|
-Centurion CN9-D9|
-Centurion CN9-Da|
-Centurion CN9-YLW2 'Yen Lo Wang'|
-Champion C|
-Champion CHP-1N|
-Champion CHP-3N|
-Champion CHP-3P|
-Charger CGR-2A2|
-Charger CGR-3K|
-Charger CGR-C|
-Charger CGR-KMZ|
-Charger CGR-SA5|
-Cicada CDA-3F|
-Cicada CDA-3G|
-Cicada CDA-3M|
-Cicada CDA-3MA|
-Cicada CDA-3P|
-Clint CLNT-2-3U|
-Clint CLNT-2-3UL|
-Clint CLNT-3-3T|
-Clint CLNT-5U|
-Clint CLNT-6S|
-Commando COM-1B|
-Commando COM-1C|
-Commando COM-4H|
-Commando COM-5S|
-Commando COM-7B|
-Commando COM-7S|
-Crab CRB-27|
-Crab CRB-30|
-Crab CRB-45|
-Crab CRB-C|
-Crockett CRK-5003-1|
-Crockett CRK-5003-3|
-Crockett CRK-5004-1|
-Crockett CRK-5005-1|
-Cyclops CP-11-A-DC|
-Cyclops CP-11-A|
-Cyclops CP-11-C|
-Cyclops CP-11-G|
-Cyclops CP-11-H|
-Cyclops CP-12-K|
-Daishi (Dire Wolf) A|
-Daishi (Dire Wolf) B|
-Daishi (Dire Wolf) C|
-Daishi (Dire Wolf) D|
-Daishi (Dire Wolf) H|
-Daishi (Dire Wolf) (Hohiro)|
-Daishi (Dire Wolf) Prime|
-Daishi (Dire Wolf) 'Prometheus'|
-Daishi (Dire Wolf) S|
-Daishi (Dire Wolf) W|
-Daishi (Dire Wolf) 'Widowmaker'|
-Dasher (Fire Moth) A|
-Dasher (Fire Moth) B|
-Dasher (Fire Moth) C|
-Dasher (Fire Moth) D|
-Dasher (Fire Moth) E|
-Dasher (Fire Moth) F|
-Dasher (Fire Moth) H|
-Dasher (Fire Moth) K|
-Dasher (Fire Moth) Prime|
-Dervish DV-7D|
-Dervish DV-8D|
-Dervish DV-9D|
-Dragon DRG-5N|
-Dragon DRG-7N|
-Dragonfly (Viper) A|
-Dragonfly (Viper) B|
-Dragonfly (Viper) C|
-Dragonfly (Viper) D|
-Dragonfly (Viper) E|
-Dragonfly (Viper) F|
-Dragonfly (Viper) G|
-Dragonfly (Viper) H|
-Dragonfly (Viper) I|
-Dragonfly (Viper) Prime|
-Enforcer ENF-5D|
-Enforcer III ENF-6G|
-Enforcer III ENF-6H|
-Enforcer III ENF-6T|
-Exterminator EXT-4A|
-Exterminator EXT-4C|
-Exterminator EXT-4D|
-Exterminator EXT-5E|
-Exterminator EXT-5F|
-Falcon FLC-4P|
-Falcon FLC-5P|
-Falcon FLC-6C|
-Fenris (Ice Ferret) A|
-Fenris (Ice Ferret) B|
-Fenris (Ice Ferret) C|
-Fenris (Ice Ferret) D|
-Fenris (Ice Ferret) E|
-Fenris (Ice Ferret) H|
-Fenris (Ice Ferret) L|
-Fenris (Ice Ferret) Prime|
-Firefly C|
-Firefly FFL-4A|
-Firefly FFL-4B|
-Firefly FFL-4C|
-Firefly FFL-4D|
-Firefly FFL-4DA|
-Firestarter FS9-B|
-Firestarter FS9-C|
-Firestarter FS9-P|
-Firestarter FS9-S|
-Firestarter FS9-S1|
-Firestarter FS9-S2|
-Firestarter FS9-S3|
-Flashman FLS-8K|
-Flashman FLS-9B|
-Flashman FLS-9C|
-Flashman FLS-9M|
-Flashman FLS-C|
-Flea 'Fire Ant'|
-Flea FLE-17|
-Flea FLE-19|
-Flea FLE-20|
-Gladiator (Executioner) A|
-Gladiator (Executioner) B|
-Gladiator (Executioner) C|
-Gladiator (Executioner) D|
-Gladiator (Executioner) E|
-Gladiator (Executioner) H|
-Gladiator (Executioner) K|
-Gladiator (Executioner) P|
-Gladiator (Executioner) Prime|
-Grand Dragon DRG-5K-DC|
-Grand Dragon DRG-5K|
-Grand Dragon DRG-7K|
-Grand Dragon DRG-9KC|
-Grand Dragon DRG-C|
-Grasshopper GHR-5J|
-Grasshopper GHR-5N|
-Grasshopper GHR-6K|
-Grasshopper GHR-7K 'Gravedigger'|
-Grasshopper GHR-7K|
-Grasshopper GHR-C|
-Guillotine GLT-3N|
-Guillotine GLT-5M|
-Guillotine GLT-6WB|
-Guillotine GLT-6WB2|
-Guillotine GLT-6WB3|
-Guillotine GLT-8D|
-Hatamoto-Chi HTM-27T|
-Hatamoto-Chi HTM-28T (Shin)|
-Hatamoto-Chi HTM-28T|
-Hatamoto-Hi HTM-27U|
-Hatamoto-Hi HTM-C|
-Hatamoto-Hi HTM-CM|
-Hatamoto-Kaze HTM-27V|
-Hatamoto-Ku HTM-27W|
-Hatamoto-Mizo HTM-27Y|
-Hatchetman HCT-5D|
-Hatchetman HCT-5DD|
-Hatchetman HCT-5K|
-Hatchetman HCT-5S|
-Hatchetman HCT-6D|
-Hatchetman HCT-6S|
-Hellspawn HSN-10G|
-Hermes HER-1S|
-Hermes HER-3S|
-Hermes HER-3S1|
-Hermes HER-3S2|
-Hermes HER-4K|
-Hermes HER-4M|
-Hermes HER-4S|
-Hermes HER-4WB|
-Hermes II HER-5C|
-Hermes II HER-5ME 'Mercury Elite'|
-Hermes II HER-5S|
-Hermes II HER-5SA|
-Hermes II HER-6D|
-Highlander HGN-694|
-Highlander HGN-732|
-Highlander HGN-734|
-Highlander HGN-736|
-Highlander HGN-738|
-Hoplite C|
-Hoplite HOP-4B|
-Hoplite HOP-4C|
-Hoplite HOP-4D|
-Hornet HNT-161|
-Hornet HNT-171|
-Hunchback HBK-5H|
-Hunchback HBK-5M|
-Hunchback HBK-5N|
-Hunchback HBK-5P|
-Hunchback HBK-5S|
-Hunchback HBK-5SG|
-Hunchback HBK-5SS|
-Hunchback HBK-6N|
-Hunchback HBK-6S|
-Hussar HSR-200-D|
-Hussar HSR-400-D|
-Hussar HSR-500-D|
-Hussar HSR-900-D|
-Hussar HSR-950-D|
-Imp C|
-Imp IMP-2E|
-Imp IMP-3E|
-Imp IMP-4E|
-JagerMech JM6-DD|
-JagerMech JM6-DDa|
-JagerMech JM6-DG|
-JagerMech JM6-DGr|
-JagerMech JM6-H|
-JagerMech JM7-D|
-JagerMech JM7-F|
-JagerMech JM7-G|
-Javelin JVN-10P|
-Javelin JVN-11A 'Fire Javelin'|
-Javelin JVN-11B|
-Javelin JVN-11D|
-Javelin JVN-11F|
-Jenner JR7-C|
-Jenner JR7-C2|
-Jenner JR7-C3|
-Jenner JR7-K (Grace)|
-Jenner JR7-K|
-Katana (Crockett) CRK-5003-2|
-Katana (Crockett) CRK-5003-C|
-Katana (Crockett) CRK-5003-CJ|
-Katana (Crockett) CRK-5003-CM|
-King Crab KGC-000|
-King Crab KGC-001|
-King Crab KGC-005|
-King Crab KGC-007|
-King Crab KGC-008|
-King Crab KGC-008B|
-Kintaro KTO-19|
-Kintaro KTO-20|
-Kintaro KTO-21|
-Kintaro KTO-C|
-Kintaro KTO-K|
-Koshi (Mist Lynx) A|
-Koshi (Mist Lynx) B|
-Koshi (Mist Lynx) C|
-Koshi (Mist Lynx) D|
-Koshi (Mist Lynx) E|
-Koshi (Mist Lynx) F|
-Koshi (Mist Lynx) G|
-Koshi (Mist Lynx) H|
-Koshi (Mist Lynx) P|
-Koshi (Mist Lynx) Prime|
-Lancelot LNC25-01|
-Lancelot LNC25-03|
-Lancelot LNC25-04|
-Lancelot LNC25-05|
-Lancelot LNC25-06|
-Lancelot LNC25-08|
-Loki (Hellbringer) A|
-Loki (Hellbringer) B|
-Loki (Hellbringer) C|
-Loki (Hellbringer) D|
-Loki (Hellbringer) E|
-Loki (Hellbringer) F|
-Loki (Hellbringer) H|
-Loki (Hellbringer) Prime|
-Mad Cat (Timber Wolf) A|
-Mad Cat (Timber Wolf) B|
-Mad Cat (Timber Wolf) C|
-Mad Cat (Timber Wolf) D|
-Mad Cat (Timber Wolf) E|
-Mad Cat (Timber Wolf) F|
-Mad Cat (Timber Wolf) H|
-Mad Cat (Timber Wolf) Prime|
-Mad Cat (Timber Wolf) (Pryde)|
-Mad Cat (Timber Wolf) S|
-Man O' War (Gargoyle) A|
-Man O' War (Gargoyle) B|
-Man O' War (Gargoyle) C|
-Man O' War (Gargoyle) D|
-Man O' War (Gargoyle) E|
-Man O' War (Gargoyle) G|
-Man O' War (Gargoyle) H|
-Man O' War (Gargoyle) M|
-Man O' War (Gargoyle) Prime|
-Masakari (Warhawk) A|
-Masakari (Warhawk) B|
-Masakari (Warhawk) C|
-Masakari (Warhawk) D|
-Masakari (Warhawk) E|
-Masakari (Warhawk) H|
-Masakari (Warhawk) Prime|
-Mauler MAL-1K|
-Mauler MAL-1R|
-Mauler MAL-2R|
-Mauler MAL-3R|
-Mauler MAL-C|
-Mercury MCY-102|
-Mercury MCY-104|
-Mercury MCY-97|
-Mercury MCY-99|
-Mongoose MON-66|
-Mongoose MON-69|
-Mongoose MON-70|
-Mongoose MON-76|
-Orion ON1-M-DC|
-Orion ON1-M|
-Orion ON1-MA|
-Orion ON1-MB|
-Orion ON1-MC|
-Orion ON1-MD|
-Orion ON2-M|
-Panther PNT-10K|
-Panther PNT-10KA|
-Panther PNT-12A|
-Panther PNT-14S|
-Panther PNT-16K|
-Panther PNT-C|
-Panther PNT-CA|
-Puma (Adder) A|
-Puma (Adder) B|
-Puma (Adder) C|
-Puma (Adder) D|
-Puma (Adder) E|
-Puma (Adder) H|
-Puma (Adder) J|
-Puma (Adder) Prime|
-Quickdraw QKD-5K|
-Quickdraw QKD-5K2|
-Quickdraw QKD-5M|
-Quickdraw QKD-8K|
-Quickdraw QKD-C|
-Raven RVN-3L|
-Raven RVN-3M|
-Raven RVN-4L|
-Raven RVN-4LC|
-Raven RVN-SR 'Shattered Raven'|
-Raven RVN-SS 'Shattered Raven'|
-Ryoken (Stormcrow) (Kotare)|
-Ryoken (Stormcrow) A|
-Ryoken (Stormcrow) B|
-Ryoken (Stormcrow) C|
-Ryoken (Stormcrow) D|
-Ryoken (Stormcrow) E|
-Ryoken (Stormcrow) F|
-Ryoken (Stormcrow) G|
-Ryoken (Stormcrow) H|
-Ryoken (Stormcrow) Prime|
-Sentinel STN-3L|
-Sentinel STN-3M|
-Sentinel STN-4D|
-Sentinel STN-5WB|
-Sentinel STN-C|
-Shogun C|
-Shogun SHG-2E|
-Shogun SHG-2F (Trisha)|
-Shogun SHG-2F|
-Spider SDR-7K|
-Spider SDR-7K2|
-Spider SDR-7KC|
-Spider SDR-7M|
-Spider SDR-8M|
-Spider SDR-C|
-Stalker STK-3F (Jamison)|
-Stalker STK-5M|
-Stalker STK-5S|
-Stalker STK-6M|
-Stalker STK-7D|
-Stalker STK-8S|
-Thor (Summoner) A|
-Thor (Summoner) B|
-Thor (Summoner) C|
-Thor (Summoner) D|
-Thor (Summoner) E|
-Thor (Summoner) F|
-Thor (Summoner) G|
-Thor (Summoner) H|
-Thor (Summoner) HH|
-Thor (Summoner) M|
-Thor (Summoner) Prime|
-Thorn THE-N|
-Thorn THE-N1|
-Thorn THE-N2|
-Thug THG-11E (Reich)|
-Thug THG-11E|
-Thug THG-12E|
-Thug THG-12K|
-Thug THG-13K|
-Trebuchet TBT-3C|
-Trebuchet TBT-7M|
-Trebuchet TBT-8B|
-Trebuchet TBT-9K|
-Uller (Kit Fox) A|
-Uller (Kit Fox) B|
-Uller (Kit Fox) C|
-Uller (Kit Fox) D|
-Uller (Kit Fox) E|
-Uller (Kit Fox) F|
-Uller (Kit Fox) H|
-Uller (Kit Fox) Prime|
-Uller (Kit Fox) S|
-Uller (Kit Fox) W|
-UrbanMech UM-R63|
-UrbanMech UM-R68|
-UrbanMech UM-R69|
-UrbanMech UM-R70|
-Victor VTR-10D|
-Victor VTR-10L|
-Victor VTR-10S|
-Victor VTR-11D|
-Victor VTR-9D|
-Victor VTR-9K|
-Victor VTR-C|
-Vindicator VND-3L|
-Vindicator VND-4L|
-Vindicator VND-5L|
-Vindicator VND-6L|
-Vulcan VT-5M|
-Vulcan VT-5S|
-Vulcan VT-6C|
-Vulcan VT-6M|
-Vulture (Mad Dog) A|
-Vulture (Mad Dog) B|
-Vulture (Mad Dog) C|
-Vulture (Mad Dog) D|
-Vulture (Mad Dog) E|
-Vulture (Mad Dog) F|
-Vulture (Mad Dog) H|
-Vulture (Mad Dog) Prime|
-Whitworth WTH-1H|
-Whitworth WTH-2|
-Whitworth WTH-2A|
-Whitworth WTH-3|
-Whitworth WTH-K|
-Wolf Trap (Tora) WFT-1|
-Wolf Trap (Tora) WFT-2|
-Wolf Trap (Tora) WFT-B|
-Wolf Trap (Tora) WFT-C|
-Wolfhound IIC 'Grinner'|
-Wolfhound WLF-1 (Allard)|
-Wolfhound WLF-2|
-Wolfhound WLF-3S|
-Wolfhound WLF-4W|
-Wyvern WVE-10N|
-Wyvern WVE-5N|
-Wyvern WVE-9N|
-Zeus-X ZEU-9WD|
-Zeus ZEU-10WB|
-Zeus ZEU-9S-DC|
-Zeus ZEU-9S|
-Zeus ZEU-9S2|
-Zeus ZEU-9T|
-Albatross ALB-3U|
-Albatross ALB-4U|
-Anvil ANV-3M|
-Anvil ANV-3R|
-Anvil ANV-5M|
-Anvil ANV-5Q|
-Anvil ANV-6M|
-Anvil ANV-8M|
-Apollo APL-1M|
-Apollo APL-1R|
-Apollo APL-2S|
-Apollo APL-3T|
-Aquagladius AQS-3|
-Aquagladius AQS-4|
-Baboon (Howler) 2|
-Baboon (Howler) 3 'Devil'|
-Baboon (Howler) (Standard)|
-Bandersnatch BNDR-01A|
-Bandersnatch BNDR-01B|
-Battle Hawk BH-K305|
-Battle Hawk BH-K306|
-Behemoth (Stone Rhino) 2|
-Behemoth (Stone Rhino) 3|
-Behemoth (Stone Rhino) 4|
-Behemoth (Stone Rhino) 5|
-Behemoth (Stone Rhino) 6|
-Behemoth (Stone Rhino) (Standard)|
-Berserker BRZ-A3|
-Berserker BRZ-B3|
-Berserker BRZ-C3|
-Bombard BMB-010|
-Bombard BMB-013|
-Bombard BMB-1X|
-Cerberus MR-5M|
-Cerberus MR-6B|
-Cerberus MR-V2|
-Cerberus MR-V3|
-Colossus CL-P3|
-Colossus CLS-4S|
-Colossus CLS-5S|
-Copperhead CPR-HD-002|
-Copperhead CPR-HD-003|
-Copperhead CPR-HD-004|
-Cudgel CDG-1B|
-Cudgel CDG-2A|
-Cudgel CDG-2B|
-Daedalus DAD-3C|
-Daedalus DAD-3D|
-Daedalus DAD-4A|
-Daedalus DAD-4B|
-Daikyu DAI-01|
-Daikyu DAI-02|
-Daikyu DAI-03|
-Daimyo DMO-1K|
-Daimyo DMO-2K|
-Daimyo DMO-4K|
-Daimyo DMO-5K|
-Dart DRT-3S|
-Dart DRT-4S|
-Dart DRT-6S|
-Epimetheus Prime|
-Falconer FLC-8R|
-Fireball ALM-7D|
-Fireball ALM-8D|
-Fireball ALM-9D|
-Flashfire FLS-P2|
-Flashfire FLS-P4|
-Flashfire FLS-P5|
-Galahad (Glass Spider) 3|
-Gallowglas GAL-1GLS|
-Gallowglas GAL-2GLS|
-Gallowglas GAL-3GLS|
-Gallowglas GAL-4GLS|
-Gallowglas WD|
-Goshawk (Vapor Eagle) 3|
-Goshawk (Vapor Eagle) 4|
-Grand Crusader GRN-D-01|
-Grand Crusader GRN-D-02|
-Grand Crusader II GRN-D-03|
-Grand Crusader II GRN-D-04|
-Grand Titan T-IT-N10M|
-Grand Titan T-IT-N11M|
-Great Turtle GTR-1|
-Great Turtle GTR-2|
-Grim Reaper GRM-R-PR29|
-Grim Reaper GRM-R-PR30|
-Grim Reaper GRM-R-PR31|
-Gunslinger GUN-1ERD|
-Gunslinger GUN-2ERD|
-Hachiwara HCA-3T|
-Hachiwara HCA-4T|
-Hachiwara HCA-4U|
-Hachiwara HCA-6P|
-Hammer HMR-3C 'Claw-Hammer'|
-Hammer HMR-3M|
-Hammer HMR-3P 'Pein-Hammer'|
-Hammer HMR-3S 'Slammer'|
-Hellhound (Conjurer) 2|
-Hellhound (Conjurer) 3|
-Hellhound (Conjurer) 4|
-Hellhound (Conjurer) 5|
-Hercules HRC-LS-9000|
-Hercules HRC-LS-9001|
-Hitman HM-1|
-Hitman HM-2|
-Hollander BZK-F3|
-Hollander BZK-G1|
-Hollander II BZK-F5|
-Hollander II BZK-F7|
-Huron Warrior HUR-WO-R4L|
-Huron Warrior HUR-WO-R4M|
-Huron Warrior HUR-WO-R4N|
-Huron Warrior HUR-WO-R4O|
-Jackal JA-KL-1532|
-Jackal JA-KL-55|
-Jenner IIC 4|
-Juggernaut JG-R9T1|
-Juggernaut JG-R9T2|
-Juggernaut JG-R9T3|
-Komodo KIM-2|
-Komodo KIM-2A|
-Komodo KIM-2C|
-Komodo KIM-3C|
-Koto KT-P2|
-Koto KTO-2A|
-Koto KTO-3A|
-Koto KTO-4A|
-Kraken (Bane) 4|
-Linebacker A|
-Linebacker B|
-Linebacker C|
-Linebacker D|
-Linebacker E|
-Linebacker H|
-Linebacker Prime|
-Longshot LNG-1B|
-Longshot LNG-2|
-Longshot LNG-3|
-Longshot LNG-3C|
-Longshot LNG-4|
-Mantis MTS-L|
-Mantis MTS-S|
-Mantis MTS-T|
-Mantis MTS-T2|
-Mantis MTS-T3|
-Mantis SA-MN|
-Morpheus MR-P1|
-Morpheus MRP-3S|
-Morpheus MRP-3T|
-Morpheus MRP-3W|
-Naga A|
-Naga B|
-Naga C|
-Naga D|
-Naga Prime|
-Naginata NG-C3A|
-Naginata NG-C3B|
-Naginata NG-C3C|
-Nexus II NXS2-A|
-Nexus II NXS2-B|
-Nexus NXS1-A|
-Nexus NXS1-B|
-Nightsky NGS-4S|
-Nightsky NGS-4T|
-Nightsky NGS-5S|
-Nightsky NGS-5T|
-Nightsky NGS-6S|
-Onslaught SA-OS|
-Onslaught SA-OS2|
-Onslaught SA-OS3|
-Paladin PAL-1|
-Paladin PAL-2|
-Paladin PAL-3|
-Penetrator PTR-4D|
-Penetrator PTR-4F|
-Penetrator PTR-6M|
-Penetrator PTR-6S|
-Penetrator PTR-6T|
-Peregrine (Horned Owl) 4|
-Peregrine (Horned Owl) 5|
-Phantom A|
-Phantom B|
-Phantom C|
-Phantom D|
-Phantom E|
-Phantom F|
-Phantom H|
-Phantom Prime|
-Porcupine PRC-1N|
-Porcupine PRC-2N|
-Pouncer A|
-Pouncer B|
-Pouncer C|
-Pouncer D|
-Pouncer E|
-Pouncer H|
-Pouncer Prime|
-Prometheus (Standard)|
-Prowler PWR-1X|
-Prowler PWR-1X1|
-Raijin II RJN-200-A|
-Raijin II RJN-200-B|
-Raijin II RJN-200-C|
-Raijin RJN-101-A|
-Rakshasa MDG-1A|
-Rakshasa MDG-1B|
-Rakshasa MDG-2A|
-Ronin SA-RN|
-Ronin SA-RN7|
-Salamander PPR-5S|
-Salamander PPR-5T|
-Salamander PPR-6S|
-Salamander PPR-6T|
-Salamander PPR-7S|
-Sasquatch SQS-TH-001|
-Sasquatch SQS-TH-002|
-Sasquatch SQS-TH-003|
-Scarabus SCB-9A|
-Scarabus SCB-9T|
-Silver Fox SVR-5X|
-Silver Fox SVR-5Y|
-Snake SNK-1V|
-Snake SNK-2B|
-Spatha SP1-X|
-Stealth STH-1D|
-Stealth STH-2D|
-Stealth STH-2D1|
-Stealth STH-2D2|
-Stealth STH-3S|
-Tarantula ZPH-1A|
-Tarantula ZPH-2A|
-Tarantula ZPH-3A|
-Tarantula ZPH-4A|
-Tempest TMP-3G|
-Tempest TMP-3M|
-Tempest TMP-3M2 'Storm Tempest'|
-Tempest TMP-3MA|
-Thunder THR-1L|
-Thunder THR-2L|
-Thunder THR-3L|
-Tsunami TS-P1|
-Tsunami TS-P1D|
-Venom SDR-9K|
-Venom SDR-9KA|
-Venom SDR-9KB|
-Venom SDR-9KC|
-Viper (Black Python) 3|
-Viper (Black Python) 4|
-Vixen (Incubus) 4|
-Vixen (Incubus) 5|
-Vixen (Incubus) (Standard)|
-Volkh VKH-1|
-Volkh VKH-7|
-War Dog WR-DG-02FC|
-War Dog WR-DG-03FC|
-Watchman WTC-4DM|
-Watchman WTC-4M|
-Werewolf WER-LF-004|
-Werewolf WER-LF-005|
-Wildfire P1-WF|
-Wraith TR1|
-Wraith TR2|
-Wraith TR3|
-Avatar AV1-O|
-Avatar AV1-OA|
-Avatar AV1-OB|
-Avatar AV1-OC|
-Avatar AV1-OD|
-Avatar AV1-OE|
-Avatar AV1-OF|
-Avatar AV1-OG|
-Avatar AV1-OH|
-Avatar AV1-OI|
-Avatar AV1-OR|
-Battle Cobra A|
-Battle Cobra B|
-Battle Cobra BTL-C-2O|
-Battle Cobra BTL-C-2OA|
-Battle Cobra BTL-C-2OB|
-Battle Cobra BTL-C-2OC|
-Battle Cobra BTL-C-2OD|
-Battle Cobra BTL-C-2OE|
-Battle Cobra BTL-C-2OF|
-Battle Cobra C|
-Battle Cobra H|
-Battle Cobra Prime|
-Black Hawk-KU BHKU-O|
-Black Hawk-KU BHKU-OA|
-Black Hawk-KU BHKU-OB|
-Black Hawk-KU BHKU-OC|
-Black Hawk-KU BHKU-OD|
-Black Hawk-KU BHKU-OE|
-Black Hawk-KU BHKU-OF|
-Black Hawk-KU BHKU-OR|
-Black Hawk-KU BHKU-OX|
-Black Lanner A|
-Black Lanner B|
-Black Lanner C|
-Black Lanner D|
-Black Lanner E|
-Black Lanner H|
-Black Lanner Prime|
-Blackjack BJ2-O|
-Blackjack BJ2-OA|
-Blackjack BJ2-OB|
-Blackjack BJ2-OC|
-Blackjack BJ2-OD|
-Blackjack BJ2-OE|
-Blackjack BJ2-OF|
-Blackjack BJ2-OR|
-Blackjack BJ2-OX|
-Bushwacker BSW-L1|
-Bushwacker BSW-S2|
-Bushwacker BSW-X1|
-Bushwacker BSW-X2|
-Cauldron-Born (Ebon Jaguar) A|
-Cauldron-Born (Ebon Jaguar) B|
-Cauldron-Born (Ebon Jaguar) C|
-Cauldron-Born (Ebon Jaguar) D|
-Cauldron-Born (Ebon Jaguar) H|
-Cauldron-Born (Ebon Jaguar) Prime|
-Cestus CTS-6X|
-Cestus CTS-6Y|
-Cestus CTS-6Z|
-Cestus CTS-7A|
-Chameleon CLN-7V|
-Chameleon CLN-7W|
-Chameleon CLN-7Z|
-Crossbow A|
-Crossbow B|
-Crossbow C|
-Crossbow D|
-Crossbow H|
-Crossbow Prime|
-Devastator DVS-1D|
-Devastator DVS-2|
-Devastator DVS-3|
-Dragon Fire DGR-3F|
-Dragon Fire DGR-4F|
-Dragon Fire DGR-6FC|
-Emperor EMP-5A|
-Emperor EMP-6A|
-Emperor EMP-6D|
-Emperor EMP-6L|
-Emperor EMP-6M|
-Emperor EMP-6S|
-Emperor EMP-7L|
-Enfield END-6J|
-Enfield END-6Q|
-Enfield END-6S|
-Excalibur EXC-B1|
-Excalibur EXC-B2|
-Excalibur EXC-C1|
-Excalibur EXC-CS|
-Excalibur EXC-D1|
-Falcon Hawk FNHK-9K|
-Falcon Hawk FNHK-9K1A|
-Falcon Hawk FNHK-9K1B|
-Fire Falcon A|
-Fire Falcon B|
-Fire Falcon C|
-Fire Falcon D|
-Fire Falcon E|
-Fire Falcon H|
-Fire Falcon Prime|
-Firestarter FS9-O|
-Firestarter FS9-OA|
-Firestarter FS9-OB|
-Firestarter FS9-OC|
-Firestarter FS9-OD|
-Firestarter FS9-OE|
-Firestarter FS9-OF|
-Firestarter FS9-OG|
-Firestarter FS9-OH|
-Firestarter FS9-OR|
-Firestarter FS9-OX|
-Grendel (Mongrel) A|
-Grendel (Mongrel) B|
-Grendel (Mongrel) C|
-Grendel (Mongrel) D|
-Grendel (Mongrel) E|
-Grendel (Mongrel) F|
-Grendel (Mongrel) H|
-Grendel (Mongrel) Prime|
-Grizzly 2|
-Grizzly (Standard)|
-Hankyu (Arctic Cheetah) A|
-Hankyu (Arctic Cheetah) B|
-Hankyu (Arctic Cheetah) C|
-Hankyu (Arctic Cheetah) D|
-Hankyu (Arctic Cheetah) H|
-Hankyu (Arctic Cheetah) Prime|
-Hunchback IIC 2|
-Hunchback IIC 3|
-Hunchback IIC (Standard)|
-Kingfisher A|
-Kingfisher B|
-Kingfisher C|
-Kingfisher D|
-Kingfisher E|
-Kingfisher H|
-Kingfisher Prime|
-Kodiak 2|
-Kodiak 3|
-Kodiak 4|
-Kodiak 5|
-Kodiak (Standard)|
-Lineholder KW1-LH2|
-Lineholder KW1-LH3|
-Lineholder KW1-LH8 'Linebreaker'|
-Lineholder KW2-LHW|
-Longbow LGB-7Q|
-Longbow LGB-7V|
-Lynx LNX-8Q|
-Lynx LNX-9C|
-Lynx LNX-9Q|
-Lynx LNX-9R|
-Maelstrom MTR-5K|
-Maelstrom MTR-6E|
-Maelstrom MTR-6K|
-Merlin MLN-1A|
-Merlin MLN-1B|
-Merlin MLN-1C|
-Night Gyr A|
-Night Gyr B|
-Night Gyr C|
-Night Gyr D|
-Night Gyr E|
-Night Gyr H|
-Night Gyr Prime|
-Night Hawk NTK-2Q|
-Night Hawk NTK-2S|
-Nightstar NSR-9FC|
-Nightstar NSR-9J|
-Nightstar NSR-9SS|
-Nobori-nin (Huntsman) A|
-Nobori-nin (Huntsman) B|
-Nobori-nin (Huntsman) C|
-Nobori-nin (Huntsman) D|
-Nobori-nin (Huntsman) H|
-Nobori-nin (Huntsman) N|
-Nobori-nin (Huntsman) Prime|
-O-Bakemono OBK-M10|
-O-Bakemono OBK-M11|
-O-Bakemono OBK-M12|
-Owens OW-1|
-Owens OW-1A|
-Owens OW-1B|
-Owens OW-1C|
-Owens OW-1D|
-Owens OW-1E|
-Owens OW-1F|
-Owens OW-1R|
-Pillager PLG-1N|
-Pillager PLG-3Z|
-Pillager PLG-4Z|
-Pillager PLG-5L|
-Pillager PLG-5Z|
-Piranha 2|
-Piranha 3|
-Piranha (Standard)|
-Raptor RTX1-O|
-Raptor RTX1-OA|
-Raptor RTX1-OB|
-Raptor RTX1-OC|
-Raptor RTX1-OD|
-Raptor RTX1-OE|
-Raptor RTX1-OF|
-Raptor RTX1-OG|
-Raptor RTX1-OR|
-Shadow Cat A|
-Shadow Cat B|
-Shadow Cat C|
-Shadow Cat H|
-Shadow Cat Prime|
-Shootist ST-8A|
-Shootist ST-8C|
-Shootist ST-9C|
-Spartan SPT-N1|
-Spartan SPT-N2|
-Spartan SPT-N3|
-Spartan SPT-NF|
-Spector SPR-4F|
-Spector SPR-5F|
-Spector SPR-5S|
-Spector SPR-ST|
-Starslayer STY-2C|
-Starslayer STY-3C|
-Starslayer STY-3D|
-Strider SR1-O|
-Strider SR1-OA|
-Strider SR1-OB|
-Strider SR1-OC|
-Strider SR1-OD|
-Strider SR1-OE|
-Strider SR1-OF|
-Strider SR1-OG|
-Strider SR1-OR|
-Strider SR1-OX|
-Striker STC-2C|
-Striker STC-2D|
-Striker STC-2S|
-Sunder SD1-O (Samual)|
-Sunder SD1-O|
-Sunder SD1-OA|
-Sunder SD1-OB|
-Sunder SD1-OC|
-Sunder SD1-OD|
-Sunder SD1-OE|
-Sunder SD1-OR|
-Sunder SD1-OX|
-Supernova 2|
-Supernova 3|
-Supernova 4|
-Supernova (Standard)|
-Talon TLN-5V|
-Talon TLN-5W|
-Talon TLN-5Z|
-Thresher 2|
-Thresher (Standard)|
-Thunder Hawk TDK-7KMA|
-Thunder Hawk TDK-7S|
-Thunder Hawk TDK-7X|
-Thunder Hawk TDK-7Y|
-Turkina A|
-Turkina B|
-Turkina C|
-Turkina D|
-Turkina H|
-Turkina Prime|
-Arctic Fox AF1|
-Arctic Fox AF1A|
-Arctic Fox AF1B|
-Arctic Fox AF1C|
-Arctic Fox AF1D|
-Arctic Fox AF1E|
-Arctic Fox AF1F|
-Arctic Wolf 2|
-Arctic Wolf A|
-Arctic Wolf J|
-Arctic Wolf Prime|
-Arctic Wolf (Standard)|
-Barghest BGS-1T|
-Barghest BGS-2T|
-Barghest BGS-3T|
-Barghest BGS-7S|
-Beowulf BEO-12|
-Beowulf BEO-14|
-Bishamon BSN-3K|
-Bishamon BSN-4K|
-Bishamon BSN-5KC|
-Black Watch BKW-7R|
-Black Watch BKW-9R|
-Blitzkrieg BTZ-3F|
-Blitzkrieg BTZ-4F|
-Blood Asp A|
-Blood Asp B|
-Blood Asp C|
-Blood Asp D|
-Blood Asp E|
-Blood Asp F|
-Blood Asp G|
-Blood Asp Prime|
-Buccaneer BCN-3R|
-Buccaneer BCN-5W|
-Buccaneer BCN-6W|
-Canis 2|
-Canis (Standard)|
-Clint IIC 2|
-Clint IIC (Standard)|
-Cobra CBR-02|
-Cobra CBR-03|
-Commando IIC (Standard)|
-Corvis 2|
-Corvis (Standard)|
-Cossack C-1FC|
-Cossack C-SK1|
-Cougar A|
-Cougar B|
-Cougar C|
-Cougar D|
-Cougar Prime|
-Duan Gung D9-G10|
-Duan Gung D9-G9|
-Eagle EGL-1M|
-Eagle EGL-2M|
-Eagle EGL-3M|
-Enforcer III ENF-6M|
-Enforcer III ENF-6NAIS|
-Fire Scorpion 2|
-Fire Scorpion 3|
-Fire Scorpion (Standard)|
-Garm GRM-01A|
-Garm GRM-01A2|
-Garm GRM-01B|
-Garm GRM-01C|
-Great Wyrm 2|
-Great Wyrm (Standard)|
-Guillotine IIC 2|
-Guillotine IIC (Standard)|
-Ha Otoko 2|
-Ha Otoko HKO-1C|
-Ha Otoko (Standard)|
-Hauptmann HA1-O|
-Hauptmann HA1-OA|
-Hauptmann HA1-OB|
-Hauptmann HA1-OC|
-Hauptmann HA1-OD|
-Hauptmann HA1-OE|
-Helios HEL-3D|
-Helios HEL-4A|
-Helios HEL-6X|
-Helios HEL-C|
-Highlander IIC 2|
-Highlander IIC (Standard)|
-Icestorm 2|
-Icestorm (Standard)|
-Initiate INI-02|
-Initiate INI-04|
-JagerMech III JM6-D3|
-JagerMech III JM6-D4|
-Jinggau JN-G7L|
-Jinggau JN-G8A|
-Jinggau JN-G9CC|
-Kabuto KBO-7A|
-Kabuto KBO-7B|
-Mandrill (Standard)|
-Marshal MHL-2L|
-Marshal MHL-6MC|
-Marshal MHL-X1|
-Matador 2|
-Matador (Standard)|
-Men Shen MS1-O|
-Men Shen MS1-OA|
-Men Shen MS1-OB|
-Men Shen MS1-OC|
-Men Shen MS1-OD|
-Men Shen MS1-OE|
-Men Shen MS1-OF|
-Nova Cat A|
-Nova Cat B|
-Nova Cat C|
-Nova Cat D|
-Nova Cat E|
-Nova Cat F|
-Nova Cat G|
-Nova Cat Prime|
-Orion IIC (Standard)|
-Pack Hunter 2|
-Pack Hunter 3|
-Pack Hunter 4|
-Pack Hunter (Standard)|
-Predator 2|
-Predator (Standard)|
-Sentry SNT-04|
-Sentry SNT-W5|
-Shugenja SJA-7D|
-Shugenja SJA-8H|
-Sirocco SRC-3C|
-Sirocco SRC-5C|
-Sirocco SRC-6C|
-Snow Fox 2|
-Snow Fox 3|
-Snow Fox (Standard)|
-Stalking Spider 2|
-Stalking Spider 3|
-Stalking Spider (Standard)|
-Stooping Hawk A|
-Stooping Hawk B|
-Stooping Hawk C|
-Stooping Hawk D|
-Stooping Hawk E|
-Stooping Hawk F|
-Stooping Hawk G|
-Stooping Hawk Prime|
-Tai-sho TSH-7S|
-Tai-sho TSH-8S|
-Thunder Stallion 2 'Fire Stallion'|
-Thunder Stallion 3|
-Thunder Stallion (Standard)|
-Ti Ts'ang TSG-9C|
-Ti Ts'ang TSG-9H|
-Ti Ts'ang TSG-9J|
-Toyama TYM-1A|
-Toyama TYM-1B|
-Toyama TYM-1C|
-UrbanMech IIC 2|
-UrbanMech IIC (Standard)|
-Ursus 2|
-Ursus (Standard)|
-Viking VKG-2F|
-Viking VKG-2G|
-Viking VKG-3A|
-Viking VKG-3W|
-Wyvern IIC 2|
-Wyvern IIC (Standard)|
-Yeoman YMN-10-OR|
-Yeoman YMN-6Y|
-Yu Huang Y-H10G|
-Yu Huang Y-H11G|
-Yu Huang Y-H9G|
-Yu Huang Y-H9GB|
-Yu Huang Y-H9GC|
-Akuma AKU-1X|
-Akuma AKU-1XJ|
-Anubis ABS-3L|
-Anubis ABS-3R|
-Anubis ABS-3T|
-Arcas 2|
-Arcas (Standard)|
-Argus AGS-2D|
-Argus AGS-4D|
-Axman AXM-3S|
-Blood Kite 2|
-Blood Kite (Standard)|
-Bloodhound B1-HND|
-Bloodhound B2-HND|
-Blue Flame BLF-21|
-Brigand LDT-1|
-Brigand LDT-X1|
-Brigand LDT-X2|
-Burrock (Standard)|
-Chimera CMA-1S|
-Chimera CMA-C|
-Crimson Langur Prime|
-Crimson Langur A|
-Crimson Langur B|
-Crimson Langur C|
-Cronus CNS-3M|
-Cronus CNS-5M|
-Fafnir FNR-5|
-Fafnir FNR-5B|
-Gurkha GUR-2G|
-Gurkha GUR-4G|
-Hellfire 2|
-Hellfire (Standard)|
-Hellion A|
-Hellion B|
-Hellion C|
-Hellion Prime|
-Hellspawn HSN-7D|
-Hellspawn HSN-8E|
-Hellspawn HSN-9F|
-Lao Hu LHU-2B|
-Lao Hu LHU-3B|
-Lao Hu LHU-3C|
-Legacy LGC-01|
-Legacy LGC-02|
-Lightray LGH-4W|
-Lightray LGH-4Y|
-Lightray LGH-5W|
-Lobo (Standard)|
-Mad Cat Mk II (Standard)|
-Ninja-To NJT-2|
-Ninja-To NJT-3|
-No-Dachi NDA-1K|
-No-Dachi NDA-2K|
-No-Dachi NDA-2KO|
-Osiris OSR-3D|
-Osiris OSR-4D|
-Perseus P1A|
-Perseus P1B|
-Perseus P1C|
-Perseus P1D|
-Perseus P1|
-Pinion 2|
-Pinion (Standard)|
-Rabid Coyote (Standard)|
-Razorback RZK-9S|
-Razorback RZK-9T|
-Red Shift RDS-2A|
-Red Shift RDS-2B|
-Sagittaire SGT-8R|
-Savage Coyote A|
-Savage Coyote B|
-Savage Coyote C|
-Savage Coyote Prime|
-Scylla (Standard)|
-Sha Yu SYU-2B|
-Sha Yu SYU-4B|
-Solitaire (Standard)|
-Spirit (Standard)|
-Stiletto STO-4A|
-Stiletto STO-4B|
-Templar TLR1-O (Grayson)|
-Templar TLR1-O (Tancred)|
-Templar TLR1-O|
-Templar TLR1-OA|
-Templar TLR1-OB|
-Templar TLR1-OC|
-Tessen TSN-1C|
-Tessen TSN-C3|
-Thanatos TNS-4S|
-Uziel UZL-2S|
-Uziel UZL-3S|
-Vanquisher VQR-2A|
-Vanquisher VQR-2B|
-Verfolger VR5-R|
-White Flame WHF-3B|
-Arcas 3|
-Bowman 2|
-Bowman 3|
-Bowman 4|
-Bowman (Standard)|
-Burrock 2|
-Crimson Langur D|
-Crimson Langur E|
-Hellfire 3|
-Lobo 2|
-Lobo 3|
-Mad Cat Mk II 2|
-Mad Cat Mk II 3|
-Pinion 3|
-Rabid Coyote 2|
-Savage Coyote J|
-Savage Coyote W|
-Scylla 2|
-Scylla 3|
-Solitaire 2|
-Spirit 2|
-Akuma AKU-2X|
-Akuma AKU-2XK|
-Anubis ABS-4C|
-Argus AGS-5D|
-Argus AGS-6F|
-Bloodhound B3-HND|
-Blue Flame BLF-40|
-Brigand LDT-X3|
-Brigand LDT-X4|
-Chimera CMA-2K|
-Cronus CNS-TD9|
-Fafnir FNR-5WB|
-Fafnir FNR-6U|
-Gurkha GUR-6G|
-Gurkha GUR-8G|
-Hellspawn HSN-10SR|
-Lao Hu LHU-3L|
-Lao Hu LHU-4E|
-Legacy LGC-03|
-Legacy LGC-04-WVR|
-Legacy LGC-05|
-Lightray LGH-7W|
-Ninja-To NJT-4|
-No-Dachi NDA-3S|
-Osiris OSR-5D|
-Perseus P1E|
-Perseus P1P|
-Perseus P1W|
-Razorback RZK-10S|
-Razorback RZK-10T|
-Red Shift RDS-3A|
-Sagittaire SGT-10X|
-Sagittaire SGT-9D|
-Sha Yu SYU-6B|
-Stiletto STO-4C|
-Templar TLR1-OD|
-Templar TLR1-OE|
-Templar TLR1-OF|
-Templar TLR1-OG|
-Templar TLR1-OH|
-Templar TLR1-OI|
-Tessen TSN-C3M|
-Thanatos TNS-4T|
-Thanatos TNS-6S|
-Uziel UZL-8S|
-Vanquisher VQR-5V|
-Vanquisher VQR-7U|
-Vanquisher VQR-7V|
-Verfolger VR6-C|
-Verfolger VR6-T|
-White Flame WHF-3C|
-White Flame WHF-4C|
-Archangel C-ANG-O Invictus|
-Archangel C-ANG-OA Dominus|
-Archangel C-ANG-OB Infernus|
-Archangel C-ANG-OC Comminus|
-Archangel C-ANG-OD Luminos|
-Archangel C-ANG-OE Eminus|
-Atlas II AS7-D-H|
-Atlas II AS7-D-H2|
-Balius A|
-Balius B|
-Balius C|
-Balius D|
-Balius Prime|
-BattleAxe BKX-7K|
-BattleAxe BKX-7NC|
-BattleAxe BKX-8D|
-BattleMaster BLR-1Gb|
-BattleMaster BLR-1Gbc|
-BattleMaster BLR-1Gc|
-Bear Cub 2|
-Bear Cub 3|
-Bear Cub (Standard)|
-Crab CRB-27b|
-Crimson Hawk 2|
-Crimson Hawk 3|
-Crimson Hawk (Standard)|
-Crossbow CRS-6B|
-Crossbow CRS-6C|
-Crossbow CRS-9A|
-Crusader CRD-2R|
-Cygnus 2|
-Cygnus 3|
-Cygnus (Standard)|
-Defiance DFN-3C|
-Defiance DFN-3S|
-Defiance DFN-3T|
-DemolitionMech WI-DM|
-DemolitionMech WI-DM2|
-Deva C-DVA-O Invictus|
-Deva C-DVA-OA Dominus|
-Deva C-DVA-OB Infernus|
-Deva C-DVA-OC Comminus|
-Deva C-DVA-OD Luminos|
-Deva C-DVA-OE Eminus|
-Excalibur EXC-B2b|
-Eyleuka EYL-35A|
-Eyleuka EYL-45A|
-Eyleuka EYL-45B|
-Eyleuka EYL-4A|
-Firebee FRB-2E|
-Firebee FRB-3E|
-Galahad GLH-1D|
-Galahad GLH-2D|
-Galahad GLH-3D|
-Gladiator GLD-2R|
-Gladiator GLD-3R|
-Gladiator GLD-4R|
-Gladiator GLD-5R|
-Gladiator (Keller)|
-Grigori C-GRG-O Invictus|
-Grigori C-GRG-O (Tamiel)|
-Grigori C-GRG-OA Dominus|
-Grigori C-GRG-OB Infernus|
-Grigori C-GRG-OC Comminus|
-Grigori C-GRG-OD Luminos|
-Grigori C-GRG-OE Eminus|
-Hammerhands HMH-3D|
-Hammerhands HMH-4D|
-Hammerhands HMH-5D|
-Hammerhands HMH-6D|
-Helepolis HEP-2H|
-Helepolis HEP-2X|
-Helepolis HEP-3H|
-Helepolis HEP-4H|
-Highlander HGN-732b|
-Hussar HSR-200-Db|
-Hyena HYN-4B SalvageMech|
-Hyena HYN-4A SalvageMech|
-Icarus II ICR-1S|
-Icarus II ICR-2S|
-Jabberwocky ConstructionMech JAW-66D|
-Jabberwocky DemolitionMech JAW-66C|
-Jabberwocky EngineerMech JAW-65A|
-Jabberwocky EngineerMech JAW-66B|
-Jackrabbit JKR-8T|
-Jackrabbit JKR-9R 'Joker'|
-Jackrabbit JKR-9W|
-Jupiter 2|
-Jupiter 3|
-Jupiter (Standard)|
-King Crab KGC-000b|
-Kintaro KTO-19b|
-Kiso ConstructionMech K-3N-KR4|
-Kiso ConstructionMech K-3N-KR5|
-Koschei KSC-3I|
-Koschei KSC-3L|
-Koschei KSC-4I|
-Koschei KSC-4L|
-Koschei KSC-5I|
-Koschei KSC-5MC|
-Koschei KSC-5X|
-Kyudo KY2-D-02|
-Kyudo KY2-D-03|
-Legionnaire LGN-1X|
-Legionnaire LGN-2D|
-Legionnaire LGN-2XA|
-Legionnaire LGN-2XU|
-Lumberjack LM1/A|
-Lumberjack LM4/C|
-Lumberjack LM4/P|
-Mackie MSK-6S|
-Mackie MSK-7A|
-Mackie MSK-8B|
-Mackie MSK-9H|
-Malak C-MK-O Invictus|
-Malak C-MK-OA Dominus|
-Malak C-MK-OB Infernus|
-Malak C-MK-OC Comminus|
-Malak C-MK-OD Luminos|
-Malak C-MK-OE Eminus|
-Marauder MAD-1R|
-Marauder MAD-2R|
-Mongoose II MON-266|
-Mongoose II MON-267|
-Mongoose II MON-268|
-Mongoose MON-66b|
-Ocelot 2|
-Ocelot 3|
-Ocelot (Standard)|
-Ostroc OSR-2Cb|
-Ostscout OTT-7Jb|
-Pariah (Septicemia) A|
-Pariah (Septicemia) B|
-Pariah (Septicemia) C|
-Pariah (Septicemia) D|
-Pariah (Septicemia) Prime|
-Patriot PKM-2C|
-Patriot PKM-2D|
-Patriot PKM-2E|
-Patron LoaderMech (Standard)|
-Patron LoaderMech PTN-1|
-Phoenix Hawk PXH-1b (Special)|
-Phoenix Hawk PXH-1c (Special)|
-Phoenix PX-3R|
-Phoenix PX-4R|
-Preta C-PRT-O Invictus|
-Preta C-PRT-OA Dominus|
-Preta C-PRT-OB Infernus|
-Preta C-PRT-OC Comminus|
-Preta C-PRT-OD Luminos|
-Preta C-PRT-OE Eminus|
-Quasit MilitiaMech QUA-51M|
-Quasit MilitiaMech QUA-51P|
-Quasit MilitiaMech QUA-51T|
-Rifleman II RFL-3N-2|
-Ryoken II 2|
-Ryoken II 3|
-Ryoken II (Standard)|
-Seraph C-SRP-O Invictus|
-Seraph C-SRP-OA Dominus|
-Seraph C-SRP-OB Infernus|
-Seraph C-SRP-OC Comminus|
-Seraph C-SRP-OD Luminos|
-Seraph C-SRP-OE Eminus|
-Sun Cobra (Standard)|
-Thug THG-11Eb|
-Titan II TI-2P|
-Titan II TI-2PA|
-Titan TI-1A|
-Toro TR-A-6|
-Valiant V4-LNT-J3|
-Valiant V4-LNT-K7|
-Valiant VLN-3T|
-Von Rohrs (Hebi) VON 4RH-5|
-Von Rohrs (Hebi) VON 4RH-6|
-Warhammer WHM-6Rb|
-Warlord BLR-2D|
-Warlord BLR-2G|
-Wight WGT-1LAW/SC|
-Wight WGT-1LAW/SC3|
-Wight WGT-2LAW|
-Wight WGT-2LAWC3|
-Wight WGT-2SC|
-Wight WGT-3SC|
-Wolverine II WVR-7H|
-Wyvern WVE-5Nb|
-Xanthos XNT-3O|
-Xanthos XNT-4O|
-Xanthos XNT-5O|
-Ymir BWP-2B|
-Ymir BWP-2E|
-Ymir BWP-3A|
-Arbalest 2|
-Arbalest 3|
-Arbalest (Standard)|
-Arctic Wolf II A|
-Arctic Wolf II B|
-Arctic Wolf II C|
-Arctic Wolf II Prime|
-Atlas AS7-Dr|
-Atlas AS7-K2|
-Atlas AS7-K3|
-Atlas AS8-D|
-Blade BLD-XL|
-Blade BLD-XS|
-Blade BLD-XX|
-Blood Reaper 2|
-Blood Reaper (Standard)|
-Brahma BRM-5A|
-Brahma BRM-5B|
-Bruin 2|
-Bruin (Standard)|
-Cuirass CDR-1X|
-Dark Crow 2|
-Dark Crow 3|
-Dark Crow 4|
-Dark Crow (Standard)|
-Dasher II 2|
-Dasher II (Standard)|
-Deimos 2|
-Deimos A|
-Deimos B|
-Deimos C|
-Deimos Prime|
-Deimos S|
-Diomede D-M3D-3 ConstructionMech|
-Diomede D-M3D-4 DemolitionMech|
-Ebony MEB-10|
-Ebony MEB-11|
-Ebony MEB-9|
-Eidolon C-EID-001|
-Eisenfaust EFT-4J|
-Eisenfaust EFT-7X|
-Eisenfaust EFT-8X|
-Fennec FEC-1CM|
-Fennec FEC-3C|
-Flamberge 2|
-Flamberge 3|
-Flamberge A|
-Flamberge B|
-Flamberge C|
-Flamberge Prime|
-Fwltur FWL-3R SalvageMech|
-Fwltur FWL-3V SalvageMech|
-Gallant GLT-7-0|
-Gallant GLT-8-0|
-Ghost GST-10|
-Ghost GST-11|
-Goshawk II 2|
-Goshawk II 3|
-Goshawk II (Standard)|
-Hatchetman HCT-6M|
-Hatchetman HCT-7S|
-Hellstar 2|
-Hellstar 3|
-Hellstar (Standard)|
-Karhu A|
-Karhu B|
-Karhu C|
-Karhu D|
-Karhu Prime|
-Kuma 2|
-Kuma 3|
-Kuma (Standard)|
-Mangonel MNL-3L|
-Mangonel MNL-3W|
-Mjolnir MLR-B2|
-Mjolnir MLR-BX|
-Morrigan 2|
-Morrigan 3|
-Morrigan (Standard)|
-Night Wolf (Standard)|
-Nyx NX-80|
-Nyx NX-80C|
-Nyx NX-90|
-Omen (Standard)|
-Onager (Standard)|
-Orochi OR-2I|
-Osprey OSP-15|
-Osprey OSP-25|
-Osprey OSP-26|
-Ostwar OWR-2M|
-Ostwar OWR-2Mb|
-Ostwar OWR-3M|
-Pack Hunter II 2|
-Pack Hunter II 3|
-Pack Hunter II (Standard)|
-Panther PNT-10K2|
-Panther PNT-12K|
-Panther PNT-12K2|
-Panther PNT-13K|
-Parash 2|
-Parash (Standard)|
-Peacekeeper PKP-1A|
-Peacekeeper PKP-1B|
-Penthesilea PEN-2H|
-Penthesilea PEN-2MAF|
-Prefect PRF-1R|
-Prefect PRF-2R|
-Raptor II RPT-2X|
-Raptor II RPT-2X1|
-Raptor II RPT-3X|
-Raptor II RPT-5X|
-Rook NH-1A|
-Rook NH-1B|
-Rook NH-2|
-Rook NH-3X|
-Shadow Cat II 2|
-Shadow Cat II (Standard)|
-Shen Yi SHY-3B|
-Shockwave SKW-2F|
-Shockwave SKW-4G|
-Sokuryou SKU-181 SurveyMech|
-Sokuryou SKU-197 SurveyMech|
-Sokuryou SKU-198 SurveyMech|
-Sphinx 2|
-Sphinx (Standard)|
-Spider SDR-8K|
-Spider SDR-8R|
-Spider SDR-8X|
-Targe TRG-1N|
-Targe TRG-2N|
-Thunder Fox TFT-A9|
-Thunder Fox TFT-C3|
-Thunder Fox TFT-L8|
-Trebaruna TR-XB|
-Trebaruna TR-XJ|
-Trebaruna TR-XL|
-Tundra Wolf 2|
-Tundra Wolf 3|
-Tundra Wolf 4|
-Tundra Wolf (Standard)|
-Ursus II (Standard)|
-Warhammer WHD-10CT|
-Wolfhound WLF-3M|
-Wolfhound WLF-5|
-Yao Lien YOL-4C|
-Akuma AKU-2XC|
-Albatross ALB-3Ur|
-Arctic Fox AF1U|
-Argus AGS-8DX|
-Avatar AV1-OU|
-Axman AXM-3Sr|
-Balius U|
-Bandersnatch BNDR-01Ar|
-Banshee BNC-3Mr|
-Beowulf C|
-Black Hawk (Nova) U|
-Black Hawk-KU BHKU-OU|
-Blackjack BJ2-OU|
-Bushwacker BSW-S2r|
-Catapult CPLT-C5A|
-Cauldron-Born (Ebon Jaguar) U|
-Centurion CN9-Ar|
-Charger CGR-3Kr|
-Commando COM-2Dr|
-Crossbow U|
-Cyclops CP-11-B|
-Cyclops CP-11-C2|
-Cyclops CP-11-C3|
-Daikyu DAI-01r|
-Daishi (Dire Wolf) U|
-Dart DRT-6T|
-Dervish DV-6Mr|
-Deva C-DVA-OU Exanimus|
-Dragon DRG-5Nr|
-Dragonfly (Viper) U|
-Enfield END-6Sr|
-Enforcer III ENF-6Ma|
-Enforcer III ENF-7C3BS|
-Fafnir FNR-5X|
-Falconer FLC-9R|
-Fenris (Ice Ferret) U|
-Fireball ALM-10D|
-Firestarter FS9-OU|
-Gallowglas GAL-2GLSA|
-Grand Dragon DRG-7KC|
-Grigori C-GRG-OU Exanimus|
-Gunslinger GUN-2ERDr|
-Ha Otoko 3|
-Hammerhands HMH-6E|
-Hatamoto-Chi HTM-28Tr|
-Hermes II HER-5Sr|
-Highlander IIC 3|
-Hitman HM-1r|
-Hunchback IIC 4|
-JagerMech JM7-C3BS|
-Jenner JR7-C4|
-King Crab KGC-005r|
-Longbow LGB-8V|
-Mad Cat (Timber Wolf) U|
-Men Shen MS1-OU|
-Mongoose MON-86|
-Naginata NG-C3Ar|
-Nightsky NGS-6T|
-No-Dachi NDA-2KC|
-Piranha 4|
-Preta C-PRT-OU Exanimus|
-Quickdraw QKD-5Mr|
-Rakshasa MDG-1Ar|
-Raptor RTX1-OU|
-Raven RVN-4Lr|
-Snake SNK-2Br|
-Spider SDR-7Kr|
-Stalker STK-7C3BS|
-Starslayer STY-3Dr|
-Talon TLN-6W|
-Templar TLR1-OU|
-Tessen TSN-1Cr|
-Thor (Summoner) U|
-Turkina U|
-Uller (Kit Fox) U|
-UrbanMech UM-AIV|
-UrbanMech UM-R80|
-Victor VTR-9Ka|
-Victor VTR-Cr|
-Vindicator VND-3Lr|
-Vulcan VT-5Sr|
-Vulture (Mad Dog) U|
-Warlord BLR-2Dr|
-Archer ARC-6S|
-Archer ARC-6W|
-Archer ARC-7L|
-Archer ARC-7S|
-Archer ARC-8M|
-Archer ARC-9K|
-Archer ARC-9M|
-Archer ARC-9W|
-BattleMaster BLR-10S|
-BattleMaster BLR-10S2|
-BattleMaster BLR-2C|
-BattleMaster BLR-3M|
-BattleMaster BLR-3S|
-BattleMaster BLR-4L|
-BattleMaster BLR-4S|
-BattleMaster BLR-5M|
-BattleMaster BLR-6X|
-BattleMaster BLR-CM|
-BattleMaster BLR-K3|
-BattleMaster BLR-K4|
-BattleMaster BLR-M3|
-BattleMaster C|
-Crusader CRD-4L|
-Crusader CRD-5K|
-Crusader CRD-6M|
-Crusader CRD-7L|
-Crusader CRD-7W|
-Crusader CRD-8L|
-Crusader CRD-8S|
-Goliath GOL-2H|
-Goliath GOL-3L|
-Goliath GOL-3S|
-Goliath GOL-4S|
-Goliath GOL-5D|
-Goliath GOL-5W|
-Goliath GOL-6H|
-Goliath GOL-6M|
-Griffin GRF-1DS|
-Griffin GRF-3M|
-Griffin GRF-4N|
-Griffin GRF-4R|
-Griffin GRF-5K|
-Griffin GRF-5L|
-Griffin GRF-5M|
-Griffin GRF-6CS|
-Griffin GRF-6S|
-Griffin IIC 3|
-Griffin IIC 4|
-Griffin IIC 5|
-Griffin IIC 6|
-Griffin IIC 7|
-Griffin IIC 8|
-Locust IIC 4|
-Locust IIC 5|
-Locust IIC 6|
-Locust IIC 7|
-Locust IIC 8|
-Locust IIC 9|
-Locust LCT-1V2|
-Locust LCT-5M|
-Locust LCT-5T|
-Locust LCT-5V|
-Locust LCT-5W|
-Locust LCT-5W2|
-Locust LCT-6M|
-Longbow LGB-12C|
-Longbow LGB-12R|
-Longbow LGB-13C|
-Longbow LGB-13NAIS|
-Longbow LGB-14C|
-Marauder II (Bounty Hunter)|
-Marauder II C|
-Marauder II MAD-4H|
-Marauder II MAD-4K|
-Marauder II MAD-4S|
-Marauder II MAD-5W|
-Marauder II MAD-6D|
-Marauder II MAD-6M|
-Marauder IIC 2|
-Marauder IIC 3|
-Marauder IIC 4|
-Marauder IIC 5|
-Marauder IIC 6|
-Marauder IIC 7|
-Marauder MAD-5L|
-Marauder MAD-5M|
-Marauder MAD-5R|
-Marauder MAD-5T|
-Marauder MAD-6L|
-Marauder MAD-7D|
-Marauder MAD-9M|
-Marauder MAD-9M2|
-Marauder MAD-9S|
-Marauder MAD-9W|
-Marauder MAD-9W2|
-Ostroc OSR-4C|
-Ostroc OSR-4K|
-Ostroc OSR-4L|
-Ostroc OSR-5C|
-Ostroc OSR-5W|
-Ostscout OTT-10CS|
-Ostscout OTT-11J|
-Ostscout OTT-7K|
-Ostscout OTT-9CS|
-Ostscout OTT-9S|
-Ostsol OTL-5D|
-Ostsol OTL-6D|
-Ostsol OTL-7M|
-Ostsol OTL-8D|
-Ostsol OTL-8M|
-Ostsol OTL-9M|
-Ostsol OTL-9R|
-Phoenix Hawk IIC 3|
-Phoenix Hawk IIC 4|
-Phoenix Hawk IIC 5|
-Phoenix Hawk IIC 6|
-Phoenix Hawk IIC 7|
-Phoenix Hawk IIC 8|
-Phoenix Hawk PXH-2|
-Phoenix Hawk PXH-3M (Masters)|
-Phoenix Hawk PXH-3PL|
-Phoenix Hawk PXH-4L|
-Phoenix Hawk PXH-4W|
-Phoenix Hawk PXH-5L|
-Phoenix Hawk PXH-6D|
-Phoenix Hawk PXH-7CS|
-Phoenix Hawk PXH-7K|
-Phoenix Hawk PXH-7S|
-Phoenix Hawk PXH-8CS|
-Rifleman C 2|
-Rifleman IIC 2|
-Rifleman IIC 3|
-Rifleman IIC 4|
-Rifleman IIC 5|
-Rifleman IIC 6|
-Rifleman IIC 7|
-Rifleman IIC 8|
-Rifleman IIC (Standard)|
-Rifleman RFL-3Cr|
-Rifleman RFL-6D|
-Rifleman RFL-6X|
-Rifleman RFL-7M|
-Rifleman RFL-7X|
-Rifleman RFL-8D|
-Rifleman RFL-8X|
-Rifleman RFL-9T|
-Scorpion SCP-10M|
-Scorpion SCP-12C|
-Scorpion SCP-12K|
-Scorpion SCP-12S|
-Shadow Hawk IIC 3|
-Shadow Hawk IIC 4|
-Shadow Hawk IIC 5|
-Shadow Hawk IIC 6|
-Shadow Hawk IIC 7|
-Shadow Hawk IIC 8|
-Shadow Hawk SHD-11CS|
-Shadow Hawk SHD-12C|
-Shadow Hawk SHD-3K|
-Shadow Hawk SHD-5D|
-Shadow Hawk SHD-7CS|
-Shadow Hawk SHD-7M|
-Shadow Hawk SHD-8L|
-Shadow Hawk SHD-9D|
-Stinger STG-3P|
-Stinger STG-5R|
-Stinger STG-5T|
-Stinger STG-6L|
-Stinger STG-6S|
-Stinger STG-7S|
-Thunderbolt TDR-10M|
-Thunderbolt TDR-10SE|
-Thunderbolt TDR-11SE|
-Thunderbolt TDR-17S|
-Thunderbolt TDR-60-RLA|
-Thunderbolt TDR-7SE|
-Thunderbolt TDR-9M|
-Thunderbolt TDR-9NAIS|
-Thunderbolt TDR-9Nr|
-Thunderbolt TDR-9T|
-Valkyrie VLK-QD1|
-Valkyrie VLK-QD2|
-Valkyrie VLK-QD3|
-Valkyrie VLK-QD4|
-Valkyrie VLK-QS5|
-Valkyrie VLK-QT2|
-Valkyrie VLK-QW5|
-Warhammer IIC 3|
-Warhammer IIC 4|
-Warhammer IIC 5|
-Warhammer IIC 6|
-Warhammer IIC 7|
-Warhammer IIC 8|
-Warhammer IIC 9|
-Warhammer WHM-10T|
-Warhammer WHM-11T|
-Warhammer WHM-4L|
-Warhammer WHM-5L|
-Warhammer WHM-8D|
-Warhammer WHM-8K|
-Warhammer WHM-8M|
-Warhammer WHM-9D|
-Warhammer WHM-9S|
-Wasp WSP-3A|
-Wasp WSP-3L|
-Wasp WSP-3S|
-Wasp WSP-7MAF|
-Wasp WSP-8T|
-Wolverine WVR-8C|
-Wolverine WVR-8D|
-Wolverine WVR-8K|
-Wolverine WVR-9D|
-Wolverine WVR-9K|
-Wolverine WVR-9M|
-Wolverine WVR-9W|
-Wolverine WVR-9W2|
-Eyrie (Standard)|
-Gravedigger GDR-1C|
-Gravedigger GDR-1D|
-Gyrfalcon (Standard)|
-Gyrfalcon 2|
-Gyrfalcon 3|
-Gyrfalcon 4|
-Kodiak II (Standard)|
-Kodiak II 2|
-Loki Mk II (Hel) (Prime)|
-Loki Mk II (Hel) A|
-Loki Mk II (Hel) B|
-Shrike (Standard)|
-Shrike 2|
-Shrike 3|
-Thor II (Grand Summoner) (Prime)|
-Thor II (Grand Summoner) A|
-Thor II (Grand Summoner) B|
-Thor II (Grand Summoner) C|
-Thor II (Grand Summoner) D|
-Tomahawk (Prime)|
-Tomahawk A|
-Tomahawk B|
-Tomahawk C|
-Tomahawk II (Prime)|
-Tomahawk II A|
-Tomahawk II B|
-Tomahawk II C|
-Vulture Mk III (Mad Dog Mk III) (Prime)|
-Vulture Mk III (Mad Dog Mk III) B|
-Vulture Mk III (Mad Dog Mk III) C|
-Vulture Mk III (Mad Dog Mk III) D|
-Vulture Mk III (Mad Dog Mk III) A|
-Warwolf (Prime)|
-Warwolf A|
-Warwolf B|
-Warwolf C|
-Warwolf H|
-Wulfen (Prime)|
-Wulfen A|
-Wulfen B|
-Wulfen C|
-Wulfen D|
-Wulfen E|
-Wulfen H|
-Antlion LK-3D|
-Atlas III AS7-D2|
-Atlas III AS7-D3|
-Black Knight BLK-NT-2Y|
-Black Knight BLK-NT-3A|
-Black Knight BLK-NT-3B|
-Black Knight BLK-NT-4D|
-Black Knight BLK-NT-5H|
-Centurion CN11-O|
-Centurion CN11-OA|
-Centurion CN11-OB|
-Centurion CN11-OC|
-Centurion CN11-OD|
-Centurion CN11-OE|
-Gunsmith CH11-NG|
-Hollander III BZK-D1|
-Hollander III BZK-D2|
-Hollander III BZK-D3|
-Prey Seeker PY-SR10|
-Scarecrow UCU-F4r 'Hobbled Scarecrow'|
-Scarecrow UCU-F4|
-Templar III TLR2-O|
-Templar III TLR2-OA|
-Templar III TLR2-OB|
-Templar III TLR2-OC|
-Templar III TLR2-OD|
-Vulpes VLP-1D|
-Avalanche AVL-1O|
-Avalanche AVL-1OA|
-Avalanche AVL-1OB|
-Avalanche AVL-1OC|
-Avalanche AVL-1ON|
-Avalanche AVL-1OR|
-Dragon II DRG-11K|
-Dragon II DRG-11R|
-Exhumer EXR-2X|
-Exhumer EXR-3P|
-Hatamoto-Godai HTM-30Z|
-Hatamoto-Suna HTM-30S|
-Hitotsume Kozo HKZ-1F|
-Hitotsume Kozo HKZ-1P|
-Phoenix Hawk L 'Fenikkusu Taka' PXH-11K|
-Phoenix Hawk L 'Fenikkusu Taka' PXH-11K2|
-Rokurokubi RK-4K|
-Rokurokubi RK-4T|
-Rokurokubi RK-4X|
-Shiro SH-1V|
-Shiro SH-2P|
-Tenshi TN-10-O|
-Tenshi TN-10-OA|
-Tenshi TN-10-OB|
-Tenshi TN-10-OR|
-Wendigo (Prime)|
-Wendigo A|
-Wendigo B|
-Wendigo C|
-Wendigo-VP (Prime)|
-Wendigo-VP A|
-Agrotera AGT-1A|
-Anubis ABS-5Y|
-Anubis ABS-5Z|
-Calliope CAL-1MAF|
-Catapult II CPLT-L7|
-Catapult II CPLT-L7L|
-Gun GN-2O|
-Gun GN-2OA|
-Gun GN-2OB|
-Lu Wei Bing LN-4B|
-Mortis MS-1A|
-Mortis MS-1P|
-Raven II RVN-5X|
-Tian-Zong TNZ-N1|
-Tian-Zong TNZ-N2|
-Tian-Zong TNZ-N3|
-Vandal LI-O|
-Vandal LI-OA|
-Vandal LI-OB|
-Yinghuochong YHC-3E|
-Yinghuochong YHC-3Y|
-Anzu ZU-G60|
-Anzu ZU-J70|
-Carronade CRN-7M|
-Gambit GBT-1G|
-Gambit GBT-1L|
-Havoc HVC-P6|
-Juliano JLN-5A|
-Neanderthal NTL-AG|
-Neanderthal NTL-UG|
-Quasimodo QSM-3D|
-Sarath SRTH-1O|
-Sarath SRTH-1OA|
-Sarath SRTH-1OB|
-Stalker II STK-9A|
-Violator VT-U1|
-Violator VT-U3|
-Black Hawk (Standard) 2|
-Black Hawk (Standard) 3|
-Black Hawk (Standard)|
-Cadaver CVR-A1|
-Cadaver CVR-T1|
-HawkWolf HWK-4F|
-Hound HD-2F|
-Jade Hawk (Standard)|
-Jade Hawk 2|
-Jade Hawk 3|
-Jade Hawk JHK-03|
-Jade Hawk JHK-04|
-Koshi (Standard) 2|
-Koshi (Standard) 3|
-Koshi (Standard)|
-Mad Cat Mk IV (Savage Wolf) (Prime)|
-Mad Cat Mk IV (Savage Wolf) A|
-Mad Cat Mk IV (Savage Wolf) B|
-Mad Cat Mk IV (Savage Wolf) C|
-Mad Cat Mk IV (Savage Wolf) PR 2|
-Mad Cat Mk IV (Savage Wolf) PR (Standard)|
-Stalking Spider II (Standard)|
-Tiburon (Standard)|
-Vulture Mk IV (Mad Dog Mk IV) A|
-Vulture Mk IV (Mad Dog Mk IV) B|
-Vulture Mk IV (Mad Dog Mk IV) C|
-Vulture Mk IV (Mad Dog Mk IV) D|
-Vulture Mk IV (Mad Dog Mk IV) Prime|
-Archer ARC-9KC|
-Atlas AS7-K4|
-Avatar AV1-OJ|
-Balius E|
-Banshee BNC-9S2|
-Berserker BRZ-D4|
-Black Hawk (Nova) X|
-Black Hawk-KU BHKU-OG|
-Blackjack BJ-2r|
-Blackjack BJ2-OG|
-Blade BLD-7R|
-Commando COM-8S|
-Cougar X 2|
-Cougar X 3|
-Cougar X|
-Crimson Hawk 4|
-Cuirass CDR-2BC|
-Cuirass CDR-2X|
-Cygnus 4|
-Dasher II 3|
-Dasher II 4|
-Deimos D|
-Deimos E|
-Diomede D-M3D-M|
-Ebony MEB-12|
-Ebony MEB-13|
-Emperor EMP-8L|
-Fennec FEC-5CM|
-Flamberge D|
-Gallant GLT-10-0|
-Ghost GST-50|
-Ghost GST-90|
-Grand Dragon DRG-10K|
-Grand Titan T-IT-N13M|
-Griffin GRF-6S2|
-Hauptmann HA1-OF|
-Hauptmann HA1-OM|
-Hauptmann HA1-OT|
-Hellion G|
-Javelin JVN-11P|
-Jupiter 4|
-Karhu G|
-Koschei KSC-6L|
-Kuma 4|
-Legionnaire LGN-2K|
-Locust LCT-5M2|
-Locust LCT-5M3|
-Loki (Hellbringer) G|
-Longbow LGB-14C2|
-Mad Cat III 3|
-Mad Cat III 4|
-Mad Cat III 5|
-Mad Cat Mk II 4|
-Mad Cat Mk II 5|
-Mad Cat Mk II 6|
-Maelstrom MTR-7K|
-Man O' War (Gargoyle) X|
-Mangonel MNL-4S|
-Marauder II MAD-4L|
-Marauder MAD-9D|
-Marshal MHL-3MC|
-Men Shen MS1-OG|
-Morrigan 4|
-Morrigan 5|
-Nobori-nin (Huntsman) F|
-Nova Cat H|
-Nova Cat I|
-Nyx NX-100|
-Nyx NX-110|
-Ocelot 4|
-Omen 2|
-Onager 2|
-Owens OW-1G|
-Pack Hunter II 4|
-Panther PNT-12KC|
-Peacekeeper PKP-2K|
-Prefect PRF-3R|
-Quickdraw QKD-9M|
-Raptor II RPT-2X2|
-Sagittaire SGT-14D|
-Salamander PPR-7T|
-Shadow Cat F|
-Shadow Cat II 3|
-Shadow Cat II 4|
-Shadow Hawk IIC 9|
-Shen Yi SHY-5B|
-Shockwave SKW-6H|
-Shockwave SKW-8X|
-Sphinx 3|
-Sphinx 4|
-Spider SDR-10K|
-Spider SDR-8Xr|
-Strider SR1-OH|
-Strider SR1-OM|
-Sun Cobra 2|
-Sunder SD1-OF|
-Sunder SD1-OG|
-Tarantula ZPH-5A|
-Targe TRG-3M|
-Templar TLR1-OR|
-Thunder Fox TFT-F11|
-Thunderbolt TDR-10S|
-Ti Ts'ang TSG-10L|
-Titan TI-1Aj|
-Titan TI-1Ar|
-Trebaruna TR-XH|
-Trebuchet TBT-9R|
-Tundra Wolf 5|
-Uller (Kit Fox) I|
-Valkyrie VLK-QD8|
-Warhammer IIC 10|
-Warhammer IIC 11|
-Warhammer IIC 12|
-Warhammer WHM-8D2|
-Wasp WSP-3K|
-Wasp WSP-3P|
-Xanthos XNT-6O|
-Xanthos XNT-7O|
-Ares ARS-V1C Aphrodite|
-Ares ARS-V1B Hades|
-Ares ARS-V1D Hephaestus|
-Ares ARS-V1A Hera|
-Ares ARS-V1 Zeus|
-Celerity CLR-03-O|
-Celerity CLR-03-OA|
-Celerity CLR-03-OB|
-Celerity CLR-03-OC|
-Celerity CLR-03-OD|
-Celerity CLR-03-OE|
-Celerity CLR-04-R|
-Celerity CLR-05-X|
-Doloire DLR-O|
-Doloire DLR-OA|
-Doloire DLR-OB|
-Doloire DLR-OC|
-Doloire DLR-OD|
-Jackalope JLP-BD|
-Jackalope JLP-C|
-Jackalope JLP-KW 'Wolpertinger'|
-Jackalope JLP-KA|
-Kheper KHP-7R|
-Lament LMT-2R|
-Lament LMT-3C|
-Lament LMT-3R|
-Lament LMT-4RC|
-Malice MAL-XP|
-Malice MAL-XT|
-Malice MAL-XV|
-Malice MAL-YZ|
-Night Stalker NSR-K1|
-Night Stalker NSR-K3|
-Night Stalker NSR-K4|
-Night Stalker NSR-K7|
-Night Stalker NSR-KC|
-Poseidon PSD-V2|
-Revenant UBM-2R|
-Revenant UBM-2R2|
-Revenant UBM-2R3|
-Revenant UBM-2R4|
-Revenant UBM-2R7|
-Uraeus UAE-7R|
-Firestarter FS9-M2|
-Firestarter FS9-M3|
-Firestarter FS9-M4|
-Gauntlet GTL-1O|
-Gauntlet GTL-1OA|
-Gauntlet GTL-1OB|
-Gauntlet GTL-1OC|
-Gotterdammerung GTD-20S|
-Jaguar (Standard)|
-Jaguar 2|
-King Crab KGC-009|
-Mongrel MGL-T1|
-Mongrel MGL-T2|
-Scourge SCG-WD1|
-Scourge SCG-WF1|
-Storm Raider STM-R1|
-Storm Raider STM-R2|
-Storm Raider STM-R3|
-Storm Raider STM-R4|
-Ursa URA-2A|
-Ursa URA-2C|
-Viking IIC (Standard)|
-Zeus-X ZEU-X|
-Zeus-X ZEU-X2|
-Zeus-X ZEU-X3|
-Zeus-X ZEU-X4|
-Atlas II AS7-D-HT|
-Banshee BNC-9S|
-Orion ON1-K (Kerensky)|
-Ti Ts'ang TSG-9 'China Doll'|
-Atlas AS7-K2 (Jedra)|
-Legionnaire LGN-2D (Raul)|
-Mad Cat III (Eve)|
-Mad Cat III 2 (MWDA)|
-Mad Cat III (Dark Age RS)|
-Pack Hunter II (Isis)|
-Ryoken II (Tassa)|
-Yu Huang (Carson)|
-Javelin JVN-11D (Farrell)|
-Mad Cat (Timber Wolf) (Bounty Hunter 2)|
-Phoenix Hawk PXH-4L (Sante)|
-Shadow Hawk SHD-5D (Sandy)|
-Ti Ts'ang Jason|
-Karhu (Syngman)|
-Osprey OSP-26 (Lawrence)|
-Prefect PRF-1R (Veronica)|
-Thunderbolt TDR-10M (Ilyena)|
-Thunderbolt TDR-10M (Salazar)|
-Duan Gung (Vaughn)|
-Men Shen (Li)|
-Sha Yu (Bulldog)|
-Snake (Arthur)|
-BattleMaster BLR-1Gd|
-BattleMaster BLR-1GHE 'HellSlinger'|
-Crab CRB-27sl|
-Dervish DV-6Md|
-Hammerhands HMH-3D (Kessem)|
-Lancelot LNC25-01sl|
-Mackie MSK-9HKR 'Kill-Roy's Little Buddy'|
-Phoenix Hawk PXH-1Kk|
-Stalker STK-3Fk|
-Thunderbolt TDR-5Sd|
-Victor VTR-9B (Shoji)|
-Warhammer WHM-6Rk|
-Wyvern WVE-5Nsl|
-Hector HOR-1B|
-Hector HOR-1C|
-Cave Lion (Standard)|
-Raider JL-1|
-Raider Mk II JL-2|
-Archer C 2|
-Blackjack C|
-Cestus CTS-6Y-EC|
-Coyotl A|
-Coyotl B|
-Coyotl C|
-Coyotl D|
-Coyotl Prime|
-Devastator DVS-2-EC|
-Drift Shag (Standard)|
-Emperor EMP-6A-EC|
-Enfield END-6J-EC|
-Excalibur EXC-B2b-EC|
-Exterminator EXT-4Db-EC|
-Fox CS-1|
-Fox (Standard)|
-Lancelot C 2|
-Lancelot C|
-Lupus A|
-Lupus B|
-Lupus C|
-Lupus D|
-Lupus Prime|
-Lynx C|
-Masauwu (Standard)|
-Minsk 2|
-Minsk MNK-101|
-Minsk (Standard)|
-Mongoose C 2|
-Mongoose C|
-Naja KTO-19b-EC|
-Naja (Standard)|
-Night Hawk NTK-2Q-EC|
-Omni-Corvis A|
-Omni-Corvis B|
-Omni-Corvis Prime|
-Phoenix Hawk PXH-1-EC|
-Pulverizer PUL-3R|
-Pulverizer (Standard)|
-Redback (Standard)|
-Spartan C|
-Starslayer STY-2C-EC|
-Storm Giant 2|
-Storm Giant (Standard)|
-Sun Bear A|
-Sun Bear B|
-Sun Bear Prime|
-Talon TLN-5W-EC|
-Vision Quest 2|
-Vision Quest VQ-1NC|
-Vision Quest (Standard)|
-Wakazashi (Standard)|
-Woodsman A|
-Woodsman B|
-Woodsman C|
-Woodsman D|
-Woodsman Prime|
-Rock Hound ProspectorMech AM-PRM-RH7 'Rock Possum'|
-Rock Hound ProspectorMech AM-PRM-RH7|
-Rock Hound ProspectorMech AM-PRM-RH7A 'Rock Otter'|
-Space Hound ProspectorMech AM-PRM-SH1|
-Thunderbolt TDR-5L|
-Thunderbolt TDR-5LS|
-Dragoon AEM-01|
-Dragoon AEM-02|
-Dragoon AEM-03|
-Dragoon AEM-04|
-Alfar AL-A1|
-Alfar AL-D1 'Dokkalfar'|
-Talos TLS-1B|
-Bakeneko BKN-1K|
-Pendragon PDG-3R|
-Thor II (Grand Summoner) E|
-Thunderbolt IIC 2|
-Vixen (Incubus) 6|
-Burrower DTM-1 MiningMech|
-Burrower DTM-1M MiningMech MOD|
-Buster BC XXI-M HaulerMech MOD|
-Carbine CON-9M Karenna|
-Carbine CON-9M-J ConstructionMech MOD|
-Carbine CON-9M-JB ConstructionMech MOD|
-Centurion CN9-H2 MilitiaMech|
-Centurion CN9-H2H MilitiaMech|
-Centurion CN9-H3 MilitiaMech|
-Crosscut ED-X4M-A LoggerMech MOD|
-Crosscut ED-X4M-E LoggerMech MOD|
-Crosscut ED-X4M-L LoggerMech MOD|
-Deep Lord MilitiaMech RCL-Z1M-B|
-Demeter WLD-1 AgroMech|
-Demeter WLD-1-M AgroMech MOD|
-DemolitionMech WI-DMM MOD|
-Dig Lord RCL-4M MiningMech MOD|
-Dig Lord RCL-4M-B MiningMech MOD|
-Exo HaulerMech HMX-1|
-Exo HaulerMech HMX-2|
-Exo HaulerMech HMX-3|
-Exo HaulerMech HMX-3M|
-Firebee WI-WAM MilitiaMech|
-Ground Pounder DVM-2 MiningMech|
-Ground Pounder DVM-2M MiningMech MOD|
-Guard SecurityMech GS-107X|
-Guard SecurityMech GS-54|
-Gulon SolahmaMech C|
-Gulon MiningMech GLN-1A|
-Gulon SecurityMech GLN-1B|
-Harvester HVR-199 AgroMech|
-Harvester HVR-199M AgroMech MOD|
-Harvester HVR-199M-A AgroMech MOD|
-Harvester HVR-199M-B AgroMech MOD|
-Harvester HVR-199M-M AgroMech MOD|
-Heavy Forester HFL-1 LoggerMech|
-Heavy Forester HFL-1M LoggerMech MOD|
-Heavy Lifter HCL-1M CargoMech MOD|
-Heavy Lifter HCL-1MM MilitiaMech|
-Inquisitor ITW-80 SecurityMech|
-Inquisitor ITW-85 SecurityMech|
-MuckRaker GMMM-2 MiningMech|
-MuckRaker GMMM-2M MiningMech MOD|
-MuckRaker GMMM-2M-B MiningMech MOD|
-Opossum SalvageMech OPO-2|
-Opossum SalvageMech OPO-3 MOD|
-Pacifier SecurityMech CCU-36|
-Pacifier SecurityMech CCU-40|
-Pompier PoliceMech GM-4P|
-St. Florian FLN-366 FireMech|
-St. Florian FLN-366-M FireMech MOD|
-StrongArm SC CV ConstructionMech|
-StrongArm SC CV-M ConstructionMech MOD|
-StrongArm SC CVI ConstructionMech|
-Mad Cat (Timber Wolf) (Bounty Hunter)|
-Rampage RMP-2G|
-Rampage RMP-4G|
-Rampage RMP-5G|
-Arana MilitiaMech ARA-S-1|
-Reptar MilitiaMech EPT-C-1|
-'Gestalt' D2X-G|
-Omega SHP-4X|
-Archangel C-ANG-OS Caelestis|
-Deva C-DVA-OS Caelestis|
-Grigori C-GRG-OS Caelestis|
-Malak C-MK-OS Caelestis|
-Mercury II MCY-100|
-Preta C-PRT-OS Caelestis|
-Pulverizer PUL-2V|
-Seraph C-SRP-OS Caelestis|
-Stag II ST-24G|
-Stag ST-14G|
-Phoenix Hawk LAM Mk I PHX-HK1|
-Phoenix Hawk LAM Mk I PHX-HK1R|
-Phoenix Hawk LAM PHX-HK1RB|
-Phoenix Hawk LAM PHX-HK2|
-Phoenix Hawk LAM PHX-HK2M|
-Pwwka S-PW-1LAM|
-Screamer LAM SCR-1X-LAM|
-Shadow Hawk LAM SHD-X1|
-Shadow Hawk LAM SHD-X2|
-Stinger LAM Mk I STG-A1|
-Stinger LAM STG-A10|
-Stinger LAM STG-A5|
-Waneta S-WN-1LAM|
-Waneta S-WN-2LAM|
-Wasp LAM Mk I WSP-100|
-Wasp LAM Mk I WSP-100A|
-Wasp LAM Mk I WSP-100b|
-Wasp LAM WSP-105|
-Wasp LAM WSP-105M|
-Wasp LAM WSP-110|
-Yurei S-YR-1LAM|
-Annihilator ANH-1G|
-Annihilator ANH-1X|
-Annihilator C 'Gausszilla'|
-Annihilator C 2|
-Carbine CON-1 ConstructionMech (RL)|
-Carbine CON-1 ConstructionMech (Standard)|
-Champion CHP-1Nb|
-Champion CHP-1Nb2|
-Crockett CRK-5003-1b|
-Crosscut ED-X2 (Flamer)|
-Crosscut ED-X2 (RL)|
-Crosscut ED-X2 LoggerMech|
-Daedalus GTX2 (Militarized)|
-Daedalus GTX2A 'Stevedore'|
-Daedalus GTX2B 'Navvy'|
-Exterminator EXT-4Db|
-Falcon FLC-4Nb (Saho)|
-Falcon FLC-4Nb-PP|
-Falcon FLC-4Nb-PP2|
-Falcon FLC-4Nb|
-Firefly FFL-3A|
-Firefly FFL-3PP|
-Firefly FFL-3PP2|
-Firefly FFL-3PP3|
-Firefly FFL-3SLE|
-Griffin GRF-2N|
-Griffin GRF-2N2|
-Harvester Ant KIC-3M AgroMech (MG)|
-Harvester Ant KIC-3M-B AgroMech (LRM)|
-Hermes HER-1Sb|
-Highlander HGN-732 (Colleen)|
-Hoplite HOP-4Bb|
-Hoplite HOP-4Cb|
-Imp IMP-1A|
-Imp IMP-1B|
-Imp IMP-1C|
-Marco MR-8C ExplorerMech|
-Marco MR-8D|
-Marco MR-8E|
-Powerman SC XI LoaderMech (Standard)|
-Sentinel STN-3Lb|
-Shogun SHG-2H|
-Sling SL-1G|
-Sling SL-1H|
-Stalker STK-3Fb|
-Thorn THE-Nb|
-Thunderbolt TDR-5Sb|
-Thunderbolt TDR-5Sb2|
-Apollo APL-4M|
-Axman AXM-6T|
-Barghest BGS-4T|
-Beowulf IIC (Standard)|
-Deep Lord MilitiaMech RCL-Z1M|
-Dola DOL-1A1|
-Dola DOL-1A2 'Yoh Ti Ts'angs'|
-Grasshopper GHR-7P|
-Hatamoto-Kaeru HTM-35K|
-Hunchback HBK-7R|
-Incubus II (Standard)|
-Legionnaire LGN-2F|
-Mad Cat III (Standard)|
-Mad Cat III 2|
-Mad Cat III X|
-Mad Cat Mk II Enhanced|
-Orion ON3-M|
-Pandarus LFA-1A|
-Patron MilitiaMech PTN-2M|
-Pendragon PDG-1R|
-Quickdraw QKD-8P|
-Sarissa SecurityMech MN2-A|
-Spindrift Aquatic SecurityMech SDT-1A|
-Stiletto STO-6S|
-Stinger IIC 2|
-Stinger IIC (Standard)|
-Thunder THR-C4|
-Thunderbolt IIC (Standard)|
-Ti Ts'ang TSG-9DDC|
-Trebuchet TBT-K7R|
-Ursus 3|
-Wolf Trap (Tora) WFT-2B|
-Wolfhound WLF-2H|
-Arion (Standard)|
-Boreas A|
-Boreas B|
-Boreas C|
-Boreas D|
-Boreas Prime|
-Cyllaros (Standard)|
-Harpagos (Standard)|
-Notos A|
-Notos B|
-Notos C|
-Notos D|
-Notos Prime|
-Commando COM-9S|
-Dominator 2|
-Dominator (Standard)|
-Goliath C|
-Grasshopper GHR-8K|
-Griffin C|
-Griffin GRF-3N|
-Loki (Hellbringer) J|
-Loki (Hellbringer) T|
-Pack Hunter 5|
-Archer (Wolf)|
-Archer ARC-2Rb|
-Archer ARC-4M|
-Archer ARC-4M2|
-Archer ARC-5R|
-Archer ARC-5S|
-Archer ARC-5W|
-Archer ARC-7C|
-Archer ARC-9R|
-Archer C|
-Centurion CN10-D|
-Crucible (Standard)|
-Crucible 2|
-Crucible 3|
-Hermit Crab HMC-13|
-Hermit Crab HMC-14|
-Hermit Crab HMC-15|
-Highlander HGN-740|
-Mongoose MON-96|
-Vulture (Mad Dog) DD|
-Vulture (Mad Dog) G|
-Vulture (Mad Dog) I|
-Vulture (Mad Dog) T|
-Vulture (Mad Dog) V|
-Butcherbird (Ion Sparrow) A|
-Butcherbird (Ion Sparrow) B|
-Butcherbird (Ion Sparrow) C|
-Butcherbird (Ion Sparrow) D|
-Butcherbird (Ion Sparrow) Prime|
-Man O' War (Gargoyle) F|
-Man O' War (Gargoyle) I|
-Man O' War (Gargoyle) J|
-Man O' War (Gargoyle) K|
-Man O' War (Gargoyle) P|
-Man O' War (Gargoyle) T|
-Peregrine (Horned Owl) 2|
-Peregrine (Horned Owl) 3|
-Peregrine (Horned Owl) 6|
-Peregrine (Horned Owl) 7|
-Peregrine (Horned Owl) (Standard)|
-Phoenix Hawk C 2|
-Phoenix Hawk C|
-Phoenix Hawk PXH-2K|
-Phoenix Hawk PXH-3D|
-Phoenix Hawk PXH-3K|
-Phoenix Hawk PXH-3M|
-Phoenix Hawk PXH-3S|
-Phoenix Hawk PXH-4M|
-Phoenix Hawk PXH-9|
-Uller (Kit Fox) G|
-Uller (Kit Fox) J|
-Uller (Kit Fox) K|
-Uller (Kit Fox) R|
-Uller (Kit Fox) T|
-Uller (Kit Fox) V|
-Axman AXM-5N|
-Black Knight BL-18-KNT|
-Carrion Crow A|
-Carrion Crow B|
-Carrion Crow C|
-Carrion Crow D|
-Carrion Crow Prime|
-Hatchetman HCT-8S|
-Nobori-nin (Huntsman) E|
-Nobori-nin (Huntsman) G|
-Nobori-nin (Huntsman) I|
-Nobori-nin (Huntsman) T|
-Shadow Hawk C|
-Shadow Hawk SHD-2D2|
-Shadow Hawk SHD-2Hb|
-Shadow Hawk SHD-4H|
-Shadow Hawk SHD-5M|
-Shadow Hawk SHD-5R|
-Shadow Hawk SHD-5S|
-Shadow Hawk SHD-6D|
-Shadow Hawk SHD-7H|
-Viper (Black Python) (Standard)|
-Viper (Black Python) 2|
-Viper (Black Python) 5|
-White Raven 2|
-White Raven (Standard)|
-Daishi (Dire Wolf) E|
-Daishi (Dire Wolf) T|
-Daishi (Dire Wolf) X|
-Firestorm (Standard)|
-Galahad (Glass Spider) 2|
-Galahad (Glass Spider) 4|
-Galahad (Glass Spider) (Standard)|
-Hunchback IIC 5|
-Piranha 5|
-Stinger C 2|
-Stinger C|
-Stinger STG-3Gb|
-Stinger STG-4G|
-Stinger STG-5G|
-Stinger STG-5M|
-Stinger STG-6G|
-Stinger STG-6M|
-Stinger STG-6R|
-Supernova 5|
-Black Hawk (Nova) G|
-Black Hawk (Nova) I|
-Black Hawk (Nova) J|
-Black Hawk (Nova) K|
-Black Hawk (Nova) L|
-Black Hawk (Nova) R|
-Black Hawk (Nova) T|
-Exterminator EXT-7X|
-Griffin IIC 2|
-Griffin IIC 9|
-Griffin IIC (Standard)|
-Lightning LHN-C5|
-Ostsol C|
-Ostsol OTL-5M|
-Ostsol OTL-8E|
-Ostsol OTL-8E3|
-Ostsol OTL-8F|
-Sentinel STN-6S|
-Thug THG-13U|
-Black Lanner F|
-Black Lanner G|
-Black Lanner I|
-Black Lanner J|
-Black Lanner T|
-Black Lanner X|
-Fire Falcon F|
-Fire Falcon G|
-Fire Falcon I|
-Fire Falcon L|
-Fire Falcon R|
-Fire Falcon T|
-Phoenix Hawk IIC 10|
-Phoenix Hawk IIC 2|
-Phoenix Hawk IIC 9|
-Phoenix Hawk IIC (Standard)|
-Rawhide RWD-R1|
-Thunderbolt C 2|
-Thunderbolt C|
-Thunderbolt TDR-11S|
-Thunderbolt TDR-12R|
-Thunderbolt TDR-7M|
-Thunderbolt TDR-7S|
-Thunderbolt TDR-8M|
-Thunderbolt TDR-9S|
-Thunderbolt TDR-9SE|
-Thunderbolt TDR-9W|
-Cauldron-Born (Ebon Jaguar) E|
-Cauldron-Born (Ebon Jaguar) F|
-Cauldron-Born (Ebon Jaguar) G|
-Cauldron-Born (Ebon Jaguar) T|
-Cauldron-Born (Ebon Jaguar) X|
-Locust C|
-Locust IIC 10|
-Locust IIC 2|
-Locust IIC 3|
-Locust IIC (Standard)|
-Locust LCT-1Vb|
-Locust LCT-3D|
-Locust LCT-3M|
-Locust LCT-3S|
-Locust LCT-5S|
-Locust LCT-7S|
-Locust LCT-7V|
-Locust LCT-7V2|
-Stormwolf A|
-Stormwolf B|
-Stormwolf C|
-Stormwolf D|
-Stormwolf Prime|
-Turkina E|
-Turkina M|
-Turkina T|
-Turkina X|
-Amarok (Standard)|
-Amarok 2|
-Amarok 3|
-Banshee BNC-12S|
-Crossbow E|
-Crossbow F|
-Crossbow G|
-Crossbow J|
-Crossbow T|
-Crossbow W|
-Crusader CRD-3R (Crael)|
-Crusader CRD-4BR|
-Crusader CRD-4D|
-Crusader CRD-4K|
-Crusader CRD-5M|
-Crusader CRD-5S|
-Crusader CRD-6D|
-Crusader CRD-6T|
-Crusader CRD-7D|
-Crusader CRD-7M|
-Crusader CRD-7M2|
-Crusader CRD-8R|
-Crusader CRD-9BR|
-Crusader CRD-9R|
-Kraken (Bane) 2|
-Kraken (Bane) 3|
-Kraken (Bane) 5|
-Kraken (Bane) 6|
-Kraken (Bane) 7|
-Kraken (Bane) (Standard)|
-Panther PNT-14R|
-Wolfhound WLF-6S|
-Enforcer ENF-5R|
-Eris ERS-2H|
-Eris ERS-2N|
-Eris ERS-3R|
-Jenner IIC (Standard)|
-Jenner IIC 2|
-Jenner IIC 3|
-Jenner IIC 5|
-Jenner JR7-N|
-Kingfisher F|
-Kingfisher G|
-Kingfisher I|
-Kingfisher T|
-Kingfisher X|
-Victor VTR-12D|
-Wolverine WVR-10D|
-Wolverine WVR-10R|
-Wolverine WVR-10V2|
-Wolverine WVR-11M|
-Wolverine WVR-7D|
-Wolverine WVR-7K|
-Wolverine WVR-7M|
-Wolverine WVR-7M2|
-Wolverine WVR-9R|
-Cougar E|
-Cougar F|
-Cougar G|
-Cougar H|
-Cougar I|
-Cougar T|
-Iron Cheetah A|
-Iron Cheetah B|
-Iron Cheetah C|
-Iron Cheetah D|
-Iron Cheetah L|
-Iron Cheetah Prime|
-Mercury MCY-105|
-Orion C 2|
-Rime Otter A|
-Rime Otter B|
-Rime Otter C|
-Rime Otter D|
-Rime Otter Prime|
-Scorpion C|
-Scorpion SCP-1BR|
-Scorpion SCP-1O|
-Scorpion SCP-1TB|
-Scorpion SCP-2N|
-Spider SDR-9M|
-Behemoth (Stone Rhino) 7|
-Behemoth (Stone Rhino) 8|
-Bushwacker BSW-X4|
-Grendel (Mongrel) G|
-Grendel (Mongrel) I|
-Grendel (Mongrel) J|
-Grendel (Mongrel) M|
-Grendel (Mongrel) T|
-Ostscout OTT-12R|
-Ostscout OTT-8J|
-Sojourner A|
-Sojourner B|
-Sojourner C|
-Sojourner D|
-Sojourner Prime|
-UrbanMech UM-R96|
-Zeus ZEU-11S|
-Hellion D|
-Hellion E|
-Hellion F|
-Hellion P|
-Hellion T|
-Longbow LGB-0H|
-Longbow LGB-0W2|
-Longbow LGB-10C|
-Longbow LGB-10K|
-Longbow LGB-14Q|
-Longbow LGB-14V|
-Longbow LGB-8C|
-Masakari (Warhawk) F|
-Masakari (Warhawk) G|
-Masakari (Warhawk) I|
-Masakari (Warhawk) L|
-Masakari (Warhawk) T|
-Mastodon A|
-Mastodon B|
-Mastodon C|
-Mastodon D|
-Mastodon Prime|
-Shadow Hawk IIC 10|
-Shadow Hawk IIC 11|
-Shadow Hawk IIC 2|
-Shadow Hawk IIC (Standard)|
-Cyclops C|
-Hankyu (Arctic Cheetah) E|
-Hankyu (Arctic Cheetah) F|
-Hankyu (Arctic Cheetah) I|
-Hankyu (Arctic Cheetah) J|
-Hankyu (Arctic Cheetah) T|
-Hunchback C|
-Kodiak 6|
-Kontio (Standard)|
-Ostroc OSR-2D|
-Ostroc OSR-3M|
-Ostroc OSR-6R|
-Ostroc OSR-9C|
-Regent A|
-Regent B|
-Regent C|
-Regent D|
-Regent Prime|
-Battle Cobra F|
-Battle Cobra G|
-Battle Cobra I|
-Battle Cobra J|
-Battle Cobra T|
-Battle Cobra X|
-Doom Courser A|
-Doom Courser B|
-Doom Courser C|
-Doom Courser D|
-Doom Courser Prime|
-Goliath GOL-3M|
-Goliath GOL-3M2|
-Goliath GOL-7C|
-Goliath GOL-7K|
-Goliath GOL-7R|
-Jade Phoenix A|
-Jade Phoenix B|
-Jade Phoenix C|
-Jade Phoenix D|
-Jade Phoenix E|
-Jade Phoenix Prime|
-Night Gyr F|
-Night Gyr G|
-Night Gyr T|
-Night Gyr X|
-Fujin RJN-301-F|
-Grand Crusader GRN-D-01-X|
-Grand Crusader GRN-D-02-B|
-Guillotine GLT-7M|
-Katana (Crockett) CRK-5006-1|
-Lancelot LNC25-09|
-Nexus NXS1-C|
-Nova Cat M|
-Nova Cat T|
-Raijin RJN-101-B|
-Raijin RJN-101-C|
-Raijin RJN-101-X|
-Raijin RJN-301-B|
-Rifleman IIC 10|
-Rifleman IIC 9|
-Star Crusader A|
-Star Crusader B|
-Star Crusader Prime|
-Star Python (Standard)|
-Ryoken III (Skinwalker) A|
-Ryoken III (Skinwalker) B|
-Ryoken III (Skinwalker) C|
-Ryoken III (Skinwalker) D|
-Ryoken III (Skinwalker) E|
-Ryoken III (Skinwalker) F|
-Ryoken III (Skinwalker) Prime|
-Alpha Wolf A|
-Alpha Wolf B|
-Alpha Wolf C|
-Alpha Wolf Prime|
-Annihilator ANH-5W|
-Atlas AS7-K-DC|
-Atlas AS7-S3-DC|
-Atlas AS7-S3|
-Atlas AS7-S4|
-Atlas AS8-K|
-Atlas AS8-KE|
-Atlas AS8-S|
-Atlas C 2|
-Atlas C 3|
-Atlas C|
-Atlas II AS7-DK-H|
-Flashman FLS-10E|
-Grand Dragon DRG-12K|
-Stalker STK-9F|
-Chameleon CLN-8V|
-Chameleon CLN-9V|
-Chameleon TRC-4B|
-Pouncer F|
-Pouncer G|
-Pouncer I|
-Pouncer T|
-Pouncer W|
-Pouncer X|
-Vindicator VND-7L|
-Wraith TR5|
-BattleMaster BLR-3M-DC|
-BattleMaster BLR-6C|
-BattleMaster BLR-6G|
-BattleMaster C 3|
-Hierofalcon A|
-Hierofalcon B|
-Hierofalcon C|
-Hierofalcon D|
-Hierofalcon Prime|
-Puma (Adder) I|
-Puma (Adder) K|
-Puma (Adder) L|
-Puma (Adder) S|
-Puma (Adder) T|
-Shadow Cat III A|
-Shadow Cat III B|
-Shadow Cat III C|
-Shadow Cat III Prime|
-Thor (Summoner) AA|
-Thor (Summoner) J|
-Thor (Summoner) Q|
-Thor (Summoner) T|
-Awesome AWS-11H|
-Blackjack BJ-5|
-Fenris (Ice Ferret) F|
-Fenris (Ice Ferret) G|
-Fenris (Ice Ferret) I|
-Fenris (Ice Ferret) J|
-Fenris (Ice Ferret) K|
-Fenris (Ice Ferret) T|
-Thresher Mk II (Standard)|
-Trebuchet TBT-9N|
-Warhammer IIC (Standard)|
-Warhammer IIC 13|
-Warhammer IIC 2|
-Wasp C|
-Wasp WSP-1S|
-Wasp WSP-3M|
-Wasp WSP-3W|
-Wasp WSP-4W|
-Wasp WSP-5A|
-Catapult CPLT-K6|
-Crab CRB-54|
-Hammerhead (Standard)|
-Hellhound (Conjurer) 7|
-Hellhound (Conjurer) 8|
-Hellhound (Conjurer) (Standard)|
-King Crab KGC-011|
-Mad Cat (Timber Wolf) M|
-Mad Cat (Timber Wolf) N|
-Mad Cat (Timber Wolf) T|
-Mad Cat (Timber Wolf) W|
-Marauder II MAD-10D|
-Marauder II MAD-5A|
-Marauder II MAD-5B|
-Marauder II MAD-5C|
-Marauder II MAD-6A|
-Marauder II MAD-6C|
-Marauder II MAD-8K|
-Cataphract CTF-5L|
-Cricket RWN-01|
-Linebacker F|
-Linebacker G|
-Linebacker I|
-Linebacker T|
-Marauder (Bounty Hunter-3015)|
-Marauder (Bounty Hunter-3044)|
-Marauder (Bounty Hunter-3138)|
-Marauder C|
-Marauder IIC 10|
-Marauder IIC 8|
-Marauder IIC 9|
-Marauder IIC (Standard)|
-Marauder MAD-11D|
-Marauder MAD-2T|
-Marauder MAD-5D-DC|
-Marauder MAD-5D|
-Marauder MAD-5S|
-Marauder MAD-7C|
-Marauder MAD-7M|
-Marauder MAD-7R|
-Marauder MAD-7S|
-Marauder Red Hunter 3146|
-Marauder Red Hunter|
-Nightstar NSR-10D|
-Raven RVN-5L|
-Koshi (Mist Lynx) I|
-Koshi (Mist Lynx) J|
-Koshi (Mist Lynx) K|
-Koshi (Mist Lynx) L|
-Koshi (Mist Lynx) M|
-Koshi (Mist Lynx) N|
-Koshi (Mist Lynx) T|
-Ryoken (Stormcrow) I|
-Ryoken (Stormcrow) J|
-Ryoken (Stormcrow) K|
-Ryoken (Stormcrow) P|
-Ryoken (Stormcrow) T|
-Vixen (Incubus) 2|
-Vixen (Incubus) 3|
-Vixen (Incubus) 7|
-Vixen (Incubus) 8|
-Vixen (Incubus) 9|
-War Crow A|
-War Crow B|
-War Crow C|
-War Crow Prime|
-Warhammer C 2|
-Warhammer C 3|
-Warhammer C|
-Warhammer WHM-10K|
-Warhammer WHM-7A|
-Warhammer WHM-7K|
-Warhammer WHM-7M-DC|
-Warhammer WHM-7M|
-Warhammer WHM-7S|
-Warhammer WHM-8R|
-Warhammer WHM-9K|
-Baboon (Howler) 4|
-Baboon (Howler) 5|
-Baboon (Howler) 6|
-Dasher (Fire Moth) G|
-Dasher (Fire Moth) I|
-Dasher (Fire Moth) J|
-Dasher (Fire Moth) M|
-Dasher (Fire Moth) P|
-Dasher (Fire Moth) R|
-Dasher (Fire Moth) T|
-Devil (Standard)|
-Dragonfly (Viper) J|
-Dragonfly (Viper) K|
-Dragonfly (Viper) L|
-Dragonfly (Viper) M|
-Dragonfly (Viper) R|
-Dragonfly (Viper) T|
-Rifleman C 3|
-Rifleman C|
-Rifleman RFL-5D|
-Rifleman RFL-5M|
-Rifleman RFL-7G|
-Rifleman RFL-7N|
-Rifleman RFL-7N2|
-Gladiator (Executioner) F|
-Gladiator (Executioner) G|
-Gladiator (Executioner) I|
-Gladiator (Executioner) J|
-Gladiator (Executioner) L|
-Gladiator (Executioner) T|
-Goshawk (Vapor Eagle) 2|
-Goshawk (Vapor Eagle) 5|
-Goshawk (Vapor Eagle) 6|
-Goshawk (Vapor Eagle) 7|
-Goshawk (Vapor Eagle) (Standard)|
-Inferno INF-NO|
-Inferno INF-NOA|
-Inferno INF-NOB|
-Inferno INF-NOC|
-Inferno INF-NOR|
-Shadow Cat D|
-Shadow Cat E|
-Shadow Cat I|
-Shadow Cat J|
-Shadow Cat M|
-Shadow Cat T|
-Valkyrie C|
-Valkyrie VLK-QD|
-Valkyrie VLK-QD6|
-Valkyrie VLK-QDD|
-Deimos H|
-Atlas AS7-A|
-Javelin JVN-10A|
-Thunderbolt TDR-5D|
-Wolverine WVR-6D|
-Zeus ZEU-6A|
-Assassin ASN-30 (Alice)|
-Bandersnatch BNDR-01A (Horus)|
-Daikyu DAI-01 (Tabitha)|
-Emperor EMP-6A (Nerran)|
-Excalibur EXC-C1 (Cernunnos)|
-Grand Dragon DRG-1G (Douglas)|
-Great Wyrm (Aemelia)|
-Gunslinger GUN-1ERD (Jared)|
-Hercules HRC-LS-9000 (Julius)|
-Jenner JR7-K (Samuli)|
-Merlin MLN-1B (Porter)|
-Snake SNK-1V (Alexi)|
-Stealth STH-1D (Anna)|
-Thanatos TNS-4S (Felix)|
-Wolf Trap (Tora) WFT-1 (Daitama)|
-Templar III TLR2-J 'Arthur'|
-Hel HL-1|
-Hel HL-2|
-Tiburon 2|
-Toro TR-B-12|
-Toro TR-B-9|
-Centurion CN10-J|
-Centurion CN10-W|
-Gyrfalcon 5|
-Thunder Stallion 4|
-SuburbanMech UM-R100|
-SuburbanMech UM-R90|
-Crusader CRD-10S|
-Crusader CRD-9S|
-Victor C|
-Hatchetman HCT-5DT|
-Gladiator-B (Executioner-B) A|
-Gladiator-B (Executioner-B) B|
-Gladiator-B (Executioner-B) C|
-Gladiator-B (Executioner-B) Prime|
-Longshot LNG-2 (Reskov)|
-Rattlesnake II RSN-1|
-Rattlesnake II RSN-2|
-Rattlesnake JR7-31|
-Rattlesnake JR7-31P|
-Rattlesnake JR7-31R (Gideon)|
-Nightstar NSR-9J (Holt)|
-Avatar AV1-OBLO|
-Doloire DLR-OBLO|
-Mad Cat (Timber Wolf) BLO|
-Templar TLR1-OBLO|
-Uller (Kit Fox) BLO|
-Vulture Mk III (Mad Dog Mk III) BLO|
-Black Knight BL-6-KNT (Ian)|
-Cataphract CTF-2X (George)|
-Enforcer ENF-4R (Daniel)|
-Grand Dragon DRG-1G (Emory)|
-Grand Dragon DRG-5K (Emory)|
-Hatamoto-Chi HTM-27T (Daniel)|
-Hatchetman HCT-3F (Austin)|
-Hunchback HBK-4G (Shakir)|
-Black Knight BL-10-KNT (Ross)|
-Cataphract CTF-3X (Sara)|
-Enforcer ENF-5D (Daniel)|
-Grand Dragon DRG-7K (Mark)|
-Hatamoto-Chi HTM-27T (Daniel II)|
-Hatchetman HCT-5S (Austin)|
-Hunchback HBK-4G (Hohiro)|
-Jenner JR7-K (Grace II)|
-Commando COM-1AK|
-Copper SecurityMech CPK-65KM|
-Crosscut ED-X4K LoggerMech|
-Phoenix PX-1KC|
-Phoenix PX-1KL|
-Phoenix PX-1KR|
-Phoenix PX-1KT|
-Reconquista (Standard)|
-Atlas II AS7-D-H (Devlin)|
-Awesome AWS-10KM (Cameron)|
-Buster BC XV HaulerMech (Standard)|
-Buster BC XV-M HaulerMech MOD|
-Buster BC XV-M-B HaulerMech MOD|
-Buster BC XV-M-C HaulerMech MOD|
-Buster BC XV-M-W HaulerMech MOD|
-Buster BC XXI HaulerMech (Standard)|
-Carbine CON-7 ConstructionMech (Standard)|
-Carbine CON-7M ConstructionMech MOD|
-Carbine CON-8 ConstructionMech (Standard)|
-Carbine CON-8H HaulerMech (Standard)|
-Carbine CON-9 ConstructionMech (Standard)|
-Carbine CON-9M ConstructionMech MOD|
-Carbine CON-9M-B ConstructionMech MOD|
-CattleMaster CTL-3R 'Herder' IndustrialMech|
-CattleMaster CTL-3R2 'Hunter' IndustrialMech|
-CattleMaster CTL-3R3 SecurityMech|
-Chaffee Servicemech BT1|
-Copper SecurityMech CPK-19|
-Copper SecurityMech CPK-65|
-Crosscut ED-X1 LoggerMech|
-Crosscut ED-X2M LoggerMech MOD|
-Crosscut ED-X4 LoggerMech|
-Crosscut ED-X4B DemolitionMech|
-Crosscut ED-X4D DemolitionMech|
-Crosscut ED-X4M LoggerMech MOD|
-Crosscut ED-X4X LoggerMech|
-Crosscut ED-X5M LoggerMech MOD|
-Crosscut ED-X5M-B DemolitionMech MOD|
-Dig King RCL-1 MiningMech MOD|
-Dig King RCL-1 MiningMech (Standard)|
-Dig Lord RCL-4 MiningMech|
-ForestryMech ED-X3|
-Grommet D90 MilitiaMech (Standard)|
-Harvester HVR-99 AgroMech (Standard)|
-Harvester Ant KIC-3 AgroMech|
-Harvester Ant KIC-3M AgroMech MOD|
-Harvester Ant KIC-3M-B AgroMech MOD|
-Heavy Lifter HCL-1 CargoMech (Standard)|
-Jabberwocky MilitiaMech JAW-67|
-Lumberjack LM5/M|
-Marco MR-6 ExplorerMech|
-Marco MR-7 ExplorerMech|
-Peacekeeper PK-6 SecurityMech|
-Peacemaker PM-6 PoliceMech (Standard)|
-Pompier Firemech GM-3CD|
-Pompier Firemech GM-3HT|
-Pompier Firemech GM-3A|
-Powerman SC XI-M LoaderMech MOD|
-Powerman SC XI-M-B LoaderMech MOD|
-Powerman SC XV HaulerMech (Standard)|
-Powerman SC XVI HaulerMech (Standard)|
-ScavengerMech SC-V SalvageMech (Standard)|
-ScavengerMech SC-V-M MilitiaMech (Standard)|
-Shugosha LAW-QM1 Q-Mech|
-Shugosha LAW-QM2 Q-Mech|
-Shugosha LAW-QM3 Q-Mech|
-Shugosha PTN-LAW LoaderMech|
-Uni ATAE-70 CargoMech (Standard)|
-Uni ATAE-70 MilitiaMech (Standard)|
-Uni ATAE-70T CargoMech (Standard)|
-Vampyr SC-V-1 SalvageMech (Standard)|
-Flea FLE-16|
-Archer ARC-5CS|
-Black Knight BL-9-KNT|
-Gladiator (Executioner) TC|
-Loki (Hellbringer) M|
-Mad Cat (Timber Wolf) TC|
-Marauder MAD-5CS|
-Phoenix Hawk PXH-1bC|
-Puma (Adder) TC|
-Rifleman RFL-5CS|
-Ryoken (Stormcrow) Attwater|
-Ryoken (Stormcrow) TC|
-Shadow Cat TC|
-Shadow Hawk SHD-2Ht|
-Vulture (Mad Dog) S|
-Warhammer WHM-7CS|
-Annihilator ANH-1E|
-Victor VTR-9B (Li)|
-Atlas AS7-WGS (Samsonov)|
-Dragon DRG-2Y (Yoriyoshi)|
-Marauder MAD-SD (Douglass)|
-Thunderbolt TDR-5S-T (Tallman)|
-Zeus (Leonidas)|
-Cauldron-Born (Ebon Jaguar) (Samantha)|
-Grasshopper (Reynolds)|
-Atlas AS7-D (Danielle)|
-Ostroc OSR-2C (Michi)|
-Stalker STK-3F (Jagawen)|
-Rampage RMP-4G (Benboudaoud)|
-Rifleman II RFL-3N-2 (Kataga)|
-Awesome AWS-8Q (Buck)|
-Brigand LDT-5|
-Brigand LDT-XPR1|
-Brigand LDT-XPR2|
-Brigand LDT-XPR3|
-Brigand LDT-XPR4|
-Brigand LDT-XPR5|
-Albatross ALB-5W (Dantalion)|
-Emperor EMP-6ME 'Mercury Elite'|
-Dasher (Fire Moth) (Aletha)|
-Kodiak (Cale)|
-Galahad GLH-3D (Laodices)|
-Black Hawk-KU BHKU-O (Albert)|
-Thresher (Edward)|
-Griffin GRF-1E2 'Sparky 2.0'|
-Grim Reaper GRM-R-PR62A|
-Cataphract CTF-5MOC (Naomi)|
-Jinggau JN-G8BX (Rush)|
-Seraph C-SRP-OR (Ravana)|
-Dragon Fire DGR-6FC2 (Gregory)|
-Fafnir FNR-4A (Peter)|
-Centurion CN9-YLW3 'Yen Lo Wang'|
-Orion IIC 'Burton'|
-Tian-Zong TNZ-N3 'Jasminda'|
-BattleMaster BLR-3M (Rogers)|
-Nightstar NSR-9J (Brubaker)|
-Marauder MAD-7D (Von Staskov)|
-Marshal MHL-6FR|
-Phoenix Hawk PXH-3D (Jiemin)|
-Cazador (Standard)|
-Rhino (Standard)|
-Snow Fox (Omni) A|
-Snow Fox (Omni) B|
-Snow Fox (Omni) Prime|
-Surtur SUR-T1|
-Tolva (Standard)|
-BattleMaster BLR-1G (Red Corsair)|
-Man O' War (Gargoyle) (Conal)|
-Atlas II AS7-D-H (Kerensky)|
-Highlander HGN-732 (Jorgensson)|
-Vanquisher VQR-7V (Pravuil)|
-Dragoon AEM-05C|
-Lament LMT-2R (Manes)|
-Night Chanter A|
-Night Chanter Prime|
-Spirit Walker A|
-Spirit Walker Prime|
-Inquisitor II ITW-200|
-Marauder II MAD-6S|
-Jenner JR7-F (Smith)|
-Panther PNT-9ALAG|
-Vulcan VL-2T (Timms)|
-Warhammer WHM-6K (Olesko)|
-Bull Shark BSK-M3|
-Bull Shark BSK-MAZ|
-Corsair COR-5R|
-Corsair COR-5T|
-Corsair COR-6R|
-Corsair COR-7A|
-Corsair COR-7R|
-Corsair COR-BR Broadside|
-Corsair COR-RA Ravager|
-Roughneck RGH-1A|
-Roughneck RGH-1B|
-Roughneck RGH-1C|
-Roughneck RGH-2A|
-Roughneck RGH-3A|
-Roughneck RGH-BLT Bolt|
-Roughneck RGH-PH Powerhouse|
-Roughneck RGH-R Reaver|
-Sun Spider A|
-Sun Spider Ambush|
-Sun Spider B|
-Sun Spider C|
-Sun Spider D|
-Sun Spider Manul|
-Sun Spider Prime|
-Sun Spider Vanguard|
-Archangel C-ANG-O (Berith)|
-BattleMaster BLR-4S (Calvin II)|
-BattleMaster BLR-4S (Calvin)|
-Deva C-DVA-O (Achilleus)|
-Gallowglas GAL-4GLSA|
-Griffin GRF-6S (Francine II)|
-Griffin GRF-6S (Francine)|
-Grigori C-GRG-O (Rufus)|
-Lightray LGH-6W|
-Malak C-MK-O (Mi)|
-Preta C-PRT-O (Kendali)|
-Seraph C-SRP-O (Havalah)|
-Uziel UZL-2S (Jacob II)|
-Uziel UZL-2S (Jacob)|
-Wolfhound WLF-4WA|
-Zeus-X ZEU-9WD (Stacy)|
-Cephalus A|
-Cephalus B|
-Cephalus C|
-Cephalus D|
-Cephalus E|
-Cephalus Prime|
-Cephalus U|
-Dragonfly (Viper) Z|
-Koshi (Mist Lynx) Z|
-Mad Cat (Timber Wolf) Z|
-Osteon (Jaguar)|
-Osteon A|
-Osteon B|
-Osteon C|
-Osteon D|
-Osteon E|
-Osteon F|
-Osteon G|
-Osteon Prime|
-Osteon U|
-Pariah (Septicemia) A-Z|
-Pariah (Septicemia) B-Z|
-Pariah (Septicemia) C-Z|
-Pariah (Septicemia) D-Z|
-Pariah (Septicemia) E|
-Pariah (Septicemia) F|
-Pariah (Septicemia) US|
-Pariah (Septicemia) UW|
-Pariah (Septicemia) Z|
-Ryoken (Stormcrow) Z|
-Savage Coyote Z|
-Thor (Summoner) Z|
-Turkina Z|
-Talon TLN-5VNO|
-Merlin MLN-SX|
-Spindrift Aquatic SecurityMech SDT-1|
-Whitworth WTH-5S|
-Liberator LIB-4T|
-Ostscout IIC (Standard)|
-Aquagladius AQS-5 MAM|
-Carbine CON-9M-D ConstructionMech MOD|
-Crosscut IIC SolahmaMech|
-Daedalus DAD-DX|
-Gauss-Buster MilitiaMech|
-OmniMarauder MAD-BR-OA|
-OmniMarauder MAD-BR-O|
-Phoenix Hawk PXH-99|
-Porcupine PRC-3N|
-Scourge SCG-WX1|
-Uni ATAE-70 ArtilleryMech|
-Valkyrie VLK-QD5|
-Volkh VKH-68|
-Wasp WSP-3X|
-Cougar XR|
-Ha Otoko-HR (Standard)|
-Kraken-XR (Standard)|
-Ursus PR|
-Beowulf BEO-X-7a|
-Celerity CLR-02-X-D|
-Exterminator EXT-6CS|
-Grim Reaper GRM-R (Einar)|
-Highlander HGN-641-X-2|
-Tessen TSN-X-4|
-Arbiter SecurityMech ARB-001|
-Charger CGR-1X1|
-Firestarter FS9-X81|
-Hunchback HBK-7X-4|
-Quickdraw QKD-8X|
-Devastator DVS-X10 MUSE EARTH|
-Enforcer III ENF-7X MUSE COMPACT|
-Legionnaire LGN-2X1 MUSE FIRE|
-Pendragon PDG-1X MUSE RED|
-Rifleman RFL-X3 MUSE WIND|
-Crosscut ED-XX 'Ichabod'|
-Juggernaut JG-R9TX1 'Leapin' Lil'|
-Spatha SP2-X 'Warlord'|
-Valiant VAL-NT-JX 'Hot Knife'|
-Warhammer WHM-X7 'The Lich'|
-Wraith TR2-X 'Alexander'|
-Exterminator EXT-4DX|
-Mongoose MON-66GX|
-Rifleman III RF2-A|
-Thug THG-11ECX (Jose)|
-Wyvern WVE-5UX|
-Banzai BNZ-X|
-Hatamoto-Kaeru HTM-35X|
-Jenner JR10-X|
-No-Dachi NDA-3X|
-Wolf Trap (Tora) WFT-2X 'Bear Trap'|
-Dola DOL-1A|
-Pillager PLG-4X 'Anvil'|
-Raven X RVN-3X|
-Ti Ts'ang TSG-9DDC 'Prototype'|
-Vindicator VND-3LD (Dao)|
-Awesome AWS-11M|
-Hermes II HER-7S|
-Jackal JA-KL-1579|
-Orion ON3-MX|
-Pandarus LFA-1X|
-Sarissa MN1-D|
-Annihilator ANH-2AX|
-Grasshopper GHR-7X|
-Hoplite HOP-4X|
-Wolfhound WLF-2X|
-Black Knight BL-X-KNT 'Red Reaper'|
-Fireball ALM-XF|
-Huron Warrior HUR-WO-RX4|
-Mauler MAL-4X 'Todesbote'|
-Pompier Firemech GM-FL|
-Anubis ABS-3MC|
-Atlas AS7-00 (Jurn)|
-Dig Lord RCL-Z1 Armed MiningMech|
-Trebuchet TBT-XK7|
-Chameleon CLN-7VQ 'Q-'Mech'|
-Grand Titan T-IT-N14R 'Vengeance'|
-Warlord BLR-2XC|
-Wight WGT-4NC 'Dezgra'|
-Commando COM-7S2 (Freyr)|
-Daimyo DMO-1K2 (Al-Shahab)|
-Dervish DV-8D2 'Lightbringer'|
-Hellspawn HSN-7D2 (Halperin)|
-Victor VTR-9K2 (St. James)|
-Commando COM-1A|
-Helepolis HEP-1H|
-Kyudo KY2-D-01|
-Mackie MSK-5S|
-Shadow Hawk SHD-1R|
-Banshee BNC-1E|
-BattleAxe BKX-1X|
-Crossbow CRS-X|
-Gladiator GLD-1R|
-Icarus ICR-1X|
-Wasp WSP-1|
-Bellerophon BEL-1X|
-Dervish DV-1S|
-Eisenfaust EFT-2|
-Firebee FRB-1E (WAM-B)|
-Longbow LGB-0C|
-Thunderbolt TDR-1C|
-Emperor EMP-1A|
-Griffin GRF-1A|
-Rifleman RFL-1N|
-Rifleman RFL-2N|
-Swordsman SWD-1|
-Swordsman SWD-2|
-Toro TR-A-1|
-Xanthos XNT-2O|
-Archer ARC-1A|
-Orion ON1-C|
-Orion ON1-H|
-Phoenix PX-1R|
-Trooper TP-1R|
-Wolverine WVR-1R|
-Wolverine WVR-3R|
-Ymir BWP-X1 'Bipedal Weapons Platform'|
-Beowulf IIC PR|
-Roadrunner (Emerald Harrier) RD-1R|
-Enforcer III ENF-7D|
-Hatchetman HCT-7R|
-Valiant VLT-3E|
-Awesome AWS-11R|
-Blade BLD-XR|
-Hatamoto-Ku HTM-27W2|
-Hornet HNT-181|
-Hornet HNT-182|
-Hunchback HBK-7S|
-Orca OC-1X|
-Penthesilea PEN-3H|
-Prefect PRF-1C|
-UrbanMech UM-R93|
-Goshawk II RISC|
-Lament LMT-2D|
-Lich UABM-2R|
-Osprey OSP-36|
-Parash 3|
-Ryoken III-XP (Skinwalker) A|
-Ryoken III-XP (Skinwalker) B|
-Ryoken III-XP (Skinwalker) C|
-Ryoken III-XP (Skinwalker) D|
-Ryoken III-XP (Skinwalker) Prime|
-Triskelion TRK-4V|
-Centurion CN9-H|
-HawkWolf HWK-3F|
-Pathfinder PFF-2|
-Pathfinder PFF-2T|
-Patron MilitiaMech PTN-2|
-Rook NH-1X 'Rook-X'|
-Agrotera AGT-UA 'Ariel'|
-Buccaneer BCN-6PX 'Pan'|
-Calliope CAL-1MAFSW 'Snow White'|
-Celerity CLR-03OMM 'Rajah'|
-Clint IIC 2L 'Leia'|
-Ghost GST-10A 'Aurora'|
-Gunsmith CH11-NGC 'Cinderella'|
-Hitotsume Kozo HKZ-1FM 'Mulan'|
-Hunchback HBK-LGN-Pin 'Anastasia'|
-Hunchback HBK-LGN-Pin 'Drizella'|
-Phoenix Hawk PXH-7KJ 'Jasmine'|
-Tessen TSN-X4R 'Rapunzel'|
-Trebuchet TBT-7MM 'Merida'|
-Vulcan VT-5ML 'Aladdin'|
-Vulpes VLP-1DX 'Beast'|
-Watchman WTC-4MB 'Belle'|
-Wraith TR2-P 'Pocahontas'|
-Axman AXM-6X|
-Banshee BNC-11X|
-Barghest BGS-4X|
-Slagmaiden SLG-X|
-Stealth STH-5X|
-Stiletto STO-6X|
-Cataphract CTF-0X|
-Flea FLE-14|
-Kiso Command Mech K-3N-KRHQ|
-Marauder MAD-4X|
-Super-Griffin GRF-2N-X|
-Super-Wasp WSP-2A-X|
-Zeus ZEU-6Y|
-Centaur 2|
-Centaur 3|
-Centaur 4|
-Centaur (Standard)|
-Gorgon 2|
-Gorgon 3|
-Gorgon 4|
-Gorgon (Standard)|
-Harpy 2|
-Harpy 3|
-Harpy 4|
-Harpy (Standard)|
-Hydra 2|
-Hydra 3|
-Hydra 4|
-Hydra (Standard)|
-Minotaur 2|
-Minotaur 3|
-Minotaur 4|
-Minotaur (Standard)|
-Roc 2|
-Roc 3|
-Roc 4|
-Roc (Standard)|
-Satyr 2|
-Satyr 3|
-Satyr 4|
-Satyr (Standard)|
-Siren 2|
-Siren 3|
-Siren 4|
-Siren 5|
-Siren (Standard)|
-Basilisk 2|
-Basilisk 3|
-Basilisk (Standard)|
-Cecerops 2|
-Cecerops 3|
-Cecerops 4|
-Cecerops (Standard)|
-Chrysaor 2|
-Chrysaor (Standard)|
-Delphyne 2|
-Delphyne 3|
-Delphyne (Standard)|
-Erinyes 2|
-Erinyes 3|
-Erinyes (Standard)|
-Orc 2|
-Orc 3|
-Orc 4|
-Orc (Standard)|
-Procyon 2|
-Procyon 3|
-Procyon 4|
-Procyon 5|
-Procyon (Standard)|
-Triton 2|
-Triton 3|
-Triton 4|
-Triton (Standard)|
-Hippogriff (Standard)|
-Minotaur P2|
-Procyon ProtoMech (Quad)|
-Satyr XP|
-Svartalfa (LRM Variant)|
-Svartalfa (Standard)|
-Basilisk ProtoMech (Quad) B|
-Basilisk ProtoMech (Quad) (Standard)|
-Boggart Ultraheavy ProtoMech 2|
-Boggart Ultraheavy ProtoMech (Standard)|
-Centaur Z|
-Hobgoblin Ultraheavy ProtoMech 2|
-Hobgoblin Ultraheavy ProtoMech (Standard)|
-Minotaur Z|
-Procyon Z|
-Roc Z|
-Sprite Ultraheavy ProtoMech 2|
-Sprite Ultraheavy ProtoMech 3|
-Sprite Ultraheavy ProtoMech (Standard)|
-Minotaur XP|
-Dragonstar Assault Transport (3060)|
-Dragonstar Passenger Transport (Standard)|
-Mowang Courier (Standard)|
-'Astrolux' Staryacht LC-100|
-Tigress Close Patrol Craft TIG-15|
-Foxhound Gunboat TIG-40|
-Ares Assault Craft Mark VII-C|
-Ares Assault Craft Mark VII|
-Bus S-7AC|
-DropShuttle K-1|
-DropShuttle K-1C|
-Escape Pod (Standard)|
-Life Boat (Standard)|
-Long-Range Shuttlecraft KR-61|
-Long-Range Shuttlecraft KR-61C|
-Battle Taxi NL-42|
-Bus S-7A|
-Shuttle ST-46|
-Shuttle ST-46C|
-Aquarius Escort M1|
-Aquarius Escort W1|
-Aquarius Escort (Standard)|
-Lyonesse Escort M1|
-Lyonesse Escort W1|
-Lyonesse Escort (Standard)|
-Ares Attack Craft Mark IX|
-Oo-Suzumebachi (Standard)|
-Zhen Niao (Standard)|
-Caerleon (Standard)|
-Condottiere Assault Craft (Standard)|
-NL-45 Gunboat (Standard)|
-Wurger Assault Craft (Standard)|
-Mowang Courier (Clandestine)|
-S7-P Bus 'Scarab'|
-Ares Assault Craft Mk.III|
-Ares Close Assault Landing Craft Mk.II|
-Ares Landing Craft Mk.I|
-Intrepid Assault Craft (2331)|
-Intrepid Assault Craft (2478)|
-Crucible Station (Standard)|
-Hong Lung Interdiction Station (Standard)|
-Snowden Mining Station (MK I)|
-Snowden Mining Station (Standard)|
-M-9 SDS Battle Station 'Pavise'|
-Drake SDS Control Station (Standard)|
-Wheeler-Class Station (2556)|
-Alliance Space Station (2713)|
-Alliance Space Station (3061)|
-Bastion System Defense Station (2584)|
-Bastion System Defense Station (3058)|
-Bastion System Defense Station (3091)|
-BattleSat System Defense Station (3089)|
-BattleSat System Defense Station (3056)|
-Capitol System Defense Station (3051)|
-Factory Medium/Large (2400)|
-Factory Medium/Large (2750)|
-Factory Small (2300)|
-Habitat Small (2400)|
-Habitat Small (2750)|
-Habitat Large (2500)|
-Habitat Large (2750)|
-Olympus Recharge Station (2663)|
-Olympus Recharge Station (2942)|
-Olympus Recharge Station (3072)|
-Pressurized Yard Huge (2450)|
-Pressurized Yard Large (2400)|
-Pressurized Yard Medium (2350)|
-Pressurized Yard Small (2200)|
-Unpressurized Yard Huge (2350)|
-Unpressurized Yard Large (2300)|
-Unpressurized Yard Medium (2250)|
-Unpressurized Yard Small (2100)|
-Puma Assault Tank PAT-001|
-Puma Assault Tank PAT-002|
-Air Car (Standard)|
-Falcon Hover Tank (Standard)|
-Ground Car (Standard)|
-Heavy Transport B1 (Standard)|
-Hover Scout (Standard)|
-Hover Tank (Standard)|
-Jeep (Standard)|
-Jet Sled (Standard)|
-M.A.S.H. Truck (Small)|
-Mobile Long Tom Artillery (Unofficial) (+ Carriage)|
-Skimmer (Standard)|
-Speeder (Standard)|
-Weapons Carrier A (LL)|
-Wheeled Scout (Standard)|
-AC/2 Carrier (Standard)|
-Armored Personnel Carrier (Hover LRM)|
-Armored Personnel Carrier (Hover MG)|
-Armored Personnel Carrier (Hover Sensors)|
-Armored Personnel Carrier (Hover SRM)|
-Armored Personnel Carrier (Hover)|
-Armored Personnel Carrier (Tracked LRM)|
-Armored Personnel Carrier (Tracked MG)|
-Armored Personnel Carrier (Tracked SRM)|
-Armored Personnel Carrier (Tracked)|
-Armored Personnel Carrier (Wheeled LRM)|
-Armored Personnel Carrier (Wheeled MG)|
-Armored Personnel Carrier (Wheeled SRM)|
-Armored Personnel Carrier (Wheeled)|
-Axel Heavy Tank Mk 1|
-Axel Heavy Tank Mk 2|
-Behemoth Heavy Tank (Armor)|
-Behemoth Heavy Tank (Flamer)|
-Behemoth Heavy Tank (Standard)|
-Bulldog Medium Tank (AC2)|
-Bulldog Medium Tank (LRM)|
-Bulldog Medium Tank (Standard)|
-Condor Heavy Hover Tank (Davion)|
-Condor Heavy Hover Tank (Flamer)|
-Condor Heavy Hover Tank (Liao)|
-Condor Heavy Hover Tank (Standard)|
-Coolant Truck (Hover)|
-Coolant Truck (Tracked)|
-Coolant Truck 135-K|
-Demolisher Heavy Tank (Defensive)|
-Demolisher Heavy Tank (Standard Mk. I)|
-Demolisher Heavy Tank (Standard Mk. II)|
-Devastator Heavy Tank (Standard)|
-Drillson Heavy Hover Tank (SRM)|
-Drillson Heavy Hover Tank (Standard)|
-Engineering Vehicle (AC)|
-Engineering Vehicle (Flamer)|
-Engineering Vehicle (Standard)|
-Ferret Light Scout VTOL (Armor) 'Wild Weasel'|
-Ferret Light Scout VTOL (Cargo)|
-Ferret Light Scout VTOL (Standard)|
-Goblin Medium Tank (LRM)|
-Goblin Medium Tank (MG)|
-Goblin Medium Tank (SRM)|
-Goblin Medium Tank (Standard)|
-Harasser Laser Platform (Standard)|
-Harasser Missile Platform (Flamer)|
-Harasser Missile Platform (LRM)|
-Harasser Missile Platform 'Mini-Peggy'|
-Harasser Missile Platform 'Leaping Lisa'|
-Harasser Missile Platform (Standard)|
-Hetzer Wheeled Assault Gun (AC10)|
-Hetzer Wheeled Assault Gun (Laser)|
-Hetzer Wheeled Assault Gun (LRM)|
-Hetzer Wheeled Assault Gun (Scout)|
-Hetzer Wheeled Assault Gun (SRM)|
-Hetzer Wheeled Assault Gun (Standard)|
-Hi-Scout Drone (NapFind)|
-Hi-Scout Drone (PathTrak)|
-Hi-Scout Drone Carrier (Standard)|
-Hunter Light Support Tank (Ammo)|
-Hunter Light Support Tank (LRM10)|
-Hunter Light Support Tank (LRM15)|
-Hunter Light Support Tank (Standard)|
-J-27 Ordnance Transport (Armor)|
-J-27 Ordnance Transport (Fusion)|
-J-27 Ordnance Transport (Trailer)|
-J-27 Ordnance Transport (Standard)|
-J. Edgar Light Hover Tank (Flamer)|
-J. Edgar Light Hover Tank (ICE)|
-J. Edgar Light Hover Tank (MG)|
-J. Edgar Light Hover Tank (Standard)|
-J-27 Ordnance Transport K-27 'Killjoy'|
-Karnov UR Gunship (Standard)|
-Karnov UR Transport (AC)|
-Karnov UR Transport (Artillery)|
-Karnov UR Transport (Standard)|
-Laser Carrier (Standard)|
-LRM Carrier (Standard)|
-M.A.S.H. Truck (ICE)|
-M.A.S.H. Truck (Standard)|
-Manticore Heavy Tank (Standard)|
-Maxim Heavy Hover Transport (SRM2)|
-Maxim Heavy Hover Transport (SRM4)|
-Maxim Heavy Hover Transport (Standard)|
-Mobile Headquarters (ICE - LL)|
-Mobile Headquarters (ICE - LRM)|
-Mobile Headquarters (ICE)|
-Mobile Headquarters (LL)|
-Mobile Headquarters (LRM)|
-Mobile Headquarters (Standard)|
-Mobile Long Tom Artillery Ammunition Trailer LT-MOB-25|
-Mobile Long Tom Artillery Support Carriage LT-MOB-25|
-Mobile Long Tom Artillery LT-MOB-25|
-Monitor Naval Vessel (Standard)|
-Neptune Submarine (LRT)|
-Neptune Submarine (SRT)|
-Neptune Submarine (Standard)|
-Ontos Heavy Tank (Fusion)|
-Ontos Heavy Tank (LRM)|
-Ontos Heavy Tank (Standard)|
-Packrat LRPV PKR-T5 (ICE)|
-Packrat LRPV PKR-T5 (ML)|
-Packrat LRPV PKR-T5 (SRM2)|
-Packrat LRPV PKR-T5|
-Partisan Heavy Tank (AC2)|
-Partisan Heavy Tank (LRM)|
-Partisan Heavy Tank (Standard)|
-Patton Tank (Standard)|
-Pegasus Scout Hover Tank (Missile)|
-Pegasus Scout Hover Tank (Sensors)|
-Pegasus Scout Hover Tank (Unarmed)|
-Pegasus Scout Hover Tank (Standard)|
-Pike Support Vehicle (AC5)|
-Pike Support Vehicle (Missile)|
-Pike Support Vehicle (Standard)|
-Rommel Tank (Standard)|
-Saladin Assault Hover Tank (Armor)|
-Saladin Assault Hover Tank (Standard)|
-Saracen Medium Hover Tank (Standard)|
-Savannah Master Hovercraft (SL)|
-Savannah Master Hovercraft (Standard)|
-Schrek AC Carrier (Standard)|
-Schrek PPC Carrier (Anti-Infantry)|
-Schrek PPC Carrier (Standard)|
-Scimitar Medium Hover Tank (Missile)|
-Scimitar Medium Hover Tank (Standard)|
-Scorpion Light Tank (LRM)|
-Scorpion Light Tank (ML)|
-Scorpion Light Tank (SRM)|
-Scorpion Light Tank (Standard)|
-Sea Skimmer Hydrofoil (SRM2)|
-Sea Skimmer Hydrofoil (SRM6)|
-Sea Skimmer Hydrofoil (Standard)|
-Skulker Wheeled Scout Tank (MG)|
-Skulker Wheeled Scout Tank (SRM)|
-Skulker Wheeled Scout Tank (Standard)|
-SRM Carrier (Standard)|
-Striker Light Tank (LRM)|
-Striker Light Tank (SRM)|
-Striker Light Tank (Standard)|
-SturmFeur Heavy Tank (SRM)|
-SturmFeur Heavy Tank (Standard)|
-Swift Wind Scout Car (ICE - Cargo)|
-Swift Wind Scout Car (ICE - Speed)|
-Swift Wind Scout Car (ICE)|
-Swift Wind Scout Car (Standard)|
-Vedette Medium Tank (AC2)|
-Vedette Medium Tank (Liao)|
-Vedette Medium Tank (Standard)|
-Von Luckner Heavy Tank VNL-K100|
-Von Luckner Heavy Tank VNL-K65N|
-Von Luckner Heavy Tank VNL-K70|
-Warrior Attack Helicopter H-7|
-Warrior Attack Helicopter H-7A|
-Warrior Attack Helicopter H-7C|
-Beagle Hover Scout (C3i)|
-Beagle Hover Scout (TAG)|
-Beagle Hover Scout (Standard)|
-Burke Defense Tank (HPPC)|
-Burke Defense Tank (Standard)|
-Chaparral Missile Artillery Tank (ERML)|
-Chaparral Missile Artillery Tank (MG)|
-Chaparral Missile Artillery Tank (SRM)|
-Chaparral Missile Artillery Tank (Standard)|
-Cyrano Gunship (ML)|
-Cyrano Gunship (Plasma)|
-Cyrano Gunship (Standard)|
-Demon Tank (HGR)|
-Demon Tank (Horned Demon)|
-Demon Tank (PPC)|
-Demon Tank (Standard)|
-Fury Command Tank (C3M)|
-Fury Command Tank (C3S)|
-Fury Command Tank (Fury II)|
-Fury Command Tank (Original)|
-Fury Command Tank (Standard)|
-Gabriel Reconnaissance Hovercraft (ERSL)|
-Gabriel Reconnaissance Hovercraft (TDF)|
-Gabriel Reconnaissance Hovercraft (Standard)|
-Kanga Medium Hovertank (Standard)|
-Lightning Attack Hovercraft (ERML)|
-Lightning Attack Hovercraft (ERSL)|
-Lightning Attack Hovercraft (RL)|
-Lightning Attack Hovercraft (Standard)|
-Magi Infantry Support Vehicle (UCSV)|
-Magi Infantry Support Vehicle (Standard)|
-Marksman Artillery Vehicle (Light PPC)|
-Marksman Artillery Vehicle (Standard)|
-Nightshade ECM VTOL (Armor)|
-Nightshade ECM VTOL (LAC)|
-Nightshade ECM VTOL (Light PPC)|
-Nightshade ECM VTOL (Standard)|
-Puma Assault Tank PAT-005|
-Puma Assault Tank PAT-007|
-Puma Assault Tank PAT-008|
-Rhino Fire Support Tank (Flamer)|
-Rhino Fire Support Tank (MG)|
-Rhino Fire Support Tank (ML)|
-Rhino Fire Support Tank (SL)|
-Rhino Fire Support Tank (Standard)|
-Ripper Infantry Transport (ERML)|
-Ripper Infantry Transport (Infantry)|
-Ripper Infantry Transport (Light PPC)|
-Ripper Infantry Transport (MG)|
-Ripper Infantry Transport (SPL)|
-Ripper Infantry Transport (Standard)|
-Rotunda Scout Vehicle RND-J-1-11|
-Thor Artillery Vehicle (C3i)|
-Thor Artillery Vehicle (Clan)|
-Thor Artillery Vehicle (Standard)|
-Zephyr Hovertank (C3i)|
-Zephyr Hovertank (LRM)|
-Zephyr Hovertank (SRM2)|
-Zephyr Hovertank (Standard)|
-AC/2 Carrier (LB-X)|
-Alacorn Heavy Tank Mk III|
-Alacorn Heavy Tank Mk IV|
-Alacorn Heavy Tank Mk VI|
-Alacorn Heavy Tank Mk VII|
-Axel Heavy Tank IIC (Standard)|
-Axel Heavy Tank IIC (XL)|
-Badger (C) Tracked Transport A|
-Badger (C) Tracked Transport B|
-Badger (C) Tracked Transport C|
-Badger (C) Tracked Transport D|
-Badger (C) Tracked Transport E|
-Badger (C) Tracked Transport F|
-Badger (C) Tracked Transport H|
-Badger (C) Tracked Transport Prime|
-Badger Tracked Transport A|
-Badger Tracked Transport B|
-Badger Tracked Transport C|
-Badger Tracked Transport D|
-Badger Tracked Transport E|
-Badger Tracked Transport F|
-Badger Tracked Transport G|
-Badger Tracked Transport Prime|
-Bandit (C) Hovercraft A|
-Bandit (C) Hovercraft B|
-Bandit (C) Hovercraft C|
-Bandit (C) Hovercraft D|
-Bandit (C) Hovercraft E|
-Bandit (C) Hovercraft F|
-Bandit (C) Hovercraft G|
-Bandit (C) Hovercraft H|
-Bandit (C) Hovercraft Prime|
-Bandit Hovercraft A|
-Bandit Hovercraft B|
-Bandit Hovercraft C|
-Bandit Hovercraft D|
-Bandit Hovercraft E|
-Bandit Hovercraft F|
-Bandit Hovercraft G|
-Bandit Hovercraft H|
-Bandit Hovercraft I|
-Bandit Hovercraft Prime|
-Behemoth Heavy Tank (Kurita)|
-Blizzard Hover Transport (SRM)|
-Blizzard Hover Transport 'Black Blizzard'|
-Blizzard Hover Transport (Standard)|
-Brutus Assault Tank (LRM)|
-Brutus Assault Tank (PPC 2)|
-Brutus Assault Tank (PPC)|
-Brutus Assault Tank (Standard)|
-Cavalry Attack Helicopter (Infantry)|
-Cavalry Attack Helicopter (LRM)|
-Cavalry Attack Helicopter (SRM)|
-Cavalry Attack Helicopter (TAG)|
-Cavalry Attack Helicopter (Standard)|
-Centipede Scout Car (SRM)|
-Centipede Scout Car (TAG)|
-Centipede Scout Car (Standard)|
-Challenger MBT X|
-Challenger MBT XI|
-Challenger MBT XII|
-Condor Heavy Hover Tank (Laser)|
-Drillson Heavy Hover Tank (ERLL)|
-Drillson Heavy Hover Tank (Streak)|
-Fulcrum Heavy Hovertank II|
-Fulcrum Heavy Hovertank (Standard)|
-Galleon Light Tank GAL-100|
-Galleon Light Tank GAL-102|
-Galleon Light Tank GAL-103|
-Galleon Light Tank GAL-104|
-Galleon Light Tank GAL-200|
-Goblin II Infantry Support Vehicle (Standard)|
-Goblin Infantry Support Vehicle (Standard)|
-Hetzer Wheeled Assault Gun (LB-X)|
-Hunter Light Support Tank (3054 Upgrade)|
-Hunter Light Support Tank (ERLL)|
-Hunter Light Support Tank (LPL)|
-Hunter Light Support Tank 'Assault Hunter'|
-J. Edgar Light Hover Tank (Kurita)|
-J. Edgar Light Hover Tank (TAG)|
-Karnov UR Transport (3055 Upgrade)|
-Karnov UR Transport (BA)|
-Karnov UR Transport (Periphery)|
-Kestrel VTOL (Clan)|
-Kestrel VTOL (MedEvac)|
-Kestrel VTOL (ML)|
-Kestrel VTOL (SL)|
-Kestrel VTOL (SRM)|
-Kestrel VTOL (Standard)|
-LRM Carrier (3055 Upgrade)|
-LRM Carrier (WoB)|
-Manticore Heavy Tank (3055 Upgrade)|
-Manticore Heavy Tank (C3M)|
-Manticore Heavy Tank (C3S)|
-Manticore Heavy Tank (LB-X)|
-Manticore Heavy Tank (RAC)|
-Maultier Hover APC (BA)|
-Maultier Hover APC (Basic)|
-Maultier Hover APC (Fusion)|
-Maultier Hover APC (Intermediate)|
-Maultier Hover APC (MG)|
-Maultier Hover APC (Standard)|
-Maxim (I) Heavy Hover Transport (Company Command)|
-Maxim (I) Heavy Hover Transport (Standard)|
-Maxim Heavy Hover Transport (3052 Upgrade)|
-Maxim Heavy Hover Transport (Anti-Infantry)|
-Maxim Heavy Hover Transport (BA Factory Upgrade)|
-Maxim Heavy Hover Transport (BA Field Upgrade)|
-Maxim Heavy Hover Transport (C3M)|
-Maxim Heavy Hover Transport (C3S)|
-Maxim Heavy Hover Transport (Clan)|
-Maxim Heavy Hover Transport (Fire Support)|
-MRM Carrier (Standard)|
-Ontos Heavy Tank (3053 Upgrade)|
-Ontos Heavy Tank (Light Gauss)|
-Padilla Heavy Artillery Tank (LRM)|
-Padilla Heavy Artillery Tank (Standard)|
-Partisan Air Defense Tank (Company Command)|
-Partisan Air Defense Tank (Lance Command)|
-Partisan Air Defense Tank (Quad RAC)|
-Partisan Air Defense Tank (RAC)|
-Partisan Air Defense Tank (XL)|
-Partisan Air Defense Tank (Standard)|
-Partisan Heavy Tank (C3)|
-Patton Tank (Ultra)|
-Pegasus Scout Hover Tank (3058 Upgrade)|
-Pegasus Scout Hover Tank (C3)|
-Pegasus Scout Hover Tank (MRM)|
-Peregrine Attack VTOL (Cargo)|
-Peregrine Attack VTOL (Kurita)|
-Peregrine Attack VTOL (Standard)|
-Pike Support Vehicle (Clan)|
-Pike Support Vehicle (RAC) 'Assault Pike'|
-Pilum Heavy Tank (Arrow IV)|
-Pilum Heavy Tank (Standard)|
-Plainsman Medium Hovertank (Scout)|
-Plainsman Medium Hovertank (Streak)|
-Plainsman Medium Hovertank (Standard)|
-Po Heavy Tank (LB-X)|
-Po Heavy Tank (Light Gauss)|
-Po Heavy Tank (Standard)|
-Regulator Hovertank (Arrow IV)|
-Regulator Hovertank (RAC)|
-Regulator Hovertank (Standard)|
-Rommel Tank (Gauss)|
-Saladin Assault Hover Tank (Clan Cargo)|
-Saladin Assault Hover Tank (LB-X)|
-Saladin Assault Hover Tank (Ultra)|
-Saracen Medium Hover Tank (MRM)|
-Scimitar Medium Hover Tank (TAG)|
-Scorpion Light Tank (MRM)|
-Sprint Scout Helicopter (C3)|
-Sprint Scout Helicopter (C3i)|
-Sprint Scout Helicopter (Laser)|
-Sprint Scout Helicopter (Troop Transport)|
-Sprint Scout Helicopter (Standard)|
-SRM Carrier (3054 Upgrade)|
-SRM Carrier (C3)|
-SRM Carrier (WoB)|
-Striker Light Tank (3053 Upgrade)|
-Striker Light Tank (3061 Upgrade)|
-Striker Light Tank (Ammo)|
-Striker Light Tank (Laser)|
-Striker Light Tank (Narc)|
-SturmFeur Heavy Tank (Heavy Gauss)|
-Tokugawa Heavy Tank (C3)|
-Tokugawa Heavy Tank (MRM)|
-Tokugawa Heavy Tank (Streak)|
-Tokugawa Heavy Tank TKG-150|
-Tokugawa Heavy Tank TKG-151|
-Tokugawa Heavy Tank (Standard)|
-Typhoon Urban Assault Vehicle (LB-X)|
-Typhoon Urban Assault Vehicle (RAC)|
-Typhoon Urban Assault Vehicle (Tracked)|
-Typhoon Urban Assault Vehicle (Standard)|
-Vedette Medium Tank (LB-X)|
-Vedette Medium Tank (Light Gauss)|
-Vedette Medium Tank (NETC)|
-Vedette Medium Tank (RAC)|
-Vedette Medium Tank (Ultra)|
-Vedette Medium Tank 'Doris' Delight'|
-Von Luckner Heavy Tank VNL-K75N|
-Warrior Attack Helicopter H-10|
-Warrior Attack Helicopter H-8|
-Warrior Attack Helicopter H-9|
-Yellow Jacket Gunship (Ammo)|
-Yellow Jacket Gunship (Arrow IV)|
-Yellow Jacket Gunship (RAC)|
-Yellow Jacket Gunship (Standard)|
-Zhukov Heavy Tank (WoB)|
-Zhukov Heavy Tank (Standard)|
-Anhur Transport (BA)|
-Anhur Transport (Standard)|
-Ares Medium Tank (Plasma)|
-Ares Medium Tank (Standard)|
-Asshur Artillery Spotter (Standard)|
-Asshur Fast Reconnaissance Vehicle (Proto AC)|
-Asshur Fast Reconnaissance Vehicle (Standard)|
-Athena Combat Vehicle (HAG)|
-Athena Combat Vehicle (Standard)|
-BattleMech Recovery Vehicle (Standard)|
-Chevalier Light Tank (BAP)|
-Chevalier Light Tank (MML)|
-Chevalier Light Tank (Speed)|
-Chevalier Light Tank (Standard)|
-Demolisher II Heavy Tank (Thunderbolt)|
-Demolisher II Heavy Tank (Standard)|
-Donar Assault Helicopter (Close Support)|
-Donar Assault Helicopter (Recon)|
-Donar Assault Helicopter (Standard)|
-Epona Pursuit Tank A|
-Epona Pursuit Tank B|
-Epona Pursuit Tank C|
-Epona Pursuit Tank D|
-Epona Pursuit Tank E|
-Epona Pursuit Tank Prime|
-Flatbed Truck (AC)|
-Flatbed Truck (Armor)|
-Flatbed Truck (Mortar)|
-Flatbed Truck (SRM)|
-Flatbed Truck (Standard)|
-Gladius Medium Hover Tank Mk II|
-Gladius Medium Hover Tank (Standard)|
-Hachiman Fire Support Tank (AAA)|
-Hachiman Fire Support Tank (Standard)|
-Hawk Moth Gunship (Armor)|
-Hawk Moth Gunship (Thunderbolt)|
-Hawk Moth Gunship (Standard)|
-Heavy BattleMech Recovery Vehicle (Standard)|
-Heavy Hover APC (LRM)|
-Heavy Hover APC (MG)|
-Heavy Hover APC (Scout Tank)|
-Heavy Hover APC (SRM)|
-Heavy Hover APC (Standard)|
-Heavy LRM Carrier (Standard)|
-Heavy MML Carrier (Standard)|
-Heavy Tracked APC (LRM)|
-Heavy Tracked APC (MG)|
-Heavy Tracked APC (SRM)|
-Heavy Tracked APC (Standard)|
-Heavy Wheeled APC (LRM)|
-Heavy Wheeled APC (MG)|
-Heavy Wheeled APC (SRM)|
-Heavy Wheeled APC (WoB)|
-Heavy Wheeled APC (Standard)|
-Huitzilopochtli Assault Tank 'Huey' (AAA)|
-Huitzilopochtli Assault Tank 'Huey' (Standard)|
-Indra Infantry Transport (BA)|
-Indra Infantry Transport (Standard)|
-Ishtar Heavy Fire Support Tank (Gauss)|
-Ishtar Heavy Fire Support Tank (Original)|
-Ishtar Heavy Fire Support Tank (Standard)|
-Ku Wheeled Assault Tank (IFV) 'Turhan II'|
-Ku Wheeled Assault Tank (Standard)|
-Light SRM Carrier (Standard)|
-Light Thunderbolt Carrier (Standard)|
-Mantis Light Attack VTOL (ECCM)|
-Mantis Light Attack VTOL (Standard)|
-Mars Assault Vehicle (ATM)|
-Mars Assault Vehicle (HAG)|
-Mars Assault Vehicle (XL)|
-Mars Assault Vehicle (Standard)|
-Mithras Light Tank (ERLL)|
-Mithras Light Tank (Standard)|
-Myrmidon Medium Tank Type 2|
-Myrmidon Medium Tank (Standard)|
-Odin Scout Tank (Spotter)|
-Odin Scout Tank (Standard)|
-Oro Heavy Tank (HAG)|
-Oro Heavy Tank (Standard)|
-Pinto Attack VTOL (WoB)|
-Pinto Attack VTOL (Standard)|
-Schiltron Mobile Fire-Support Platform A|
-Schiltron Mobile Fire-Support Platform B|
-Schiltron Mobile Fire-Support Platform C|
-Schiltron Mobile Fire-Support Platform D|
-Schiltron Mobile Fire-Support Platform E|
-Schiltron Mobile Fire-Support Platform F|
-Schiltron Mobile Fire-Support Platform Prime|
-Shamash Reconnaissance Vehicle (Flamer)|
-Shamash Reconnaissance Vehicle (Standard)|
-Svantovit Infantry Fighting Vehicle (ATM) 'Masada'|
-Svantovit Infantry Fighting Vehicle (Original)|
-Svantovit Infantry Fighting Vehicle (Standard)|
-Zorya Light Tank (Ammo)|
-Zorya Light Tank (ATM)|
-Zorya Light Tank (Standard)|
-Enyo Strike Tank (Standard)|
-Heimdall Ground Monitor Tank A|
-Heimdall Ground Monitor Tank Prime|
-Hephaestus Scout Tank A|
-Hephaestus Scout Tank B|
-Hephaestus Scout Tank C|
-Hephaestus Scout Tank Prime|
-Morrigu Fire Support Vehicle (Laser)|
-Morrigu Fire Support Vehicle (Standard)|
-Shoden Assault Vehicle (Streak)|
-Shoden Assault Vehicle (Standard)|
-Tyr Infantry Support Tank (Standard)|
-Ajax Assault Tank A|
-Ajax Assault Tank B|
-Ajax Assault Tank Prime|
-Fortune Wheeled Assault Vehicle (Standard)|
-Glaive Medium Tank (Standard)|
-Glory Heavy Fire Support Vehicle (Light Gauss)|
-Glory Heavy Fire Support Vehicle (Standard)|
-Main Gauche Light Support Tank (C3)|
-Main Gauche Light Support Tank (XL)|
-Main Gauche Light Support Tank (Standard)|
-Manteuffel Attack Tank A|
-Manteuffel Attack Tank B|
-Manteuffel Attack Tank Prime|
-Minion Advanced Tactical Vehicle (TAG)|
-Minion Advanced Tactical Vehicle (Targeting Computer)|
-Minion Advanced Tactical Vehicle (Standard)|
-Morningstar City Command Vehicle (Company Command)|
-Morningstar City Command Vehicle (Laser)|
-Morningstar City Command Vehicle (Standard)|
-Musketeer Hover Tank (Armor)|
-Musketeer Hover Tank (Standard)|
-Stygian Strike Tank (Armor)|
-Stygian Strike Tank (Standard)|
-Enyo Strike Tank (LB-X) 'Sholef'|
-Heimdall Ground Monitor Tank B|
-Heimdall Ground Monitor Tank C|
-Hephaestus Scout Tank D|
-Morrigu Fire Support Vehicle (HAG)|
-Shoden Assault Vehicle (LB-X)|
-Tyr Infantry Support Tank (Kurita)|
-Ajax Assault Tank C|
-Ajax Assault Tank D|
-Fortune Wheeled Assault Vehicle (Thunderbolt)|
-Glaive Medium Tank (MFB)|
-Glory Heavy Fire Support Vehicle (Arrow IV)|
-Main Gauche Light Support Tank (IFV)|
-Manteuffel Attack Tank C|
-Manteuffel Attack Tank D|
-Minion Advanced Tactical Vehicle (Gauss) 'Sandblaster'|
-Morningstar City Command Vehicle (HPG)|
-Musketeer Hover Tank (3080 Upgrade)|
-Stygian Strike Tank (WOB)|
-Bellona Hover Tank (Laser)|
-Bellona Hover Tank (Standard)|
-Cobra Transport VTOL (Command)|
-Cobra Transport VTOL (MASH)|
-Cobra Transport VTOL (Original)|
-Cobra Transport VTOL (Standard)|
-Condor Heavy Hover Tank (Upgrade) (Laser)|
-Condor Heavy Hover Tank (Upgrade) (Standard)|
-Crow Scout Helicopter 'Dragonfly'|
-Crow Scout Helicopter (C3)|
-Crow Scout Helicopter (Export)|
-Crow Scout Helicopter (Standard)|
-Cyrano Gunship (Royal)|
-Daimyo HQ 67-K|
-Daimyo HQ 67-K2|
-Daimyo HQ 67-NC|
-Daimyo HQ 67-R|
-Danai Support Vehicle (Standard)|
-Darter Scout Car (BAP)|
-Darter Scout Car (C3)|
-Darter Scout Car (ECM)|
-Darter Scout Car (SRM)|
-Darter Scout Car (SRM-2)|
-Darter Scout Car (Standard)|
-Demon Tank (Royal)|
-DI Morgan Assault Tank (Gauss)|
-DI Morgan Assault Tank (LRM)|
-DI Morgan Assault Tank (Standard)|
-Fury Command Tank (Royal)|
-Hiryo Armored Infantry Transport (Light PPC)|
-Hiryo Armored Infantry Transport (MRM)|
-Hiryo Armored Infantry Transport (Standard)|
-Ignis Infantry Support Tank (SRM)|
-Ignis Infantry Support Tank (Standard)|
-JES I Tactical Missile Carrier (Standard)|
-Korvin Tank KRV-3|
-Lightning Attack Hovercraft (Royal)|
-Marsden II MBT II (Primitive)|
-Marsden II MBT II-A (LB-X)|
-Marsden II MBT II-A|
-Marsden II MBT (Standard)|
-Mauna Kea Command Vessel (LB-X)|
-Mauna Kea Command Vessel (LRM)|
-Mauna Kea Command Vessel (LRT)|
-Mauna Kea Command Vessel (Standard)|
-Merkava Heavy Tank Mk IX|
-Merkava Heavy Tank Mk VIII|
-MIT23 MASH Vehicle (Standard)|
-Nightshade ECM VTOL (Royal)|
-Puma Assault Tank PAT-005b|
-Rhino Fire Support Tank (Royal)|
-Ripper Infantry Transport (Royal)|
-Sabaku Kaze Heavy Scout Hover Tank (Standard)|
-Saxon APC (HQ)|
-Saxon APC (Laser)|
-Saxon APC (MASH)|
-Saxon APC (Standard)|
-SM1 Tank Destroyer SM1|
-SM1A Tank Destroyer SM1A|
-SM3 Tank Destroyer SM3|
-Tamerlane Strike Sled (Flamer)|
-Tamerlane Strike Sled (RL)|
-Tamerlane Strike Sled 2|
-Tamerlane Strike Sled (Standard)|
-Thumper Artillery Vehicle TAV-1|
-Thumper Artillery Vehicle TAV-2|
-Thumper Artillery Vehicle (Standard)|
-Turhan Urban Combat Vehicle (C3)|
-Turhan Urban Combat Vehicle (Original)|
-Turhan Urban Combat Vehicle (Standard)|
-Zephyr Hovertank (Royal)|
-'Oppie' (HMRV DeConAid Trailer) (Standard)|
-'Oppie' (HMRV Salvage Bed Trailer) (Standard)|
-Buffel Engineering Support Vehicle VII (Cargo)|
-Buffel Engineering Support Vehicle VII (Reverse)|
-Buffel Engineering Support Vehicle VII (Standard)|
-Buffel Engineering Support Vehicle VIII (Standard)|
-Dromedary Water Transport (Standard)|
-Jifty Transportable Field Repair Unit JI-50 (Hoist)|
-Jifty Transportable Field Repair Unit JI-50 (MG)|
-Jifty Transportable Field Repair Unit JI-50 (ML)|
-Jifty Transportable Field Repair Unit JI-50 (Q-Vehicle)|
-Jifty Transportable Field Repair Unit JI-50|
-Merkava Heavy Tank Mk VII|
-O-65 'Oppie' Hazardous Materials Recovery Vehicle O-65 HMRV|
-O-66 'Oppie' Hazardous Materials Recovery Vehicle O-66 HMRV|
-Paramour Mobile Repair Vehicle (MFB)|
-Paramour Mobile Repair Vehicle (Standard)|
-Prometheus Combat Support Bridgelayer (Standard)|
-Nifty Transportable Field Repair Unit (Standard)|
-Aeron Strike VTOL (BAP)|
-Aeron Strike VTOL (Standard)|
-Augustus MBT A3|
-Balac Strike VTOL (LRM)|
-Balac Strike VTOL (Spotter)|
-Balac Strike VTOL (Standard)|
-Bolla Stealth Tank (RotS) A|
-Bolla Stealth Tank (RotS) B|
-Bolla Stealth Tank (RotS) C|
-Bolla Stealth Tank Comminus|
-Bolla Stealth Tank Dominus|
-Bolla Stealth Tank Infernus|
-Bolla Stealth Tank Invictus|
-Bolla Stealth Tank (RotS) Prime|
-Carnivore Assault Tank (HAG)|
-Carnivore Assault Tank (Second Line)|
-Carnivore Assault Tank (Standard)|
-Chalchiuhtotolin Support Tank (Bombast Laser)|
-Chalchiuhtotolin Support Tank (Chemical Laser)|
-Chalchiuhtotolin Support Tank (Standard)|
-Demon Medium Tank (Rifle)|
-Demon Medium Tank (Standard)|
-Eldingar Hover Sled (Streak)|
-Eldingar Hover Sled (Standard)|
-Fensalir Combat WiGE (HAG)|
-Fensalir Combat WiGE (Infantry)|
-Fensalir Combat WiGE (Standard)|
-Fox Armored Car (Flamer)|
-Fox Armored Car (VSP)|
-Fox Armored Car (Standard)|
-Giggins APC (Fire Support)|
-Giggins APC (Standard)|
-Gurteltier MBT (C3M)|
-Gurteltier MBT (Standard)|
-J-37 Ordnance Transport (Original)|
-J-37 Ordnance Transport (Standard)|
-JES II Strategic Missile Carrier (Ammo)|
-JES II Strategic Missile Carrier (Standard)|
-Joust Medium Tank BE700|
-Joust Medium Tank BE701|
-Kinnol MBT (PPC)|
-Kinnol MBT (Standard)|
-Marksman MBT M1|
-Marksman MBT M1A|
-Maxim Mk II Transport (Infantry Support) 'Shiloh'|
-Maxim Mk II Transport (Standard)|
-Moltke MBT M1|
-Moltke MBT M2|
-Moltke MBT M3|
-Padilla Tube Artillery Tank (LTC)|
-Padilla Tube Artillery Tank (Thumper)|
-Padilla Tube Artillery Tank (Standard)|
-Palmoni Assault Infantry Fighting Vehicle (Standard)|
-Pandion Combat WiGE (C3)|
-Pandion Combat WiGE (Infantry)|
-Pandion Combat WiGE (Standard)|
-Po II Heavy Tank (Arrow IV)|
-Po II Heavy Tank (Standard)|
-Prowler Multi-Terrain Vehicle (ECM)|
-Prowler Multi-Terrain Vehicle (RAF)|
-Prowler Multi-Terrain Vehicle (Sealed)|
-Prowler Multi-Terrain Vehicle (Succession Wars)|
-Prowler Multi-Terrain Vehicle (Support)|
-Prowler Multi-Terrain Vehicle (WoB)|
-Prowler Multi-Terrain Vehicle (Standard)|
-Ranger Armored Fighting Vehicle VV1 (MG)|
-Ranger Armored Fighting Vehicle VV1|
-Ranger Armored Fighting Vehicle VV2|
-Ranger Armored Fighting Vehicle VV22|
-Regulator II Hovertank (RAC)|
-Regulator II Hovertank (Stealth)|
-Regulator II Hovertank (Standard)|
-Tonbo Superheavy Transport (Standard)|
-Trajan Assault Infantry Fighting Vehicle (ICE)|
-Trajan Assault Infantry Fighting Vehicle (Standard)|
-Transportable Field Repair Unit JI-100|
-Trireme Infantry Transport (CS)|
-Trireme Infantry Transport (Standard)|
-Tufana Hovercraft (iNarc)|
-Tufana Hovercraft (Standard)|
-Winston Combat Vehicle (LAC)|
-Winston Combat Vehicle (Standard)|
-Yasha VTOL (Interdictor)|
-Yasha VTOL 'Spectre'|
-Yasha VTOL (Standard)|
-Zephyros Infantry Support Vehicle (Dual Turret)|
-Zephyros Infantry Support Vehicle (Standard)|
-Zugvogel Omni Support Aircraft A|
-Zugvogel Omni Support Aircraft B|
-Zugvogel Omni Support Aircraft C|
-Zugvogel Omni Support Aircraft D 'Raubvogel'|
-Zugvogel Omni Support Aircraft E|
-Zugvogel Omni Support Aircraft Prime|
-Ajax Assault Tank (Sealed)|
-Beagle Hover Scout (Sealed)|
-Brutus Assault Tank (HPPC)|
-Challenger MBT XIVs|
-Chaparral Missile Artillery Tank (CASE)|
-Demolisher II Heavy Tank (MML)|
-Drillson Heavy Hover Tank (Sealed)|
-Fortune Wheeled Assault Vehicle (C3M)|
-Fulcrum Heavy Hovertank III|
-Goblin Infantry Support Vehicle (Sealed)|
-Hetzer Wheeled Assault Gun (Sealed)|
-JES I Tactical Missile Carrier (3082 Upgrade)|
-Manticore Heavy Tank (HPPC)|
-Ontos Heavy Tank (MML)|
-Ontos Heavy Tank (Sealed)|
-Partisan Air Defense Tank (Cell)|
-Partisan Air Defense Tank (LRM)|
-Pegasus Scout Hover Tank (Sealed)|
-Plainsman Medium Hovertank (Sealed)|
-Rommel Tank (Sealed)|
-Savannah Master Hovercraft (Interdictor)|
-Schrek PPC Carrier (Armor)|
-Schrek PPC Carrier (C3M)|
-Scimitar Medium Hover Tank (C3)|
-Scorpion Light Tank (LAC)|
-Shamash Reconnaissance Vehicle (Interdictor)|
-Skulker Wheeled Scout Tank (C3M)|
-Sprint Scout Helicopter (Interdictor)|
-Striker Light Tank (Sealed)|
-Vedette Medium Tank (Cell)|
-Yellow Jacket Gunship (PPC)|
-Zhukov Heavy Tank (LB-X)|
-Zhukov Heavy Tank (Liao)|
-Bokkusu Support Trailer (Standard)|
-Manta Fast Attack Submarine (Standard)|
-Manta Fast Attack Submarine (Support)|
-Moray Heavy Attack Submarine (Original)|
-Moray Heavy Attack Submarine (Standard)|
-Tenmaku Command Trailer (Standard|
-Teppo Artillery Vehicle (Standard)|
-Aesir Medium AA Vehicle (HAG)|
-Aesir Medium AA Vehicle (Standard)|
-Anat APC (Standard)|
-Gurzil Support Tank (Standard)|
-Hadur Fast Support Vehicle (Standard)|
-Nacon Armored Scout (Standard)|
-Skadi Swift Attack VTOL (Standard)|
-Skanda Light Tank (Standard)|
-Ballista Artillery Trailer (Standard)|
-Destrier Siege Vehicle (Standard)|
-Hanse MBT (Standard)|
-Hasek Mechanized Combat Vehicle (Standard)|
-JI2A1 Attack APC (MML)|
-JI2A1 Attack APC (Standard)|
-Kruger Combat Car (Original)|
-Kruger Combat Car (Standard)|
-Marten Scout VTOL (Infantry)|
-Marten Scout VTOL (Standard)|
-Paladin Defense System (Standard)|
-Sniper Artillery (Standard)|
-Sortek Assault Craft (Interdictor)|
-Sortek Assault Craft (Standard)|
-Zibler Fast Strike Tank (A)|
-Zibler Fast Strike Tank (B)|
-Zibler Fast Strike Tank (C)|
-Zibler Fast Strike Tank (D)|
-Zibler Fast Strike Tank (Prime)|
-Cizin Hover Tank (Standard)|
-Cizin Hover Tank (Support)|
-Kamakiri Attack VTOL (Gauss) 'Shi Kamakiri'|
-Kamakiri Attack VTOL (Standard)|
-Mamono IFV (Standard)|
-Narukami Heavy Tank NK-1C|
-Narukami Heavy Tank NK-BC3|
-Saladin Mk II HCV (BC3)|
-Saladin Mk II HCV (Standard)|
-Saracen Mk II HCV (BC3)|
-Saracen Mk II HCV (Standard)|
-Scimitar Mk II HCV (3136 Upgrade)|
-Scimitar Mk II HCV (BC3)|
-Scimitar Mk II HCV (Standard)|
-Sekhmet Assault Vehicle (Standard)|
-Shillelagh Missile Tank (Original)|
-Shillelagh Missile Tank (Standard)|
-SM2 Heavy Artillery Vehicle (LTC)|
-SM2 Heavy Artillery Vehicle (Standard)|
-Arrow IV Assault Vehicle (Standard)|
-Behemoth II Heavy Tank (Standard)|
-Behemoth II Heavy Tank (Support)|
-Luduan Scout Vehicle (Standard)|
-Nisos Attack WIGE (Standard)|
-Nisos Attack WIGE (Support)|
-Pixiu Heavy Tank (Standard)|
-Predator Tank Destroyer (Original)|
-Predator Tank Destroyer (Standard)|
-Sheriff Infantry Support Tank (Standard)|
-Shun Transport VTOL (Standard)|
-Zahn Heavy Transport (Standard)|
-Bardiche Heavy Strike Tank (Minesweeper)|
-Bardiche Heavy Strike Tank (Standard)|
-Bulwark Assault Vehicle (Original)|
-Bulwark Assault Vehicle (Standard)|
-Partisan AA Vehicle (3134 Upgrade)|
-Partisan AA Vehicle (Standard)|
-R10 Mechanized ICV (A)|
-R10 Mechanized ICV (B)|
-R10 Mechanized ICV (Coolant Truck)|
-R10 Mechanized ICV (Prime)|
-Red Kite Attack VTOL (Standard)|
-Thang-Ta APC (Standard)|
-Bishop Transport VTOL (Standard)|
-Cardinal Transport (RAF)|
-Cardinal Transport (Standard)|
-Garrot Superheavy Transport (Standard)|
-Gossamer VTOL (XL)|
-Gossamer VTOL (Standard)|
-Kite Reconnaissance Vehicle (Standard)|
-Lamprey Transport Helicopter (Standard)|
-Savior Repair Vehicle (Standard)|
-Testudo Siege Tank (Standard)|
-Gun Trailer (Ambush)|
-Gun Trailer (Artillery/AA)|
-Gun Trailer (LRM)|
-Gun Trailer (Mjolnir)|
-Gun Trailer (Siege)|
-Gun Trailer (Sniper Cannon)|
-Gun Trailer (Stronghold)|
-Gun Trailer (Thumper)|
-Gun Trailer (Thunderbolt)|
-Gun Trailer (Ultra)|
-Balac Strike VTOL (Hybrid)|
-Bolla Stealth Tank (RotS) D|
-Bulldog Medium Tank (Cell)|
-Chalchiuhtotolin Support Tank (XL)|
-Condor Heavy Hover Tank (Laser Upgrade)|
-Demon Medium Tank (Armor)|
-Eldingar Hover Sled 'HumHov'|
-Fox Armored Car (Interdictor)|
-Fury Command Tank (Fury III)|
-Fury Command Tank (Fury IIIm)|
-Glory Heavy Fire Support Vehicle (3090 Upgrade)|
-Harasser Missile Platform (MML)|
-Harasser Missile Platform (Thunderbolt)|
-Heimdall Ground Monitor Tank D|
-JES II Strategic Missile Carrier (Support)|
-Kinnol MBT (RAC)|
-Manteuffel Attack Tank E|
-Marksman MBT M1J|
-Maxim Mk II Transport (ECM)|
-MIT24 MASH Vehicle (Standard)|
-Mortar Carrier (Standard)|
-Po II Heavy Tank (Gauss)|
-Po II Heavy Tank (Stealth)|
-Prowler Multi-Terrain Vehicle (3140 Upgrade)|
-Prowler Multi-Terrain Vehicle (Security)|
-Ranger Armored Fighting Vehicle VV1 (Interdictor)|
-Vedette Medium Tank V9|
-Winston Combat Vehicle (Support)|
-Winston Combat Vehicle (TSEMP)|
-Winston Combat Vehicle (XXL)|
-Zugvogel Omni Support Aircraft F|
-Crane Heavy Transport (Standard)|
-Hawk Moth II Gunship (MML)|
-Hawk Moth II Gunship (Sniper)|
-Hawk Moth II Gunship (Standard)|
-JES III Missile Carrier (C3)|
-JES III Missile Carrier (MML)|
-JES III Missile Carrier (Speed)|
-JES III Missile Carrier (Standard)|
-JES III Missile Carrier (Thunderbolt)|
-MHI Amphibious APC (Standard)|
-MHI Defense AA Tank (Standard)|
-Scapha Hovertank (A)|
-Scapha Hovertank (B)|
-Scapha Hovertank (C)|
-Scapha Hovertank (D)|
-Scapha Hovertank (E)|
-Scapha Hovertank (F)|
-Scapha Hovertank (G)|
-Scapha Hovertank (H)|
-Scapha Hovertank (I)|
-Scapha Hovertank (J)|
-Scapha Hovertank (Primary)|
-Shandra Advanced Scout Vehicle (Original)|
-Shandra Advanced Scout Vehicle (Standard)|
-DI Multipurpose VTOL (Gunship)|
-DI Multipurpose VTOL (Standard)|
-DI Schmitt Tank (Standard)|
-DI Schmitt Tank (Targeting Computer)|
-Gulltoppr OmniMonitor (A)|
-Gulltoppr OmniMonitor (B)|
-Gulltoppr OmniMonitor (Prime)|
-Kelswa Assault Tank (Standard)|
-Manticore II Heavy Tank (Standard)|
-Schildkrote Line Tank (HPPC)|
-Schildkrote Line Tank (Standard)|
-Swallow Attack WIGE (Original)|
-Swallow Attack WIGE (Standard)|
-Winterhawk APC (Standard)|
-Fensalir Combat WiGE (3132 Upgrade)|
-Fensalir Combat WiGE (3137 Upgrade)|
-Fensalir Combat WiGE (Stealth)|
-Pandion Combat WiGE (3135 Upgrade)|
-Pandion Combat WiGE (3140 Upgrade)|
-Boreas Cavalry Hovercraft A|
-Boreas Cavalry Hovercraft B|
-Boreas Cavalry Hovercraft (Prime)|
-Hoodling Sensor HoverJeep (Standard)|
-HoverPod (Standard)|
-JI-002 HoverBike (Standard)|
-Harpoon ParaSub (Standard)|
-Small Steamer (Standard)|
-HTE Micro-Copter (Standard)|
-Assuan Armored Bike (Standard)|
-Beast Riot Car (Standard)|
-Death Trike (Standard)|
-Dune Buggy (Standard)|
-Eagre Firefighting ATV (Standard)|
-Tracked Quad (Standard)|
-Mobile Tactical Command HQ (Standard)|
-Shackleton AESV (Standard)|
-Estevez MBT (Anti-Aircraft)|
-Estevez MBT (Standard)|
-Marsden I|
-Praetorian Mobile Strategic Command HQ (Standard)|
-Tribune Mobile Tactical Command HQ (Standard)|
-Kokou Defense Tank (XL)|
-Kokou Defense Tank|
-Manticore Heavy Tank EC|
-Rhino Fire Support Tank EC|
-Zephyr Hovertank EC|
-Apocalypse World Rover (Standard)|
-Generic Expandable Services Vehicle (Command Post)|
-Generic Expandable Services Vehicle (Field Kitchen)|
-Generic Expandable Services Vehicle (MASH)|
-Generic Expandable Services Vehicle Trailer (Bunk)|
-Generic Expandable Services Vehicle Trailer (Cargo)|
-Heavy Combat ATV (Standard)|
-Obuzaabaa Tactical Vehicle (Standard)|
-Sasayaku Control Transport (Standard)|
-Apple-Churchill Surveillance VTOL (Standard)|
-C-85 Sprinter Delivery Vehicle (Standard)|
-Hector Road Train Tractor (Standard)|
-Hector Road Train Trailer Module (Liquid)|
-Hector Road Train Trailer Module (Livestock)|
-Hector Road Train Trailer Module (Passenger)|
-Hector Road Train Trailer Module (Refrigerated)|
-Hector Road Train Trailer Module (Standard)|
-Ibex RV (Militarized:Gauss)|
-Ibex RV (Militarized:MG)|
-Ibex RV (Standard)|
-Ballista Self-Propelled Artillery Tank (Standard)|
-Pollux ADA Heavy Tank (Standard)|
-Vali Artillery Vehicle (Standard)|
-Vector Combat Support VTOL (Attack)|
-Vector Combat Support VTOL (EW)|
-Vector Combat Support VTOL (Scout)|
-Vector Combat Support VTOL (Standard)|
-Weapon Carrier (Tracked) (AC/20)|
-Weapon Carrier (Tracked) (LB-10X)|
-Weapon Carrier (Tracked) (Ultra/5)|
-Gallant Urban Assault Tank (Standard)|
-Hipparch Cavalry Tank (Standard)|
-Tiger Medium Tank T-12|
-Wayland Mobile Base (Standard)|
-Sleipnir APC Tank (SRM)|
-Sleipnir APC Tank (Standard)|
-Vargr APC Tank (LRM)|
-Vargr APC Tank (Standard)|
-Bulldog Medium Tank (Chemical)|
-Bulldog Medium Tank (ERLL)|
-Bulldog Medium Tank (LB-X)|
-Bulldog Medium Tank (Plasma)|
-Demolisher Heavy Tank (Arrow IV)|
-Demolisher Heavy Tank (Cell)|
-Demolisher Heavy Tank (Clan)|
-Demolisher Heavy Tank (Gauss)|
-Demolisher Heavy Tank (MRM)|
-Demolisher Heavy Tank (Reinforced)|
-Pegasus Scout Hover Tank (Upgrade)|
-Hoverbike (Laser)|
-Hoverbike (MG)|
-Hoverbike|
-Minigun Cycle (SRM)|
-Minigun Cycle|
-Monocycle|
-Scout ATV|
-TrackBike|
-Trike|
-Prime Mover (Original)|
-Prime Mover (Succession Wars)|
-Prime Mover|
-Sturmvogel Gunship WiGE|
-Sturmvogel Maritime Patrol WiGE (LB-10X)|
-Sturmvogel Maritime Patrol WiGE (LB-2X)|
-Sturmvogel Maritime Patrol WiGE|
-Wheeled Scout (Camera)|
-Wheeled Scout (Sensors)|
-Wheeled Scout|
-Brunel Dump Truck (AC)|
-Brunel Dump Truck (LRM)|
-Burke Defense Tank (Royal)|
-Flatbed Truck (LRM)|
-Flatbed Truck (RL)|
-Galleon Light Tank GAL-200 (RL)|
-Kanga Medium Hovertank (AC)|
-Marksman Artillery Vehicle (AC)|
-Rotunda Scout Vehicle RND-J-1-11 (LRM)|
-Rotunda Scout Vehicle RND-J-1-11 (RL)|
-Rotunda Scout Vehicle RND-J-1-11 (SRM)|
-Thor Artillery Vehicle (AC)|
-Von Luckner Heavy Tank (Royal)|
-Von Luckner Heavy Tank (Star League)|
-Aithon Assault Transport (Standard)|
-Bandit Hovercraft Mk 2|
-Cavalry Attack Helicopter (Infiltrator)|
-Challenger MBT Mk. XV|
-Enyo Strike Tank (ER Pulse)|
-Fulcrum Heavy HoverTank (Hybrid)|
-Garuda Heavy VTOL (Standard)|
-Heavy NLRM Carrier (Standard)|
-Hephaestus Jump Tank (AP)|
-Hephaestus Jump Tank (Standard)|
-Hiryo Armored Infantry Transport 'BloodHound'|
-Hunter Light Support Tank (Amphibious)|
-Kalki Cruise Missile Launcher (Standard)|
-Lexan Surveillance VTOL (Production)|
-Myrmidon Medium Tank (Anti-Infantry)|
-Nishikigoi Support Aircraft Koi Variant|
-Nuberu Anti Aircraft Tank 2 'Numantia'|
-Nuberu Anti Aircraft Tank (Standard)|
-Ontos Heavy Tank HEAT|
-Pegasus Scout Hover Tank X-Pulse|
-Phalanx Support Tank (Production)|
-Phalanx Support Tank (Prototype)|
-Po Heavy Tank (HV)|
-Rommel Tank (Howitzer) Production|
-Scorpion Light Tank (Minesweeper)|
-Sea Skimmer Hydrofoil (ELRM)|
-Skulker Wheeled Scout Tank Mk II (Standard)|
-Sokar Urban Combat Unit (Standard)|
-Thumper Artillery Vehicle Angel|
-Vedette Medium Tank V7|
-Vidar Heavy Defense Tank (Standard)|
-Warrior Stealth Helicopter S-9|
-SM5 Field Commander Prime|
-Packrat LRPV PKR-T5 (TOC)|
-Auxiliary Defense Tank ADT-1|
-Desert Scorpion Light Tank (Standard)|
-Outrider (Standard)|
-Bayamo Hoverbike (Standard)|
-BFFL 'Buffalo' (Standard)|
-Champion Hoversports Crimson Streak Hover Racer (Standard)|
-Champion Hoversports CS535 Hover Car (Standard)|
-Deusenberg VIP Luxury Hovercar (Standard)|
-Deusenberg VIP Luxury Hovercar (Original)|
-Freedom 900 Hover Jeep (Standard)|
-Ina-du Swamp Skimmer (Standard)|
-Kressly Dillinger Police Vehicle (Standard)|
-Lewis Skimmer Bus (Standard)|
-Routemaster Hover Shuttle (Standard)|
-Slipper Hovercar LX-Series (Standard)|
-Baleena Passenger Submarine (Standard)|
-Jonah Submarine JN-002|
-Seahorse Cargo Sub (Standard)|
-Atlantia Luxury Yacht (Standard)|
-Silverback Coastal Cutter (Standard)|
-Silverfin Coastal Cutter (Standard)|
-Whitestreak Jetski (Standard)|
-Whitestreak Speedboat (Standard)|
-Adelante Passenger/Cargo Train (Standard)|
-TGV Omni Railcar Primary Configuration|
-Cellco Ranger UPU-3000|
-Corx Mobile Tunnel Miner (Standard)|
-Croyle Systems Cortez Series N (Standard)|
-Donovan-Miter Magellan Series Four (Standard)|
-Galaport Ground Trailer (Standard)|
-Galaport Ground Tug (Standard)|
-Gienah-Durapaq Elite Land Train (Tractor) Series 3|
-Gienah-Durapaq Elite Land Train (Trailer) Series 3T|
-Hesiod Utility Vehicle B (Bulldozer)|
-Hesiod Utility Vehicle Prime (Cargo)|
-Hesiod Utility Vehicle C (Crane)|
-Hesiod Utility Vehicle A (Harvester)|
-Kallon UL-series Construction Vehicle UL-10 'Backhoe'|
-Luciano White Wolverine (Standard)|
-Raptor RRV (Standard)|
-RRV 'Rock Rover' Half-Track (Standard)|
-Saturn Harvester (Standard)|
-Sherpa Armored Truck (MASH)|
-Sherpa Armored Truck (Standard)|
-Blackstone Baronet Passenger VTOL (Standard)|
-Blackstone Pegasus Passenger VTOL (Standard)|
-Cal-Boeing Swiftran RTC-215M (Passenger)|
-Lexan Oceanic Luxury VTOL Series VI|
-Lexan Oceanic Personal VTOL Series II|
-Peacekeeper SWAT Carrier (Standard)|
-Pion-Laurier Cascatelle (Standard)|
-Lama-Deux Firefighting VTOL (Standard)|
-Sky Eye News Helicopter (Standard)|
-SOAR (Standard)|
-St. Christopher Cargo Lifter C1|
-St. Christopher Cargo Lifter C2|
-Aston-Martin Fiver Roadster (Standard)|
-Aston-Martin Fiver Traveler (Standard)|
-Bailey Armored Car (Standard)|
-Brunel Dump Truck (Standard)|
-Bulldog Medium Truck (Standard)|
-Ceres-Bikes Flashbang ZZ10000|
-Durandel-British 'Blue Nova' Convertible (Standard)|
-Iveco Burro Heavy Support Truck (Standard)|
-Iveco Burro II Super Heavy Cargo Truck (Standard)|
-Knox Armored Car (Standard)|
-Lesseps Dump Truck (Standard)|
-Mao-Heng Charioteer (Original)|
-Motuo Che Shang No.2 (Standard)|
-Pit Bull Medium Truck (Standard)|
-Prairie Schooner Land Train (Standard)|
-Prairie Schooner Module (Standard)|
-Saturnus V Grande Circuit Racer (Standard)|
-Saurer-Bucher Fire Engine TLF-LL6500|
-Simca Ambulance (Standard)|
-Skoda 'Growler' Service Utility Truck (Standard)|
-Coanda Personal Sports Craft (Standard)|
-Cormorant Medium Cargo Craft (Cargo)|
-Cormorant Medium Cargo Craft (Standard)|
-Fulmar Patrol Craft (Original)|
-Fulmar Patrol Craft (Standard)|
-Koi Heavy Transport (Standard)|
-Quicksilver Personal Sports Craft (Standard)|
-Ryu Heavy Transport (Standard)|
-Koryu Submarine (Civilian)|
-Koryu Submarine (Military)|
-Neptune Submarine (Hunter-Killer)|
-Heavy Weapons Carrier (PPC)|
-Tokugawa Heavy Tank SD2|
-SturmFeur Heavy Tank (WoB)|
-Pollux II ADA Heavy Tank (Standard)|
-Flatbed Railcar (Standard)|
-Goblin Medium Tank X|
-Heavy LRM Carrier (EN Variant)|
-Jagdpanzer II (Standard)|
-Lexan Surveillance Helo (Standard)|
-Sea Hunter Maritime Tank (Standard)|
-Athena Combat Vehicle XR|
-Enyo Strike Tank XR|
-Demon Tank CX-2|
-Fury Command Tank CX-17|
-Lightning Attack Hovercraft CX-3|
-Maxim Flanker (Standard)|
-Partisan Hull Defense (Standard)|
-Sea Skimmer Hydrofoil 'Sniper'|
-Skulker Wheeled Scout Tank X-5|
-SturmFeur 'Kalki' Cruise Missile Launcher (Standard)|
-Cavalry Attack Helicopter Cadence Rain|
-Challenger MBT XVc|
-Fulcrum Heavy HoverTank X|
-Bandit Hovercraft 'Warthog'|
-Manticore 'The Ballista'|
-Minion Advanced Tactical Vehicle 'Silver Bullet'|
-Beagle Hover Scout (LRRP)|
-Burke II Superheavy Tank (Standard)|
-Cyrano Gunship (Fury)|
-Rhino Fire Support Tank (Hagar)|
-Hiryo Armored Infantry Transport 'Hound'|
-Pegasus Scout Hover Tank X|
-Tokugawa Heavy Tank Yumi|
-Po Heavy Tank (HV Prototype)|
-Regulator Hovertank (Alan)|
-Scorpion Light Tank (Minesweeper Prototype)|
-Galleon Light Tank Maxwell|
-Thumper Artillery Vehicle Maxwell|
-Kanga-X Jump Tank (Standard)|
-Schrek II-X PPC Carrier (Standard)|
-Vedette Medium Tank V-G7X|
-Warrior Attack Helicopter HX-9|
-Fensalir Combat WiGE (XXL)|
-Harasser Missile Platform (Fuel Cell)|
-Hawk Moth Gunship 'Vedwandlung'|
-Karnov UR Transport (Heavy Stealth)|
-Von Luckner Heavy Tank VNL-X71 (Yakuza)|
-Danai Support Vehicle Arrow|
-Dreadnought Mk II Land Trailer Configuration #1|
-Dreadnought Mk II Land Trailer Configuration #2|
-Dreadnought Mk II Land Trailer Configuration #3|
-Dreadnought Mk II Land Trailer Configuration #4|
-Dreadnought Mk II Land Train (Standard)|
-Patton Tank-SB|
-Saladin Assault Hover Tank Ifrit|
-Ferret Light Scout VTOL 'Fermi'|
-Hi-Scout Drone Carrier (Cunnington)|
-Packrat LRPV 'Gespenst'|
-SM1 Tank Destroyer (Telos)|
-Anhur (P-Stealth)|
-Myrmidon Medium Tank P (Tate)|
-Ontos Heavy Tank X 'All-Aspect Assault Tank'|
-Striker Light Tank 'Wet Striker'|
-Armored Personnel Carrier (Hover Primitive)|
-Armored Personnel Carrier (Tracked Primitive)|
-Armored Personnel Carrier (Wheeled Primitive)|
-Merkava Heavy Tank Mk VI|
-Sand Devil Hover Tank (Standard)|
-Stoat Scout Car (Standard)|
-AC/2 Carrier (Primitive)|
-LRM Carrier (Primitive)|
-LTV-4 Hover Tank (Standard)|
-Mosquito Light Fighter (Standard)|
-Randolph Support Vehicle (Standard)|
-SRM Carrier (Primitive)|
-Strike Falcon Attack VTOL (Standard)|
-Alacorn Heavy Tank Mk I|
-Alacorn Heavy Tank Mk II|
-Caravan Heavy Transport (Standard)|
-Carter Medical Emergency Response Vehicle (Standard)|
-Korvin Tank KRV-2|
-Chi-Ha Infantry Combat Vehicle (Original)|
-Chi-Ha Infantry Combat Vehicle (Standard)|
-Cobra VTOL Transport (Fusion)|
-Cobra VTOL Transport (Standard)|
-Sturmblitz Assault Gun (Standard)|
-Apostle Self-Propelled Artillery (Standard)|
-Asher Hover Scout (Standard)|
-Dunning Mobile Tactical Command Post (Standard)|
-Reaper Self-Propelled Artillery (Standard)|
-RR-3 Recovery Vehicle (Standard)|
-UTR-588 Recovery Vehicle (Standard)|
-Condor Multi-Purpose Tank (Reactive)|
-Condor Multi-Purpose Tank (Standard)|
-Diggs Drone Control Tank (Standard)|
-Hexareme HQ Hovercraft (Standard)|
-Quaestor Mobile Tactical Command HQ (Standard)|
-Strix Stealth VTOL (Standard)|
-Zephyr Hovertank (Omnidrone) A|
-Zephyr Hovertank (Omnidrone) B|
-Zephyr Hovertank (Omnidrone) C|
-Zephyr Hovertank (Omnidrone) Prime|
-Padilla Anti-Missile Tank (Standard)|
-Barouche Military Transport (Standard)|
-Humming Bird VTOL (Rescue)|
-Hwacha Urban Combat Vehicle HW1|
-Nike Air Defense Platform (Standard)|
-White Tip Submarine (Standard)|
-Centipede Scout Car Commando|
-Demolisher II Heavy Tank II-X|
-Rommel Tank (Howitzer) Prototype|
-Buffalo Drone Bomb (Standard)|
-Condor Heavy Hover Tank (Fission)|
-J. Edgar Light Hover Tank (Cell)|
-Kestrel VTOL (Scout)|
-Soarece Superheavy MBT (Standard)|
-Aegis Heavy Cruiser (2843)|
-Black Lion II Battlecruiser (2843)|
-Cameron Battlecruiser (2851)|
-Carrack Transport (Merchant 2985)|
-Congress Frigate (2914)|
-Essex II Destroyer (2862)|
-Fredasa Corvette Raider (2962)|
-Liberator Cruiser (3024)|
-Lola III Destroyer (2841)|
-McKenna Battleship (2851)|
-Nightlord Battleship (2932)|
-Potemkin Troop Cruiser (2875)|
-Sovetskii Soyuz Heavy Cruiser (2845)|
-Sovetskii Soyuz Heavy Cruiser (Dire Wolf) (2845)|
-Texas Battleship (2835)|
-Vincent Corvette Mk 42|
-Volga Transport (2836)|
-Whirlwind Destroyer (2901)|
-York Destroyer Carrier (2947)|
-Aegis Heavy Cruiser (2372)|
-Aegis Heavy Cruiser (2582)|
-Atreus Battleship (2552)|
-Avatar Heavy Cruiser (2531)|
-Baron Destroyer (2520)|
-Black Lion II Battlecruiser (2691)|
-Bonaventure Corvette (2317)|
-Cameron Battlecruiser (2688)|
-Carrack Transport (2600)|
-Carson Destroyer (2632)|
-Congress Frigate (2542)|
-Dart Light Cruiser (2305)|
-Davion Destroyer Block I|
-Davion Destroyer Block II|
-Essex II Destroyer (2711)|
-Farragut Battleship (2448)|
-Fox Corvette (3057)|
-Impavido Destroyer (3058)|
-Kimagure Pursuit Cruiser (2582)|
-Kirishima Cruiser (3061)|
-Kyushu Frigate (3057)|
-Lola I Destroyer (2345)|
-Lola II Destroyer (2622)|
-Lola III Destroyer (2662)|
-Luxor Heavy Cruiser (2727)|
-Mako Corvette (2692)|
-McKenna Battleship (2652)|
-Monsoon Battleship (2368)|
-Monsoon Battleship (LF) (2574)|
-Naga Destroyer (2645)|
-Nightwing Surveillance (2447)|
-Pinto Corvette (2502)|
-Potemkin Troop Cruiser (2611)|
-Quixote Frigate (2350)|
-Riga Frigate (2440)|
-Sovetskii Soyuz Heavy Cruiser (2742)|
-Suffren Destroyer (3062)|
-Sylvester Transport (2499)|
-Texas Battleship (2618)|
-Tracker Surveillance (2407)|
-Vigilant Corvette (2320)|
-Vincent Corvette Mk 39|
-Volga Transport (2709)|
-Wagon Wheel Frigate (2570)|
-Whirlwind Destroyer (2606)|
-Winchester Cruiser (2364)|
-Carrack Transport (Clan)|
-Conqueror Battlecruiser Carrier (Standard)|
-Leviathan Heavy Transport (Standard)|
-Leviathan II Battleship (Standard)|
-Dante Frigate (Standard)|
-Avalon Cruiser (Standard)|
-Inazuma Corvette (Standard)|
-Tatsumaki Destroyer (Standard)|
-Feng Huang Cruiser (Upgrade)|
-Feng Huang Cruiser (Standard)|
-Agamemnon Heavy Cruiser (Standard)|
-Eagle Frigate (Standard)|
-Thera Carrier (Standard)|
-Zechetinu Corvette (Standard)|
-Zechetinu II Corvette (Standard)|
-Mjolnir Battlecruiser (Standard)|
-Du Shi Wang Battleship (Standard)|
-Robinson Transport Block I|
-Robinson Transport Block II|
-Samarkand Carrier Block I|
-Samarkand Carrier Block II|
-Tharkad Battlecruiser (2690)|
-Tharkad Battlecruiser (WoB)|
-Newgrange III Yardship (2700)|
-Quicksilver Mongoose Battleship (Standard)|
-Black Lion I Battlecruiser|
-Soyal Heavy Cruiser (Standard)|
-Congress D Frigate (Standard)|
-Defender Battlecruiser (Standard)|
-Cruiser (Standard)|
-Narukami Destroyer (Block I)|
-Narukami Destroyer (Block II)|
-League Destroyer (Block I)|
-League Destroyer (Block II)|
-Athena Cruiser (2569)|
-Essex I Destroyer (2351)|
-Riga II Destroyer/Carrier (2747)|
-Commonwealth Light Cruiser (Block I)|
-Commonwealth Light Cruiser (Block II)|
-Corone Destroyer (2915)|
-Molniya Corvette (2951)|
-Peregrine Corvette (2969)|
-Capital Drone M-5 'Caspar'|
-Capital Drone M-5C 'Caspar'|
-Stefan Amaris Battleship (Standard)|
-Concordat Frigate (2506)|
-Dreadnought Battleship (2330)|
-New Syrtis Carrier (2557)|
-Bug-Eye Surveillance Ship (Standard)|
-Faslane Yardship (Standard)|
-Newgrange Yardship (Standard)|
-Newgrange III Yardship 'Eyrines'|
-Naga Destroyer (Caspar II Control Ship)|
-Conestoga Transport Jumpship|
-Mingo|
-Kimagure Pursuit Cruiser (Surprise)|
-Leviathan III Battleship (Standard)|
+MegaMek Official Unit List
+This file can be regenerated with java -jar MegaMek.jar -oul
+Format is: Chassis Model|
+Achileus Light Battle Armor [David](Sqd4)|
+Achileus Light Battle Armor [Flamer](Sqd4)|
+Achileus Light Battle Armor [Laser](Sqd4)|
+Achileus Light Battle Armor [MG](Sqd4)|
+Achileus Light Battle Armor [TAG](Sqd4)|
+Achileus Light Battle Armor (WoB)(Sqd4)|
+Achileus Light Battle Armor [David](Sqd5)|
+Achileus Light Battle Armor [Flamer](Sqd5)|
+Achileus Light Battle Armor [Laser](Sqd5)|
+Achileus Light Battle Armor [MG](Sqd5)|
+Achileus Light Battle Armor [TAG](Sqd5)|
+Achileus Light Battle Armor (WoB)(Sqd5)|
+Achileus Light Battle Armor [David](Sqd6)|
+Achileus Light Battle Armor [Flamer](Sqd6)|
+Achileus Light Battle Armor [Laser](Sqd6)|
+Achileus Light Battle Armor [MG](Sqd6)|
+Achileus Light Battle Armor [TAG](Sqd6)|
+Achileus Light Battle Armor (WoB)(Sqd6)|
+Cavalier Battle Armor [Flamer](Sqd4)|
+Cavalier Battle Armor [Flamer](Sqd5)|
+Cavalier Battle Armor [Flamer](Sqd6)|
+Cavalier Battle Armor [Laser](Sqd4)|
+Cavalier Battle Armor [Laser](Sqd5)|
+Cavalier Battle Armor [Laser](Sqd6)|
+Cavalier Battle Armor [MG](Sqd4)|
+Cavalier Battle Armor [MG](Sqd5)|
+Cavalier Battle Armor [MG](Sqd6)|
+Cavalier Battle Armor [SRM](Sqd4)|
+Cavalier Battle Armor [SRM](Sqd5)|
+Cavalier Battle Armor [SRM](Sqd6)|
+Elemental Battle Armor (Headhunter)(Sqd4)|
+Elemental Battle Armor (Headhunter)(Sqd5)|
+Elemental Battle Armor (Headhunter)(Sqd6)|
+Elemental Battle Armor [AP Gauss](Sqd3)|
+Elemental Battle Armor [AP Gauss](Sqd4)|
+Elemental Battle Armor [AP Gauss](Sqd5)|
+Elemental Battle Armor [AP Gauss](Sqd6)|
+Elemental Battle Armor [ER Laser](Sqd3)|
+Elemental Battle Armor [ER Laser](Sqd4)|
+Elemental Battle Armor [ER Laser](Sqd5)|
+Elemental Battle Armor [ER Laser](Sqd6)|
+Elemental Battle Armor [Flamer](Sqd3)|
+Elemental Battle Armor [Flamer](Sqd4)|
+Elemental Battle Armor [Flamer](Sqd5)|
+Elemental Battle Armor [Flamer](Sqd6)|
+Elemental Battle Armor [HMG](Sqd3)|
+Elemental Battle Armor [HMG](Sqd4)|
+Elemental Battle Armor [HMG](Sqd5)|
+Elemental Battle Armor [HMG](Sqd6)|
+Elemental Battle Armor [Laser](Sqd3)|
+Elemental Battle Armor [Laser](Sqd4)|
+Elemental Battle Armor [Laser](Sqd5)|
+Elemental Battle Armor [Laser](Sqd6)|
+Elemental Battle Armor [MG](Sqd3)|
+Elemental Battle Armor [MG](Sqd4)|
+Elemental Battle Armor [MG](Sqd5)|
+Elemental Battle Armor [MG](Sqd6)|
+Elemental Battle Armor [MicroPL](Sqd3)|
+Elemental Battle Armor [MicroPL](Sqd4)|
+Elemental Battle Armor [MicroPL](Sqd5)|
+Elemental Battle Armor [MicroPL](Sqd6)|
+Fa Shih Battle Armor [Flamer](Sqd4)|
+Fa Shih Battle Armor [Flamer](Sqd5)|
+Fa Shih Battle Armor [Flamer](Sqd6)|
+Fa Shih Battle Armor [Laser](Sqd4)|
+Fa Shih Battle Armor [Laser](Sqd5)|
+Fa Shih Battle Armor [Laser](Sqd6)|
+Fa Shih Battle Armor [LRR](Sqd4)|
+Fa Shih Battle Armor [LRR](Sqd5)|
+Fa Shih Battle Armor [LRR](Sqd6)|
+Fa Shih Battle Armor [MG](Sqd4)|
+Fa Shih Battle Armor [MG](Sqd5)|
+Fa Shih Battle Armor [MG](Sqd6)|
+Fa Shih Battle Armor [TAG](Sqd4)|
+Fa Shih Battle Armor [TAG](Sqd5)|
+Fa Shih Battle Armor [TAG](Sqd6)|
+Fenrir Battle Armor [ERML](Sqd4)|
+Fenrir Battle Armor [ERML](Sqd5)|
+Fenrir Battle Armor [ERML](Sqd6)|
+Fenrir Battle Armor [MG](Sqd4)|
+Fenrir Battle Armor [MG](Sqd5)|
+Fenrir Battle Armor [MG](Sqd6)|
+Fenrir Battle Armor [Mortar](Sqd4)|
+Fenrir Battle Armor [Mortar](Sqd5)|
+Fenrir Battle Armor [Mortar](Sqd6)|
+Fenrir Battle Armor [MPL](Sqd4)|
+Fenrir Battle Armor [MPL](Sqd5)|
+Fenrir Battle Armor [MPL](Sqd6)|
+Fenrir Battle Armor [SL](Sqd4)|
+Fenrir Battle Armor [SL](Sqd5)|
+Fenrir Battle Armor [SL](Sqd6)|
+Fenrir Battle Armor [SPL](Sqd4)|
+Fenrir Battle Armor [SPL](Sqd5)|
+Fenrir Battle Armor [SPL](Sqd6)|
+Fenrir Battle Armor [SRM](Sqd4)|
+Fenrir Battle Armor [SRM](Sqd5)|
+Fenrir Battle Armor [SRM](Sqd6)|
+Fenrir Battle Armor [VSP](Sqd4)|
+Fenrir Battle Armor [VSP](Sqd5)|
+Fenrir Battle Armor [VSP](Sqd6)|
+Gnome Battle Armor (Sqd3)|
+Gnome Battle Armor (Sqd4)|
+Gnome Battle Armor (Sqd5)|
+Gnome Battle Armor (Sqd6)|
+Gnome Battle Armor (Upgrade) [Bearhunter](Sqd4)|
+Gnome Battle Armor (Upgrade) [Bearhunter](Sqd5)|
+Gnome Battle Armor (Upgrade) [Bearhunter](Sqd6)|
+Gnome Battle Armor (Upgrade) [MRR](Sqd4)|
+Gnome Battle Armor (Upgrade) [MRR](Sqd5)|
+Gnome Battle Armor (Upgrade) [MRR](Sqd6)|
+Gnome Battle Armor (Upgrade) [Pulse Laser](Sqd4)|
+Gnome Battle Armor (Upgrade) [Pulse Laser](Sqd5)|
+Gnome Battle Armor (Upgrade) [Pulse Laser](Sqd6)|
+Gray Death Scout Suit (Sqd4)|
+Gray Death Scout Suit (Sqd5)|
+Gray Death Scout Suit (Sqd6)|
+Gray Death Standard Suit [Flamer](Sqd4)|
+Gray Death Standard Suit [Flamer](Sqd5)|
+Gray Death Standard Suit [Flamer](Sqd6)|
+Gray Death Standard Suit [Laser](Sqd4)|
+Gray Death Standard Suit [Laser](Sqd5)|
+Gray Death Standard Suit [Laser](Sqd6)|
+Gray Death Standard Suit [LRR](Sqd4)|
+Gray Death Standard Suit [LRR](Sqd5)|
+Gray Death Standard Suit [LRR](Sqd6)|
+Gray Death Standard Suit [MG](Sqd4)|
+Gray Death Standard Suit [MG](Sqd5)|
+Gray Death Standard Suit [MG](Sqd6)|
+Gray Death Standard Suit [SRM](Sqd4)|
+Gray Death Standard Suit [SRM](Sqd5)|
+Gray Death Standard Suit [SRM](Sqd6)|
+Infiltrator Mk. I Battle Armor (Special Ops)(Sqd4)|
+Infiltrator Mk. I Battle Armor (Special Ops)(Sqd5)|
+Infiltrator Mk. I Battle Armor (Special Ops)(Sqd6)|
+Infiltrator Mk. I Battle Armor 'Waddle'(Sqd4)|
+Infiltrator Mk. I Battle Armor 'Waddle'(Sqd5)|
+Infiltrator Mk. I Battle Armor 'Waddle'(Sqd6)|
+Infiltrator Mk. II Battle Armor (Sensor)(Sqd4)|
+Infiltrator Mk. II Battle Armor (Sensor)(Sqd5)|
+Infiltrator Mk. II Battle Armor (Sensor)(Sqd6)|
+Infiltrator Mk. II Battle Armor 'Puma'(Sqd4)|
+Infiltrator Mk. II Battle Armor 'Puma'(Sqd5)|
+Infiltrator Mk. II Battle Armor 'Puma'(Sqd6)|
+IS Standard Battle Armor [Flamer](Sqd4)|
+IS Standard Battle Armor [Flamer](Sqd5)|
+IS Standard Battle Armor [Flamer](Sqd6)|
+IS Standard Battle Armor [Laser](Sqd4)|
+IS Standard Battle Armor [Laser](Sqd5)|
+IS Standard Battle Armor [Laser](Sqd6)|
+IS Standard Battle Armor [LRR](Sqd4)|
+IS Standard Battle Armor [LRR](Sqd5)|
+IS Standard Battle Armor [LRR](Sqd6)|
+IS Standard Battle Armor [MG](Sqd4)|
+IS Standard Battle Armor [MG](Sqd5)|
+IS Standard Battle Armor [MG](Sqd6)|
+IS Standard Battle Armor [SRM](Sqd4)|
+IS Standard Battle Armor [SRM](Sqd5)|
+IS Standard Battle Armor [SRM](Sqd6)|
+Kage Light Battle Armor (DEST)(Sqd4)|
+Kage Light Battle Armor (DEST)(Sqd5)|
+Kage Light Battle Armor (DEST)(Sqd6)|
+Kage Light Battle Armor (Vibro-Claw)(Sqd4)|
+Kage Light Battle Armor (Vibro-Claw)(Sqd5)|
+Kage Light Battle Armor (Vibro-Claw)(Sqd6)|
+Kage Light Battle Armor [ECM](Sqd4)|
+Kage Light Battle Armor [ECM](Sqd5)|
+Kage Light Battle Armor [ECM](Sqd6)|
+Kage Light Battle Armor [Flamer](Sqd4)|
+Kage Light Battle Armor [Flamer](Sqd5)|
+Kage Light Battle Armor [Flamer](Sqd6)|
+Kage Light Battle Armor [Laser](Sqd4)|
+Kage Light Battle Armor [Laser](Sqd5)|
+Kage Light Battle Armor [Laser](Sqd6)|
+Kage Light Battle Armor [MG](Sqd4)|
+Kage Light Battle Armor [MG](Sqd5)|
+Kage Light Battle Armor [MG](Sqd6)|
+Kage Light Battle Armor [TAG](Sqd4)|
+Kage Light Battle Armor [TAG](Sqd5)|
+Kage Light Battle Armor [TAG](Sqd6)|
+Kanazuchi Assault Battle Armor (Upgrade) [Battle Claw](Sqd4)|
+Kanazuchi Assault Battle Armor (Upgrade) [Battle Claw](Sqd5)|
+Kanazuchi Assault Battle Armor (Upgrade) [Battle Claw](Sqd6)|
+Kanazuchi Assault Battle Armor [Battle Claw](Sqd4)|
+Kanazuchi Assault Battle Armor [Battle Claw](Sqd5)|
+Kanazuchi Assault Battle Armor [Battle Claw](Sqd6)|
+Kanazuchi Assault Battle Armor [Industrial Drill](Sqd4)|
+Kanazuchi Assault Battle Armor [Industrial Drill](Sqd5)|
+Kanazuchi Assault Battle Armor [Industrial Drill](Sqd6)|
+Kanazuchi Assault Battle Armor [Salvage Arm](Sqd4)|
+Kanazuchi Assault Battle Armor [Salvage Arm](Sqd5)|
+Kanazuchi Assault Battle Armor [Salvage Arm](Sqd6)|
+Longinus Battle Armor [David](Sqd4)|
+Longinus Battle Armor [David](Sqd5)|
+Longinus Battle Armor [David](Sqd6)|
+Longinus Battle Armor [Flamer](Sqd4)|
+Longinus Battle Armor [Flamer](Sqd5)|
+Longinus Battle Armor [Flamer](Sqd6)|
+Longinus Battle Armor [Laser](Sqd4)|
+Longinus Battle Armor [Laser](Sqd5)|
+Longinus Battle Armor [Laser](Sqd6)|
+Longinus Battle Armor [MG](Sqd4)|
+Longinus Battle Armor [MG](Sqd5)|
+Longinus Battle Armor [MG](Sqd6)|
+Purifier Adaptive Battle Armor [Laser](Sqd4)|
+Purifier Adaptive Battle Armor [Laser](Sqd5)|
+Purifier Adaptive Battle Armor [Laser](Sqd6)|
+Purifier Adaptive Battle Armor [Narc](Sqd4)|
+Purifier Adaptive Battle Armor [Narc](Sqd5)|
+Purifier Adaptive Battle Armor [Narc](Sqd6)|
+Purifier Adaptive Battle Armor [PPC](Sqd4)|
+Purifier Adaptive Battle Armor [PPC](Sqd5)|
+Purifier Adaptive Battle Armor [PPC](Sqd6)|
+Purifier Adaptive Battle Armor [TAG](Sqd4)|
+Purifier Adaptive Battle Armor [TAG](Sqd5)|
+Purifier Adaptive Battle Armor [TAG](Sqd6)|
+Raiden Battle Armor (Original)(Sqd4)|
+Raiden Battle Armor (Original)(Sqd5)|
+Raiden Battle Armor (Original)(Sqd6)|
+Raiden Battle Armor [Flamer](Sqd4)|
+Raiden Battle Armor [Flamer](Sqd5)|
+Raiden Battle Armor [Flamer](Sqd6)|
+Raiden Battle Armor [Laser](Sqd4)|
+Raiden Battle Armor [Laser](Sqd5)|
+Raiden Battle Armor [Laser](Sqd6)|
+Raiden Battle Armor [MG](Sqd4)|
+Raiden Battle Armor [MG](Sqd5)|
+Raiden Battle Armor [MG](Sqd6)|
+Raiden Battle Armor [MRM](Sqd4)|
+Raiden Battle Armor [MRM](Sqd5)|
+Raiden Battle Armor [MRM](Sqd6)|
+Raiden Battle Armor [Tsunami](Sqd4)|
+Raiden Battle Armor [Tsunami](Sqd5)|
+Raiden Battle Armor [Tsunami](Sqd6)|
+Salamander Battle Armor (Anti-Infantry)(Sqd4)|
+Salamander Battle Armor (Anti-Infantry)(Sqd5)|
+Salamander Battle Armor (Anti-Infantry)(Sqd6)|
+Salamander Battle Armor (Laser)(Sqd4)|
+Salamander Battle Armor (Laser)(Sqd5)|
+Salamander Battle Armor (Laser)(Sqd6)|
+Salamander Battle Armor (Sqd3)|
+Salamander Battle Armor (Sqd4)|
+Salamander Battle Armor (Sqd5)|
+Salamander Battle Armor (Sqd6)|
+Sloth Battle Armor (Sqd4)|
+Sloth Battle Armor (Sqd5)|
+Sloth Battle Armor (Sqd6)|
+Sylph Battle Armor (Sqd4)|
+Sylph Battle Armor (Sqd5)|
+Sylph Battle Armor (Sqd6)|
+Sylph Battle Armor (Upgrade)(Sqd4)|
+Sylph Battle Armor (Upgrade)(Sqd5)|
+Sylph Battle Armor (Upgrade)(Sqd6)|
+Undine Battle Armor (Sqd4)|
+Undine Battle Armor (Sqd5)|
+Undine Battle Armor (Sqd6)|
+Undine Battle Armor (Upgrade)(Sqd4)|
+Undine Battle Armor (Upgrade)(Sqd5)|
+Undine Battle Armor (Upgrade)(Sqd6)|
+Aerie PA(L) (Salvage)(Sqd4)|
+Aerie PA(L) (Salvage)(Sqd5)|
+Aerie PA(L) (Salvage)(Sqd6)|
+Aerie PA(L) (Sqd4)|
+Aerie PA(L) (Sqd5)|
+Aerie PA(L) (Sqd6)|
+Afreet Medium Battle Armor (Hell's Horses)(Sqd4)|
+Afreet Medium Battle Armor (Hell's Horses)(Sqd5)|
+Afreet Medium Battle Armor (Hell's Horses)(Sqd6)|
+Afreet Medium Battle Armor (Jade Falcon)(Sqd4)|
+Afreet Medium Battle Armor (Jade Falcon)(Sqd5)|
+Afreet Medium Battle Armor (Jade Falcon)(Sqd6)|
+Afreet Medium Battle Armor (Sqd4)|
+Afreet Medium Battle Armor (Sqd5)|
+Afreet Medium Battle Armor (Sqd6)|
+Asura Medium Battle Armor (Anti-Infantry)(Sqd4)|
+Asura Medium Battle Armor (Anti-Infantry)(Sqd5)|
+Asura Medium Battle Armor (Anti-Infantry)(Sqd6)|
+Asura Medium Battle Armor (SRM)(Sqd4)|
+Asura Medium Battle Armor (SRM)(Sqd5)|
+Asura Medium Battle Armor (SRM)(Sqd6)|
+Asura Medium Battle Armor (Sqd4)|
+Asura Medium Battle Armor (Sqd5)|
+Asura Medium Battle Armor (Sqd6)|
+Clan Medium Battle Armor (Naval) 'Bar' (Sqd4)|
+Clan Medium Battle Armor (Naval) 'Bar' (Sqd5)|
+Clan Medium Battle Armor (Naval) 'Bar' (Sqd6)|
+Clan Medium Battle Armor (Rabid)(Sqd4)|
+Clan Medium Battle Armor (Rabid)(Sqd5)|
+Clan Medium Battle Armor (Rabid)(Sqd6)|
+Clan Medium Battle Armor (Laser) 'Volk' (Sqd4)|
+Clan Medium Battle Armor (Laser) 'Volk' (Sqd5)|
+Clan Medium Battle Armor (Laser) 'Volk' (Sqd6)|
+Corona Heavy Battle Armor (Sqd4)|
+Corona Heavy Battle Armor (Sqd5)|
+Corona Heavy Battle Armor (Sqd6)|
+Corona Heavy Battle Armor (SRM) (Sqd4)|
+Corona Heavy Battle Armor (SRM) (Sqd5)|
+Corona Heavy Battle Armor (SRM) (Sqd6)|
+Djinn Battle Armor (Sqd4)|
+Djinn Battle Armor (Sqd5)|
+Djinn Battle Armor (Sqd6)|
+Djinn Battle Armor (Stealth) (Sqd4)|
+Djinn Battle Armor (Stealth) (Sqd5)|
+Djinn Battle Armor (Stealth) (Sqd6)|
+Golem Assault Armor (Fast Assault)(Sqd4)|
+Golem Assault Armor (Fast Assault)(Sqd5)|
+Golem Assault Armor (Fast Assault)(Sqd6)|
+Golem Assault Armor (Rock Golem)(Sqd4)|
+Golem Assault Armor (Rock Golem)(Sqd5)|
+Golem Assault Armor (Rock Golem)(Sqd6)|
+Golem Assault Armor (Sqd4)|
+Golem Assault Armor (Sqd5)|
+Golem Assault Armor (Sqd6)|
+Grenadier Battle Armor (Hunter-Killer) [MagShot](Sqd4)|
+Grenadier Battle Armor (Hunter-Killer) [MagShot](Sqd5)|
+Grenadier Battle Armor (Hunter-Killer) [MagShot](Sqd6)|
+Grenadier Battle Armor (Hunter-Killer) [NARC](Sqd4)|
+Grenadier Battle Armor (Hunter-Killer) [NARC](Sqd5)|
+Grenadier Battle Armor (Hunter-Killer) [NARC](Sqd6)|
+Grenadier Battle Armor [Flamer](Sqd4)|
+Grenadier Battle Armor [Flamer](Sqd5)|
+Grenadier Battle Armor [Flamer](Sqd6)|
+Grenadier Battle Armor [LRR](Sqd4)|
+Grenadier Battle Armor [LRR](Sqd5)|
+Grenadier Battle Armor [LRR](Sqd6)|
+Grenadier Battle Armor [MagShot](Sqd4)|
+Grenadier Battle Armor [MagShot](Sqd5)|
+Grenadier Battle Armor [MagShot](Sqd6)|
+Grenadier Battle Armor [SRM/SL](Sqd4)|
+Grenadier Battle Armor [SRM/SL](Sqd5)|
+Grenadier Battle Armor [SRM/SL](Sqd6)|
+Grenadier Battle Armor [TAG](Sqd4)|
+Grenadier Battle Armor [TAG](Sqd5)|
+Grenadier Battle Armor [TAG](Sqd6)|
+Hauberk Battle Armor (Sqd4)|
+Hauberk Battle Armor (Sqd5)|
+Hauberk Battle Armor (Sqd6)|
+Hauberk II Battle Armor (Sqd4)|
+Hauberk II Battle Armor (Sqd5)|
+Hauberk II Battle Armor (Sqd6)|
+Kobold Battle Armor [MicroGL/Flamer](Sqd4)|
+Kobold Battle Armor [MicroGL/Flamer](Sqd5)|
+Kobold Battle Armor [MicroGL/Flamer](Sqd6)|
+Kobold Battle Armor [MicroGL/SPL](Sqd4)|
+Kobold Battle Armor [MicroGL/SPL](Sqd5)|
+Kobold Battle Armor [MicroGL/SPL](Sqd6)|
+Kobold Battle Armor [MicroGL/TAG](Sqd4)|
+Kobold Battle Armor [MicroGL/TAG](Sqd5)|
+Kobold Battle Armor [MicroGL/TAG](Sqd6)|
+Kobold Battle Armor [SL/Flamer](Sqd4)|
+Kobold Battle Armor [SL/Flamer](Sqd5)|
+Kobold Battle Armor [SL/Flamer](Sqd6)|
+Kobold Battle Armor [SL/TAG](Sqd6)|
+Kobold Battle Armor [SL/TAG](Sqd4)|
+Kobold Battle Armor [SL/TAG](Sqd5)|
+Nephilim Assault Battle Armor (Capture Team)[HMG](Sqd4)|
+Nephilim Assault Battle Armor (Capture Team)[HMG](Sqd5)|
+Nephilim Assault Battle Armor (Capture Team)[HMG](Sqd6)|
+Nephilim Assault Battle Armor (Gauss)(Sqd4)|
+Nephilim Assault Battle Armor (Gauss)(Sqd5)|
+Nephilim Assault Battle Armor (Gauss)(Sqd6)|
+Nephilim Assault Battle Armor (Narc)(Sqd4)|
+Nephilim Assault Battle Armor (Narc)(Sqd5)|
+Nephilim Assault Battle Armor (Narc)(Sqd6)|
+Nephilim Assault Battle Armor (Seeker) [MG](Sqd4)|
+Nephilim Assault Battle Armor (Seeker) [MG](Sqd5)|
+Nephilim Assault Battle Armor (Seeker) [MG](Sqd6)|
+Nephilim Assault Battle Armor (Support)(Sqd4)|
+Nephilim Assault Battle Armor (Support)(Sqd5)|
+Nephilim Assault Battle Armor (Support)(Sqd6)|
+Nephilim Assault Battle Armor (Plasma)(Sqd4)|
+Nephilim Assault Battle Armor (Plasma)(Sqd5)|
+Nephilim Assault Battle Armor (Plasma)(Sqd6)|
+Nighthawk PA(L) Mk. XXI(Sqd4)|
+Nighthawk PA(L) Mk. XXI(Sqd5)|
+Nighthawk PA(L) Mk. XXI(Sqd6)|
+Nighthawk PA(L) Mk. XXII(Sqd4)|
+Nighthawk PA(L) Mk. XXII(Sqd5)|
+Nighthawk PA(L) Mk. XXII(Sqd6)|
+Phalanx Battle Armor (A)(Sqd4)|
+Phalanx Battle Armor (A)(Sqd5)|
+Phalanx Battle Armor (A)(Sqd6)|
+Phalanx Battle Armor (B)(Sqd4)|
+Phalanx Battle Armor (B)(Sqd5)|
+Phalanx Battle Armor (B)(Sqd6)|
+Phalanx Battle Armor (C)(Sqd4)|
+Phalanx Battle Armor (C)(Sqd5)|
+Phalanx Battle Armor (C)(Sqd6)|
+Rogue Bear Heavy Battle Armor (Sqd4)|
+Rogue Bear Heavy Battle Armor (Sqd5)|
+Rogue Bear Heavy Battle Armor (Sqd6)|
+Rottweiler Battle Armor (Close Combat)(Sqd4)|
+Rottweiler Battle Armor (Close Combat)(Sqd5)|
+Rottweiler Battle Armor (Close Combat)(Sqd6)|
+Rottweiler Battle Armor (Sqd4)|
+Rottweiler Battle Armor (Sqd5)|
+Rottweiler Battle Armor (Sqd6)|
+Rottweiler Battle Armor (Upgrade)(Sqd4)|
+Rottweiler Battle Armor (Upgrade)(Sqd5)|
+Rottweiler Battle Armor (Upgrade)(Sqd6)|
+Se'irim Medium Battle Armor (Anti-Infantry)(Sqd4)|
+Se'irim Medium Battle Armor (Anti-Infantry)(Sqd5)|
+Se'irim Medium Battle Armor (Anti-Infantry)(Sqd6)|
+Se'irim Medium Battle Armor (Capture Team)(Sqd4)|
+Se'irim Medium Battle Armor (Capture Team)(Sqd5)|
+Se'irim Medium Battle Armor (Capture Team)(Sqd6)|
+Se'irim Medium Battle Armor (Sqd4)|
+Se'irim Medium Battle Armor (Sqd5)|
+Se'irim Medium Battle Armor (Sqd6)|
+Shedu Assault Battle Armor (Capture Team)(Sqd4)|
+Shedu Assault Battle Armor (Capture Team)(Sqd5)|
+Shedu Assault Battle Armor (Capture Team)(Sqd6)|
+Shedu Assault Battle Armor (PPC)(Sqd4)|
+Shedu Assault Battle Armor (PPC)(Sqd5)|
+Shedu Assault Battle Armor (PPC)(Sqd6)|
+Shedu Assault Battle Armor (Recon)(Sqd4)|
+Shedu Assault Battle Armor (Recon)(Sqd5)|
+Shedu Assault Battle Armor (Recon)(Sqd6)|
+Shedu Assault Battle Armor (Sqd4)|
+Shedu Assault Battle Armor (Sqd5)|
+Shedu Assault Battle Armor (Sqd6)|
+Shedu Assault Battle Armor (Support)(Sqd4)|
+Shedu Assault Battle Armor (Support)(Sqd5)|
+Shedu Assault Battle Armor (Support)(Sqd6)|
+Tengu Heavy Battle Armor [C3i](Sqd4)|
+Tengu Heavy Battle Armor [C3i](Sqd5)|
+Tengu Heavy Battle Armor [C3i](Sqd6)|
+Tengu Heavy Battle Armor [ML](Sqd4)|
+Tengu Heavy Battle Armor [ML](Sqd5)|
+Tengu Heavy Battle Armor [ML](Sqd6)|
+Tengu Heavy Battle Armor [Plasma](Sqd4)|
+Tengu Heavy Battle Armor [Plasma](Sqd5)|
+Tengu Heavy Battle Armor [Plasma](Sqd6)|
+Tengu Heavy Battle Armor [RL](Sqd4)|
+Tengu Heavy Battle Armor [RL](Sqd5)|
+Tengu Heavy Battle Armor [RL](Sqd6)|
+Tengu Heavy Battle Armor (Support)[LRR](Sqd4)|
+Tengu Heavy Battle Armor (Support)[LRR](Sqd5)|
+Tengu Heavy Battle Armor (Support)[LRR](Sqd6)|
+Tengu Heavy Battle Armor (SVSP)(Sqd4)|
+Tengu Heavy Battle Armor (SVSP)(Sqd5)|
+Tengu Heavy Battle Armor (SVSP)(Sqd6)|
+Tornado PA(L) G12(Sqd4)|
+Tornado PA(L) G12(Sqd5)|
+Tornado PA(L) G12(Sqd6)|
+Tornado PA(L) G13 [David Light Gauss](Sqd4)|
+Tornado PA(L) G13 [David Light Gauss](Sqd5)|
+Tornado PA(L) G13 [David Light Gauss](Sqd6)|
+Tornado PA(L) G13 [Flamer](Sqd4)|
+Tornado PA(L) G13 [Flamer](Sqd5)|
+Tornado PA(L) G13 [Flamer](Sqd6)|
+Tornado PA(L) G13 [Grenade Launcher](Sqd4)|
+Tornado PA(L) G13 [Grenade Launcher](Sqd5)|
+Tornado PA(L) G13 [Grenade Launcher](Sqd6)|
+Tornado PA(L) G13 [Machine Gun](Sqd4)|
+Tornado PA(L) G13 [Machine Gun](Sqd5)|
+Tornado PA(L) G13 [Machine Gun](Sqd6)|
+Tornado PA(L) G13 [Small Laser](Sqd4)|
+Tornado PA(L) G13 [Small Laser](Sqd5)|
+Tornado PA(L) G13 [Small Laser](Sqd6)|
+Tornado PA(L) G14(Sqd4)|
+Tornado PA(L) G14(Sqd5)|
+Tornado PA(L) G14(Sqd6)|
+Tornado PA(L) P12 'Hurricane'(Sqd4)|
+Tornado PA(L) P12 'Hurricane'(Sqd5)|
+Tornado PA(L) P12 'Hurricane'(Sqd6)|
+Trinity Medium Battle Armor (Asterion)[MRR](Sqd4)|
+Trinity Medium Battle Armor (Asterion)[MRR](Sqd5)|
+Trinity Medium Battle Armor (Asterion)[MRR](Sqd6)|
+Trinity Medium Battle Armor (Asterion)[PPC](Sqd4)|
+Trinity Medium Battle Armor (Asterion)[PPC](Sqd5)|
+Trinity Medium Battle Armor (Asterion)[PPC](Sqd6)|
+Trinity Medium Battle Armor (Theseus RL)[LRR](Sqd4)|
+Trinity Medium Battle Armor (Theseus RL)[LRR](Sqd5)|
+Trinity Medium Battle Armor (Theseus RL)[LRR](Sqd6)|
+Trinity Medium Battle Armor (Theseus)[MRR](Sqd4)|
+Trinity Medium Battle Armor (Theseus)[MRR](Sqd5)|
+Trinity Medium Battle Armor (Theseus)[MRR](Sqd6)|
+Trinity Medium Battle Armor (Ying Long)(Plasma)(Sqd4)|
+Trinity Medium Battle Armor (Ying Long)(Plasma)(Sqd5)|
+Trinity Medium Battle Armor (Ying Long)(Plasma)(Sqd6)|
+Void Medium Battle Armor (DCA)(Sqd4)|
+Void Medium Battle Armor (DCA)(Sqd5)|
+Void Medium Battle Armor (DCA)(Sqd6)|
+Void Medium Battle Armor (Nova Cat)(Sqd4)|
+Void Medium Battle Armor (Nova Cat)(Sqd5)|
+Void Medium Battle Armor (Nova Cat)(Sqd6)|
+Void Medium Battle Armor (Sqd4)|
+Void Medium Battle Armor (Sqd5)|
+Void Medium Battle Armor (Sqd6)|
+Angerona Scout Suit (Recon)(Sqd4)|
+Angerona Scout Suit (Recon)(Sqd5)|
+Angerona Scout Suit (Recon)(Sqd6)|
+Angerona Scout Suit (Sqd4)|
+Angerona Scout Suit (Sqd5)|
+Angerona Scout Suit (Sqd6)|
+Ironhold Assault Battle Armor (Fire)(Sqd4)|
+Ironhold Assault Battle Armor (Fire)(Sqd5)|
+Ironhold Assault Battle Armor (Fire)(Sqd6)|
+Ironhold Assault Battle Armor (Sqd4)|
+Ironhold Assault Battle Armor (Sqd5)|
+Ironhold Assault Battle Armor (Sqd6)|
+Kopis Assault Battle Armor (Anti-Infantry)(Sqd4)|
+Kopis Assault Battle Armor (Anti-Infantry)(Sqd5)|
+Kopis Assault Battle Armor (Anti-Infantry)(Sqd6)|
+Kopis Assault Battle Armor 'The Dark Alley'(Sqd4)|
+Kopis Assault Battle Armor 'The Dark Alley'(Sqd5)|
+Kopis Assault Battle Armor 'The Dark Alley'(Sqd6)|
+Ravager Assault Battle Armor (Sqd4)|
+Ravager Assault Battle Armor (Sqd5)|
+Ravager Assault Battle Armor (Sqd6)|
+Thunderbird Battle Armor [AP Gauss](Sqd4)|
+Thunderbird Battle Armor [AP Gauss](Sqd5)|
+Thunderbird Battle Armor [AP Gauss](Sqd6)|
+Thunderbird Battle Armor [ER Laser](Sqd4)|
+Thunderbird Battle Armor [ER Laser](Sqd5)|
+Thunderbird Battle Armor [ER Laser](Sqd6)|
+Thunderbird Battle Armor [Pulse Laser](Sqd4)|
+Thunderbird Battle Armor [Pulse Laser](Sqd5)|
+Thunderbird Battle Armor [Pulse Laser](Sqd6)|
+Warg Assault Battle Armor (Sqd4)|
+Warg Assault Battle Armor (Sqd5)|
+Warg Assault Battle Armor (Sqd6)|
+Afreet Medium Battle Armor (Interdictor)(Sqd4)|
+Afreet Medium Battle Armor (Interdictor)(Sqd5)|
+Afreet Medium Battle Armor (Interdictor)(Sqd6)|
+Clan Medium Battle Armor (Rache)(Sqd4)|
+Clan Medium Battle Armor (Rache)(Sqd5)|
+Clan Medium Battle Armor (Rache)(Sqd6)|
+Elemental Battle Armor (Fire) [AP Gauss](Sqd4)|
+Elemental Battle Armor (Fire) [AP Gauss](Sqd5)|
+Elemental Battle Armor (Fire) [AP Gauss](Sqd6)|
+Elemental Battle Armor (Fire) [Flamer](Sqd4)|
+Elemental Battle Armor (Fire) [Flamer](Sqd5)|
+Elemental Battle Armor (Fire) [Flamer](Sqd6)|
+Elemental Battle Armor (Fire) [MicroPL](Sqd4)|
+Elemental Battle Armor (Fire) [MicroPL](Sqd5)|
+Elemental Battle Armor (Fire) [MicroPL](Sqd6)|
+Elemental Battle Armor (Space) [Flamer](Sqd4)|
+Elemental Battle Armor (Space) [Flamer](Sqd5)|
+Elemental Battle Armor (Space) [Flamer](Sqd6)|
+Elemental Battle Armor (Space) [MG](Sqd4)|
+Elemental Battle Armor (Space) [MG](Sqd5)|
+Elemental Battle Armor (Space) [MG](Sqd6)|
+Elemental Battle Armor (Space) [MicroPL](Sqd4)|
+Elemental Battle Armor (Space) [MicroPL](Sqd5)|
+Elemental Battle Armor (Space) [MicroPL](Sqd6)|
+Fa Shih Battle Armor (Support) [King David](Sqd4)|
+Fa Shih Battle Armor (Support) [King David](Sqd5)|
+Fa Shih Battle Armor (Support) [King David](Sqd6)|
+Fa Shih Battle Armor (Support) [Plasma](Sqd6)|
+Fa Shih Battle Armor (Support) [Plasma](Sqd4)|
+Fa Shih Battle Armor (Support) [Plasma](Sqd5)|
+Gnome Battle Armor (LRM)(Sqd4)|
+Gnome Battle Armor (LRM)(Sqd5)|
+Gnome Battle Armor (LRM)(Sqd6)|
+Golem Assault Armor (Support)(Sqd4)|
+Golem Assault Armor (Support)(Sqd5)|
+Golem Assault Armor (Support)(Sqd6)|
+Gray Death Heavy Suit (Sqd4)|
+Gray Death Heavy Suit (Sqd5)|
+Gray Death Heavy Suit (Sqd6)|
+Infiltrator Mk. II Battle Armor (Magnetic)(Sqd4)|
+Infiltrator Mk. II Battle Armor (Magnetic)(Sqd5)|
+Infiltrator Mk. II Battle Armor (Magnetic)(Sqd6)|
+Kage Light Battle Armor (Space)(Sqd4)|
+Kage Light Battle Armor (Space)(Sqd5)|
+Kage Light Battle Armor (Space)(Sqd6)|
+Longinus Battle Armor (Magnetic)(Sqd4)|
+Longinus Battle Armor (Magnetic)(Sqd5)|
+Longinus Battle Armor (Magnetic)(Sqd6)|
+Nighthawk PA(L) Mk. XXX(Bountry Hunter)(Restored)|
+Nighthawk PA(L) Mk. XXX (Bounty Hunter)(Non-Functional)|
+Nighthawk PA(L) Mk. XXX(Sqd4)|
+Nighthawk PA(L) Mk. XXX(Sqd5)|
+Nighthawk PA(L) Mk. XXX(Sqd6)|
+Raiden Battle Armor (Anti-Infantry)(Sqd4)|
+Raiden Battle Armor (Anti-Infantry)(Sqd5)|
+Raiden Battle Armor (Anti-Infantry)(Sqd6)|
+Rottweiler Battle Armor (Firedrake)(Sqd4)|
+Rottweiler Battle Armor (Firedrake)(Sqd5)|
+Rottweiler Battle Armor (Firedrake)(Sqd6)|
+Sloth Battle Armor (Interdictor)(Sqd4)|
+Sloth Battle Armor (Interdictor)(Sqd5)|
+Sloth Battle Armor (Interdictor)(Sqd6)|
+Trinity Medium Battle Armor (Asterion Upgrade)[MRR](Sqd4)|
+Trinity Medium Battle Armor (Asterion Upgrade)[MRR](Sqd5)|
+Trinity Medium Battle Armor (Asterion Upgrade)[MRR](Sqd6)|
+Trinity Medium Battle Armor (Asterion Upgrade)[PPC](Sqd4)|
+Trinity Medium Battle Armor (Asterion Upgrade)[PPC](Sqd5)|
+Trinity Medium Battle Armor (Asterion Upgrade)[PPC](Sqd6)|
+Trinity Medium Battle Armor (Theseus Support)'Killshot'(Sqd4)|
+Trinity Medium Battle Armor (Theseus Support)'Killshot'(Sqd5)|
+Trinity Medium Battle Armor (Theseus Support)'Killshot'(Sqd6)|
+Black Wolf Battle Armor [ERSPL](Sqd4)|
+Black Wolf Battle Armor [ERSPL](Sqd5)|
+Black Wolf Battle Armor [ERSPL](Sqd6)|
+Black Wolf Battle Armor [Heavy Flamer](Sqd4)|
+Black Wolf Battle Armor [Heavy Flamer](Sqd5)|
+Black Wolf Battle Armor [Heavy Flamer](Sqd6)|
+Black Wolf Battle Armor [Heavy Mortar](Sqd4)|
+Black Wolf Battle Armor [Heavy Mortar](Sqd5)|
+Black Wolf Battle Armor [Heavy Mortar](Sqd6)|
+Black Wolf Battle Armor [LBX](Sqd4)|
+Black Wolf Battle Armor [LBX](Sqd5)|
+Black Wolf Battle Armor [LBX](Sqd6)|
+Black Wolf Battle Armor [Plasma](Sqd4)|
+Black Wolf Battle Armor [Plasma](Sqd5)|
+Black Wolf Battle Armor [Plasma](Sqd6)|
+Buraq Fast Battle Armor (Hunter-Killer)(Sqd4)|
+Buraq Fast Battle Armor (Hunter-Killer)(Sqd5)|
+Buraq Fast Battle Armor (Hunter-Killer)(Sqd6)|
+Buraq Fast Battle Armor (Sqd4)|
+Buraq Fast Battle Armor (Sqd5)|
+Buraq Fast Battle Armor (Sqd6)|
+Buraq Fast Battle Armor (Support)(Sqd4)|
+Buraq Fast Battle Armor (Support)(Sqd5)|
+Buraq Fast Battle Armor (Support)(Sqd6)|
+Constable Pacification Suit [ECM] (Sqd4)|
+Constable Pacification Suit [ECM] (Sqd5)|
+Constable Pacification Suit [ECM] (Sqd6)|
+Constable Pacification Suit [Sensor] (Sqd4)|
+Constable Pacification Suit [Sensor] (Sqd5)|
+Constable Pacification Suit [Sensor] (Sqd6)|
+Constable Pacification Suit [LMG] (Sqd4)|
+Constable Pacification Suit [LMG] (Sqd5)|
+Constable Pacification Suit [LMG] (Sqd6)|
+Constable Pacification Suit [SRM] (Sqd4)|
+Constable Pacification Suit [SRM] (Sqd5)|
+Constable Pacification Suit [SRM] (Sqd6)|
+Constable Pacification Suit [TAG] (Sqd4)|
+Constable Pacification Suit [TAG] (Sqd5)|
+Constable Pacification Suit [TAG] (Sqd6)|
+Wraith Battle Armor (Anti-Infantry)(Sqd4)|
+Wraith Battle Armor (Anti-Infantry)(Sqd5)|
+Wraith Battle Armor (Anti-Infantry)(Sqd6)|
+Wraith Battle Armor (Sqd4)|
+Wraith Battle Armor (Sqd5)|
+Wraith Battle Armor (Sqd6)|
+Fusilier Battle Armor (Sqd4)|
+Fusilier Battle Armor (Sqd5)|
+Fusilier Battle Armor (Sqd6)|
+Fusilier Battle Armor (Upgrade)(Sqd4)|
+Fusilier Battle Armor (Upgrade)(Sqd5)|
+Fusilier Battle Armor (Upgrade)(Sqd6)|
+PAB-28 Sniper Suit (Sqd4)|
+PAB-28 Sniper Suit (Sqd5)|
+PAB-28 Sniper Suit (Sqd6)|
+Sea Fox Amphibious Armor (Sqd4)|
+Sea Fox Amphibious Armor (Sqd5)|
+Sea Fox Amphibious Armor (Sqd6)|
+Kishi Ceremonial Armor (Sqd4)|
+Kishi Ceremonial Armor (Sqd5)|
+Kishi Ceremonial Armor (Sqd6)|
+Oni Battle Armor [Bearhunter](Sqd4)|
+Oni Battle Armor [Bearhunter](Sqd5)|
+Oni Battle Armor [Bearhunter](Sqd6)|
+Oni Battle Armor [MRR](Sqd4)|
+Oni Battle Armor [MRR](Sqd5)|
+Oni Battle Armor [MRR](Sqd6)|
+Oni Battle Armor [PPC](Sqd4)|
+Oni Battle Armor [PPC](Sqd5)|
+Oni Battle Armor [PPC](Sqd6)|
+Oni Battle Armor [Narc](Sqd4)|
+Oni Battle Armor [Narc](Sqd5)|
+Oni Battle Armor [Narc](Sqd6)|
+Zou Heavy Battle Armor (C3)(Sqd4)|
+Zou Heavy Battle Armor (C3)(Sqd5)|
+Zou Heavy Battle Armor (C3)(Sqd6)|
+Zou Heavy Battle Armor (Sqd4)|
+Zou Heavy Battle Armor (Sqd5)|
+Zou Heavy Battle Armor (Sqd6)|
+Amazon Battle Armor [MRR](Sqd4)|
+Amazon Battle Armor [MRR](Sqd5)|
+Amazon Battle Armor [MRR](Sqd6)|
+Amazon Battle Armor [Support PPC](Sqd4)|
+Amazon Battle Armor [Support PPC](Sqd5)|
+Amazon Battle Armor [Support PPC](Sqd6)|
+Shen Long Battle Armor [David Light Gauss](Sqd4)|
+Shen Long Battle Armor [David Light Gauss](Sqd5)|
+Shen Long Battle Armor [David Light Gauss](Sqd6)|
+Shen Long Battle Armor [Interdictor](Sqd4)|
+Shen Long Battle Armor [Interdictor](Sqd5)|
+Shen Long Battle Armor [Interdictor](Sqd6)|
+Shen Long Battle Armor [MG](Sqd4)|
+Shen Long Battle Armor [MG](Sqd5)|
+Shen Long Battle Armor [MG](Sqd6)|
+Shen Long Battle Armor [MRM](Sqd4)|
+Shen Long Battle Armor [MRM](Sqd5)|
+Shen Long Battle Armor [MRM](Sqd6)|
+Shen Long Battle Armor [Pop-Up Mine](Sqd4)|
+Shen Long Battle Armor [Pop-Up Mine](Sqd5)|
+Shen Long Battle Armor [Pop-Up Mine](Sqd6)|
+Shen Long Battle Armor [SRM](Sqd4)|
+Shen Long Battle Armor [SRM](Sqd5)|
+Shen Long Battle Armor [SRM](Sqd6)|
+Leonidas Battle Armor (David)(Sqd4)|
+Leonidas Battle Armor (David)(Sqd5)|
+Leonidas Battle Armor (David)(Sqd6)|
+Leonidas Battle Armor (FireDrake)(Sqd4)|
+Leonidas Battle Armor (FireDrake)(Sqd5)|
+Leonidas Battle Armor (FireDrake)(Sqd6)|
+Leonidas Battle Armor (Sensor)(Sqd4)|
+Leonidas Battle Armor (Sensor)(Sqd5)|
+Leonidas Battle Armor (Sensor)(Sqd6)|
+Leonidas Battle Armor (TAG)(Sqd4)|
+Leonidas Battle Armor (TAG)(Sqd5)|
+Leonidas Battle Armor (TAG)(Sqd6)|
+Leonidas Battle Armor (MG)(Sqd4)|
+Leonidas Battle Armor (MG)(Sqd5)|
+Leonidas Battle Armor (MG)(Sqd6)|
+Ogre Battle Armor (Sqd5)|
+Ogre Battle Armor (Sqd6)|
+Ogre Battle Armor (Interdictor)(Sqd5)|
+Ogre Battle Armor (Interdictor)(Sqd6)|
+Ogre Battle Armor (Interdictor)(Sqd4)|
+Ogre Battle Armor (Sqd4)|
+Xiphos Assault Battle Armor A(Sqd4)|
+Xiphos Assault Battle Armor A(Sqd5)|
+Xiphos Assault Battle Armor A(Sqd6)|
+Xiphos Assault Battle Armor B(Sqd4)|
+Xiphos Assault Battle Armor B(Sqd5)|
+Xiphos Assault Battle Armor B(Sqd6)|
+Xiphos Assault Battle Armor C(Sqd4)|
+Xiphos Assault Battle Armor C(Sqd5)|
+Xiphos Assault Battle Armor C(Sqd6)|
+Marauder Battle Armor (Sqd4)|
+Marauder Battle Armor (Sqd5)|
+Marauder Battle Armor (Sqd6)|
+Spectre Stealth Battle Armor (Sqd4)|
+Spectre Stealth Battle Armor (Sqd5)|
+Spectre Stealth Battle Armor (Sqd6)|
+Gray Death Strike Suit (HarJel)(Sqd4)|
+Gray Death Strike Suit (HarJel)(Sqd5)|
+Gray Death Strike Suit (HarJel)(Sqd6)|
+Grenadier Battle Armor [Heavy Flamer](Sqd4)|
+Grenadier Battle Armor [Heavy Flamer](Sqd5)|
+Grenadier Battle Armor [Heavy Flamer](Sqd6)|
+Grenadier Battle Armor (Hunter-Killer) [C3/HRR](Sqd4)|
+Grenadier Battle Armor (Hunter-Killer) [C3/HRR](Sqd5)|
+Grenadier Battle Armor (Hunter-Killer) [C3/HRR](Sqd6)|
+Grenadier Battle Armor (Hunter-Killer) [SVSP/Magshot](Sqd4)|
+Grenadier Battle Armor (Hunter-Killer) [SVSP/Magshot](Sqd5)|
+Grenadier Battle Armor (Hunter-Killer) [SVSP/Magshot](Sqd6)|
+Infiltrator Mk. II Battle Armor (Marine)(Sqd4)|
+Infiltrator Mk. II Battle Armor (Marine)(Sqd5)|
+Infiltrator Mk. II Battle Armor (Marine)(Sqd6)|
+Ironhold Assault Battle Armor (Anti-Tank)(Sqd4)|
+Ironhold Assault Battle Armor (Anti-Tank)(Sqd5)|
+Ironhold Assault Battle Armor (Anti-Tank)(Sqd6)|
+Kobold Battle Armor IIC (Sqd4)|
+Kobold Battle Armor IIC (Sqd5)|
+Kobold Battle Armor IIC (Sqd6)|
+Kopis Assault Battle Armor (AI Mk II)(Sqd4)|
+Kopis Assault Battle Armor (AI Mk II)(Sqd5)|
+Kopis Assault Battle Armor (AI Mk II)(Sqd6)|
+Kopis Assault Battle Armor (Mortar)(Sqd4)|
+Kopis Assault Battle Armor (Mortar)(Sqd5)|
+Kopis Assault Battle Armor (Mortar)(Sqd6)|
+Kopis Assault Battle Armor (AI Mk IIr)(Sqd4)|
+Kopis Assault Battle Armor (AI Mk IIr)(Sqd5)|
+Kopis Assault Battle Armor (AI Mk IIr)(Sqd6)|
+Phalanx Battle Armor (D)(Sqd4)|
+Phalanx Battle Armor (D)(Sqd5)|
+Phalanx Battle Armor (D)(Sqd6)|
+Raiden II Battle Armor [Flamer](Sqd4)|
+Raiden II Battle Armor [Flamer](Sqd5)|
+Raiden II Battle Armor [Flamer](Sqd6)|
+Raiden II Battle Armor [HMG](Sqd4)|
+Raiden II Battle Armor [HMG](Sqd5)|
+Raiden II Battle Armor [HMG](Sqd6)|
+Ravager Assault Battle Armor (LRM)(Sqd4)|
+Ravager Assault Battle Armor (LRM)(Sqd5)|
+Ravager Assault Battle Armor (LRM)(Sqd6)|
+Rogue Bear Heavy Battle Armor (Upgrade)(Sqd4)|
+Rogue Bear Heavy Battle Armor (Upgrade)(Sqd5)|
+Rogue Bear Heavy Battle Armor (Upgrade)(Sqd6)|
+Sloth Battle Armor 'Huntsman'(Sqd4)|
+Sloth Battle Armor 'Huntsman'(Sqd5)|
+Sloth Battle Armor 'Huntsman'(Sqd6)|
+Thunderbird Battle Armor (Upgrade)[ER Laser](Sqd4)|
+Thunderbird Battle Armor (Upgrade)[ER Laser](Sqd5)|
+Thunderbird Battle Armor (Upgrade)[ER Laser](Sqd6)|
+Thunderbird Battle Armor (Upgrade)[LB-X](Sqd4)|
+Thunderbird Battle Armor (Upgrade)[LB-X](Sqd5)|
+Thunderbird Battle Armor (Upgrade)[LB-X](Sqd6)|
+Thunderbird Battle Armor (Upgrade)[Pulse Laser](Sqd4)|
+Thunderbird Battle Armor (Upgrade)[Pulse Laser](Sqd5)|
+Thunderbird Battle Armor (Upgrade)[Pulse Laser](Sqd6)|
+Warg Assault Battle Armor (Reactive)(Sqd4)|
+Warg Assault Battle Armor (Reactive)(Sqd5)|
+Warg Assault Battle Armor (Reactive)(Sqd6)|
+Centaur Battle Armor (Sqd4)|
+Centaur Battle Armor (Sqd5)|
+Centaur Battle Armor (Sqd6)|
+Quirinus Battle Armor [David](Sqd4)|
+Quirinus Battle Armor [David](Sqd5)|
+Quirinus Battle Armor [David](Sqd6)|
+Quirinus Battle Armor [GL](Sqd4)|
+Quirinus Battle Armor [GL](Sqd5)|
+Quirinus Battle Armor [GL](Sqd6)|
+Quirinus Battle Armor [MG](Sqd4)|
+Quirinus Battle Armor [MG](Sqd5)|
+Quirinus Battle Armor [MG](Sqd6)|
+Simian Battle Armor [Flamer](Sqd4)|
+Simian Battle Armor [Flamer](Sqd5)|
+Simian Battle Armor [Flamer](Sqd6)|
+Simian Battle Armor [Heavy MG](Sqd4)|
+Simian Battle Armor [Heavy MG](Sqd5)|
+Simian Battle Armor [Heavy MG](Sqd6)|
+Simian Battle Armor [LRR](Sqd4)|
+Simian Battle Armor [LRR](Sqd5)|
+Simian Battle Armor [LRR](Sqd6)|
+Simian Battle Armor [SL](Sqd4)|
+Simian Battle Armor [SL](Sqd5)|
+Simian Battle Armor [SL](Sqd6)|
+Taranis Battle Armor (Sqd4)|
+Taranis Battle Armor (Sqd5)|
+Taranis Battle Armor (Sqd6)|
+Cuchulainn Support Armor (Sqd4)|
+Cuchulainn Support Armor (Sqd5)|
+Cuchulainn Support Armor (Sqd6)|
+Fenrir II Assault Battle Armor (AI)(Sqd4)|
+Fenrir II Assault Battle Armor (AI)(Sqd5)|
+Fenrir II Assault Battle Armor (AI)(Sqd6)|
+Fenrir II Assault Battle Armor (LRM)(Sqd4)|
+Fenrir II Assault Battle Armor (LRM)(Sqd5)|
+Fenrir II Assault Battle Armor (LRM)(Sqd6)|
+Fenrir II Assault Battle Armor (Med. Laser)(Sqd4)|
+Fenrir II Assault Battle Armor (Med. Laser)(Sqd5)|
+Fenrir II Assault Battle Armor (Med. Laser)(Sqd6)|
+Fenrir II Assault Battle Armor (MRR)(Sqd4)|
+Fenrir II Assault Battle Armor (MRR)(Sqd5)|
+Fenrir II Assault Battle Armor (MRR)(Sqd6)|
+Fenrir II Assault Battle Armor (SRM)(Sqd4)|
+Fenrir II Assault Battle Armor (SRM)(Sqd5)|
+Fenrir II Assault Battle Armor (SRM)(Sqd6)|
+Gray Death Infiltrator Suit (Firedrake)(Sqd4)|
+Gray Death Infiltrator Suit (Firedrake)(Sqd5)|
+Gray Death Infiltrator Suit (Firedrake)(Sqd6)|
+Gray Death Infiltrator Suit (Sensors)(Sqd4)|
+Gray Death Infiltrator Suit (Sensors)(Sqd5)|
+Gray Death Infiltrator Suit (Sensors)(Sqd6)|
+Gray Death Infiltrator Suit (TAG)(Sqd4)|
+Gray Death Infiltrator Suit (TAG)(Sqd5)|
+Gray Death Infiltrator Suit (TAG)(Sqd6)|
+Gray Death Infiltrator Suit (Mines)(Sqd4)|
+Gray Death Infiltrator Suit (Mines)(Sqd5)|
+Gray Death Infiltrator Suit (Mines)(Sqd6)|
+Gray Death Infiltrator Suit (Remote Sensors)(Sqd4)|
+Gray Death Infiltrator Suit (Remote Sensors)(Sqd5)|
+Gray Death Infiltrator Suit (Remote Sensors)(Sqd6)|
+Cavalier II Battle Armor [Flamer](Sqd4)|
+Cavalier II Battle Armor [MRR](Sqd4)|
+Cavalier II Battle Armor [PPC](Sqd4)|
+Cavalier II Battle Armor [SRM](Sqd4)|
+IS Standard Battle Armor (Baka) [LRR](Sqd4)|
+IS Standard Battle Armor (Baka) [LRR](Sqd5)|
+IS Standard Battle Armor (Baka) [LRR](Sqd6)|
+IS Standard Battle Armor (Baka) [SL](Sqd4)|
+IS Standard Battle Armor (Baka) [SL](Sqd5)|
+IS Standard Battle Armor (Baka) [SL](Sqd6)|
+IS Standard Battle Armor (Fa Sure) [David](Sqd4)|
+IS Standard Battle Armor (Fa Sure) [David](Sqd5)|
+IS Standard Battle Armor (Fa Sure) [David](Sqd6)|
+IS Standard Battle Armor (Fa Sure) [MG](Sqd4)|
+IS Standard Battle Armor (Fa Sure) [MG](Sqd5)|
+IS Standard Battle Armor (Fa Sure) [MG](Sqd6)|
+Kanazuchi Assault Battle Armor (Support)(Sqd4)|
+Kanazuchi Assault Battle Armor (Support)(Sqd5)|
+Kanazuchi Assault Battle Armor (Support)(Sqd6)|
+Longinus C Battle Armor [MMR] (Sqd4)|
+Longinus C Battle Armor [MMR] (Sqd5)|
+Longinus C Battle Armor [PPC] (Sqd4)|
+Longinus C Battle Armor [PPC] (Sqd5)|
+Rhino Battle Armor (Sqd4)|
+Rhino Battle Armor (Sqd5)|
+Rhino Battle Armor (Sqd6)|
+Water Elemental Mining Suit (Sqd4)|
+Water Elemental Mining Suit (Sqd5)|
+Water Elemental Mining Suit (Sqd6)|
+Machina Domini Interface Armor (Sqd1)|
+TinStar BattleArmor (Sqd4)|
+TinStar BattleArmor (Sqd5)|
+TinStar BattleArmor (Sqd6)|
+Elemental II Battle Armor (Sqd4)|
+Elemental II Battle Armor (Sqd5)|
+Elemental II Battle Armor (Sqd6)|
+Gladiator Battle Armor S (Sqd4)|
+Gladiator Battle Armor S (Sqd5)|
+Gladiator Battle Armor S (Sqd6)|
+Gray Death Strike Suit (Sqd4)|
+Gray Death Strike Suit (Sqd5)|
+Gray Death Strike Suit (Sqd6)|
+Hauberk Battle Armor Commando(Sqd4)|
+Hauberk Battle Armor Commando(Sqd5)|
+Hauberk Battle Armor Commando(Sqd6)|
+Rogue Bear Heavy Battle Armor (Hybrid)(Sqd4)|
+Rogue Bear Heavy Battle Armor (Hybrid)(Sqd5)|
+Rogue Bear Heavy Battle Armor (Hybrid)(Sqd6)|
+Sylph Battle Armor (Enhanced)(Sqd4)|
+Sylph Battle Armor (Enhanced)(Sqd5)|
+Sylph Battle Armor (Enhanced)(Sqd6)|
+Void Medium Battle Armor (Minelayer)(Sqd4)|
+Void Medium Battle Armor (Minelayer)(Sqd5)|
+Void Medium Battle Armor (Minelayer)(Sqd6)|
+Elemental III Battle Armor [AP Gauss](Sqd4)|
+Elemental III Battle Armor [AP Gauss](Sqd5)|
+Elemental III Battle Armor [AP Gauss](Sqd6)|
+Elemental III Battle Armor [Flamer](Sqd4)|
+Elemental III Battle Armor [Flamer](Sqd5)|
+Elemental III Battle Armor [Flamer](Sqd6)|
+Elemental III Battle Armor [MicroPL](Sqd4)|
+Elemental III Battle Armor [MicroPL](Sqd5)|
+Elemental III Battle Armor [MicroPL](Sqd6)|
+TinStar BattleArmor (Original)(Sqd4)|
+TinStar BattleArmor (Original)(Sqd5)|
+TinStar BattleArmor (Original)(Sqd6)|
+Dragoon Battle Armor (Advanced)(Sqd4)|
+Dragoon Battle Armor (Advanced)(Sqd5)|
+Dragoon Battle Armor (Advanced)(Sqd6)|
+Dragoon Battle Armor (Sqd4)|
+Dragoon Battle Armor (Sqd5)|
+Dragoon Battle Armor (Sqd6)|
+Stormbird Battle Armor (Jade Falcon)(Sqd4)|
+Stormbird Battle Armor (Jade Falcon)(Sqd5)|
+Stormbird Battle Armor (Jade Falcon)(Sqd6)|
+Stormbird Battle Armor (Sqd4)|
+Stormbird Battle Armor (Sqd5)|
+Stormbird Battle Armor (Sqd6)|
+Callisto Battle Armor A [Bearhunter](Sqd4)|
+Callisto Battle Armor A [Bearhunter](Sqd5)|
+Callisto Battle Armor A [Bearhunter](Sqd6)|
+Callisto Battle Armor A [ER Laser](Sqd4)|
+Callisto Battle Armor A [ER Laser](Sqd5)|
+Callisto Battle Armor A [ER Laser](Sqd6)|
+Callisto Battle Armor A [HMG](Sqd4)|
+Callisto Battle Armor A [HMG](Sqd5)|
+Callisto Battle Armor A [HMG](Sqd6)|
+Callisto Battle Armor B [MRR](Sqd4)|
+Callisto Battle Armor B [MRR](Sqd5)|
+Callisto Battle Armor B [MRR](Sqd6)|
+Callisto Battle Armor B [SRM](Sqd4)|
+Callisto Battle Armor B [SRM](Sqd5)|
+Callisto Battle Armor B [SRM](Sqd6)|
+IS Standard Battle Armor [Magnetic](Sqd4)|
+IS Standard Battle Armor [Magnetic](Sqd5)|
+IS Standard Battle Armor [Magnetic](Sqd6)|
+Gray Death Scout Suit (Reaper)(Sqd4)|
+Hantu AIX-210(Sqd4)|
+Hantu AIX-210(Sqd5)|
+Hantu AIX-210(Sqd6)|
+Ailette Zero-G Engineering Exoskeleton (Sqd4)|
+Ailette Zero-G Engineering Exoskeleton (Sqd5)|
+Ailette Zero-G Engineering Exoskeleton (Sqd6)|
+Gladiator Exoskeleton [AG](Sqd5)|
+Gladiator Exoskeleton [AG](Sqd4)|
+Gladiator Exoskeleton [AG](Sqd6)|
+Gladiator Exoskeleton [BC/ID](Sqd5)|
+Gladiator Exoskeleton [BC/ID](Sqd4)|
+Gladiator Exoskeleton [BC/ID](Sqd6)|
+Gorilla Exoskeleton 'Falcata'(Sqd4)|
+Gorilla Exoskeleton 'Falcata'(Sqd5)|
+Gorilla Exoskeleton 'Falcata'(Sqd6)|
+Gorilla Exoskeleton PEX-2B(Sqd4)|
+Gorilla Exoskeleton PEX-2B(Sqd5)|
+Gorilla Exoskeleton PEX-2B(Sqd6)|
+Groundhog Exoskeleton CEX-205 [Armored Glove](Sqd4)|
+Groundhog Exoskeleton CEX-205 [Armored Glove](Sqd5)|
+Groundhog Exoskeleton CEX-205 [Armored Glove](Sqd6)|
+Groundhog Exoskeleton CEX-205 [Basic Manipulator](Sqd4)|
+Groundhog Exoskeleton CEX-205 [Basic Manipulator](Sqd5)|
+Groundhog Exoskeleton CEX-205 [Basic Manipulator](Sqd6)|
+Groundhog Exoskeleton CEX-205 [Cargo Lifter](Sqd4)|
+Groundhog Exoskeleton CEX-205 [Cargo Lifter](Sqd5)|
+Groundhog Exoskeleton CEX-205 [Cargo Lifter](Sqd6)|
+Groundhog Exoskeleton CEX-205 [Industrial Drill](Sqd4)|
+Groundhog Exoskeleton CEX-205 [Industrial Drill](Sqd5)|
+Groundhog Exoskeleton CEX-205 [Industrial Drill](Sqd6)|
+Groundhog Exoskeleton CEX-205 [Mine Clearance](Sqd4)|
+Groundhog Exoskeleton CEX-205 [Mine Clearance](Sqd5)|
+Groundhog Exoskeleton CEX-205 [Mine Clearance](Sqd6)|
+Groundhog Exoskeleton CEX-205 [Salvage Arm](Sqd4)|
+Groundhog Exoskeleton CEX-205 [Salvage Arm](Sqd5)|
+Groundhog Exoskeleton CEX-205 [Salvage Arm](Sqd6)|
+HeavyHauler Exoskeleton (Sqd4)|
+HeavyHauler Exoskeleton (Sqd5)|
+HeavyHauler Exoskeleton (Sqd6)|
+Krise PA(L) (Sqd4)|
+Krise PA(L) (Sqd5)|
+Krise PA(L) (Sqd6)|
+PowerLoader Exoskeleton P-5000(Sqd4)|
+PowerLoader Exoskeleton P-5000(Sqd5)|
+PowerLoader Exoskeleton P-5000(Sqd6)|
+Resgate PA(L) (Interdictor)(Sqd4)|
+Resgate PA(L) (Interdictor)(Sqd5)|
+Resgate PA(L) (Interdictor)(Sqd6)|
+Resgate PA(L) (Scout)(Sqd4)|
+Resgate PA(L) (Scout)(Sqd5)|
+Resgate PA(L) (Scout)(Sqd6)|
+Resgate PA(L) (Spotter)(Sqd4)|
+Resgate PA(L) (Spotter)(Sqd5)|
+Resgate PA(L) (Spotter)(Sqd6)|
+Resgate PA(L) (Sqd4)|
+Resgate PA(L) (Sqd5)|
+Resgate PA(L) (Sqd6)|
+Resgate PA(L) (Support)(Sqd4)|
+Resgate PA(L) (Support)(Sqd5)|
+Resgate PA(L) (Support)(Sqd6)|
+Salrilla Exoskeleton [Mine Clearance](Sqd4)|
+Salrilla Exoskeleton [Mine Clearance](Sqd5)|
+Salrilla Exoskeleton [Mine Clearance](Sqd6)|
+Salrilla Exoskeleton [Salvage Arm](Sqd4)|
+Salrilla Exoskeleton [Salvage Arm](Sqd5)|
+Salrilla Exoskeleton [Salvage Arm](Sqd6)|
+Smoothdavid PA(L) II(Sqd4)|
+Smoothdavid PA(L) II(Sqd5)|
+Smoothdavid PA(L) II(Sqd6)|
+Smoothdavid PA(L) III(Sqd4)|
+Smoothdavid PA(L) III(Sqd5)|
+Smoothdavid PA(L) III(Sqd6)|
+Smoothgoliath PA(L) II(Sqd4)|
+Smoothgoliath PA(L) II(Sqd5)|
+Smoothgoliath PA(L) II(Sqd6)|
+Tunnel Rat I Mining Exoskeleton [Armored Glove](Sqd4)|
+Tunnel Rat I Mining Exoskeleton [Armored Glove](Sqd5)|
+Tunnel Rat I Mining Exoskeleton [Armored Glove](Sqd6)|
+Tunnel Rat I Mining Exoskeleton [Industrial Drill](Sqd4)|
+Tunnel Rat I Mining Exoskeleton [Industrial Drill](Sqd5)|
+Tunnel Rat I Mining Exoskeleton [Industrial Drill](Sqd6)|
+Tunnel Rat II Mining Exoskeleton [Armored Glove](Sqd4)|
+Tunnel Rat II Mining Exoskeleton [Armored Glove](Sqd5)|
+Tunnel Rat II Mining Exoskeleton [Armored Glove](Sqd6)|
+Tunnel Rat II Mining Exoskeleton [Industrial Drill](Sqd4)|
+Tunnel Rat II Mining Exoskeleton [Industrial Drill](Sqd5)|
+Tunnel Rat II Mining Exoskeleton [Industrial Drill](Sqd6)|
+Tunnel Rat III Mining Exoskeleton [Armored Glove](Sqd4)|
+Tunnel Rat III Mining Exoskeleton [Armored Glove](Sqd5)|
+Tunnel Rat III Mining Exoskeleton [Armored Glove](Sqd6)|
+Tunnel Rat III Mining Exoskeleton [Industrial Drill](Sqd4)|
+Tunnel Rat III Mining Exoskeleton [Industrial Drill](Sqd5)|
+Tunnel Rat III Mining Exoskeleton [Industrial Drill](Sqd6)|
+Tunnel Rat IV Mining Exoskeleton [Armored Glove/GL](Sqd4)|
+Tunnel Rat IV Mining Exoskeleton [Armored Glove/GL](Sqd5)|
+Tunnel Rat IV Mining Exoskeleton [Armored Glove/GL](Sqd6)|
+Tunnel Rat IV Mining Exoskeleton [Armored Glove/LMG](Sqd4)|
+Tunnel Rat IV Mining Exoskeleton [Armored Glove/LMG](Sqd5)|
+Tunnel Rat IV Mining Exoskeleton [Armored Glove/LMG](Sqd6)|
+Tunnel Rat IV Mining Exoskeleton [Battle Claw/GL](Sqd4)|
+Tunnel Rat IV Mining Exoskeleton [Battle Claw/GL](Sqd5)|
+Tunnel Rat IV Mining Exoskeleton [Battle Claw/GL](Sqd6)|
+Tunnel Rat IV Mining Exoskeleton [Battle Claw/LMG](Sqd4)|
+Tunnel Rat IV Mining Exoskeleton [Battle Claw/LMG](Sqd5)|
+Tunnel Rat IV Mining Exoskeleton [Battle Claw/LMG](Sqd6)|
+Elemental II Battle Armor X(Sqd4)|
+Elemental II Battle Armor X(Sqd5)|
+Elemental II Battle Armor X(Sqd6)|
+Rogue Bear Heavy Battle Armor HR(Sqd4)|
+Rogue Bear Heavy Battle Armor HR(Sqd5)|
+Rogue Bear Heavy Battle Armor HR(Sqd6)|
+Sylph Battle Armor XR(Sqd4)|
+Sylph Battle Armor XR(Sqd5)|
+Sylph Battle Armor XR(Sqd6)|
+Tornado PA(L) P17 'Hurricane'(Sqd4)|
+Tornado PA(L) P17 'Hurricane'(Sqd5)|
+Tornado PA(L) P17 'Hurricane'(Sqd6)|
+Kobold Battle Armor X-C3(Sqd4)|
+Kobold Battle Armor X-C3(Sqd5)|
+Kobold Battle Armor X-C3(Sqd6)|
+Hauberk Battle Armor U15(Sqd4)|
+Hauberk Battle Armor U15(Sqd5)|
+Hauberk Battle Armor U15(Sqd6)|
+Infiltrator Mk. II Battle Armor Coral Intent(Sqd4)|
+Infiltrator Mk. II Battle Armor Coral Intent(Sqd5)|
+Infiltrator Mk. II Battle Armor Coral Intent(Sqd6)|
+Gladiator Exoskeleton 'The Spider'(Sqd4)|
+Gladiator Exoskeleton 'The Spider'(Sqd5)|
+Gladiator Exoskeleton 'The Spider'(Sqd6)|
+Gray Death Scout Suit 'The Willow Wisps'(Sqd4)|
+Gray Death Scout Suit 'The Willow Wisps'(Sqd5)|
+Gray Death Scout Suit 'The Willow Wisps'(Sqd6)|
+IS Standard Battle Armor 'Hive'(Sqd4)|
+IS Standard Battle Armor 'Hive'(Sqd5)|
+IS Standard Battle Armor 'Hive'(Sqd6)|
+Kanazuchi Assault Battle Armor 'Cyclops'(Sqd4)|
+Kanazuchi Assault Battle Armor 'Cyclops'(Sqd5)|
+Kanazuchi Assault Battle Armor 'Cyclops'(Sqd6)|
+Kage Light Battle Armor C(Sqd4)|
+Kage Light Battle Armor C(Sqd5)|
+Kage Light Battle Armor C(Sqd6)|
+Void Medium Battle Armor Caltrop(Sqd4)|
+Void Medium Battle Armor Caltrop(Sqd5)|
+Void Medium Battle Armor Caltrop(Sqd6)|
+Fa Shih Battle Armor 2 [MG](Sqd4)|
+Fa Shih Battle Armor 2 [MG](Sqd5)|
+Fa Shih Battle Armor 2 [MG](Sqd6)|
+Trinity Medium Battle Armor (Ying Long BC3)[David](Sqd4)|
+Trinity Medium Battle Armor (Ying Long BC3)[David](Sqd5)|
+Trinity Medium Battle Armor (Ying Long BC3)[David](Sqd6)|
+Longinus Battle Armor 'Hacked' [David](Sqd4)|
+Longinus Battle Armor 'Hacked' [David](Sqd5)|
+Longinus Battle Armor 'Hacked' [David](Sqd6)|
+Longinus Battle Armor 'Hacked' [MG](Sqd4)|
+Longinus Battle Armor 'Hacked' [MG](Sqd5)|
+Longinus Battle Armor 'Hacked' [MG](Sqd6)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [Flamer] (Sqd4)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [Flamer] (Sqd5)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [Flamer] (Sqd6)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [MG] (Sqd4)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [MG] (Sqd5)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [MG] (Sqd6)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [Laser] (Sqd4)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [Laser] (Sqd5)|
+Djinn Battle Armor (Reflective) 'Terrorizer' [Laser] (Sqd6)|
+Groundhog Exoskeleton 'Master Thief'(Sqd1)|
+Ailette Rescue PA(L) (Sqd4)|
+Ailette Rescue PA(L) (Sqd5)|
+Ailette Rescue PA(L) (Sqd6)|
+Purifier Battle Armor Terra [AP Gauss](Sqd4)|
+Purifier Battle Armor Terra [AP Gauss](Sqd5)|
+Purifier Battle Armor Terra [AP Gauss](Sqd6)|
+Purifier Battle Armor Terra [ERSL](Sqd4)|
+Purifier Battle Armor Terra [ERSL](Sqd5)|
+Purifier Battle Armor Terra [ERSL](Sqd6)|
+Purifier Battle Armor Terra [MRR](Sqd4)|
+Purifier Battle Armor Terra [MRR](Sqd5)|
+Purifier Battle Armor Terra [MRR](Sqd6)|
+Purifier Battle Armor Terra [SPL](Sqd4)|
+Purifier Battle Armor Terra [SPL](Sqd5)|
+Purifier Battle Armor Terra [SPL](Sqd6)|
+Tornado PA(L) G17(Sqd4)|
+Tornado PA(L) G17(Sqd5)|
+Tornado PA(L) G17(Sqd6)|
+Surat (Gray Death) Solahma Suit (Sqd4)|
+Surat (Gray Death) Solahma Suit (Sqd5)|
+Surat (Gray Death) Solahma Suit (Sqd6)|
+Thunderbird II Battle Armor (Sqd4)|
+Thunderbird II Battle Armor (Sqd5)|
+Thunderbird II Battle Armor (Sqd6)|
+Tortoise II (aSRM)(Sqd4)|
+Tortoise II (aSRM)(Sqd5)|
+Tortoise II (aSRM)(Sqd6)|
+Tortoise II (C3)(Sqd4)|
+Tortoise II (C3)(Sqd5)|
+Tortoise II (C3)(Sqd6)|
+Tortoise II (LRM)(Sqd4)|
+Tortoise II (LRM)(Sqd5)|
+Tortoise II (LRM)(Sqd6)|
+Tortoise II (SRM)(Sqd4)|
+Tortoise II (SRM)(Sqd5)|
+Tortoise II (SRM)(Sqd6)|
+Aegis Point Defense Suit (Sqd4)|
+Aegis Point Defense Suit (Sqd5)|
+Aegis Point Defense Suit (Sqd6)|
+Clan Interface Armor (Sqd1)|
+Grenadier II Battle Armor A(Sqd4)|
+Grenadier II Battle Armor A(Sqd5)|
+Grenadier II Battle Armor A(Sqd6)|
+Grenadier II Battle Armor B(Sqd4)|
+Grenadier II Battle Armor B(Sqd5)|
+Grenadier II Battle Armor B(Sqd6)|
+Grenadier II Battle Armor C(Sqd4)|
+Grenadier II Battle Armor C(Sqd5)|
+Grenadier II Battle Armor C(Sqd6)|
+Grenadier II Battle Armor D(Sqd4)|
+Grenadier II Battle Armor D(Sqd5)|
+Grenadier II Battle Armor D(Sqd6)|
+Gnome Battle Armor 'Dwarf'(Sqd4)|
+Sylph Battle Armor 'TinkerBelle'(Sqd4)|
+Undine Battle Armor 'Sebastian'(Sqd4)|
+Fenrir Battle Armor 'Longshot' (Sqd4)|
+Fenrir Battle Armor 'Longshot' (Sqd5)|
+Fenrir Battle Armor 'Longshot' (Sqd6)|
+Gray Death Strike Suit (Prototype)(Sqd4)|
+Gray Death Strike Suit (Prototype)(Sqd5)|
+Gray Death Strike Suit (Prototype)(Sqd6)|
+Boeing Jump Bomber|
+Boomerang Spotter Plane|
+Guardian Fighter B|
+Guardian Fighter C|
+Guardian Fighter D|
+Guardian Fighter|
+Heavy Strike Fighter Bat Hawk|
+Heavy Strike Fighter Inseki II|
+Heavy Strike Fighter Inseki|
+Heavy Strike Fighter Meteor-G|
+Heavy Strike Fighter Meteor-U|
+Heavy Strike Fighter Meteor|
+Light Strike Fighter Andurien|
+Light Strike Fighter Angel (Upgrade)|
+Light Strike Fighter Angel|
+Light Strike Fighter Comet|
+Light Strike Fighter Owl II|
+Light Strike Fighter Owl III|
+Light Strike Fighter Owl|
+Light Strike Fighter Suzume ('Sparrow')|
+Mechbuster (Laser)|
+Mechbuster (LB-X)|
+Mechbuster (SRM)|
+Mechbuster|
+Medium Strike Fighter Crane|
+Medium Strike Fighter Defender II|
+Medium Strike Fighter Defender|
+Medium Strike Fighter Kaiseradler (Imperial Eagle)|
+Medium Strike Fighter Steinadler (Golden Eagle)|
+Planetlifter Air Transport 'SuperPelican' aka 'Waddle'|
+Planetlifter Air Transport|
+Stork Light Refueling Craft (Original)|
+Stork Light Refueling Craft|
+Saroyan Jump Bomber|
+Medium Strike Fighter Defender II C|
+Katya Ground Assault Craft C-906(RL10)|
+Katya Ground Assault Craft C-904(RL15)|
+Katya Ground Assault Craft C-905(RL20)|
+Raubvogel Aerobomber AB-18C|
+Bluehawk Combat Support Fighter MSF-42|
+Protector Combat Support Fighter ASF-23|
+Bullet Suicide Drone|
+Drake Medium Stealth Fighter|
+Planetlifter Tactical Support|
+Seabuster Strike Fighter|
+Avanti Aerospace Airliner ACL-800|
+Chariot High-Speed Medevac|
+Delta Air Cruiser MA-80|
+Federated-Boeing Longhaul FB-335|
+Jetta Coruna 4X|
+King Karnov Transport KC-6|
+King Karnov Transport KC-9|
+Mosquito Radar Plane IX|
+Protector High-Speed Medevac C-790|
+S 2772 Airplane|
+Torrent Heavy Bomber (Original)|
+Torrent Heavy Bomber|
+Zanadu Air Bus|
+Drake Medium Strike Fighter|
+Planetlifter Support Aircraft|
+Seabuster Strike Fighter (Early)|
+Hurricane Conventional Fighter|
+Vendetta Medium Fighter|
+Mustang Fighter|
+Colt Medium Fighter (LRM)|
+Colt Medium Fighter (SRM)|
+Tsuru VIP Aircraft|
+Gaajian System Patrol Boat (2485)|
+Gaajian System Patrol Boat (3060)|
+Hoshiryokou|
+Hoshiryokou (Tug Boat)|
+Aqueduct Liquid Carrier|
+Princess Luxury Liner (Cargo)|
+Princess Luxury Liner|
+Lee (Cargo Carrier)|
+Lee (Aerospace Carrier)|
+Lee (Armor Carrier)|
+Lee (BattleMech Carrier)|
+Drone M-3|
+Model 96C “Howdah� SDS Command Ship|
+Pueblo (2673)|
+Jumbo|
+Polaris|
+Cockatrice Monitor Platform (Drone)|
+Dragau Assault Interceptor (CASPAR II Drone)|
+Tiamat Pocket Warship (CASPAR II Drone)|
+Danais|
+Trojan (Blockade Runner)|
+Mingo|
+Buccaneer Rezak|
+Lion (3052) (WD)|
+Rose (Bara no Ryu) (Hive)|
+Outpost (Defender)|
+Titan (Monitor)|
+Claymore V3|
+Lung Wang P2|
+Merlin R1|
+Vengeance DC|
+Behemoth C (2848)|
+Behemoth C (Arcship)|
+Broadsword (2979)|
+Carrier (2882)|
+Confederate C (3048)|
+Lion (2835)|
+Lion (3005) (WD)|
+Miraborg (3053)|
+Mule C (2842)|
+Noruff (3056)|
+Overlord C (2818) (Tank)|
+Overlord C (2818)|
+Sassanid (2875)|
+Titan (2953)|
+Union C (2829) (Tank)|
+Union C (2829)|
+Union C (2840) (Cargo)|
+Achilles (2582)|
+Achilles (2721)|
+Achilles (2721b)|
+Achilles (3055)|
+Avenger (2816)|
+Avenger (3048)|
+Behemoth (2658)|
+Behemoth (2782)|
+Buccaneer (2708)|
+Buccaneer (2709) (Vehicle)|
+Buccaneer (2792)|
+Cargo King (2790)|
+Cargomaster (2790)|
+Claymore (3054)|
+Condor (2801)|
+Condor (3035) Dove|
+Condor (3054)|
+Condor (3079)|
+Confederate (2602)|
+Confederate (2602) (Mech)|
+Excalibur (2786)|
+Excalibur (3056)|
+Fortress (2613)|
+Fortress (3058)|
+Fury (2638)|
+Fury (3056)|
+Gazelle (2531)|
+Gazelle (3055)|
+Gazelle (Heavy Vehicle)|
+Hamilcar (3054)|
+Hamilcar (3084)|
+Hannibal (3055)|
+Hercules (3053)|
+Intruder (2655)|
+Intruder (3056)|
+Kuan Ti (3055)|
+Leopard (2537)|
+Leopard (3056)|
+Leopard CV (2581)|
+Leopard CV (3054)|
+Lion (2595)|
+Lung Wang (3055)|
+Mammoth (2658)|
+Model 97 'Octopus' (3051)|
+Monarch (2759)|
+Mule 'Q-Ship'|
+Mule (2737)|
+Nagumo (3056)|
+Okinawa (3055)|
+Okinawa (3056)|
+Overlord (2762)|
+Overlord (2762b)|
+Overlord (2775) (Combined Arms)|
+Overlord (2809) (Klondike)|
+Overlord (2817) (Command)|
+Overlord (3056)|
+Rose (Bara no Ryu) (3054)|
+Seeker (2815)|
+Seeker (2815) (Mech)|
+Seeker (3054)|
+Titan (2647)|
+Titan (2647b)|
+Triumph (2593)|
+Triumph (2593b)|
+Triumph (3057)|
+Union (2708) (Cargo)|
+Union (2708)|
+Union (2708b)|
+Union (2709) (Combined Arms)|
+Union (2710) (CV)|
+Union (3055)|
+Vengeance (2682)|
+Vengeance (3056)|
+Arcadia (3066)|
+Arcadia (3080)|
+Mercer (3065)|
+Outpost (3063)|
+Outpost (3070)|
+Assault Triumph (3062)|
+Assault Triumph (3082)|
+Conquistador (3063)|
+Conquistador (Avalon One)|
+Merlin (3063)|
+Nekohono'o|
+Overlord A3|
+Overlord A3A|
+Union-X (3065)|
+Union-X (3071)|
+Colossus|
+Colossus Mk I|
+Dictator (Command)|
+Dictator|
+Manatee (Cargo)|
+Manatee|
+Model 96 'Elephant'|
+Model 96 'Elephant' Mk I|
+Mule (Star League Pocket Warship)|
+Pentagon 'Pocket Warship'|
+Pentagon (2751)|
+Pentagon|
+Pentagon Mk I|
+Vampire|
+Vulture (2312)|
+Vulture (2405)|
+Vulture (Cargo)|
+Aurora (BA)|
+Aurora (Cargo)|
+Aurora (Combined Arms)|
+Aurora (CV)|
+Aurora (Gunship)|
+Aurora|
+Aurora (Tanker)|
+Aurora (Vehicle)|
+Excalibur 'Pocket Warship'|
+Leopard 'Pocket Warship'|
+Mule 'Pocket Warship'|
+Mule (Armored Pocket Warship)|
+Union 'Pocket Warship'|
+Aesir Assault Dropship|
+Isegrim Assault DropShip|
+Vanir Assault Dropship|
+Arondight Pocket Warship (Refit)|
+Arondight Pocket Warship (SCC)|
+Arondight Pocket Warship|
+Interdictor Pocket Warship (SCC)|
+Interdictor Pocket Warship|
+Interdictor Pocket Warship (Sub-Capital)|
+Taihou Assault Dropship|
+Nekohono'o (SCL)|
+Dragau II Assault Interceptor|
+Tiamat Pocket Warship|
+Gorgon Carrier|
+Seleucus Infantry Transport|
+Nagasawa|
+Achilles (3088)|
+Dragau II (3097)|
+Interdictor Pocket Warship (3115)|
+Tiamat II (3112)|
+Vampire III|
+Duat Military Transport|
+Trutzburg|
+Castrum Pocket WarShip|
+Conquistador 'Blockade Runner'|
+Nekohono'o (HQ)|
+Lung Wang 'Predator'|
+Merlin Ngake|
+Vengeance (Danai Centrella)|
+Vampire II|
+Leopard PA-Class Dropship|
+Black Eagle|
+Czar Dropship (Armored Carrier)|
+Czar Dropship (Mech Carrier)|
+Czar Dropship|
+DroST IIa Transport (2445)|
+DroST IIa Transport (2470)|
+DroST IIb Transport (2445)|
+DroST IIb Transport (2470)|
+Saturn Patrol Ship|
+Claymore Interceptor|
+Firebird FR-1|
+Star Dagger S-2B|
+Thrush TR-5|
+Transit TR-9|
+Chippewa IIC 2|
+Chippewa IIC|
+Goth A|
+Goth B|
+Goth C|
+Goth D|
+Goth Prime|
+Ironsides IRN-SD1b-EC|
+Issedone A|
+Issedone B|
+Issedone C|
+Issedone D|
+Issedone Prime|
+Kublai E|
+Kublai F|
+Kublai G|
+Ogotai A|
+Ogotai B|
+Ogotai Prime|
+Pella|
+Qasar A|
+Qasar B|
+Qasar C|
+Qasar D|
+Qasar Prime|
+Rapier RPR-100b-EC|
+Sabre SB-27b-EC|
+Tomahawk THK-63-EC|
+Voidseeker Mk 39-004 Interceptor|
+Voidseeker Mk 39-007 Striker|
+DragonFly MM-1|
+Blackwasp Mk. 30|
+Aeshna Heavy Drone Fighter|
+Scarab Medium Drone Fighter|
+Tabanid Light Drone Fighter|
+Chippewa CHP-W5b|
+Corsair CSR-V12b|
+Eagle EGL-R6b|
+Hellcat II HCT-213C|
+Lightning LTN-G15b|
+Sabre SB-27b|
+Stuka STU-K5b|
+Stuka STU-K5b2|
+Thunderbird TRB-D36b|
+Zero ZRO-116b|
+Cheetah OF-17A-R|
+Corax C|
+Corsair CSR-12D|
+Hydaspes 3|
+Lucifer III LCR-3|
+Persepolis|
+Rapier RPR-300S|
+Sabre SB-31D|
+Suzaku SU-14|
+Transit TR-13G|
+Tyre 3|
+Umbra RF-1|
+Wildkatze WKT-1S|
+Wildkatze WKT-2S|
+Chippewa CHP-W7 (Manfred)|
+Corsair (Bob) 'Roswell'|
+Hydaspes (Algar)|
+Issus (Erika)|
+Mechbuster (Mary)|
+Seydlitz (Mary) 'Yari'|
+Slayer SL-15 (Eric)|
+Stingray F-92 (Michael)|
+Thrush (Maximilian)'C-1247'|
+Tyre (Michiko)|
+Banshee BSE-X2|
+Cheetah F-10|
+Cheetah F-11-R|
+Cheetah F-11-RR|
+Cheetah F-11|
+Cheetah F-12-S|
+Cheetah F-13|
+Cheetah F-14-S|
+Chippewa CHP-W10|
+Chippewa CHP-W5|
+Chippewa CHP-W7|
+Chippewa CHP-W7T|
+Chippewa CHP-W8|
+Corsair CSR-V12|
+Corsair CSR-V12M 'Regulus'|
+Corsair CSR-V14|
+Corsair CSR-V18|
+Corsair CSR-V20|
+Lucifer II LCF-R16K|
+Lucifer II LCF-R16KR|
+Lucifer LCF-R15|
+Lucifer LCF-R16|
+Lucifer LCF-R20|
+Riever F-100|
+Riever F-100a|
+Riever F-100b|
+Riever F-700|
+Riever F-700a|
+Riever F-700b|
+Sai S-3|
+Sai S-4|
+Sai S-4C|
+Sai S-4X|
+Sai S-7|
+Sai S-8|
+Samurai SL-25|
+Samurai SL-26|
+Samurai SL-27|
+Seydlitz SYD-21|
+Seydlitz SYD-Z1|
+Seydlitz SYD-Z2|
+Seydlitz SYD-Z2A|
+Seydlitz SYD-Z2B|
+Seydlitz SYD-Z3|
+Seydlitz SYD-Z3A|
+Seydlitz SYD-Z4|
+Shilone SL-17|
+Shilone SL-17AC|
+Shilone SL-17R|
+Shilone SL-18|
+Sholagar SL-21|
+Sholagar SL-21L|
+Sholagar SL-22|
+Slayer SL-15|
+Slayer SL-15A|
+Slayer SL-15B|
+Slayer SL-15C|
+Slayer SL-15K|
+Slayer SL-15R|
+Sparrowhawk SPR-6D|
+Sparrowhawk SPR-7D|
+Sparrowhawk SPR-8H|
+Sparrowhawk SPR-H5|
+Sparrowhawk SPR-H5K|
+Stingray F-90|
+Stingray F-90S|
+Stingray F-92|
+Stingray F-94|
+Stingray F-95|
+Stuka STU-D6|
+Stuka STU-D7|
+Stuka STU-K10|
+Stuka STU-K15|
+Stuka STU-K5|
+Thrush TR-7|
+Thrush TR-7p|
+Thrush TR-8|
+Transgressor TR-13|
+Transgressor TR-13A|
+Transgressor TR-14 'AC'|
+Transgressor TR-15|
+Transgressor TR-16|
+Transit TR-10|
+Transit TR-11|
+Transit TR-12|
+Swift C|
+Tomahawk 'C'|
+Tomahawk CH|
+Ahab AHB-443|
+Ahab AHB-643|
+Ahab AHB-MD|
+Ahab AHB-X|
+Gotha GTHA-100|
+Gotha GTHA-300|
+Gotha GTHA-400|
+Gotha GTHA-500|
+Gotha GTHA-600|
+Hammerhead HMR-HD|
+Hammerhead HMR-HE|
+Hammerhead HMR-HF|
+Hammerhead HMR-HG|
+Hellcat II HCT-212|
+Hellcat II HCT-213B|
+Hellcat II HCT-214|
+Hellcat II HCT-215|
+Ironsides IRN-SD1|
+Ironsides IRN-SD2|
+Ironsides IRN-SD3|
+Rapier RPR-100|
+Rapier RPR-101|
+Rapier RPR-102|
+Rapier RPR-200|
+Rapier RPR-300|
+Rogue RGU-133E|
+Rogue RGU-133F|
+Rogue RGU-133L|
+Rogue RGU-133LP|
+Rogue RGU-133P|
+Spad SPD-502|
+Spad SPD-503|
+Spad SPD-504|
+Swift SWF-606|
+Swift SWF-606R|
+Tomahawk THK-33|
+Tomahawk THK-43|
+Tomahawk THK-53|
+Tomahawk THK-63|
+Tomahawk THK-63CS|
+Trident TRN-3T|
+Trident TRN-3U|
+Trident TRN-3V|
+Zero ZRO-114|
+Zero ZRO-115|
+Avar A|
+Avar B|
+Avar C|
+Avar D|
+Avar E|
+Avar Prime|
+Bashkir A|
+Bashkir B|
+Bashkir C|
+Bashkir D|
+Bashkir E|
+Bashkir Prime|
+Batu A|
+Batu B|
+Batu C|
+Batu D|
+Batu E|
+Batu Prime|
+Jagatai A|
+Jagatai B|
+Jagatai C|
+Jagatai D|
+Jagatai E|
+Jagatai Prime|
+Jagatai X|
+Jengiz A|
+Jengiz B|
+Jengiz C|
+Jengiz D|
+Jengiz E|
+Jengiz Prime|
+Jengiz X|
+Kirghiz A|
+Kirghiz B|
+Kirghiz C|
+Kirghiz D|
+Kirghiz E|
+Kirghiz Prime|
+Sabutai A|
+Sabutai B|
+Sabutai C|
+Sabutai D|
+Sabutai E|
+Sabutai Prime|
+Sabutai X|
+Scytha A|
+Scytha B|
+Scytha C|
+Scytha D|
+Scytha E|
+Scytha Prime|
+Scytha X|
+Sulla A|
+Sulla B|
+Sulla C|
+Sulla D|
+Sulla E|
+Sulla Prime|
+Turk A|
+Turk B|
+Turk C|
+Turk D|
+Turk E|
+Turk Prime|
+Vandal A|
+Vandal B|
+Vandal C|
+Vandal D|
+Vandal E|
+Vandal Prime|
+Visigoth A|
+Visigoth B|
+Visigoth C|
+Visigoth D|
+Visigoth E|
+Visigoth Prime|
+Ammon|
+Chaeronea|
+Hydaspes|
+Issus|
+Tyre 2|
+Tyre|
+Corax CRX-O|
+Corax CRX-OA|
+Corax CRX-OB|
+Corax CRX-OC|
+Dagger DARO-1|
+Dagger DARO-1A|
+Dagger DARO-1B|
+Defiance DFC-O|
+Defiance DFC-OA|
+Defiance DFC-OB|
+Defiance DFC-OC|
+Eisensturm EST-O|
+Eisensturm EST-OA|
+Eisensturm EST-OB|
+Eisensturm EST-OC|
+Eisensturm EST-R3|
+Huscarl HSCL-1-O|
+Huscarl HSCL-1-OA|
+Huscarl HSCL-1-OB|
+Huscarl HSCL-1-OC|
+Lancer LX-2|
+Lancer LX-2A|
+Oni ON-1|
+Oni ON-2|
+Shiva SHV-O|
+Shiva SHV-OA|
+Shiva SHV-OB|
+Shiva SHV-OC|
+Tatsu MIK-O|
+Tatsu MIK-OA|
+Tatsu MIK-OB|
+Tatsu MIK-OC|
+Troika CMT-3T|
+Troika CMT-4U|
+Ammon 2|
+Chaeronea 2|
+Chaeronea 3|
+Chaeronea 4|
+Hydaspes 2|
+Issus 2|
+Issus 3|
+Xerxes 2|
+Xerxes 3|
+Xerxes|
+Corax CRX-OD|
+Corax CRX-OR|
+Dagger DARO-1C|
+Dagger DARO-1D|
+Defiance DFC-OD|
+Eisensturm EST-OD|
+Huscarl HSCL-1-OD|
+Huscarl HSCL-1-OR|
+Lancer LX-3|
+Shiva SHV-OD|
+Tatsu MIK-OD|
+Tatsu MIK-OE|
+Troika CMT-6T|
+Centurion CNT-1A|
+Centurion CNT-1D|
+Centurion CNT-2D|
+Centurion CNT-3S|
+Deathstalker F-77|
+Deathstalker F-77A|
+Eagle EGL-R1|
+Eagle EGL-R10|
+Eagle EGL-R11|
+Eagle EGL-R4|
+Eagle EGL-R6|
+Eagle EGL-R9|
+Hellcat HCT-213|
+Hellcat HCT-213D|
+Hellcat HCT-213R|
+Hellcat HCT-213S|
+Hellcat HCT-313|
+Lightning LTN-G14|
+Lightning LTN-G15|
+Lightning LTN-G16D|
+Lightning LTN-G16L|
+Lightning LTN-G16O|
+Lightning LTN-G16S|
+Lightning LTN-G16T|
+Ahab AHB-443b|
+Gotha GTHA-500b|
+Hammerhead HMR-HDb|
+Ironsides IRN-SD1b|
+Rapier RPR-100b|
+Rogue RGU-133Eb|
+Tomahawk THK-63b|
+Trident TRN-3Tb|
+Sabre SB-26|
+Sabre SB-27|
+Sabre SB-28|
+Sabre SB-29|
+Rusalka S-RSL-O Invictus|
+Rusalka S-RSL-OA Dominus|
+Rusalka S-RSL-OB Infernus|
+Rusalka S-RSL-OC Comminus|
+Rusalka S-RSL-OD Luminos|
+Rusalka S-RSL-OE Eminus|
+Shade S-HA-O Invictus|
+Shade S-HA-OA Dominus|
+Shade S-HA-OB Infernus|
+Shade S-HA-OC Comminus|
+Shade S-HA-OD Luminos|
+Shade S-HA-OE Eminus|
+Striga S-STR-O Invictus|
+Striga S-STR-OA Dominus|
+Striga S-STR-OB Infernus|
+Striga S-STR-OC Comminus|
+Striga S-STR-OD Luminos|
+Striga S-STR-OE Eminus|
+Starfire SF-1X|
+Thunderbird TRB-D36|
+Thunderbird TRB-D46|
+Thunderbird TRB-D50|
+Thunderbird TRB-D56|
+Typhoon TFN-2A|
+Typhoon TFN-3A|
+Typhoon TFN-3M|
+Typhoon TFN-5H|
+Vulcan VLC-5N|
+Vulcan VLC-6N|
+Vulcan VLC-8N|
+Mengqin MNG-8L|
+Morgenstern MR-1S|
+Morgenstern MR-1SA|
+Morgenstern MR-1SB|
+Morgenstern MR-1SC|
+Morgenstern MR-1SD|
+Ostrogoth A|
+Ostrogoth B|
+Ostrogoth C|
+Ostrogoth Prime|
+Poignard PGD-L3|
+Poignard PGD-R3|
+Poignard PGD-Y3|
+Sagittarii SGT-2R|
+Sagittarii SGT-3R|
+Wusun A|
+Wusun B|
+Wusun C|
+Wusun Prime|
+Cutlass CUT-01D|
+Cutlass CUT-01E|
+Rondel RDL-01C|
+Koroshiya KOS-1A|
+Yun Y-2|
+Aquila AQA-1M|
+Picaroon CSR-F100|
+Shikra SKR-4M|
+Cheetah IIC|
+Jengiz F|
+Lucifer III C|
+Morgenstern MR-1SE|
+Ostrogoth D|
+Sagittarii SGT-4R|
+Scytha F|
+Seydlitz C|
+Sparrowhawk SPR-7Dr|
+Stingray F-96R|
+Sulla F|
+Tatsu MIK-OF|
+Thrush TR-9|
+Troika CMT-7T|
+Wusun D|
+Schrack SCK-O|
+Schrack SCK-OA|
+Schrack SCK-OB|
+Simurgh SMG-O|
+Simurgh SMG-OA|
+Simurgh SMG-OB|
+Sternensturm STM-O|
+Sternensturm STM-OA|
+Sternensturm STM-OB|
+Shikra SKR-4N|
+Bashkir Z|
+Batu Z|
+Sabutai Z|
+Sangihe Shrike-Thrush 'Nanook'|
+Cheetah II F-12A|
+Ammon XR|
+Scytha XR|
+Ironsides CX-19|
+Tomahawk CX-11|
+Zero ZRO-CX-3|
+Sabre SB-31 'Defense Special'|
+Sholagar SL-27X|
+Corsair CSR-X12 Rigid Night|
+Dagger DAR4-XP|
+Hellcat II HCT-213BC (Herman)|
+Swift SWF-606CA (Aaron)|
+Oni ON-2X|
+Shilone SL-17X|
+Transit TR-13X 'Glare'|
+Troika CMT-3TV (Viktor)|
+Cheetah OF-17|
+Shiva SHV-S|
+Lucifer LCF-X30|
+Seydlitz SYD-45X 'Starling'|
+Slayer SL-CX1|
+Thunderbird TRB-XTS|
+Battle Taxi NL-43|
+Deathstalker XF-78|
+Chippewa CHP-X-P (Gladstone)|
+Lightning LTN-G16-P (Branson)|
+Vulcan VLC-3N|
+Hammerhead HMR-HA|
+Hammerhead HMR-HC|
+Persepolis 2|
+Malaika BAM-1A1|
+Sparrowhawk SPR-DH|
+Star Dagger S-2|
+Rapier RPR-300X|
+Starfire SF-1X (Prototype)|
+Arrow IV Artillery Turret (Dual)|
+Arrow IV Artillery Turret (Quad)|
+Arrow IV Artillery Turret (Triple)|
+Arrow IV Artillery Turret (Single)|
+Long Tom Artillery Cannon Turret (Dual)|
+Long Tom Artillery Cannon Turret (Quad)|
+Long Tom Artillery Cannon Turret (Triple)|
+Long Tom Artillery Cannon Turret (Single)|
+Long Tom Artillery Turret (Dual)|
+Long Tom Artillery Turret (Quad)|
+Long Tom Artillery Turret (Triple)|
+Long Tom Artillery Turret (Single)|
+'Mech Mortar/1 Battery (Dual)|
+'Mech Mortar/1 Battery (Quad)|
+'Mech Mortar/1 Battery (Single)|
+'Mech Mortar/1 Battery (Triple)|
+'Mech Mortar/2 Battery (Dual)|
+'Mech Mortar/2 Battery (Quad)|
+'Mech Mortar/2 Battery (Single)|
+'Mech Mortar/2 Battery (Triple)|
+'Mech Mortar/4 Battery (Dual)|
+'Mech Mortar/4 Battery (Quad)|
+'Mech Mortar/4 Battery (Triple)|
+'Mech Mortar/4 Battery (Single)|
+'Mech Mortar/8 Battery (Dual)|
+'Mech Mortar/8 Battery (Quad)|
+'Mech Mortar/8 Battery (Triple)|
+'Mech Mortar/8 Battery (Single)|
+Sniper Artillery Cannon Turret (Dual)|
+Sniper Artillery Cannon Turret (Quad)|
+Sniper Artillery Cannon Turret (Triple)|
+Sniper Artillery Cannon Turret (Single)|
+Sniper Artillery Turret (Dual)|
+Sniper Artillery Turret (Quad)|
+Sniper Artillery Turret (Triple)|
+Sniper Artillery Turret (Single)|
+Thumper Artillery Cannon Turret (Dual)|
+Thumper Artillery Cannon Turret (Quad)|
+Thumper Artillery Cannon Turret (Triple)|
+Thumper Artillery Cannon Turret (Single)|
+Thumper Artillery Turret (Dual)|
+Thumper Artillery Turret (Quad)|
+Thumper Artillery Turret (Triple)|
+Thumper Artillery Turret (Single)|
+ATM/12 Turret (Dual)|
+ATM/12 Turret (Quad)|
+ATM/12 Turret (Triple)|
+ATM/12 Turret (Single)|
+ATM/3 Turret (Dual)|
+ATM/3 Turret (Quad)|
+ATM/3 Turret (Triple)|
+ATM/3 Turret (Single)|
+ATM/6 Turret (Dual)|
+ATM/6 Turret (Quad)|
+ATM/6 Turret (Triple)|
+ATM/6 Turret (Single)|
+ATM/9 Turret (Dual)|
+ATM/9 Turret (Quad)|
+ATM/9 Turret (Triple)|
+ATM/9 Turret (Single)|
+Improved ATM/12 Turret (Dual)|
+Improved ATM/12 Turret (Quad)|
+Improved ATM/12 Turret (Triple)|
+Improved ATM/12 Turret (Single)|
+Improved ATM/3 Turret (Dual)|
+Improved ATM/3 Turret (Quad)|
+Improved ATM/3 Turret (Triple)|
+Improved ATM/3 Turret (Single)|
+Improved ATM/6 Turret (Dual)|
+Improved ATM/6 Turret (Quad)|
+Improved ATM/6 Turret (Triple)|
+Improved ATM/6 Turret (Single)|
+Improved ATM/9 Turret (Dual)|
+Improved ATM/9 Turret (Quad)|
+Improved ATM/9 Turret (Triple)|
+Improved ATM/9 Turret (Single)|
+LB-10-X Turret (Dual)|
+LB-10-X Turret (Quad)|
+LB-10-X Turret (Single)|
+LB-10-X Turret (Triple)|
+LB-20-X Turret (Dual)|
+LB-20-X Turret (Quad)|
+LB-20-X Turret (Single)|
+LB-20-X Turret (Triple)|
+LB-2-X Turret (Dual)|
+LB-2-X Turret (Quad)|
+LB-2-X Turret (Single)|
+LB-2-X Turret (Triple)|
+LB-5-X Turret (Dual)|
+LB-5-X Turret (Quad)|
+LB-5-X Turret (Single)|
+LB-5-X Turret (Triple)|
+ProtoMech AC/2 Turret (Dual)|
+ProtoMech AC/2 Turret (Quad)|
+ProtoMech AC/2 Turret (Single)|
+ProtoMech AC/2 Turret (Triple)|
+ProtoMech AC/4 Turret (Dual)|
+ProtoMech AC/4 Turret (Quad)|
+ProtoMech AC/4 Turret (Single)|
+ProtoMech AC/4 Turret (Triple)|
+ProtoMech AC/8 Turret (Dual)|
+ProtoMech AC/8 Turret (Quad)|
+ProtoMech AC/8 Turret (Single)|
+ProtoMech AC/8 Turret (Triple)|
+RAC/2 Turret (Dual)|
+RAC/2 Turret (Quad)|
+RAC/2 Turret (Single)|
+RAC/2 Turret (Triple)|
+RAC/5 Turret (Dual)|
+RAC/5 Turret (Quad)|
+RAC/5 Turret (Single)|
+RAC/5 Turret (Triple)|
+UAC/10 Turret (Dual)|
+UAC/10 Turret (Quad)|
+UAC/10 Turret (Single)|
+UAC/10 Turret (Triple)|
+UAC/2 Turret (Dual)|
+UAC/2 Turret (Quad)|
+UAC/2 Turret (Single)|
+UAC/2 Turret (Triple)|
+UAC/20 Turret (Dual)|
+UAC/20 Turret (Quad)|
+UAC/20 Turret (Single)|
+UAC/20 Turret (Triple)|
+UAC/5 Turret (Dual)|
+UAC/5 Turret (Quad)|
+UAC/5 Turret (Single)|
+UAC/5 Turret (Triple)|
+ER Flamer Turret (Dual)|
+ER Flamer Turret (Quad)|
+ER Flamer Turret (Single)|
+ER Flamer Turret (Triple)|
+Flamer Turret (Dual)|
+Flamer Turret (Quad)|
+Flamer Turret (Single)|
+Flamer Turret (Triple)|
+Heavy Flamer Turret (Dual)|
+Heavy Flamer Turret (Quad)|
+Heavy Flamer Turret (Single)|
+Heavy Flamer Turret (Triple)|
+AP Gauss Turret (Dual)|
+AP Gauss Turret (Quad)|
+AP Gauss Turret (Triple)|
+AP Gauss Turret (Single)|
+Gauss Turret (Dual)|
+Gauss Turret (Quad)|
+Gauss Turret (Triple)|
+Gauss Turret (Single)|
+HAG/20 Turret (Dual)|
+HAG/20 Turret (Quad)|
+HAG/20 Turret (Triple)|
+HAG/20 Turret (Single)|
+HAG/30 Turret (Dual)|
+HAG/30 Turret (Quad)|
+HAG/30 Turret (Triple)|
+HAG/30 Turret (Single)|
+HAG/40 Turret (Dual)|
+HAG/40 Turret (Quad)|
+HAG/40 Turret (Triple)|
+HAG/40 Turret (Single)|
+Large Chemical Laser Turret (Dual)|
+Large Chemical Laser Turret (Quad)|
+Large Chemical Laser Turret (Single)|
+Large Chemical Laser Turret (Triple)|
+Medium Chemical Laser Turret (Dual)|
+Medium Chemical Laser Turret (Quad)|
+Medium Chemical Laser Turret (Single)|
+Medium Chemical Laser Turret (Triple)|
+Small Chemical Laser Turret (Dual)|
+Small Chemical Laser Turret (Quad)|
+Small Chemical Laser Turret (Single)|
+Small Chemical Laser Turret (Triple)|
+ER Large Laser Turret (Dual)|
+ER Large Laser Turret (Quad)|
+ER Large Laser Turret (Single)|
+ER Large Laser Turret (Triple)|
+ER Large Laser Turret (w/ Targeting) (Dual)|
+ER Large Laser Turret (w/ Targeting) (Quad)|
+ER Large Laser Turret (w/ Targeting) (Single)|
+ER Large Laser Turret (w/ Targeting) (Triple)|
+ER Micro Laser Turret (Dual)|
+ER Micro Laser Turret (Quad)|
+ER Micro Laser Turret (Single)|
+ER Micro Laser Turret (Triple)|
+ER Medium Laser Turret (Dual)|
+ER Medium Laser Turret (Quad)|
+ER Medium Laser Turret (Single)|
+ER Medium Laser Turret (Triple)|
+ER Small Laser Turret (Dual)|
+ER Small Laser Turret (Quad)|
+ER Small Laser Turret (Single)|
+ER Small Laser Turret (Triple)|
+Large ER Pulse Laser Turret (Dual)|
+Large ER Pulse Laser Turret (Quad)|
+Large ER Pulse Laser Turret (Single)|
+Large ER Pulse Laser Turret (Triple)|
+Medium ER Pulse Laser Turret (Dual)|
+Medium ER Pulse Laser Turret (Quad)|
+Medium ER Pulse Laser Turret (Single)|
+Medium ER Pulse Laser Turret (Triple)|
+Small ER Pulse Laser Turret (Dual)|
+Small ER Pulse Laser Turret (Quad)|
+Small ER Pulse Laser Turret (Single)|
+Small ER Pulse Laser Turret (Triple)|
+Heavy Large Laser Turret (Dual)|
+Heavy Large Laser Turret (Quad)|
+Heavy Large Laser Turret (Single)|
+Heavy Large Laser Turret (Triple)|
+Heavy Large Laser Turret(w/ Targeting) (Dual)|
+Heavy Large Laser Turret(w/ Targeting) (Quad)|
+Heavy Large Laser Turret(w/ Targeting) (Single)|
+Heavy Large Laser Turret(w/ Targeting) (Triple)|
+Heavy Medium Laser Turret (Dual)|
+Heavy Medium Laser Turret (Quad)|
+Heavy Medium Laser Turret (Single)|
+Heavy Medium Laser Turret (Triple)|
+Heavy Small Laser Turret (Dual)|
+Heavy Small Laser Turret (Quad)|
+Heavy Small Laser Turret (Single)|
+Heavy Small Laser Turret (Triple)|
+Improved Heavy Large Laser Turret (Dual)|
+Improved Heavy Large Laser Turret (Quad)|
+Improved Heavy Large Laser Turret (Single)|
+Improved Heavy Large Laser Turret (Triple)|
+Improved Heavy Large Laser Turret (w/ Targeting) (Dual)|
+Improved Heavy Large Laser Turret (w/ Targeting) (Quad)|
+Improved Heavy Large Laser Turret (w/ Targeting) (Single)|
+Improved Heavy Large Laser Turret (w/ Targeting) (Triple)|
+Improved Heavy Medium Laser Turret (Dual)|
+Improved Heavy Medium Laser Turret (Quad)|
+Improved Heavy Medium Laser Turret (Single)|
+Improved Heavy Medium Laser Turret (Triple)|
+Improved Heavy Small Laser Turret (Dual)|
+Improved Heavy Small Laser Turret (Quad)|
+Improved Heavy Small Laser Turret (Single)|
+Improved Heavy Small Laser Turret (Triple)|
+Micro Pulse Laser Turret (Dual)|
+Micro Pulse Laser Turret (Quad)|
+Micro Pulse Laser Turret (Single)|
+Micro Pulse Laser Turret (Triple)|
+Large Pulse Laser Turret (Dual)|
+Large Pulse Laser Turret (Quad)|
+Large Pulse Laser Turret (Single)|
+Large Pulse Laser Turret (Triple)|
+Micro Pulse Laser Turret (Dual)|
+Micro Pulse Laser Turret (Quad)|
+Micro Pulse Laser Turret (Single)|
+Micro Pulse Laser Turret (Triple)|
+Medium Pulse Laser Turret (Dual)|
+Medium Pulse Laser Turret (Quad)|
+Medium Pulse Laser Turret (Single)|
+Medium Pulse Laser Turret (Triple)|
+Small Pulse Laser Turret (Dual)|
+Small Pulse Laser Turret (Quad)|
+Small Pulse Laser Turret (Single)|
+Small Pulse Laser Turret (Triple)|
+LRM/10 Turret (w/ Artemis IV) (Dual)|
+LRM/10 Turret (w/ Artemis IV) (Quad)|
+LRM/10 Turret (w/ Artemis IV) (Triple)|
+LRM/10 Turret (w/ Artemis IV) (Single)|
+LRM/15 Turret (w/ Artemis IV) (Dual)|
+LRM/15 Turret (w/ Artemis IV) (Quad)|
+LRM/15 Turret (w/ Artemis IV) (Triple)|
+LRM/15 Turret (w/ Artemis IV) (Single)|
+LRM/20 Turret (w/ Artemis IV) (Dual)|
+LRM/20 Turret (w/ Artemis IV) (Quad)|
+LRM/20 Turret (w/ Artemis IV) (Triple)|
+LRM/20 Turret (w/ Artemis IV) (Single)|
+LRM/5 Turret (w/ Artemis IV) (Dual)|
+LRM/5 Turret (w/ Artemis IV) (Quad)|
+LRM/5 Turret (w/ Artemis IV) (Triple)|
+LRM/5 Turret (w/ Artemis IV) (Single)|
+LRM/10 Turret (w/ Artemis V) (Dual)|
+LRM/10 Turret (w/ Artemis V) (Quad)|
+LRM/10 Turret (w/ Artemis V) (Triple)|
+LRM/10 Turret (w/ Artemis V) (Single)|
+LRM/15 Turret (w/ Artemis V) (Dual)|
+LRM/15 Turret (w/ Artemis V) (Quad)|
+LRM/15 Turret (w/ Artemis V) (Triple)|
+LRM/15 Turret (w/ Artemis V) (Single)|
+LRM/20 Turret (w/ Artemis V) (Dual)|
+LRM/20 Turret (w/ Artemis V) (Quad)|
+LRM/20 Turret (w/ Artemis V) (Triple)|
+LRM/20 Turret (w/ Artemis V) (Single)|
+LRM/5 Turret (w/ Artemis V) (Dual)|
+LRM/5 Turret (w/ Artemis V) (Quad)|
+LRM/5 Turret (w/ Artemis V) (Triple)|
+LRM/5 Turret (w/ Artemis V) (Single)|
+LRM/10 Turret (Dual)|
+LRM/10 Turret (Quad)|
+LRM/10 Turret (Triple)|
+LRM/10 Turret (Single)|
+LRM/15 Turret (Dual)|
+LRM/15 Turret (Quad)|
+LRM/15 Turret (Triple)|
+LRM/15 Turret (Single)|
+LRM/20 Turret (Dual)|
+LRM/20 Turret (Quad)|
+LRM/20 Turret (Triple)|
+LRM/20 Turret (Single)|
+LRM/5 Turret (Dual)|
+LRM/5 Turret (Quad)|
+LRM/5 Turret (Triple)|
+LRM/5 Turret (Single)|
+Streak LRM/10 Turret (Dual)|
+Streak LRM/10 Turret (Quad)|
+Streak LRM/10 Turret (Triple)|
+Streak LRM/10 Turret (Single)|
+Streak LRM/15 Turret (Dual)|
+Streak LRM/15 Turret (Quad)|
+Streak LRM/15 Turret (Triple)|
+Streak LRM/15 Turret (Single)|
+Streak LRM/20 Turret (Dual)|
+Streak LRM/20 Turret (Quad)|
+Streak LRM/20 Turret (Triple)|
+Streak LRM/20 Turret (Single)|
+Streak LRM/5 Turret (Dual)|
+Streak LRM/5 Turret (Quad)|
+Streak LRM/5 Turret (Triple)|
+Streak LRM/5 Turret (Single)|
+Heavy MG Turret (Dual)|
+Heavy MG Turret (Quad)|
+Heavy MG Turret (Triple)|
+Heavy MG Turret w/ Array (Dual)|
+Heavy MG Turret w/ Array (Quad)|
+Heavy MG Turret w/ Array (Triple)|
+Heavy MG Turret (Single)|
+Light MG Turret (Dual)|
+Light MG Turret (Quad)|
+Light MG Turret (Triple)|
+Light MG Turret w/ Array (Dual)|
+Light MG Turret w/ Array (Quad)|
+Light MG Turret w/ Array (Triple)|
+Light MG Turret (Single)|
+MG Turret (Dual)|
+MG Turret (Quad)|
+MG Turret (Triple)|
+MG Turret w/ Array (Dual)|
+MG Turret w/ Array (Quad)|
+MG Turret w/ Array (Triple)|
+MG Turret (Single)|
+Enhanced PPC Turret (Dual)|
+Enhanced PPC Turret (Quad)|
+Enhanced PPC Turret (Single)|
+Enhanced PPC Turret (Triple)|
+ER PPC Turret (Dual)|
+ER PPC Turret (Quad)|
+ER PPC Turret (Single)|
+ER PPC Turret (Triple)|
+ER PPC w Capacitor Turret (Single)|
+ER PPC w Capacitor Turret (Quad)|
+ER PPC w Capacitor Turret (Triple)|
+ER PPC w Capacitor Turret (Dual)|
+Plasma Cannon Turret (Triple)|
+Plasma Cannon Turret (Dual)|
+Plasma Cannon Turret (Quad)|
+Plasma Cannon Turret (Single)|
+Active Probe Bunker|
+AMS Turret (Dual)|
+AMS Turret (Single)|
+Angel ECM Bunker|
+ECM Suite Bunker|
+Laser AMS Turret (Dual)|
+Laser AMS Turret (Single)|
+Light Active Probe Bunker|
+Narc Turret (Dual)|
+Narc Turret (Single)|
+TAG Turret (Dual)|
+TAG Turret (Single)|
+Grenade Launcher Turret (Dual)|
+Grenade Launcher Turret (Quad)|
+Grenade Launcher Turret (Single)|
+Grenade Launcher Turret (Triple)|
+Watchdog ECM Bunker|
+SRM/2 Turret (w/ Artemis IV) (Dual)|
+SRM/2 Turret (w/ Artemis IV) (Quad)|
+SRM/2 Turret (w/ Artemis IV) (Single)|
+SRM/2 Turret (w/ Artemis IV) (Triple)|
+SRM/4 Turret (w/ Artemis IV) (Dual)|
+SRM/4 Turret (w/ Artemis IV) (Quad)|
+SRM/4 Turret (w/ Artemis IV) (Single)|
+SRM/4 Turret (w/ Artemis IV) (Triple)|
+SRM/6 Turret (w/ Artemis IV) (Dual)|
+SRM/6 Turret (w/ Artemis IV) (Quad)|
+SRM/6 Turret (w/ Artemis IV) (Single)|
+SRM/6 Turret (w/ Artemis IV) (Triple)|
+SRM/2 Turret (w/ Artemis V) (Dual)|
+SRM/2 Turret (w/ Artemis V) (Quad)|
+SRM/2 Turret (w/ Artemis V) (Single)|
+SRM/2 Turret (w/ Artemis V) (Triple)|
+SRM/4 Turret (w/ Artemis V) (Dual)|
+SRM/4 Turret (w/ Artemis V) (Quad)|
+SRM/4 Turret (w/ Artemis V) (Single)|
+SRM/4 Turret (w/ Artemis V) (Triple)|
+SRM/6 Turret (w/ Artemis V) (Dual)|
+SRM/6 Turret (w/ Artemis V) (Quad)|
+SRM/6 Turret (w/ Artemis V) (Single)|
+SRM/6 Turret (w/ Artemis V) (Triple)|
+SRM/2 Turret (Dual)|
+SRM/2 Turret (Quad)|
+SRM/2 Turret (Single)|
+SRM/2 Turret (Triple)|
+SRM/4 Turret (Dual)|
+SRM/4 Turret (Quad)|
+SRM/4 Turret (Single)|
+SRM/4 Turret (Triple)|
+SRM/6 Turret (Dual)|
+SRM/6 Turret (Quad)|
+SRM/6 Turret (Single)|
+SRM/6 Turret (Triple)|
+Streak SRM/2 Turret (Dual)|
+Streak SRM/2 Turret (Quad)|
+Streak SRM/2 Turret (Single)|
+Streak SRM/2 Turret (Triple)|
+Streak SRM/4 Turret (Dual)|
+Streak SRM/4 Turret (Quad)|
+Streak SRM/4 Turret (Single)|
+Streak SRM/4 Turret (Triple)|
+Streak SRM/6 Turret (Dual)|
+Streak SRM/6 Turret (Quad)|
+Streak SRM/6 Turret (Single)|
+Streak SRM/6 Turret (Triple)|
+Arrow IV Artillery Turret (Dual)|
+Arrow IV Artillery Turret (Quad)|
+Arrow IV Artillery Turret (Triple)|
+Arrow IV Artillery Turret (Single)|
+Cruise Missile/120 Launcher (Dual)|
+Cruise Missile/120 Launcher (Quad)|
+Cruise Missile/120 Launcher (Triple)|
+Cruise Missile/120 Launcher (Single)|
+Cruise Missile/50 Launcher (Dual)|
+Cruise Missile/50 Launcher (Quad)|
+Cruise Missile/50 Launcher (Triple)|
+Cruise Missile/50 Launcher (Single)|
+Cruise Missile/70 Launcher (Dual)|
+Cruise Missile/70 Launcher (Quad)|
+Cruise Missile/70 Launcher (Triple)|
+Cruise Missile/70 Launcher (Single)|
+Cruise Missile/90 Launcher (Dual)|
+Cruise Missile/90 Launcher (Quad)|
+Cruise Missile/90 Launcher (Triple)|
+Cruise Missile/90 Launcher (Single)|
+Long Tom Artillery Cannon Turret (Dual)|
+Long Tom Artillery Cannon Turret (Triple)|
+Long Tom Artillery Cannon Turret (Triple)|
+Long Tom Artillery Cannon Turret (Single)|
+Long Tom Artillery Turret (Dual)|
+Long Tom Artillery Turret (Quad)|
+Long Tom Artillery Turret (Triple)|
+Long Tom Artillery Turret (Single)|
+'Mech Mortar/1 Battery (Dual)|
+'Mech Mortar/1 Battery (Quad)|
+'Mech Mortar/1 Battery (Triple)|
+'Mech Mortar/1 Battery (Single)|
+'Mech Mortar/2 Battery (Dual)|
+'Mech Mortar/2 Battery (Quad)|
+'Mech Mortar/2 Battery (Triple)|
+'Mech Mortar/2 Battery (Single)|
+'Mech Mortar/4 Battery (Dual)|
+'Mech Mortar/4 Battery (Quad)|
+'Mech Mortar/4 Battery (Triple)|
+'Mech Mortar/4 Battery (Single)|
+'Mech Mortar/8 Battery (Dual)|
+'Mech Mortar/8 Battery (Quad)|
+'Mech Mortar/8 Battery (Triple)|
+'Mech Mortar/8 Battery (Single)|
+Sniper Artillery Cannon Turret (Dual)|
+Sniper Artillery Cannon Turret (Quad)|
+Sniper Artillery Cannon Turret (Triple)|
+Sniper Artillery Cannon Turret (Single)|
+Sniper Artillery Turret (Dual)|
+Sniper Artillery Turret (Quad)|
+Sniper Artillery Turret (Triple)|
+Sniper Artillery Turret (Single)|
+Thumper Artillery Cannon Turret (Dual)|
+Thumper Artillery Cannon Turret (Quad)|
+Thumper Artillery Cannon Turret (Triple)|
+Thumper Artillery Cannon Turret (Single)|
+Thumper Artillery Turret (Dual)|
+Thumper Artillery Turret (Quad)|
+Thumper Artillery Turret (Triple)|
+Thumper Artillery Turret (Single)|
+HV Autocannon/10 Turret (Dual)|
+HV Autocannon/10 Turret (Quad)|
+HV Autocannon/10 Turret (Single)|
+HV Autocannon/10 Turret (Triple)|
+HV Autocannon/2 Turret (Dual)|
+HV Autocannon/2 Turret (Quad)|
+HV Autocannon/2 Turret (Single)|
+HV Autocannon/2 Turret (Triple)|
+HV Autocannon/5 Turret (Dual)|
+HV Autocannon/5 Turret (Quad)|
+HV Autocannon/5 Turret (Single)|
+HV Autocannon/5 Turret (Triple)|
+LB-10-X Turret (Dual)|
+LB-10-X Turret (Quad)|
+LB-10-X Turret (Single)|
+LB-10-X Turret (Triple)|
+LB-20-X Turret (Dual)|
+LB-20-X Turret (Quad)|
+LB-20-X Turret (Single)|
+LB-20-X Turret (Triple)|
+LB-2-X Turret (Dual)|
+LB-2-X Turret (Quad)|
+LB-2-X Turret (Single)|
+LB-2-X Turret (Triple)|
+LB-5-X Turret (Dual)|
+LB-5-X Turret (Quad)|
+LB-5-X Turret (Single)|
+LB-5-X Turret (Triple)|
+Light AC/2 Turret (Dual)|
+Light AC/2 Turret (Quad)|
+Light AC/2 Turret (Single)|
+Light AC/2 Turret (Triple)|
+Light AC/5 Turret (Dual)|
+Light AC/5 Turret (Quad)|
+Light AC/5 Turret (Single)|
+Light AC/5 Turret (Triple)|
+RAC/2 Turret (Dual)|
+RAC/2 Turret (Quad)|
+RAC/2 Turret (Single)|
+RAC/2 Turret (Triple)|
+RAC/5 Turret (Dual)|
+RAC/5 Turret (Quad)|
+RAC/5 Turret (Single)|
+RAC/5 Turret (Triple)|
+Heavy Rifle Turret (Dual)|
+Heavy Rifle Turret (Quad)|
+Heavy Rifle Turret (Single)|
+Heavy Rifle Turret (Triple)|
+Light Rifle Turret (Dual)|
+Light Rifle Turret (Quad)|
+Light Rifle Turret (Single)|
+Light Rifle Turret (Triple)|
+Medium Rifle Turret (Dual)|
+Medium Rifle Turret (Quad)|
+Medium Rifle Turret (Single)|
+Medium Rifle Turret (Triple)|
+AC/10 Turret (Dual)|
+AC/10 Turret (Quad)|
+AC/10 Turret (Single)|
+AC/10 Turret (Triple)|
+AC/2 Turret (Dual)|
+AC/2 Turret (Quad)|
+AC/2 Turret (Single)|
+AC/2 Turret (Triple)|
+AC/20 Turret (Dual)|
+AC/20 Turret (Quad)|
+AC/20 Turret (Single)|
+AC/20 Turret (Triple)|
+AC/5 Turret (Dual)|
+AC/5 Turret (Quad)|
+AC/5 Turret (Single)|
+AC/5 Turret (Triple)|
+UAC/10 Turret (Dual)|
+UAC/10 Turret (Quad)|
+UAC/10 Turret (Single)|
+UAC/10 Turret (Triple)|
+UAC/2 Turret (Dual)|
+UAC/2 Turret (Quad)|
+UAC/2 Turret (Single)|
+UAC/2 Turret (Triple)|
+UAC/20 Turret (Dual)|
+UAC/20 Turret (Quad)|
+UAC/20 Turret (Single)|
+UAC/20 Turret (Triple)|
+UAC/5 Turret (Dual)|
+UAC/5 Turret (Quad)|
+UAC/5 Turret (Single)|
+UAC/5 Turret (Triple)|
+ER Flamer Turret (Dual)|
+ER Flamer Turret (Quad)|
+ER Flamer Turret (Single)|
+ER Flamer Turret (Triple)|
+Flamer Turret (Dual)|
+Flamer Turret (Quad)|
+Flamer Turret (Single)|
+Flamer Turret (Triple)|
+Heavy Flamer Turret (Dual)|
+Heavy Flamer Turret (Quad)|
+Heavy Flamer Turret (Single)|
+Heavy Flamer Turret (Triple)|
+Gauss Turret (Dual)|
+Gauss Turret (Quad)|
+Gauss Turret (Triple)|
+Gauss Turret (Single)|
+Heavy Gauss Turret (Dual)|
+Heavy Gauss Turret (Quad)|
+Heavy Gauss Turret (Triple)|
+Heavy Gauss Turret (Single)|
+Imp.Heavy Gauss Turret (Dual)|
+Imp.Heavy Gauss Turret (Quad)|
+Imp.Heavy Gauss Turret (Triple)|
+Imp.Heavy Gauss Turret (Single)|
+Light Gauss Turret (Dual)|
+Light Gauss Turret (Quad)|
+Light Gauss Turret (Triple)|
+Light Gauss Turret (Single)|
+Magshot Gauss Turret (Dual)|
+Magshot Gauss Turret (Quad)|
+Magshot Gauss Turret (Triple)|
+Magshot Gauss Turret (Single)|
+Silver Bullet Gauss Turret (Dual)|
+Silver Bullet Gauss Turret (Quad)|
+Silver Bullet Gauss Turret (Triple)|
+Silver Bullet Gauss Turret (Single)|
+Blazer Cannon Turret (Dual)|
+Blazer Cannon Turret (Quad)|
+Blazer Cannon Turret (Single)|
+Blazer Cannon Turret (Triple)|
+Bombast Laser Turret (Dual)|
+Bombast Laser Turret (Quad)|
+Bombast Laser Turret (Single)|
+Bombast Laser Turret (Triple)|
+ER Large Laser Turret (Dual)|
+ER Large Laser Turret (Quad)|
+ER Large Laser Turret (Single)|
+ER Large Laser Turret (Triple)|
+ER Medium Laser Turret (Dual)|
+ER Medium Laser Turret (Quad)|
+ER Medium Laser Turret (Single)|
+ER Medium Laser Turret (Triple)|
+ER Small Laser Turret (Dual)|
+ER Small Laser Turret (Quad)|
+ER Small Laser Turret (Single)|
+ER Small Laser Turret (Triple)|
+Large Pulse Laser Turret (Dual)|
+Large Pulse Laser Turret (Quad)|
+Large Pulse Laser Turret (Single)|
+Large Pulse Laser Turret (Triple)|
+Medium Pulse Laser Turret (Dual)|
+Medium Pulse Laser Turret (Quad)|
+Medium Pulse Laser Turret (Single)|
+Medium Pulse Laser Turret (Triple)|
+Small Pulse Laser Turret (Dual)|
+Small Pulse Laser Turret (Quad)|
+Small Pulse Laser Turret (Single)|
+Small Pulse Laser Turret (Triple)|
+Large Re-engineered Laser Turret (Dual)|
+Large Re-engineered Laser Turret (Quad)|
+Large Re-engineered Laser Turret (Single)|
+Large Re-engineered Laser Turret (Triple)|
+Medium Re-engineered Laser Turret Turret (Dual)|
+Medium Re-engineered Laser Turret Turret (Quad)|
+Medium Re-engineered Laser Turret Turret (Single)|
+Medium Re-engineered Laser Turret Turret (Triple)|
+Small Re-Engineered Laser Turret (Dual)|
+Small Re-Engineered Laser Turret (Quad)|
+Small Re-Engineered Laser Turret (Single)|
+Small Re-Engineered Laser Turret (Triple)|
+Large Laser Turret (Dual)|
+Large Laser Turret (Quad)|
+Large Laser Turret (Single)|
+Large Laser Turret (Triple)|
+Medium Laser Turret (Dual)|
+Medium Laser Turret (Quad)|
+Medium Laser Turret (Single)|
+Medium Laser Turret (Triple)|
+Small Laser Turret (Dual)|
+Small Laser Turret (Quad)|
+Small Laser Turret (Single)|
+Small Laser Turret (Triple)|
+TSEMP Cannon Turret (Dual)|
+TSEMP Cannon Turret (Single)|
+Large VSP Laser Turret (Dual)|
+Large VSP Laser Turret (Quad)|
+Large VSP Laser Turret (Single)|
+Large VSP Laser Turret (Triple)|
+Medium VSP Laser Turret (Dual)|
+Medium VSP Laser Turret (Quad)|
+Medium VSP Laser Turret (Single)|
+Medium VSP Laser Turret (Triple)|
+Small VSP Laser Turret (Dual)|
+Small VSP Laser Turret (Quad)|
+Small VSP Laser Turret (Single)|
+Small VSP Laser Turret (Triple)|
+Large X-Pulse Laser Turret (Dual)|
+Large X-Pulse Laser Turret (Quad)|
+Large X-Pulse Laser Turret (Single)|
+Large X-Pulse Laser Turret (Triple)|
+Medium X-Pulse Laser Turret (Dual)|
+Medium X-Pulse Laser Turret (Quad)|
+Medium X-Pulse Laser Turret (Single)|
+Medium X-Pulse Laser Turret (Triple)|
+Small X-Pulse Laser Turret (Dual)|
+Small X-Pulse Laser Turret (Quad)|
+Small X-Pulse Laser Turret (Single)|
+Small X-Pulse Laser Turret (Triple)|
+Enhanced LRM/10 Turret (Dual)|
+Enhanced LRM/10 Turret (Quad)|
+Enhanced LRM/10 Turret (Triple)|
+Enhanced LRM/10 Turret (Single)|
+Enhanced LRM/15 Turret (Dual)|
+Enhanced LRM/15 Turret (Quad)|
+Enhanced LRM/15 Turret (Triple)|
+Enhanced LRM/15 Turret (Single)|
+Enhanced LRM/20 Turret (Dual)|
+Enhanced LRM/20 Turret (Quad)|
+Enhanced LRM/20 Turret (Triple)|
+Enhanced LRM/20 Turret (Single)|
+Enhanced LRM/5 Turret (Dual)|
+Enhanced LRM/5 Turret (Quad)|
+Enhanced LRM/5 Turret (Triple)|
+Enhanced LRM/5 Turret (Single)|
+Extended LRM/10 Turret (Dual)|
+Extended LRM/10 Turret (Quad)|
+Extended LRM/10 Turret (Triple)|
+Extended LRM/10 Turret (Single)|
+Extended LRM/15 Turret (Dual)|
+Extended LRM/15 Turret (Quad)|
+Extended LRM/15 Turret (Triple)|
+Extended LRM/15 Turret (Single)|
+Extended LRM/20 Turret (Dual)|
+Extended LRM/20 Turret (Quad)|
+Extended LRM/20 Turret (Triple)|
+Extended LRM/20 Turret (Single)|
+Extended LRM/5 Turret (Dual)|
+Extended LRM/5 Turret (Quad)|
+Extended LRM/5 Turret (Triple)|
+Extended LRM/5 Turret (Single)|
+LRM/10 Turret (w/ Artemis IV) (Dual)|
+LRM/10 Turret (Dual)|
+LRM/10 Turret (w/ Artemis IV) (Quad)|
+LRM/10 Turret (Quad)|
+LRM/10 Turret (w/ Artemis IV) (Triple)|
+LRM/10 Turret (Triple)|
+LRM/10 Turret (w/ Artemis IV) (Single)|
+LRM/10 Turret (Single)|
+LRM/15 Turret (w/ Artemis IV) (Dual)|
+LRM/15 Turret (Dual)|
+LRM/15 Turret (w/ Artemis IV) (Quad)|
+LRM/15 Turret (Quad)|
+LRM/15 Turret (w/ Artemis IV) (Triple)|
+LRM/15 Turret (Triple)|
+LRM/15 Turret (w/ Artemis IV) (Single)|
+LRM/15 Turret (Single)|
+LRM/20 Turret (w/ Artemis IV) (Dual)|
+LRM/20 Turret (Dual)|
+LRM/20 Turret (w/ Artemis IV) (Quad)|
+LRM/20 Turret (Quad)|
+LRM/20 Turret (w/ Artemis IV) (Triple)|
+LRM/20 Turret (Triple)|
+LRM/20 Turret (w/ Artemis IV) (Single)|
+LRM/20 Turret (Single)|
+LRM/5 Turret (w/ Artemis IV) (Dual)|
+LRM/5 Turret (Dual)|
+LRM/5 Turret (w/ Artemis IV) (Quad)|
+LRM/5 Turret (Quad)|
+LRM/5 Turret (w/ Artemis IV) (Triple)|
+LRM/5 Turret (Triple)|
+LRM/5 Turret (w/ Artemis IV) (Single)|
+LRM/5 Turret (Single)|
+Heavy MG Turret (Dual)|
+Heavy MG Turret (Quad)|
+Heavy MG Turret (Triple)|
+Heavy MG Turret w/ Array (Dual)|
+Heavy MG Turret w/ Array (Quad)|
+Heavy MG Turret w/ Array (Triple)|
+Heavy MG Turret (Single)|
+Light MG Turret (Dual)|
+Light MG Turret (Quad)|
+Light MG Turret (Triple)|
+Light MG Turret w/ Array (Dual)|
+Light MG Turret w/ Array (Quad)|
+Light MG Turret w/ Array (Triple)|
+Light MG Turret (Single)|
+MG Turret (Dual)|
+MG Turret (Quad)|
+MG Turret (Triple)|
+MG Turret w/ Array (Dual)|
+MG Turret w/ Array (Quad)|
+MG Turret w/ Array (Triple)|
+MG Turret (Single)|
+MML/3 Turret (w/ Artemis IV) (Dual)|
+MML/3 Turret (Dual)|
+MML/3 Turret (w/ Artemis IV) (Quad)|
+MML/3 Turret (Quad)|
+MML/3 Turret (w/ Artemis IV) (Triple)|
+MML/3 Turret (Triple)|
+MML/3 Turret (w/ Artemis IV) (Single)|
+MML/3 Turret (Single)|
+MML/5 Turret (w/ Artemis IV) (Dual)|
+MML/5 Turret (Dual)|
+MML/5 Turret (w/ Artemis IV) (Quad)|
+MML/5 Turret (Quad)|
+MML/5 Turret (w/ Artemis IV) (Triple)|
+MML/5 Turret (Triple)|
+MML/5 Turret (w/ Artemis IV) (Single)|
+MML/5 Turret (Single)|
+MML/7 Turret (w/ Artemis IV) (Dual)|
+MML/7 Turret (Dual)|
+MML/7 Turret (w/ Artemis IV) (Quad)|
+MML/7 Turret (Quad)|
+MML/7 Turret (w/ Artemis IV) (Triple)|
+MML/7 Turret (Triple)|
+MML/7 Turret (w/ Artemis IV) (Single)|
+MML/7 Turret (Single)|
+MML/9 Turret (w/ Artemis IV) (Dual)|
+MML/9 Turret (Dual)|
+MML/9 Turret (w/ Artemis IV) (Quad)|
+MML/9 Turret (Quad)|
+MML/9 Turret (w/ Artemis IV) (Triple)|
+MML/9 Turret (Triple)|
+MML/9 Turret (w/ Artemis IV) (Single)|
+MML/9 Turret (Single)|
+MRM 10 Turret (Dual)|
+MRM 10 Turret (Quad)|
+MRM 10 Turret (Triple)|
+MRM 10 Turret w/ Apollo FCS (Dual)|
+MRM 10 Turret w/ Apollo FCS (Quad)|
+MRM 10 Turret w/ Apollo FCS (Triple)|
+MRM 10 Turret w/ Apollo FCS (Single)|
+MRM 10 Turret (Single)|
+MRM 20 Turret (Dual)|
+MRM 20 Turret (Quad)|
+MRM 20 Turret (Triple)|
+MRM 20 Turret w/ Apollo FCS (Dual)|
+MRM 20 Turret w/ Apollo FCS (Quad)|
+MRM 20 Turret w/ Apollo FCS (Triple)|
+MRM 20 Turret w/ Apollo FCS (Single)|
+MRM 20 Turret (Single)|
+MRM 30 Turret (Dual)|
+MRM 30 Turret (Quad)|
+MRM 30 Turret (Triple)|
+MRM 30 Turret w/ Apollo FCS (Dual)|
+MRM 30 Turret w/ Apollo FCS (Quad)|
+MRM 30 Turret w/ Apollo FCS (Triple)|
+MRM 30 Turret w/ Apollo FCS (Single)|
+MRM 30 Turret (Single)|
+MRM 40 Turret (Dual)|
+MRM 40 Turret (Quad)|
+MRM 40 Turret (Triple)|
+MRM 40 Turret w/ Apollo FCS (Dual)|
+MRM 40 Turret w/ Apollo FCS (Quad)|
+MRM 40 Turret w/ Apollo FCS (Triple)|
+MRM 40 Turret w/ Apollo FCS (Single)|
+MRM 40 Turret (Single)|
+ER PPC Turret (Dual)|
+ER PPC Turret (Quad)|
+ER PPC Turret (Single)|
+ER PPC Turret (Triple)|
+ER PPC w Capacitor Turret (Quad)|
+ER PPC w Capacitor Turret (Single)|
+ER PPC w Capacitor Turret (Triple)|
+ER PPC w Capacitor Turret (Dual)|
+Heavy PPC Turret (Dual)|
+Heavy PPC Turret (Quad)|
+Heavy PPC Turret (Single)|
+Heavy PPC Turret (Triple)|
+Heavy PPC w Capacitor Turret (Single)|
+Heavy PPC w Capacitor Turret (Quad)|
+Heavy PPC w Capacitor Turret (Triple)|
+Heavy PPC w Capacitor Turret (Dual)|
+Light PPC Turret (Dual)|
+Light PPC Turret (Quad)|
+Light PPC Turret (Single)|
+Light PPC Turret (Triple)|
+Light PPC w Capacitor Turret (Quad)|
+Light PPC w Capacitor Turret (Single)|
+Light PPC w Capacitor Turret (Dual)|
+Light PPC w Capacitor Turret (Triple)|
+Plasma Rifle Turret (Triple)|
+Plasma Rifle Turret (Quad)|
+Plasma Rifle Turret (Dual)|
+Plasma Rifle Turret (Single)|
+PPC Turret (Dual)|
+PPC Turret (Quad)|
+PPC Turret (Single)|
+PPC Turret (Triple)|
+PPC w Capacitor Turret (Dual)|
+PPC w Capacitor Turret (Quad)|
+PPC w Capacitor Turret (Single)|
+PPC w Capacitor Turret (Triple)|
+Snub-Nosed PPC (Dual)|
+Snub-Nosed PPC (Quad)|
+Snub-Nosed PPC (Single)|
+Snub-Nosed PPC (Triple)|
+Snub-Nosed PPC w Capacitor Turret (Dual)|
+Snub-Nosed PPC w Capacitor Turret (Quad)|
+Snub-Nosed PPC w Capacitor Turret (Single)|
+Snub-Nosed PPC w Capacitor Turret (Triple)|
+Rocket Launcher/1 Turret (Single)|
+Rocket Launcher/10 Turret (Single)|
+Rocket Launcher/15 Turret (Single)|
+Rocket Launcher/2 Turret (Single)|
+Rocket Launcher/20 Turret (Single)|
+Rocket Launcher/3 Turret (Single)|
+Rocket Launcher/4 Turret (Single)|
+Rocket Launcher/5 Turret (Single)|
+Beagle Active Probe Bunker|
+AMS Turret (Dual)|
+AMS Turret (Single)|
+Angel ECM Bunker|
+Bloodhound Active Probe Bunker|
+C3 (Boosted) Command Bunker (Dual)|
+C3 (Boosted) Command Bunker (Single)|
+C3 (Boosted) Command Bunker (Triple)|
+C3 Command Bunker (Dual)|
+C3 Command Bunker (Single)|
+C3 Command Bunker (Triple)|
+C3i Bunker|
+Calliope Turret (2800)|
+Calliope Turret (3053)|
+ECM Turret (Guardian)|
+Improved Narc Turret (Dual)|
+Improved Narc Turret (Single)|
+Laser AMS Turret (Dual)|
+Laser AMS Turret (Single)|
+Narc Turret (Dual)|
+Narc Turret (Single)|
+RISC APDS Turret (Dual)|
+RISC APDS Turret (Single)|
+TAG Turret (Dual)|
+TAG Turret (Single)|
+Grenade Launcher Turret (Dual)|
+Grenade Launcher Turret (Quad)|
+Grenade Launcher Turret (Single)|
+Grenade Launcher Turret (Triple)|
+SRM/2 Turret (w/ Artemis IV) (Dual)|
+SRM/2 Turret (Dual)|
+SRM/2 Turret (w/ Artemis IV) (Quad)|
+SRM/2 Turret (Quad)|
+SRM/2 Turret (w/ Artemis IV) (Single)|
+SRM/2 Turret (Single)|
+SRM/2 Turret (w/ Artemis IV) (Triple)|
+SRM/2 Turret (Triple)|
+SRM/4 Turret (w/ Artemis IV) (Dual)|
+SRM/4 Turret (Dual)|
+SRM/4 Turret (w/ Artemis IV) (Quad)|
+SRM/4 Turret (Quad)|
+SRM/4 Turret (w/ Artemis IV) (Single)|
+SRM/4 Turret (Single)|
+SRM/4 Turret (w/ Artemis IV) (Triple)|
+SRM/4 Turret (Triple)|
+SRM/6 Turret (w/ Artemis IV) (Dual)|
+SRM/6 Turret (Dual)|
+SRM/6 Turret (w/ Artemis IV) (Quad)|
+SRM/6 Turret (Quad)|
+SRM/6 Turret (w/ Artemis IV) (Single)|
+SRM/6 Turret (Single)|
+SRM/6 Turret (w/ Artemis IV) (Triple)|
+SRM/6 Turret (Triple)|
+Streak SRM/2 Turret (Dual)|
+Streak SRM/2 Turret (Quad)|
+Streak SRM/2 Turret (Single)|
+Streak SRM/2 Turret (Triple)|
+Streak SRM/4 Turret (Dual)|
+Streak SRM/4 Turret (Quad)|
+Streak SRM/4 Turret (Single)|
+Streak SRM/4 Turret (Triple)|
+Streak SRM/6 Turret (Dual)|
+Streak SRM/6 Turret (Quad)|
+Streak SRM/6 Turret (Single)|
+Streak SRM/6 Turret (Triple)|
+Thunderbolt 10 Turret (Dual)|
+Thunderbolt 10 Turret (Quad)|
+Thunderbolt 10 Turret (Triple)|
+Thunderbolt 10 Turret (Single)|
+Thunderbolt 15 Turret (Dual)|
+Thunderbolt 15 Turret (Quad)|
+Thunderbolt 15 Turret (Triple)|
+Thunderbolt 15 Turret (Single)|
+Thunderbolt 20 Turret (Dual)|
+Thunderbolt 20 Turret (Quad)|
+Thunderbolt 20 Turret (Triple)|
+Thunderbolt 20 Turret (Single)|
+Thunderbolt 5 Turret (Dual)|
+Thunderbolt 5 Turret (Quad)|
+Thunderbolt 5 Turret (Triple)|
+Thunderbolt 5 Turret (Single)|
+Clan Anti-Infantry Clan Jade Falcon Police|
+Clan Heavy Foot Infantry Ebon Keshik Point|
+Clan Space Marine Clan Snow Raven Space Marines|
+Motorized Infantry Dark Caste Bandits|
+Bridge-builder Engineers Take the Time III-chi; Forty-eighth Division|
+Motorized XCT Infantry Explorer Corps Hostile Environment|
+Space Marine Com Guards Warship Fleet Marine|
+Heavy Support Infantry Irian Technologies SWAT Team|
+Hover Assault Infantry Johnston Industries Rapid Response Force|
+Jump Support Infantry Star Corps Jump Assault Infantry|
+VTOL Infantry Hachiman Taro Enterprise Extraction Force|
+Firefighter Twenty-fourth Hellfire Firefighting Battalion; 84th Avalon LI; 17th Avalon Hussars|
+Frogmen Blue Water Marine Response Teams (Frogmen)|
+Mountaineer 45th Cerulean Mountain Infantry; 3rd Davion Guards|
+SpecOps Paratrooper MI6 Extraction Team|
+Anti-'Mech Jump Infantry Third Ueda Infantry|
+Clan Assault Infantry Ghost Bear Heavy Solahma Infantry|
+Clan Mechanized Infantry Mimir/Watch Counter Insurgency Point|
+Motorized Heavy Infantry Motstand/Mimir Troop|
+AA Mechanized Infantry Mechanized AA Infantry|
+Clan Foot Infantry Ad Hoc Point|
+Clan Heavy Jump Infantry Heavy Infantry Point|
+Fast Recon Cavalry Point|
+Ceremonial Guard Otomo Guard|
+Heavy Jump Infantry DEST Heavy Response Platoon|
+Mechanized Field Artillery 71st Mechanized|
+Recon Infantry Recon Battalion; 201st Pesht Assault Team; 3rd Proserpina Hussars|
+Commando Battlefield Infiltration Units|
+Missile Artillery Infantry Kommando Special Forces|
+Sniper House Dai Da Chi Snipers|
+AA Jump Infantry 292nd League Regulars|
+Heavy Jump Infantry Royal Gurkha Battalion|
+Xenoplanetary Infantry Eagle Corps Eyrie Defense Force|
+Heavy Foot LRM Infantry Stalwart Support - Heavy LRM Infantry|
+Scout Infantry The Battle Corps - Baker Street Irregulars|
+Submersible Mechanized Infantry Kraken Unleashed - The Mermen|
+TAG Spotter Infantry Stalwart Support - Spotter Infantry|
+Assault Commando Ebon Magistrate Shock Troops|
+Field Medic Magistracy Medical Corp|
+Foot Infantry Raventhir's Infantry Guard|
+Heavy Mountain Infantry Cavalier 'Mountain Men' Infantry Guard; Magistracy Cavaliers|
+Skaret Assassins JàrnFòlk|
+Ceremonial Guard Caesar's Royal Guard; Marion Hegemony|
+Pirate Lady Death's 'Pacification' Squads|
+Foot Ballistic Rifle Hastati V|
+Jump Laser Infantry Principes III 103rd Jump Battalion|
+Motorized MG Galatean Support Wheels|
+Special Forces Stone's Trackers|
+Anti-Infantry Unit Second Lyran Armored Infantry|
+Combat Engineer Royal Engineers; 1st Lyran Royal Guards RCT|
+HALO Paratrooper Lyran Paratrooper Corps|
+Heavy Infantry Heavy Urban Response Platoon|
+Field Gun Infantry (Motorized Batteries)|
+Minesweepers Thirty-fifth Cluster Support Force; Red Chasseurs|
+SRM Foot Infantry Taurian Citizens' Militia|
+XCT Marine Special Asteroid Support Forces|
+Mechanized Assault XCT Word of Blake Militia NBC|
+Riot Police Word of Blake Protectorate Militia Pacification Unit|
+Manei Domini Recon Squad 'Tau Wraith'|
+Manei Domini Attack Squad 'Tau Zombie'|
+Clan Field Artillery (Arrow IV)|
+Clan Field Artillery (Sniper)|
+Clan Field Artillery (Thumper)|
+Clan Field Gunners (Gauss)|
+Clan Field Gunners (LBX10)|
+Clan Field Gunners (LBX2)|
+Clan Field Gunners (LBX20)|
+Clan Field Gunners (LBX5)|
+Clan Field Gunners (RAC2)|
+Clan Field Gunners (RAC5)|
+Clan Field Gunners (UAC10)|
+Clan Field Gunners (UAC2)|
+Clan Field Gunners (UAC20)|
+Clan Field Gunners (UAC5)|
+Field Artillery (Arrow IV)|
+Field Artillery (Sniper)|
+Field Artillery (Thumper)|
+Field Gunners (AC10)|
+Field Gunners (AC2)|
+Field Gunners (AC20)|
+Field Gunners (AC5)|
+Field Gunners (Gauss)|
+Field Gunners (LAC2)|
+Field Gunners (LAC5)|
+Field Gunners (LBX10)|
+Field Gunners (LBX2)|
+Field Gunners (LBX20)|
+Field Gunners (LBX5)|
+Field Gunners (Light Gauss)|
+Field Gunners (RAC2)|
+Field Gunners (RAC5)|
+Field Gunners (UAC10)|
+Field Gunners (UAC2)|
+Field Gunners (UAC20)|
+Field Gunners (UAC5)|
+Foot Platoon (Gauss)|
+Jump Platoon (Gauss)|
+Motorized Platoon (Gauss)|
+Foot Platoon (Rifle AA)|
+Jump Platoon (Rifle AA)|
+Mechanized Hover Platoon (Rifle AA)|
+Mechanized Tracked Platoon (Rifle AA)|
+Mechanized Wheeled Platoon (Rifle AA)|
+Motorized Platoon (Rifle AA)|
+Foot Platoon (Flechette)|
+Motorized Platoon (Flechette)|
+Foot Platoon, Taurian (Flamer)|
+Foot Platoon, Taurian (Laser)|
+Foot Platoon, Taurian (LRM)|
+Foot Platoon, Taurian (MG)|
+Foot Platoon, Taurian (Rifle)|
+Foot Platoon, Taurian (SRM)|
+Jump Platoon, Taurian (Flamer)|
+Jump Platoon, Taurian (Laser)|
+Jump Platoon, Taurian (LRM)|
+Jump Platoon, Taurian (MG)|
+Jump Platoon, Taurian (Rifle)|
+Jump Platoon, Taurian (SRM)|
+Motorized Platoon, Taurian (Flamer)|
+Motorized Platoon, Taurian (Laser)|
+Motorized Platoon, Taurian (LRM)|
+Motorized Platoon, Taurian (MG)|
+Motorized Platoon, Taurian (Rifle)|
+Motorized Platoon, Taurian (SRM)|
+Field Gun Infantry Platoon (AC/10)|
+Clan Foot Point (Anti-'Mech) (Flamer)|
+Clan Foot Point (Anti-'Mech) (Laser)|
+Clan Foot Point (Anti-'Mech) (LRM)|
+Clan Foot Point (Anti-'Mech) (MG)|
+Clan Foot Point (Anti-'Mech) (Rifle)|
+Clan Foot Point (Anti-'Mech) (SRM)|
+Clan Foot Squad (Anti-'Mech) (Flamer)|
+Clan Foot Squad (Anti-'Mech) (Laser)|
+Clan Foot Squad (Anti-'Mech) (LRM)|
+Clan Foot Squad (Anti-'Mech) (MG)|
+Clan Foot Squad (Anti-'Mech) (Rifle)|
+Clan Foot Squad (Anti-'Mech) (SRM)|
+Foot Platoon (Anti-'Mech) (Flamer)|
+Foot Platoon (Anti-'Mech) (Laser)|
+Foot Platoon (Anti-'Mech) (LRM)|
+Foot Platoon (Anti-'Mech) (MG)|
+Foot Platoon (Anti-'Mech) (Rifle)|
+Foot Platoon (Anti-'Mech) (SRM)|
+Foot Squad (Anti-'Mech) (Flamer)|
+Foot Squad (Anti-'Mech) (Laser)|
+Foot Squad (Anti-'Mech) (LRM)|
+Foot Squad (Anti-'Mech) (MG)|
+Foot Squad (Anti-'Mech) (Rifle)|
+Foot Squad (Anti-'Mech) (SRM)|
+Clan Foot Point (Flamer)|
+Clan Foot Point (Laser)|
+Clan Foot Point (LRM)|
+Clan Foot Point (MG)|
+Clan Foot Point (Rifle)|
+Clan Foot Point (SRM)|
+Clan Jump Point (Flamer)|
+Clan Jump Point (Laser)|
+Clan Jump Point (LRM)|
+Clan Jump Point (MG)|
+Clan Jump Point (Rifle)|
+Clan Jump Point (SRM)|
+Clan Mechanized Hover Point (Flamer)|
+Clan Mechanized Hover Point (Laser)|
+Clan Mechanized Hover Point (LRM)|
+Clan Mechanized Hover Point (MG)|
+Clan Mechanized Hover Point (Rifle)|
+Clan Mechanized Hover Point (SRM)|
+Clan Mechanized Tracked Point (Flamer)|
+Clan Mechanized Tracked Point (Laser)|
+Clan Mechanized Tracked Point (LRM)|
+Clan Mechanized Tracked Point (MG)|
+Clan Mechanized Tracked Point (Rifle)|
+Clan Mechanized Tracked Point (SRM)|
+Clan Mechanized Wheeled Point (Flamer)|
+Clan Mechanized Wheeled Point (Laser)|
+Clan Mechanized Wheeled Point (LRM)|
+Clan Mechanized Wheeled Point (MG)|
+Clan Mechanized Wheeled Point (Rifle)|
+Clan Mechanized Wheeled Point (SRM)|
+Clan Motorized Point (Flamer)|
+Clan Motorized Point (Laser)|
+Clan Motorized Point (LRM)|
+Clan Motorized Point (MG)|
+Clan Motorized Point (Rifle)|
+Clan Motorized Point (SRM)|
+Clan Foot Squad (Flamer)|
+Clan Foot Squad (Laser)|
+Clan Foot Squad (LRM)|
+Clan Foot Squad (MG)|
+Clan Foot Squad (Rifle)|
+Clan Foot Squad (SRM)|
+Clan Jump Squad (Flamer)|
+Clan Jump Squad (Laser)|
+Clan Jump Squad (LRM)|
+Clan Jump Squad (MG)|
+Clan Jump Squad (Rifle)|
+Clan Jump Squad (SRM)|
+Clan Mechanized Hover Squad (Flamer)|
+Clan Mechanized Hover Squad (Laser)|
+Clan Mechanized Hover Squad (LRM)|
+Clan Mechanized Hover Squad (MG)|
+Clan Mechanized Hover Squad (Rifle)|
+Clan Mechanized Hover Squad (SRM)|
+Clan Mechanized Tracked Squad (Flamer)|
+Clan Mechanized Tracked Squad (Laser)|
+Clan Mechanized Tracked Squad (LRM)|
+Clan Mechanized Tracked Squad (MG)|
+Clan Mechanized Tracked Squad (Rifle)|
+Clan Mechanized Tracked Squad (SRM)|
+Clan Mechanized Wheeled Squad (Flamer)|
+Clan Mechanized Wheeled Squad (Laser)|
+Clan Mechanized Wheeled Squad (LRM)|
+Clan Mechanized Wheeled Squad (MG)|
+Clan Mechanized Wheeled Squad (Rifle)|
+Clan Mechanized Wheeled Squad (SRM)|
+Clan Motorized Squad (Flamer)|
+Clan Motorized Squad (Laser)|
+Clan Motorized Squad (LRM)|
+Clan Motorized Squad (MG)|
+Clan Motorized Squad (Rifle)|
+Clan Motorized Squad (SRM)|
+Bandit Motorized Point (Rifle)|
+Ceremonial Platoon (Close Combat)|
+Ceremonial Platoon (MG Heavy)|
+Foot Platoon (Laser Heavy XCT)|
+Foot Platoon (Laser Marine)|
+Foot Platoon (Laser TAG)|
+Foot Platoon (Laser XCT)|
+Foot Platoon (Light Scout)|
+Foot Platoon (LRM Heavy)|
+Foot Platoon (Rifle Light)|
+Foot Platoon (Rifle Mountain)|
+Foot Platoon (Rifle Paratrooper)|
+Foot Squad (Medic)|
+Foot Stealth Platoon (Rifle Paratrooper)|
+Foot Stealth Squad (Sniper Paratrooper)|
+Jump Platoon (Anti-Mech) (Laser)|
+Jump Platoon (Grenade Launcher)|
+Jump Platoon (Laser Heavy)|
+Jump Stealth Platoon (Laser)|
+Jump Stealth Platoon (Needler Demolition)|
+Mechanized Hover Platoon (Demolition)|
+Mechanized Sub Platoon (SRM SCUBA)|
+Mechanized Tracked Platoon (Bridging)|
+Mechanized Wheeled Platoon (Laser XCT)|
+Motorized Platoon (Fieldworks)|
+Motorized Platoon (Firefighters)|
+Motorized Platoon (Gauss Heavy)|
+Motorized Platoon (Laser XCT)|
+Motorized Platoon (Needler Heavy)|
+Motorized Platoon (Nonlethal)|
+Motorized Platoon (Plasma Heavy)|
+Motorized Sub Platoon (Laser SCUBA)|
+Foot Platoon (Flamer)|
+Foot Platoon (Laser)|
+Foot Platoon (LRM)|
+Foot Platoon (MG)|
+Foot Platoon (Rifle)|
+Foot Platoon (SRM)|
+Jump Platoon (Flamer)|
+Jump Platoon (Laser)|
+Jump Platoon (LRM)|
+Jump Platoon (MG)|
+Jump Platoon (Rifle)|
+Jump Platoon (SRM)|
+Mechanized Hover Platoon (Flamer)|
+Mechanized Hover Platoon (Laser)|
+Mechanized Hover Platoon (LRM)|
+Mechanized Hover Platoon (MG)|
+Mechanized Hover Platoon (Rifle)|
+Mechanized Hover Platoon (SRM)|
+Mechanized Tracked Platoon (Flamer)|
+Mechanized Tracked Platoon (Laser)|
+Mechanized Tracked Platoon (LRM)|
+Mechanized Tracked Platoon (MG)|
+Mechanized Tracked Platoon (Rifle)|
+Mechanized Tracked Platoon (SRM)|
+Mechanized Wheeled Platoon (Flamer)|
+Mechanized Wheeled Platoon (Laser)|
+Mechanized Wheeled Platoon (LRM)|
+Mechanized Wheeled Platoon (MG)|
+Mechanized Wheeled Platoon (Rifle)|
+Mechanized Wheeled Platoon (SRM)|
+Motorized Platoon (Flamer)|
+Motorized Platoon (Laser)|
+Motorized Platoon (LRM)|
+Motorized Platoon (MG)|
+Motorized Platoon (Rifle)|
+Motorized Platoon (SRM)|
+Foot Squad (Flamer)|
+Foot Squad (Laser)|
+Foot Squad (LRM)|
+Foot Squad (MG)|
+Foot Squad (Rifle)|
+Foot Squad (SRM)|
+Jump Squad (Flamer)|
+Jump Squad (Laser)|
+Jump Squad (LRM)|
+Jump Squad (MG)|
+Jump Squad (Rifle)|
+Jump Squad (SRM)|
+Mechanized Hover Squad (Flamer)|
+Mechanized Hover Squad (Laser)|
+Mechanized Hover Squad (LRM)|
+Mechanized Hover Squad (MG)|
+Mechanized Hover Squad (Rifle)|
+Mechanized Hover Squad (SRM)|
+Mechanized Tracked Squad (Flamer)|
+Mechanized Tracked Squad (Laser)|
+Mechanized Tracked Squad (LRM)|
+Mechanized Tracked Squad (MG)|
+Mechanized Tracked Squad (Rifle)|
+Mechanized Tracked Squad (SRM)|
+Mechanized Wheeled Squad (Flamer)|
+Mechanized Wheeled Squad (Laser)|
+Mechanized Wheeled Squad (LRM)|
+Mechanized Wheeled Squad (MG)|
+Mechanized Wheeled Squad (Rifle)|
+Mechanized Wheeled Squad (SRM)|
+Motorized Squad (Flamer)|
+Motorized Squad (Laser)|
+Motorized Squad (LRM)|
+Motorized Squad (MG)|
+Motorized Squad (Rifle)|
+Motorized Squad (SRM)|
+Comitatus JumpShip (2995)|
+Hunter Jumpship (2832)|
+Hunter Jumpship (2948) (LF)|
+Invader Jumpship (2850)|
+Merchant Jumpship (2901)|
+Monolith Jumpship (2839)|
+Odyssey Jumpship (2887)|
+Scout JumpShip (2895)|
+Star Lord JumpShip (2841)|
+Chimeisho JumpShip (3056)|
+Invader Jumpship (2631) (LF)|
+Invader Jumpship (2631 PPC)|
+Invader Jumpship (2631)|
+Magellan Jumpship (2960)|
+Merchant Jumpship (2503)|
+Merchant Jumpship (2602)|
+Merchant Jumpship (2602)(Passenger)|
+Monolith Jumpship (2776)|
+Quetzalcoatl-Scout JumpShip|
+Scout JumpShip (2712)|
+Star Lord JumpShip (2590) (LF)|
+Star Lord JumpShip (2590)|
+Tramp JumpShip (2754)|
+Tramp JumpShip (2755) (LF)|
+Tramp JumpShip (3071)|
+Explorer JumpShip (HPG)|
+Explorer JumpShip|
+Aquilla Transport Jumpship|
+Liberty Jumpship|
+Leviathan Jumpship|
+Archer ARC-2K|
+Archer ARC-2R|
+Archer ARC-2S|
+Archer ARC-2W|
+Assassin ASN-101|
+Assassin ASN-21|
+Atlas AS7-D-DC|
+Atlas AS7-D|
+Atlas AS7-RS|
+Awesome AWS-8Q|
+Awesome AWS-8R|
+Awesome AWS-8T|
+Awesome AWS-8V|
+Banshee BNC-3E|
+Banshee BNC-3M|
+Banshee BNC-3MC|
+Banshee BNC-3Q|
+Banshee BNC-3S (Reinesblatt)|
+Banshee BNC-3S|
+BattleMaster BLR-1D|
+BattleMaster BLR-1G-DC|
+BattleMaster BLR-1G|
+BattleMaster BLR-1S|
+Black Knight BL-7-KNT-L|
+Black Knight BL-7-KNT|
+Blackjack BJ-1|
+Blackjack BJ-1DB|
+Blackjack BJ-1DC|
+Blackjack BJ-1X|
+Bombardier BMB-10D|
+Cataphract CTF-1X|
+Cataphract CTF-2X|
+Catapult CPLT-A1|
+Catapult CPLT-C1 (Jenny) 'Butterbee'|
+Catapult CPLT-C1|
+Catapult CPLT-C1b|
+Catapult CPLT-C4|
+Catapult CPLT-K2|
+Centurion CN9-A|
+Centurion CN9-AH|
+Centurion CN9-AL|
+Centurion CN9-YLW 'Yen Lo Wang'|
+Champion CHP-1N2|
+Champion CHP-2N|
+Charger CGR-1A1|
+Charger CGR-1A5|
+Charger CGR-1A9|
+Charger CGR-1L|
+Charger CGR-SB 'Challenger'|
+Cicada CDA-2A|
+Cicada CDA-2B|
+Cicada CDA-3C|
+Clint CLNT-1-2R|
+Clint CLNT-2-3T (Denton)|
+Clint CLNT-2-3T|
+Clint CLNT-2-4T|
+Commando COM-1D|
+Commando COM-2D|
+Commando COM-3A|
+Crab CRB-20|
+Crockett CRK-5003-0|
+Crusader CRD-3D|
+Crusader CRD-3K|
+Crusader CRD-3L|
+Crusader CRD-3R|
+Cyclops CP-10-HQ|
+Cyclops CP-10-Q|
+Cyclops CP-10-Z|
+Daboku DCMS-MX90-D|
+Dervish DV-6M|
+Dragon DRG-1C|
+Dragon DRG-1N|
+Enforcer ENF-4R|
+Falcon FLC-4N|
+Firestarter FS9-A|
+Firestarter FS9-H|
+Firestarter FS9-K|
+Firestarter FS9-M 'Mirage'|
+Flashman FLS-7K|
+Flea FLE-15|
+Flea FLE-4|
+Goliath GOL-1H|
+Grand Dragon DRG-1G|
+Grasshopper GHR-5H|
+Griffin GRF-1E 'Sparky'|
+Griffin GRF-1N|
+Griffin GRF-1S|
+Guillotine GLT-4L|
+Guillotine GLT-4P|
+Hatamoto-Chi HTM-26T|
+Hatchetman HCT-3F|
+Hermes HER-1A|
+Hermes HER-1B|
+Hermes II HER-2M 'Mercury'|
+Hermes II HER-2S|
+Hermes II HER-4K 'Hermes III'|
+Highlander HGN-733|
+Highlander HGN-733C|
+Highlander HGN-733P|
+Hornet HNT-151|
+Hornet HNT-152|
+Hunchback HBK-4G|
+Hunchback HBK-4H|
+Hunchback HBK-4J|
+Hunchback HBK-4N|
+Hunchback HBK-4P|
+Hunchback HBK-4SP|
+Hussar HSR-300-D|
+Hussar HSR-350-D|
+JagerMech JM6-A|
+JagerMech JM6-S|
+Javelin JVN-10F 'Fire Javelin'|
+Javelin JVN-10N|
+Jenner JR7-A|
+Jenner JR7-D|
+Jenner JR7-F|
+King Crab KGC-0000|
+King Crab KGC-010|
+Kintaro KTO-18|
+Lancelot LNC25-01X|
+Lancelot LNC25-02|
+Locust LCT-1E|
+Locust LCT-1L|
+Locust LCT-1M|
+Locust LCT-1S|
+Locust LCT-1V|
+Locust LCT-3V|
+Longbow LGB-0W|
+Marauder II MAD-4A|
+Marauder MAD-3D|
+Marauder MAD-3L|
+Marauder MAD-3M|
+Marauder MAD-3R|
+Mercury MCY-98|
+Mongoose MON-67|
+Mongoose MON-68|
+Orion ON1-K|
+Orion ON1-V-DC|
+Orion ON1-V|
+Orion ON1-VA|
+Ostroc OSR-2C|
+Ostroc OSR-2L|
+Ostroc OSR-2M|
+Ostroc OSR-3C|
+Ostscout OTT-7J|
+Ostsol OTL-4D|
+Ostsol OTL-4F|
+Panther PNT-8Z|
+Panther PNT-9R|
+Phoenix Hawk PXH-1|
+Phoenix Hawk PXH-1D|
+Phoenix Hawk PXH-1K|
+Quickdraw QKD-4G|
+Quickdraw QKD-4H|
+Quickdraw QKD-5A|
+Raven RVN-1X|
+Raven RVN-2X|
+Raven RVN-3X|
+Raven RVN-4X|
+Rifleman RFL-3C|
+Rifleman RFL-3N|
+Rifleman RFL-4D|
+Scorpion SCP-1N (Wendall)|
+Scorpion SCP-1N|
+Sentinel STN-1S|
+Sentinel STN-3K|
+Sentinel STN-3KA|
+Sentinel STN-3KB|
+Shadow Hawk SHD-2D|
+Shadow Hawk SHD-2H|
+Shadow Hawk SHD-2K|
+Spider SDR-5D|
+Spider SDR-5K|
+Spider SDR-5V|
+Stalker STK-3F|
+Stalker STK-3H|
+Stalker STK-4N|
+Stalker STK-4P|
+Stinger STG-3G|
+Stinger STG-3R|
+Thorn THE-F|
+Thorn THE-S|
+Thorn THE-T|
+Thug THG-10E|
+Thunderbolt TDR-5S|
+Thunderbolt TDR-5SE|
+Thunderbolt TDR-5SS|
+Trebuchet TBT-5J|
+Trebuchet TBT-5N|
+Trebuchet TBT-5S|
+Trebuchet TBT-7K|
+UrbanMech UM-R60|
+UrbanMech UM-R60L|
+Valkyrie VLK-QA|
+Valkyrie VLK-QF|
+Victor VTR-9A|
+Victor VTR-9A1|
+Victor VTR-9B|
+Victor VTR-9S|
+Vindicator VND-1AA 'Avenging Angel'|
+Vindicator VND-1R (Vong)|
+Vindicator VND-1R|
+Vindicator VND-1SIC|
+Vindicator VND-1X|
+Vulcan VL-2T|
+Vulcan VL-5T|
+Warhammer WHM-6D|
+Warhammer WHM-6K|
+Warhammer WHM-6L|
+Warhammer WHM-6R|
+Wasp WSP-1A|
+Wasp WSP-1D|
+Wasp WSP-1K|
+Wasp WSP-1L|
+Wasp WSP-1W|
+Whitworth WTH-0|
+Whitworth WTH-1|
+Whitworth WTH-1S|
+Wolfhound WLF-1|
+Wolfhound WLF-1A|
+Wolfhound WLF-1B|
+Wolverine WVR-6K|
+Wolverine WVR-6M|
+Wolverine WVR-6R|
+Wyvern WVE-6N|
+Zeus ZEU-5S|
+Zeus ZEU-5T|
+Zeus ZEU-6S|
+Zeus ZEU-6T|
+Annihilator ANH-1A|
+Annihilator ANH-2A|
+Annihilator ANH-3A|
+Annihilator ANH-4A|
+Annihilator C|
+Assassin ASN-23|
+Assassin ASN-30|
+Assassin ASN-99|
+Assassin 'Servitor'|
+Atlas AS7-C|
+Atlas AS7-CM|
+Atlas AS7-K|
+Atlas AS7-S|
+Atlas AS7-S2|
+Awesome AWS-10KM|
+Awesome AWS-9M|
+Awesome AWS-9Ma|
+Awesome AWS-9Q (Klatt)|
+Awesome AWS-9Q|
+Axman AXM-1N|
+Axman AXM-2N|
+Axman AXM-4D|
+Banshee BNC-5S (Sawyer)|
+Banshee BNC-5S (Vandergriff)|
+Banshee BNC-5S|
+Banshee BNC-6S|
+Banshee BNC-7S|
+Banshee BNC-8S|
+Black Hawk (Nova) A|
+Black Hawk (Nova) B|
+Black Hawk (Nova) C|
+Black Hawk (Nova) D|
+Black Hawk (Nova) E|
+Black Hawk (Nova) F|
+Black Hawk (Nova) H|
+Black Hawk (Nova) Prime|
+Black Hawk (Nova) S|
+Black Knight BL-12-KNT|
+Black Knight BL-6-KNT|
+Black Knight BL-6-RR|
+Black Knight BL-6b-KNT|
+Blackjack BJ-2|
+Blackjack BJ-3|
+Blackjack BJ-4|
+Bombardier BMB-05A|
+Bombardier BMB-12D|
+Bombardier BMB-14C|
+Bombardier BMB-14K|
+Caesar CES-3R 'Archangel'|
+Caesar CES-3R (Gertrude)|
+Caesar CES-3R|
+Caesar CES-3S|
+Caesar CES-4R|
+Caesar CES-4S|
+Cataphract CTF-3D|
+Cataphract CTF-3L|
+Cataphract CTF-3LL|
+Cataphract CTF-4L|
+Cataphract CTF-4X|
+Cataphract CTF-5D|
+Catapult CPLT-C2|
+Catapult CPLT-C3|
+Catapult CPLT-C4C|
+Catapult CPLT-C5|
+Catapult CPLT-C6|
+Catapult CPLT-H2|
+Catapult CPLT-K2K|
+Catapult CPLT-K3|
+Catapult CPLT-K4|
+Catapult CPLT-K5|
+Centurion CN10-B|
+Centurion CN9-D|
+Centurion CN9-D3|
+Centurion CN9-D3D|
+Centurion CN9-D4D|
+Centurion CN9-D5|
+Centurion CN9-D9|
+Centurion CN9-Da|
+Centurion CN9-YLW2 'Yen Lo Wang'|
+Champion C|
+Champion CHP-1N|
+Champion CHP-3N|
+Champion CHP-3P|
+Charger CGR-2A2|
+Charger CGR-3K|
+Charger CGR-C|
+Charger CGR-KMZ|
+Charger CGR-SA5|
+Cicada CDA-3F|
+Cicada CDA-3G|
+Cicada CDA-3M|
+Cicada CDA-3MA|
+Cicada CDA-3P|
+Clint CLNT-2-3U|
+Clint CLNT-2-3UL|
+Clint CLNT-3-3T|
+Clint CLNT-5U|
+Clint CLNT-6S|
+Commando COM-1B|
+Commando COM-1C|
+Commando COM-4H|
+Commando COM-5S|
+Commando COM-7B|
+Commando COM-7S|
+Crab CRB-27|
+Crab CRB-30|
+Crab CRB-45|
+Crab CRB-C|
+Crockett CRK-5003-1|
+Crockett CRK-5003-3|
+Crockett CRK-5004-1|
+Crockett CRK-5005-1|
+Cyclops CP-11-A-DC|
+Cyclops CP-11-A|
+Cyclops CP-11-C|
+Cyclops CP-11-G|
+Cyclops CP-11-H|
+Cyclops CP-12-K|
+Daishi (Dire Wolf) A|
+Daishi (Dire Wolf) B|
+Daishi (Dire Wolf) C|
+Daishi (Dire Wolf) D|
+Daishi (Dire Wolf) H|
+Daishi (Dire Wolf) (Hohiro)|
+Daishi (Dire Wolf) Prime|
+Daishi (Dire Wolf) 'Prometheus'|
+Daishi (Dire Wolf) S|
+Daishi (Dire Wolf) W|
+Daishi (Dire Wolf) 'Widowmaker'|
+Dasher (Fire Moth) A|
+Dasher (Fire Moth) B|
+Dasher (Fire Moth) C|
+Dasher (Fire Moth) D|
+Dasher (Fire Moth) E|
+Dasher (Fire Moth) F|
+Dasher (Fire Moth) H|
+Dasher (Fire Moth) K|
+Dasher (Fire Moth) Prime|
+Dervish DV-7D|
+Dervish DV-8D|
+Dervish DV-9D|
+Dragon DRG-5N|
+Dragon DRG-7N|
+Dragonfly (Viper) A|
+Dragonfly (Viper) B|
+Dragonfly (Viper) C|
+Dragonfly (Viper) D|
+Dragonfly (Viper) E|
+Dragonfly (Viper) F|
+Dragonfly (Viper) G|
+Dragonfly (Viper) H|
+Dragonfly (Viper) I|
+Dragonfly (Viper) Prime|
+Enforcer ENF-5D|
+Enforcer III ENF-6G|
+Enforcer III ENF-6H|
+Enforcer III ENF-6T|
+Exterminator EXT-4A|
+Exterminator EXT-4C|
+Exterminator EXT-4D|
+Exterminator EXT-5E|
+Exterminator EXT-5F|
+Falcon FLC-4P|
+Falcon FLC-5P|
+Falcon FLC-6C|
+Fenris (Ice Ferret) A|
+Fenris (Ice Ferret) B|
+Fenris (Ice Ferret) C|
+Fenris (Ice Ferret) D|
+Fenris (Ice Ferret) E|
+Fenris (Ice Ferret) H|
+Fenris (Ice Ferret) L|
+Fenris (Ice Ferret) Prime|
+Firefly C|
+Firefly FFL-4A|
+Firefly FFL-4B|
+Firefly FFL-4C|
+Firefly FFL-4D|
+Firefly FFL-4DA|
+Firestarter FS9-B|
+Firestarter FS9-C|
+Firestarter FS9-P|
+Firestarter FS9-S|
+Firestarter FS9-S1|
+Firestarter FS9-S2|
+Firestarter FS9-S3|
+Flashman FLS-8K|
+Flashman FLS-9B|
+Flashman FLS-9C|
+Flashman FLS-9M|
+Flashman FLS-C|
+Flea 'Fire Ant'|
+Flea FLE-17|
+Flea FLE-19|
+Flea FLE-20|
+Gladiator (Executioner) A|
+Gladiator (Executioner) B|
+Gladiator (Executioner) C|
+Gladiator (Executioner) D|
+Gladiator (Executioner) E|
+Gladiator (Executioner) H|
+Gladiator (Executioner) K|
+Gladiator (Executioner) P|
+Gladiator (Executioner) Prime|
+Grand Dragon DRG-5K-DC|
+Grand Dragon DRG-5K|
+Grand Dragon DRG-7K|
+Grand Dragon DRG-9KC|
+Grand Dragon DRG-C|
+Grasshopper GHR-5J|
+Grasshopper GHR-5N|
+Grasshopper GHR-6K|
+Grasshopper GHR-7K 'Gravedigger'|
+Grasshopper GHR-7K|
+Grasshopper GHR-C|
+Guillotine GLT-3N|
+Guillotine GLT-5M|
+Guillotine GLT-6WB|
+Guillotine GLT-6WB2|
+Guillotine GLT-6WB3|
+Guillotine GLT-8D|
+Hatamoto-Chi HTM-27T|
+Hatamoto-Chi HTM-28T (Shin)|
+Hatamoto-Chi HTM-28T|
+Hatamoto-Hi HTM-27U|
+Hatamoto-Hi HTM-C|
+Hatamoto-Hi HTM-CM|
+Hatamoto-Kaze HTM-27V|
+Hatamoto-Ku HTM-27W|
+Hatamoto-Mizo HTM-27Y|
+Hatchetman HCT-5D|
+Hatchetman HCT-5DD|
+Hatchetman HCT-5K|
+Hatchetman HCT-5S|
+Hatchetman HCT-6D|
+Hatchetman HCT-6S|
+Hellspawn HSN-10G|
+Hermes HER-1S|
+Hermes HER-3S|
+Hermes HER-3S1|
+Hermes HER-3S2|
+Hermes HER-4K|
+Hermes HER-4M|
+Hermes HER-4S|
+Hermes HER-4WB|
+Hermes II HER-5C|
+Hermes II HER-5ME 'Mercury Elite'|
+Hermes II HER-5S|
+Hermes II HER-5SA|
+Hermes II HER-6D|
+Highlander HGN-694|
+Highlander HGN-732|
+Highlander HGN-734|
+Highlander HGN-736|
+Highlander HGN-738|
+Hoplite C|
+Hoplite HOP-4A|
+Hoplite HOP-4B|
+Hoplite HOP-4C|
+Hoplite HOP-4D|
+Hornet HNT-161|
+Hornet HNT-171|
+Hunchback HBK-5H|
+Hunchback HBK-5M|
+Hunchback HBK-5N|
+Hunchback HBK-5P|
+Hunchback HBK-5S|
+Hunchback HBK-5SG|
+Hunchback HBK-5SS|
+Hunchback HBK-6N|
+Hunchback HBK-6S|
+Hussar HSR-200-D|
+Hussar HSR-400-D|
+Hussar HSR-500-D|
+Hussar HSR-900-D|
+Hussar HSR-950-D|
+Imp C|
+Imp IMP-2E|
+Imp IMP-3E|
+Imp IMP-4E|
+JagerMech JM6-DD|
+JagerMech JM6-DDa|
+JagerMech JM6-DG|
+JagerMech JM6-DGr|
+JagerMech JM6-H|
+JagerMech JM7-D|
+JagerMech JM7-F|
+JagerMech JM7-G|
+Javelin JVN-10P|
+Javelin JVN-11A 'Fire Javelin'|
+Javelin JVN-11B|
+Javelin JVN-11D|
+Javelin JVN-11F|
+Jenner JR7-C|
+Jenner JR7-C2|
+Jenner JR7-C3|
+Jenner JR7-K (Grace)|
+Jenner JR7-K|
+Katana (Crockett) CRK-5003-2|
+Katana (Crockett) CRK-5003-C|
+Katana (Crockett) CRK-5003-CJ|
+Katana (Crockett) CRK-5003-CM|
+King Crab KGC-000|
+King Crab KGC-001|
+King Crab KGC-005|
+King Crab KGC-007|
+King Crab KGC-008|
+King Crab KGC-008B|
+Kintaro KTO-19|
+Kintaro KTO-20|
+Kintaro KTO-21|
+Kintaro KTO-C|
+Kintaro KTO-K|
+Koshi (Mist Lynx) A|
+Koshi (Mist Lynx) B|
+Koshi (Mist Lynx) C|
+Koshi (Mist Lynx) D|
+Koshi (Mist Lynx) E|
+Koshi (Mist Lynx) F|
+Koshi (Mist Lynx) G|
+Koshi (Mist Lynx) H|
+Koshi (Mist Lynx) P|
+Koshi (Mist Lynx) Prime|
+Lancelot LNC25-01|
+Lancelot LNC25-03|
+Lancelot LNC25-04|
+Lancelot LNC25-05|
+Lancelot LNC25-06|
+Lancelot LNC25-08|
+Loki (Hellbringer) A|
+Loki (Hellbringer) B|
+Loki (Hellbringer) C|
+Loki (Hellbringer) D|
+Loki (Hellbringer) E|
+Loki (Hellbringer) F|
+Loki (Hellbringer) H|
+Loki (Hellbringer) Prime|
+Mad Cat (Timber Wolf) A|
+Mad Cat (Timber Wolf) B|
+Mad Cat (Timber Wolf) C|
+Mad Cat (Timber Wolf) D|
+Mad Cat (Timber Wolf) E|
+Mad Cat (Timber Wolf) F|
+Mad Cat (Timber Wolf) H|
+Mad Cat (Timber Wolf) Prime|
+Mad Cat (Timber Wolf) (Pryde)|
+Mad Cat (Timber Wolf) S|
+Man O' War (Gargoyle) A|
+Man O' War (Gargoyle) B|
+Man O' War (Gargoyle) C|
+Man O' War (Gargoyle) D|
+Man O' War (Gargoyle) E|
+Man O' War (Gargoyle) G|
+Man O' War (Gargoyle) H|
+Man O' War (Gargoyle) M|
+Man O' War (Gargoyle) Prime|
+Masakari (Warhawk) A|
+Masakari (Warhawk) B|
+Masakari (Warhawk) C|
+Masakari (Warhawk) D|
+Masakari (Warhawk) E|
+Masakari (Warhawk) H|
+Masakari (Warhawk) Prime|
+Mauler MAL-1K|
+Mauler MAL-1R|
+Mauler MAL-2R|
+Mauler MAL-3R|
+Mauler MAL-C|
+Mercury MCY-102|
+Mercury MCY-104|
+Mercury MCY-97|
+Mercury MCY-99|
+Mongoose MON-66|
+Mongoose MON-69|
+Mongoose MON-70|
+Mongoose MON-76|
+Orion ON1-M-DC|
+Orion ON1-M|
+Orion ON1-MA|
+Orion ON1-MB|
+Orion ON1-MC|
+Orion ON1-MD|
+Orion ON2-M|
+Panther PNT-10K|
+Panther PNT-10KA|
+Panther PNT-12A|
+Panther PNT-14S|
+Panther PNT-16K|
+Panther PNT-C|
+Panther PNT-CA|
+Puma (Adder) A|
+Puma (Adder) B|
+Puma (Adder) C|
+Puma (Adder) D|
+Puma (Adder) E|
+Puma (Adder) H|
+Puma (Adder) J|
+Puma (Adder) Prime|
+Quickdraw QKD-5K|
+Quickdraw QKD-5K2|
+Quickdraw QKD-5M|
+Quickdraw QKD-8K|
+Quickdraw QKD-C|
+Raven RVN-3L|
+Raven RVN-3M|
+Raven RVN-4L|
+Raven RVN-4LC|
+Raven RVN-SR 'Shattered Raven'|
+Raven RVN-SS 'Shattered Raven'|
+Ryoken (Stormcrow) (Kotare)|
+Ryoken (Stormcrow) A|
+Ryoken (Stormcrow) B|
+Ryoken (Stormcrow) C|
+Ryoken (Stormcrow) D|
+Ryoken (Stormcrow) E|
+Ryoken (Stormcrow) F|
+Ryoken (Stormcrow) G|
+Ryoken (Stormcrow) H|
+Ryoken (Stormcrow) Prime|
+Sentinel STN-3L|
+Sentinel STN-3M|
+Sentinel STN-4D|
+Sentinel STN-5WB|
+Sentinel STN-C|
+Shogun C|
+Shogun SHG-2E|
+Shogun SHG-2F (Trisha)|
+Shogun SHG-2F|
+Spider SDR-7K|
+Spider SDR-7K2|
+Spider SDR-7KC|
+Spider SDR-7M|
+Spider SDR-8M|
+Spider SDR-C|
+Stalker STK-3F (Jamison)|
+Stalker STK-5M|
+Stalker STK-5S|
+Stalker STK-6M|
+Stalker STK-7D|
+Stalker STK-8S|
+Thor (Summoner) A|
+Thor (Summoner) B|
+Thor (Summoner) C|
+Thor (Summoner) D|
+Thor (Summoner) E|
+Thor (Summoner) F|
+Thor (Summoner) G|
+Thor (Summoner) H|
+Thor (Summoner) HH|
+Thor (Summoner) M|
+Thor (Summoner) Prime|
+Thorn THE-N|
+Thorn THE-N1|
+Thorn THE-N2|
+Thug THG-11E (Reich)|
+Thug THG-11E|
+Thug THG-12E|
+Thug THG-12K|
+Thug THG-13K|
+Trebuchet TBT-3C|
+Trebuchet TBT-7M|
+Trebuchet TBT-8B|
+Trebuchet TBT-9K|
+Uller (Kit Fox) A|
+Uller (Kit Fox) B|
+Uller (Kit Fox) C|
+Uller (Kit Fox) D|
+Uller (Kit Fox) E|
+Uller (Kit Fox) F|
+Uller (Kit Fox) H|
+Uller (Kit Fox) Prime|
+Uller (Kit Fox) S|
+Uller (Kit Fox) W|
+UrbanMech UM-R63|
+UrbanMech UM-R68|
+UrbanMech UM-R69|
+UrbanMech UM-R70|
+Victor VTR-10D|
+Victor VTR-10L|
+Victor VTR-10S|
+Victor VTR-11D|
+Victor VTR-9D|
+Victor VTR-9K|
+Victor VTR-C|
+Vindicator VND-3L|
+Vindicator VND-4L|
+Vindicator VND-5L|
+Vindicator VND-6L|
+Vulcan VT-5M|
+Vulcan VT-5S|
+Vulcan VT-6C|
+Vulcan VT-6M|
+Vulture (Mad Dog) A|
+Vulture (Mad Dog) B|
+Vulture (Mad Dog) C|
+Vulture (Mad Dog) D|
+Vulture (Mad Dog) E|
+Vulture (Mad Dog) F|
+Vulture (Mad Dog) H|
+Vulture (Mad Dog) Prime|
+Whitworth WTH-1H|
+Whitworth WTH-2|
+Whitworth WTH-2A|
+Whitworth WTH-3|
+Whitworth WTH-K|
+Wolf Trap (Tora) WFT-1|
+Wolf Trap (Tora) WFT-2|
+Wolf Trap (Tora) WFT-B|
+Wolf Trap (Tora) WFT-C|
+Wolfhound IIC 'Grinner'|
+Wolfhound WLF-1 (Allard)|
+Wolfhound WLF-2|
+Wolfhound WLF-3S|
+Wolfhound WLF-4W|
+Wyvern WVE-10N|
+Wyvern WVE-5N|
+Wyvern WVE-9N|
+Zeus-X ZEU-9WD|
+Zeus ZEU-10WB|
+Zeus ZEU-9S-DC|
+Zeus ZEU-9S|
+Zeus ZEU-9S2|
+Zeus ZEU-9T|
+Albatross ALB-3U|
+Albatross ALB-4U|
+Anvil ANV-3M|
+Anvil ANV-3R|
+Anvil ANV-5M|
+Anvil ANV-5Q|
+Anvil ANV-6M|
+Anvil ANV-8M|
+Apollo APL-1M|
+Apollo APL-1R|
+Apollo APL-2S|
+Apollo APL-3T|
+Aquagladius AQS-3|
+Aquagladius AQS-4|
+Baboon (Howler) 2|
+Baboon (Howler) 3 'Devil'|
+Baboon (Howler)|
+Bandersnatch BNDR-01A|
+Bandersnatch BNDR-01B|
+Battle Hawk BH-K305|
+Battle Hawk BH-K306|
+Behemoth (Stone Rhino) 2|
+Behemoth (Stone Rhino) 3|
+Behemoth (Stone Rhino) 4|
+Behemoth (Stone Rhino) 5|
+Behemoth (Stone Rhino) 6|
+Behemoth (Stone Rhino)|
+Berserker BRZ-A3|
+Berserker BRZ-B3|
+Berserker BRZ-C3|
+Bombard BMB-010|
+Bombard BMB-013|
+Bombard BMB-1X|
+Cerberus MR-5M|
+Cerberus MR-6B|
+Cerberus MR-V2|
+Cerberus MR-V3|
+Colossus CL-P3|
+Colossus CLS-4S|
+Colossus CLS-5S|
+Copperhead CPR-HD-002|
+Copperhead CPR-HD-003|
+Copperhead CPR-HD-004|
+Cudgel CDG-1B|
+Cudgel CDG-2A|
+Cudgel CDG-2B|
+Daedalus DAD-3C|
+Daedalus DAD-3D|
+Daedalus DAD-4A|
+Daedalus DAD-4B|
+Daikyu DAI-01|
+Daikyu DAI-02|
+Daikyu DAI-03|
+Daimyo DMO-1K|
+Daimyo DMO-2K|
+Daimyo DMO-4K|
+Daimyo DMO-5K|
+Dart DRT-3S|
+Dart DRT-4S|
+Dart DRT-6S|
+Epimetheus Prime|
+Falconer FLC-8R|
+Fireball ALM-7D|
+Fireball ALM-8D|
+Fireball ALM-9D|
+Flashfire FLS-P2|
+Flashfire FLS-P4|
+Flashfire FLS-P5|
+Galahad (Glass Spider) 3|
+Gallowglas GAL-1GLS|
+Gallowglas GAL-2GLS|
+Gallowglas GAL-3GLS|
+Gallowglas GAL-4GLS|
+Gallowglas WD|
+Goshawk (Vapor Eagle) 3|
+Goshawk (Vapor Eagle) 4|
+Grand Crusader GRN-D-01|
+Grand Crusader GRN-D-02|
+Grand Crusader II GRN-D-03|
+Grand Crusader II GRN-D-04|
+Grand Titan T-IT-N10M|
+Grand Titan T-IT-N11M|
+Great Turtle GTR-1|
+Great Turtle GTR-2|
+Grim Reaper GRM-R-PR29|
+Grim Reaper GRM-R-PR30|
+Grim Reaper GRM-R-PR31|
+Gunslinger GUN-1ERD|
+Gunslinger GUN-2ERD|
+Hachiwara HCA-3T|
+Hachiwara HCA-4T|
+Hachiwara HCA-4U|
+Hachiwara HCA-6P|
+Hammer HMR-3C 'Claw-Hammer'|
+Hammer HMR-3M|
+Hammer HMR-3P 'Pein-Hammer'|
+Hammer HMR-3S 'Slammer'|
+Hellhound (Conjurer) 2|
+Hellhound (Conjurer) 3|
+Hellhound (Conjurer) 4|
+Hellhound (Conjurer) 5|
+Hercules HRC-LS-9000|
+Hercules HRC-LS-9001|
+Hitman HM-1|
+Hitman HM-2|
+Hollander BZK-F3|
+Hollander BZK-G1|
+Hollander II BZK-F5|
+Hollander II BZK-F7|
+Huron Warrior HUR-WO-R4L|
+Huron Warrior HUR-WO-R4M|
+Huron Warrior HUR-WO-R4N|
+Huron Warrior HUR-WO-R4O|
+Jackal JA-KL-1532|
+Jackal JA-KL-55|
+Jenner IIC 4|
+Juggernaut JG-R9T1|
+Juggernaut JG-R9T2|
+Juggernaut JG-R9T3|
+Komodo KIM-2|
+Komodo KIM-2A|
+Komodo KIM-2C|
+Komodo KIM-3C|
+Koto KT-P2|
+Koto KTO-2A|
+Koto KTO-3A|
+Koto KTO-4A|
+Kraken (Bane) 4|
+Linebacker A|
+Linebacker B|
+Linebacker C|
+Linebacker D|
+Linebacker E|
+Linebacker H|
+Linebacker Prime|
+Longshot LNG-1B|
+Longshot LNG-2|
+Longshot LNG-3|
+Longshot LNG-3C|
+Longshot LNG-4|
+Mantis MTS-L|
+Mantis MTS-S|
+Mantis MTS-T|
+Mantis MTS-T2|
+Mantis MTS-T3|
+Mantis SA-MN|
+Morpheus MR-P1|
+Morpheus MRP-3S|
+Morpheus MRP-3T|
+Morpheus MRP-3W|
+Naga A|
+Naga B|
+Naga C|
+Naga D|
+Naga Prime|
+Naginata NG-C3A|
+Naginata NG-C3B|
+Naginata NG-C3C|
+Nexus II NXS2-A|
+Nexus II NXS2-B|
+Nexus NXS1-A|
+Nexus NXS1-B|
+Nightsky NGS-4S|
+Nightsky NGS-4T|
+Nightsky NGS-5S|
+Nightsky NGS-5T|
+Nightsky NGS-6S|
+Onslaught SA-OS|
+Onslaught SA-OS2|
+Onslaught SA-OS3|
+Paladin PAL-1|
+Paladin PAL-2|
+Paladin PAL-3|
+Penetrator PTR-4D|
+Penetrator PTR-4F|
+Penetrator PTR-6M|
+Penetrator PTR-6S|
+Penetrator PTR-6T|
+Peregrine (Horned Owl) 4|
+Peregrine (Horned Owl) 5|
+Phantom A|
+Phantom B|
+Phantom C|
+Phantom D|
+Phantom E|
+Phantom H|
+Phantom Prime|
+Porcupine PRC-1N|
+Porcupine PRC-2N|
+Pouncer A|
+Pouncer B|
+Pouncer C|
+Pouncer D|
+Pouncer E|
+Pouncer H|
+Pouncer Prime|
+Prometheus|
+Prowler PWR-1X|
+Prowler PWR-1X1|
+Raijin II RJN-200-A|
+Raijin II RJN-200-B|
+Raijin II RJN-200-C|
+Raijin RJN-101-A|
+Rakshasa MDG-1A|
+Rakshasa MDG-1B|
+Rakshasa MDG-2A|
+Ronin SA-RN|
+Ronin SA-RN7|
+Salamander PPR-5S|
+Salamander PPR-5T|
+Salamander PPR-6S|
+Salamander PPR-6T|
+Salamander PPR-7S|
+Sasquatch SQS-TH-001|
+Sasquatch SQS-TH-002|
+Sasquatch SQS-TH-003|
+Scarabus SCB-9A|
+Scarabus SCB-9T|
+Silver Fox SVR-5X|
+Silver Fox SVR-5Y|
+Snake SNK-1V|
+Snake SNK-2B|
+Spatha SP1-X|
+Stealth STH-1D|
+Stealth STH-2D|
+Stealth STH-2D1|
+Stealth STH-2D2|
+Stealth STH-3S|
+Tarantula ZPH-1|
+Tarantula ZPH-2A|
+Tarantula ZPH-3A|
+Tarantula ZPH-4A|
+Tempest TMP-3G|
+Tempest TMP-3M|
+Tempest TMP-3M2 'Storm Tempest'|
+Tempest TMP-3MA|
+Thunder THR-1L|
+Thunder THR-2L|
+Thunder THR-3L|
+Tsunami TS-P1|
+Tsunami TS-P1D|
+Venom SDR-9K|
+Venom SDR-9KA|
+Venom SDR-9KB|
+Venom SDR-9KC|
+Viper (Black Python) 3|
+Viper (Black Python) 4|
+Vixen (Incubus) 4|
+Vixen (Incubus) 5|
+Vixen (Incubus)|
+Volkh VKH-1|
+Volkh VKH-7|
+War Dog WR-DG-02FC|
+War Dog WR-DG-03FC|
+Watchman WTC-4DM|
+Watchman WTC-4M|
+Werewolf WER-LF-004|
+Werewolf WER-LF-005|
+Wildfire P1-WF|
+Wraith TR1|
+Wraith TR2|
+Wraith TR3|
+Avatar AV1-O|
+Avatar AV1-OA|
+Avatar AV1-OB|
+Avatar AV1-OC|
+Avatar AV1-OD|
+Avatar AV1-OE|
+Avatar AV1-OF|
+Avatar AV1-OG|
+Avatar AV1-OH|
+Avatar AV1-OI|
+Avatar AV1-OR|
+Battle Cobra A|
+Battle Cobra B|
+Battle Cobra BTL-C-2O|
+Battle Cobra BTL-C-2OA|
+Battle Cobra BTL-C-2OB|
+Battle Cobra BTL-C-2OC|
+Battle Cobra BTL-C-2OD|
+Battle Cobra BTL-C-2OE|
+Battle Cobra BTL-C-2OF|
+Battle Cobra C|
+Battle Cobra H|
+Battle Cobra Prime|
+Black Hawk-KU BHKU-O|
+Black Hawk-KU BHKU-OA|
+Black Hawk-KU BHKU-OB|
+Black Hawk-KU BHKU-OC|
+Black Hawk-KU BHKU-OD|
+Black Hawk-KU BHKU-OE|
+Black Hawk-KU BHKU-OF|
+Black Hawk-KU BHKU-OR|
+Black Hawk-KU BHKU-OX|
+Black Lanner A|
+Black Lanner B|
+Black Lanner C|
+Black Lanner D|
+Black Lanner E|
+Black Lanner H|
+Black Lanner Prime|
+Blackjack BJ2-O|
+Blackjack BJ2-OA|
+Blackjack BJ2-OB|
+Blackjack BJ2-OC|
+Blackjack BJ2-OD|
+Blackjack BJ2-OE|
+Blackjack BJ2-OF|
+Blackjack BJ2-OR|
+Blackjack BJ2-OX|
+Bushwacker BSW-L1|
+Bushwacker BSW-S2|
+Bushwacker BSW-X1|
+Bushwacker BSW-X2|
+Cauldron-Born (Ebon Jaguar) A|
+Cauldron-Born (Ebon Jaguar) B|
+Cauldron-Born (Ebon Jaguar) C|
+Cauldron-Born (Ebon Jaguar) D|
+Cauldron-Born (Ebon Jaguar) H|
+Cauldron-Born (Ebon Jaguar) Prime|
+Cestus CTS-6X|
+Cestus CTS-6Y|
+Cestus CTS-6Z|
+Cestus CTS-7A|
+Chameleon CLN-7V|
+Chameleon CLN-7W|
+Chameleon CLN-7Z|
+Crossbow A|
+Crossbow B|
+Crossbow C|
+Crossbow D|
+Crossbow H|
+Crossbow Prime|
+Devastator DVS-1D|
+Devastator DVS-2|
+Devastator DVS-3|
+Dragon Fire DGR-3F|
+Dragon Fire DGR-4F|
+Dragon Fire DGR-6FC|
+Emperor EMP-5A|
+Emperor EMP-6A|
+Emperor EMP-6D|
+Emperor EMP-6L|
+Emperor EMP-6M|
+Emperor EMP-6S|
+Emperor EMP-7L|
+Enfield END-6J|
+Enfield END-6Q|
+Enfield END-6S|
+Excalibur EXC-B1|
+Excalibur EXC-B2|
+Excalibur EXC-C1|
+Excalibur EXC-CS|
+Excalibur EXC-D1|
+Falcon Hawk FNHK-9K|
+Falcon Hawk FNHK-9K1A|
+Falcon Hawk FNHK-9K1B|
+Fire Falcon A|
+Fire Falcon B|
+Fire Falcon C|
+Fire Falcon D|
+Fire Falcon E|
+Fire Falcon H|
+Fire Falcon Prime|
+Firestarter FS9-O|
+Firestarter FS9-OA|
+Firestarter FS9-OB|
+Firestarter FS9-OC|
+Firestarter FS9-OD|
+Firestarter FS9-OE|
+Firestarter FS9-OF|
+Firestarter FS9-OG|
+Firestarter FS9-OH|
+Firestarter FS9-OR|
+Firestarter FS9-OX|
+Grendel (Mongrel) A|
+Grendel (Mongrel) B|
+Grendel (Mongrel) C|
+Grendel (Mongrel) D|
+Grendel (Mongrel) E|
+Grendel (Mongrel) F|
+Grendel (Mongrel) H|
+Grendel (Mongrel) Prime|
+Grizzly 2|
+Grizzly|
+Hankyu (Arctic Cheetah) A|
+Hankyu (Arctic Cheetah) B|
+Hankyu (Arctic Cheetah) C|
+Hankyu (Arctic Cheetah) D|
+Hankyu (Arctic Cheetah) H|
+Hankyu (Arctic Cheetah) Prime|
+Hunchback IIC 2|
+Hunchback IIC 3|
+Hunchback IIC|
+Kingfisher A|
+Kingfisher B|
+Kingfisher C|
+Kingfisher D|
+Kingfisher E|
+Kingfisher H|
+Kingfisher Prime|
+Kodiak 2|
+Kodiak 3|
+Kodiak 4|
+Kodiak 5|
+Kodiak|
+Lineholder KW1-LH2|
+Lineholder KW1-LH3|
+Lineholder KW1-LH8 'Linebreaker'|
+Lineholder KW2-LHW|
+Longbow LGB-7Q|
+Longbow LGB-7V|
+Lynx LNX-8Q|
+Lynx LNX-9C|
+Lynx LNX-9Q|
+Lynx LNX-9R|
+Maelstrom MTR-5K|
+Maelstrom MTR-6E|
+Maelstrom MTR-6K|
+Merlin MLN-1A|
+Merlin MLN-1B|
+Merlin MLN-1C|
+Night Gyr A|
+Night Gyr B|
+Night Gyr C|
+Night Gyr D|
+Night Gyr E|
+Night Gyr H|
+Night Gyr Prime|
+Night Hawk NTK-2Q|
+Night Hawk NTK-2S|
+Nightstar NSR-9FC|
+Nightstar NSR-9J|
+Nightstar NSR-9SS|
+Nobori-nin (Huntsman) A|
+Nobori-nin (Huntsman) B|
+Nobori-nin (Huntsman) C|
+Nobori-nin (Huntsman) D|
+Nobori-nin (Huntsman) H|
+Nobori-nin (Huntsman) N|
+Nobori-nin (Huntsman) Prime|
+O-Bakemono OBK-M10|
+O-Bakemono OBK-M11|
+O-Bakemono OBK-M12|
+Owens OW-1|
+Owens OW-1A|
+Owens OW-1B|
+Owens OW-1C|
+Owens OW-1D|
+Owens OW-1E|
+Owens OW-1F|
+Owens OW-1R|
+Pillager PLG-1N|
+Pillager PLG-3Z|
+Pillager PLG-4Z|
+Pillager PLG-5L|
+Pillager PLG-5Z|
+Piranha 2|
+Piranha 3|
+Piranha|
+Raptor RTX1-O|
+Raptor RTX1-OA|
+Raptor RTX1-OB|
+Raptor RTX1-OC|
+Raptor RTX1-OD|
+Raptor RTX1-OE|
+Raptor RTX1-OF|
+Raptor RTX1-OG|
+Raptor RTX1-OR|
+Shadow Cat A|
+Shadow Cat B|
+Shadow Cat C|
+Shadow Cat H|
+Shadow Cat Prime|
+Shootist ST-8A|
+Shootist ST-8C|
+Shootist ST-9C|
+Spartan SPT-N1|
+Spartan SPT-N2|
+Spartan SPT-N3|
+Spartan SPT-NF|
+Spector SPR-4F|
+Spector SPR-5F|
+Spector SPR-5S|
+Spector SPR-ST|
+Starslayer STY-2C|
+Starslayer STY-3C|
+Starslayer STY-3D|
+Strider SR1-O|
+Strider SR1-OA|
+Strider SR1-OB|
+Strider SR1-OC|
+Strider SR1-OD|
+Strider SR1-OE|
+Strider SR1-OF|
+Strider SR1-OG|
+Strider SR1-OR|
+Strider SR1-OX|
+Striker STC-2C|
+Striker STC-2D|
+Striker STC-2S|
+Sunder SD1-O (Samual)|
+Sunder SD1-O|
+Sunder SD1-OA|
+Sunder SD1-OB|
+Sunder SD1-OC|
+Sunder SD1-OD|
+Sunder SD1-OE|
+Sunder SD1-OR|
+Sunder SD1-OX|
+Supernova 2|
+Supernova 3|
+Supernova 4|
+Supernova|
+Talon TLN-5V|
+Talon TLN-5W|
+Talon TLN-5Z|
+Thresher 2|
+Thresher|
+Thunder Hawk TDK-7KMA|
+Thunder Hawk TDK-7S|
+Thunder Hawk TDK-7X|
+Thunder Hawk TDK-7Y|
+Turkina A|
+Turkina B|
+Turkina C|
+Turkina D|
+Turkina H|
+Turkina Prime|
+Arctic Fox AF1|
+Arctic Fox AF1A|
+Arctic Fox AF1B|
+Arctic Fox AF1C|
+Arctic Fox AF1D|
+Arctic Fox AF1E|
+Arctic Fox AF1F|
+Arctic Wolf 2|
+Arctic Wolf A|
+Arctic Wolf J|
+Arctic Wolf Prime|
+Arctic Wolf|
+Barghest BGS-1T|
+Barghest BGS-2T|
+Barghest BGS-3T|
+Barghest BGS-7S|
+Beowulf BEO-12|
+Beowulf BEO-14|
+Bishamon BSN-3K|
+Bishamon BSN-4K|
+Bishamon BSN-5KC|
+Black Watch BKW-7R|
+Black Watch BKW-9R|
+Blitzkrieg BTZ-3F|
+Blitzkrieg BTZ-4F|
+Buccaneer BCN-3R|
+Buccaneer BCN-5W|
+Buccaneer BCN-6W|
+Canis 2|
+Canis|
+Clint IIC 2|
+Clint IIC|
+Cobra CBR-02|
+Cobra CBR-03|
+Commando IIC|
+Corvis 2|
+Corvis|
+Cossack C-1FC|
+Cossack C-SK1|
+Cougar A|
+Cougar B|
+Cougar C|
+Cougar D|
+Cougar Prime|
+Duan Gung D9-G10|
+Duan Gung D9-G9|
+Eagle EGL-1M|
+Eagle EGL-2M|
+Eagle EGL-3M|
+Enforcer III ENF-6M|
+Enforcer III ENF-6NAIS|
+Fire Scorpion 2|
+Fire Scorpion 3|
+Fire Scorpion|
+Garm GRM-01A|
+Garm GRM-01A2|
+Garm GRM-01B|
+Garm GRM-01C|
+Great Wyrm 2|
+Great Wyrm|
+Guillotine IIC 2|
+Guillotine IIC|
+Ha Otoko 2|
+Ha Otoko HKO-1C|
+Ha Otoko|
+Hauptmann HA1-O|
+Hauptmann HA1-OA|
+Hauptmann HA1-OB|
+Hauptmann HA1-OC|
+Hauptmann HA1-OD|
+Hauptmann HA1-OE|
+Helios HEL-3D|
+Helios HEL-4A|
+Helios HEL-6X|
+Helios HEL-C|
+Highlander IIC 2|
+Highlander IIC|
+Icestorm 2|
+Icestorm|
+Initiate INI-02|
+Initiate INI-04|
+JagerMech III JM6-D3|
+JagerMech III JM6-D4|
+Jinggau JN-G7L|
+Jinggau JN-G8A|
+Jinggau JN-G9CC|
+Kabuto KBO-7A|
+Kabuto KBO-7B|
+Mandrill|
+Marshal MHL-2L|
+Marshal MHL-6MC|
+Marshal MHL-X1|
+Matador 2|
+Matador|
+Men Shen MS1-O|
+Men Shen MS1-OA|
+Men Shen MS1-OB|
+Men Shen MS1-OC|
+Men Shen MS1-OD|
+Men Shen MS1-OE|
+Men Shen MS1-OF|
+Nova Cat A|
+Nova Cat B|
+Nova Cat C|
+Nova Cat D|
+Nova Cat E|
+Nova Cat F|
+Nova Cat G|
+Nova Cat Prime|
+Orion IIC|
+Pack Hunter 2|
+Pack Hunter 3|
+Pack Hunter 4|
+Pack Hunter|
+Predator 2|
+Predator|
+Sentry SNT-04|
+Sentry SNT-W5|
+Shugenja SJA-7D|
+Shugenja SJA-8H|
+Sirocco SRC-3C|
+Sirocco SRC-5C|
+Sirocco SRC-6C|
+Snow Fox 2|
+Snow Fox 3|
+Snow Fox|
+Stalking Spider 2|
+Stalking Spider 3|
+Stalking Spider|
+Star Adder (Blood Asp) A|
+Star Adder (Blood Asp) B|
+Star Adder (Blood Asp) C|
+Star Adder (Blood Asp) D|
+Star Adder (Blood Asp) Prime|
+Stooping Hawk A|
+Stooping Hawk B|
+Stooping Hawk C|
+Stooping Hawk D|
+Stooping Hawk E|
+Stooping Hawk F|
+Stooping Hawk G|
+Stooping Hawk Prime|
+Tai-sho TSH-7S|
+Tai-sho TSH-8S|
+Thunder Stallion 2 'Fire Stallion'|
+Thunder Stallion 3|
+Thunder Stallion|
+Ti Ts'ang TSG-9C|
+Ti Ts'ang TSG-9H|
+Ti Ts'ang TSG-9J|
+Toyama TYM-1A|
+Toyama TYM-1B|
+Toyama TYM-1C|
+UrbanMech IIC 2|
+UrbanMech IIC|
+Ursus 2|
+Ursus|
+Viking VKG-2F|
+Viking VKG-2G|
+Viking VKG-3A|
+Viking VKG-3W|
+Wyvern IIC 2|
+Wyvern IIC|
+Yeoman YMN-10-OR|
+Yeoman YMN-6Y|
+Yu Huang Y-H10G|
+Yu Huang Y-H11G|
+Yu Huang Y-H9G|
+Yu Huang Y-H9GB|
+Yu Huang Y-H9GC|
+Akuma AKU-1X|
+Akuma AKU-1XJ|
+Anubis ABS-3L|
+Anubis ABS-3R|
+Anubis ABS-3T|
+Arcas 2|
+Arcas|
+Argus AGS-2D|
+Argus AGS-4D|
+Axman AXM-3S|
+Blood Kite 2|
+Blood Kite|
+Bloodhound B1-HND|
+Bloodhound B2-HND|
+Blue Flame BLF-21|
+Brigand LDT-1|
+Brigand LDT-X1|
+Brigand LDT-X2|
+Burrock|
+Chimera CMA-1S|
+Chimera CMA-C|
+Crimson Langur A|
+Crimson Langur B|
+Crimson Langur C|
+Crimson Langur Prime|
+Cronus CNS-3M|
+Cronus CNS-5M|
+Fafnir FNR-5|
+Fafnir FNR-5B|
+Gurkha GUR-2G|
+Gurkha GUR-4G|
+Hellfire 2|
+Hellfire|
+Hellion A|
+Hellion B|
+Hellion C|
+Hellion Prime|
+Hellspawn HSN-7D|
+Hellspawn HSN-8E|
+Hellspawn HSN-9F|
+Lao Hu LHU-2B|
+Lao Hu LHU-3B|
+Lao Hu LHU-3C|
+Legacy LGC-01|
+Legacy LGC-02|
+Lightray LGH-4W|
+Lightray LGH-4Y|
+Lightray LGH-5W|
+Lobo|
+Mad Cat Mk II|
+Ninja-To NJT-2|
+Ninja-To NJT-3|
+No-Dachi NDA-1K|
+No-Dachi NDA-2K|
+No-Dachi NDA-2KO|
+Osiris OSR-3D|
+Osiris OSR-4D|
+Perseus P1A|
+Perseus P1B|
+Perseus P1C|
+Perseus P1D|
+Perseus P1|
+Pinion 2|
+Pinion|
+Rabid Coyote|
+Razorback RZK-9S|
+Razorback RZK-9T|
+Red Shift RDS-2A|
+Red Shift RDS-2B|
+Sagittaire SGT-8R|
+Savage Coyote A|
+Savage Coyote B|
+Savage Coyote C|
+Savage Coyote Prime|
+Scylla|
+Sha Yu SYU-2B|
+Sha Yu SYU-4B|
+Solitaire|
+Spirit|
+Stiletto STO-4A|
+Stiletto STO-4B|
+Templar TLR1-O (Grayson)|
+Templar TLR1-O (Tancred)|
+Templar TLR1-O|
+Templar TLR1-OA|
+Templar TLR1-OB|
+Templar TLR1-OC|
+Tessen TSN-1C|
+Tessen TSN-C3|
+Thanatos TNS-4S|
+Uziel UZL-2S|
+Uziel UZL-3S|
+Vanquisher VQR-2A|
+Vanquisher VQR-2B|
+Verfolger VR5-R|
+White Flame WHF-3B|
+Arcas 3|
+Bowman 2|
+Bowman 3|
+Bowman 4|
+Bowman|
+Burrock 2|
+Crimson Langur D|
+Crimson Langur E|
+Hellfire 3|
+Lobo 2|
+Lobo 3|
+Mad Cat Mk II 2|
+Mad Cat Mk II 3|
+Pinion 3|
+Rabid Coyote 2|
+Savage Coyote J|
+Savage Coyote W|
+Scylla 2|
+Scylla 3|
+Solitaire 2|
+Spirit 2|
+Akuma AKU-2X|
+Akuma AKU-2XK|
+Anubis ABS-4C|
+Argus AGS-5D|
+Argus AGS-6F|
+Bloodhound B3-HND|
+Blue Flame BLF-40|
+Brigand LDT-X3|
+Brigand LDT-X4|
+Chimera CMA-2K|
+Cronus CNS-TD9|
+Fafnir FNR-5WB|
+Fafnir FNR-6U|
+Gurkha GUR-6G|
+Gurkha GUR-8G|
+Hellspawn HSN-10SR|
+Lao Hu LHU-3L|
+Lao Hu LHU-4E|
+Legacy LGC-03|
+Legacy LGC-04-WVR|
+Legacy LGC-05|
+Lightray LGH-7W|
+Ninja-To NJT-4|
+No-Dachi NDA-3S|
+Osiris OSR-5D|
+Perseus P1E|
+Perseus P1P|
+Perseus P1W|
+Razorback RZK-10S|
+Razorback RZK-10T|
+Red Shift RDS-3A|
+Sagittaire SGT-10X|
+Sagittaire SGT-9D|
+Sha Yu SYU-6B|
+Stiletto STO-4C|
+Templar TLR1-OD|
+Templar TLR1-OE|
+Templar TLR1-OF|
+Templar TLR1-OG|
+Templar TLR1-OH|
+Templar TLR1-OI|
+Tessen TSN-C3M|
+Thanatos TNS-4T|
+Thanatos TNS-6S|
+Uziel UZL-8S|
+Vanquisher VQR-5V|
+Vanquisher VQR-7U|
+Vanquisher VQR-7V|
+Verfolger VR6-C|
+Verfolger VR6-T|
+White Flame WHF-3C|
+White Flame WHF-4C|
+Archangel C-ANG-O Invictus|
+Archangel C-ANG-OA Dominus|
+Archangel C-ANG-OB Infernus|
+Archangel C-ANG-OC Comminus|
+Archangel C-ANG-OD Luminos|
+Archangel C-ANG-OE Eminus|
+Atlas II AS7-D-H|
+Atlas II AS7-D-H2|
+Balius A|
+Balius B|
+Balius C|
+Balius D|
+Balius Prime|
+BattleAxe BKX-7K|
+BattleAxe BKX-7NC|
+BattleAxe BKX-8D|
+BattleMaster BLR-1Gb|
+BattleMaster BLR-1Gbc|
+BattleMaster BLR-1Gc|
+Bear Cub 2|
+Bear Cub 3|
+Bear Cub|
+Crab CRB-27b|
+Crimson Hawk 2|
+Crimson Hawk 3|
+Crimson Hawk|
+Crossbow CRS-6B|
+Crossbow CRS-6C|
+Crossbow CRS-9A|
+Crusader CRD-2R|
+Cygnus 2|
+Cygnus 3|
+Cygnus|
+Defiance DFN-3C|
+Defiance DFN-3S|
+Defiance DFN-3T|
+DemolitionMech WI-DM|
+DemolitionMech WI-DM2|
+Deva C-DVA-O Invictus|
+Deva C-DVA-OA Dominus|
+Deva C-DVA-OB Infernus|
+Deva C-DVA-OC Comminus|
+Deva C-DVA-OD Luminos|
+Deva C-DVA-OE Eminus|
+Excalibur EXC-B2b|
+Eyleuka EYL-35A|
+Eyleuka EYL-45A|
+Eyleuka EYL-45B|
+Eyleuka EYL-4A|
+Firebee FRB-2E|
+Firebee FRB-3E|
+Galahad GLH-1D|
+Galahad GLH-2D|
+Galahad GLH-3D|
+Gladiator GLD-2R|
+Gladiator GLD-3R|
+Gladiator GLD-4R|
+Gladiator GLD-5R|
+Gladiator GLD-1R (Keller)|
+Grigori C-GRG-O Invictus|
+Grigori C-GRG-O (Tamiel)|
+Grigori C-GRG-OA Dominus|
+Grigori C-GRG-OB Infernus|
+Grigori C-GRG-OC Comminus|
+Grigori C-GRG-OD Luminos|
+Grigori C-GRG-OE Eminus|
+Hammerhands HMH-3D|
+Hammerhands HMH-4D|
+Hammerhands HMH-5D|
+Hammerhands HMH-6D|
+Helepolis HEP-2H|
+Helepolis HEP-2X|
+Helepolis HEP-3H|
+Helepolis HEP-4H|
+Highlander HGN-732b|
+Hussar HSR-200-Db|
+Hyena HYN-4B SalvageMech|
+Hyena HYN-4A SalvageMech|
+Icarus II ICR-1S|
+Icarus II ICR-2S|
+Jabberwocky ConstructionMech JAW-66D|
+Jabberwocky DemolitionMech JAW-66C|
+Jabberwocky EngineerMech JAW-65A|
+Jabberwocky EngineerMech JAW-66B|
+Jackrabbit JKR-8T|
+Jackrabbit JKR-9R 'Joker'|
+Jackrabbit JKR-9W|
+Jupiter 2|
+Jupiter 3|
+Jupiter|
+King Crab KGC-000b|
+Kintaro KTO-19b|
+Kiso ConstructionMech K-3N-KR4|
+Kiso ConstructionMech K-3N-KR5|
+Koschei KSC-3I|
+Koschei KSC-3L|
+Koschei KSC-4I|
+Koschei KSC-4L|
+Koschei KSC-5I|
+Koschei KSC-5MC|
+Koschei KSC-5X|
+Kyudo KY2-D-02|
+Kyudo KY2-D-03|
+Legionnaire LGN-1X|
+Legionnaire LGN-2D|
+Legionnaire LGN-2XA|
+Legionnaire LGN-2XU|
+Lumberjack LM1/A|
+Lumberjack LM4/C|
+Lumberjack LM4/P|
+Mackie MSK-6S|
+Mackie MSK-7A|
+Mackie MSK-8B|
+Mackie MSK-9H|
+Malak C-MK-O Invictus|
+Malak C-MK-OA Dominus|
+Malak C-MK-OB Infernus|
+Malak C-MK-OC Comminus|
+Malak C-MK-OD Luminos|
+Malak C-MK-OE Eminus|
+Marauder MAD-1R|
+Marauder MAD-2R|
+Mongoose II MON-266|
+Mongoose II MON-267|
+Mongoose II MON-268|
+Mongoose MON-66b|
+Ocelot 2|
+Ocelot 3|
+Ocelot|
+Ostroc OSR-2Cb|
+Ostscout OTT-7Jb|
+Pariah (Septicemia) A|
+Pariah (Septicemia) B|
+Pariah (Septicemia) C|
+Pariah (Septicemia) D|
+Pariah (Septicemia) Prime|
+Patriot PKM-2C|
+Patriot PKM-2D|
+Patriot PKM-2E|
+Patron LoaderMech|
+Patron LoaderMech PTN-1|
+Phoenix Hawk PXH-1b (Special)|
+Phoenix Hawk PXH-1c (Special)|
+Phoenix PX-3R|
+Phoenix PX-4R|
+Preta C-PRT-O Invictus|
+Preta C-PRT-OA Dominus|
+Preta C-PRT-OB Infernus|
+Preta C-PRT-OC Comminus|
+Preta C-PRT-OD Luminos|
+Preta C-PRT-OE Eminus|
+Quasit MilitiaMech QUA-51M|
+Quasit MilitiaMech QUA-51P|
+Quasit MilitiaMech QUA-51T|
+Rifleman II RFL-3N-2|
+Ryoken II 2|
+Ryoken II 3|
+Ryoken II|
+Seraph C-SRP-O Invictus|
+Seraph C-SRP-OA Dominus|
+Seraph C-SRP-OB Infernus|
+Seraph C-SRP-OC Comminus|
+Seraph C-SRP-OD Luminos|
+Seraph C-SRP-OE Eminus|
+Sun Cobra|
+Thug THG-11Eb|
+Titan II TI-2P|
+Titan II TI-2PA|
+Titan TI-1A|
+Toro TR-A-6|
+Valiant V4-LNT-J3|
+Valiant V4-LNT-K7|
+Valiant VLN-3T|
+Von Rohrs (Hebi) VON 4RH-5|
+Von Rohrs (Hebi) VON 4RH-6|
+Warhammer WHM-6Rb|
+Warlord BLR-2D|
+Warlord BLR-2G|
+Wight WGT-1LAW/SC|
+Wight WGT-1LAW/SC3|
+Wight WGT-2LAW|
+Wight WGT-2LAWC3|
+Wight WGT-2SC|
+Wight WGT-3SC|
+Wolverine II WVR-7H|
+Wyvern WVE-5Nb|
+Xanthos XNT-3O|
+Xanthos XNT-4O|
+Xanthos XNT-5O|
+Ymir BWP-2B|
+Ymir BWP-2E|
+Ymir BWP-3A|
+Arbalest 2|
+Arbalest 3|
+Arbalest|
+Arctic Wolf II A|
+Arctic Wolf II B|
+Arctic Wolf II C|
+Arctic Wolf II Prime|
+Atlas AS7-Dr|
+Atlas AS7-K2|
+Atlas AS7-K3|
+Atlas AS8-D|
+Blade BLD-XL|
+Blade BLD-XS|
+Blade BLD-XX|
+Blood Reaper 2|
+Blood Reaper|
+Brahma BRM-5A|
+Brahma BRM-5B|
+Bruin 2|
+Bruin|
+Cuirass CDR-1X|
+Dark Crow 2|
+Dark Crow 3|
+Dark Crow 4|
+Dark Crow|
+Dasher II 2|
+Dasher II|
+Deimos 2|
+Deimos A|
+Deimos B|
+Deimos C|
+Deimos Prime|
+Deimos S|
+Diomede D-M3D-3 ConstructionMech|
+Diomede D-M3D-4 DemolitionMech|
+Ebony MEB-10|
+Ebony MEB-11|
+Ebony MEB-9|
+Eidolon C-EID-001|
+Eisenfaust EFT-4J|
+Eisenfaust EFT-7X|
+Eisenfaust EFT-8X|
+Fennec FEC-1CM|
+Fennec FEC-3C|
+Flamberge 2|
+Flamberge 3|
+Flamberge A|
+Flamberge B|
+Flamberge C|
+Flamberge Prime|
+Fwltur FWL-3R SalvageMech|
+Fwltur FWL-3V SalvageMech|
+Gallant GLT-7-0|
+Gallant GLT-8-0|
+Ghost GST-10|
+Ghost GST-11|
+Goshawk II 2|
+Goshawk II 3|
+Goshawk II|
+Hatchetman HCT-6M|
+Hatchetman HCT-7S|
+Hellstar 2|
+Hellstar 3|
+Hellstar|
+Karhu A|
+Karhu B|
+Karhu C|
+Karhu D|
+Karhu Prime|
+Kuma 2|
+Kuma 3|
+Kuma|
+Mangonel MNL-3L|
+Mangonel MNL-3W|
+Mjolnir MLR-B2|
+Mjolnir MLR-BX|
+Morrigan 2|
+Morrigan 3|
+Morrigan|
+Night Wolf|
+Nyx NX-80|
+Nyx NX-80C|
+Nyx NX-90|
+Omen|
+Onager|
+Orochi OR-2I|
+Osprey OSP-15|
+Osprey OSP-25|
+Osprey OSP-26|
+Ostwar OWR-2M|
+Ostwar OWR-2Mb|
+Ostwar OWR-3M|
+Pack Hunter II 2|
+Pack Hunter II 3|
+Pack Hunter II|
+Panther PNT-10K2|
+Panther PNT-12K|
+Panther PNT-12K2|
+Panther PNT-13K|
+Parash 2|
+Parash|
+Peacekeeper PKP-1A|
+Peacekeeper PKP-1B|
+Penthesilea PEN-2H|
+Penthesilea PEN-2MAF|
+Prefect PRF-1R|
+Prefect PRF-2R|
+Raptor II RPT-2X|
+Raptor II RPT-2X1|
+Raptor II RPT-3X|
+Raptor II RPT-5X|
+Rook NH-1A|
+Rook NH-1B|
+Rook NH-2|
+Rook NH-3X|
+Shadow Cat II 2|
+Shadow Cat II|
+Shen Yi SHY-3B|
+Shockwave SKW-2F|
+Shockwave SKW-4G|
+Sokuryou SKU-181 SurveyMech|
+Sokuryou SKU-197 SurveyMech|
+Sokuryou SKU-198 SurveyMech|
+Sphinx 2|
+Sphinx|
+Spider SDR-8K|
+Spider SDR-8R|
+Spider SDR-8X|
+Targe TRG-1N|
+Targe TRG-2N|
+Thunder Fox TFT-A9|
+Thunder Fox TFT-C3|
+Thunder Fox TFT-L8|
+Trebaruna TR-XB|
+Trebaruna TR-XJ|
+Trebaruna TR-XL|
+Tundra Wolf 2|
+Tundra Wolf 3|
+Tundra Wolf 4|
+Tundra Wolf|
+Ursus II|
+Warhammer WHD-10CT|
+Wolfhound WLF-3M|
+Wolfhound WLF-5|
+Yao Lien YOL-4C|
+Akuma AKU-2XC|
+Albatross ALB-3Ur|
+Arctic Fox AF1U|
+Argus AGS-8DX|
+Avatar AV1-OU|
+Axman AXM-3Sr|
+Balius U|
+Bandersnatch BNDR-01Ar|
+Banshee BNC-3Mr|
+Beowulf C|
+Black Hawk (Nova) U|
+Black Hawk-KU BHKU-OU|
+Blackjack BJ2-OU|
+Bushwacker BSW-S2r|
+Catapult CPLT-C5A|
+Cauldron-Born (Ebon Jaguar) U|
+Centurion CN9-Ar|
+Charger CGR-3Kr|
+Commando COM-2Dr|
+Crossbow U|
+Cyclops CP-11-B|
+Cyclops CP-11-C2|
+Cyclops CP-11-C3|
+Daikyu DAI-01r|
+Daishi (Dire Wolf) U|
+Dart DRT-6T|
+Dervish DV-6Mr|
+Deva C-DVA-OU Exanimus|
+Dragon DRG-5Nr|
+Dragonfly (Viper) U|
+Enfield END-6Sr|
+Enforcer III ENF-6Ma|
+Enforcer III ENF-7C3BS|
+Fafnir FNR-5X|
+Falconer FLC-9R|
+Fenris (Ice Ferret) U|
+Fireball ALM-10D|
+Firestarter FS9-OU|
+Gallowglas GAL-2GLSA|
+Grand Dragon DRG-7KC|
+Grigori C-GRG-OU Exanimus|
+Gunslinger GUN-2ERDr|
+Ha Otoko 3|
+Hammerhands HMH-6E|
+Hatamoto-Chi HTM-28Tr|
+Hermes II HER-5Sr|
+Highlander IIC 3|
+Hitman HM-1r|
+Hunchback IIC 4|
+JagerMech JM7-C3BS|
+Jenner JR7-C4|
+King Crab KGC-005r|
+Longbow LGB-8V|
+Mad Cat (Timber Wolf) U|
+Men Shen MS1-OU|
+Mongoose MON-86|
+Naginata NG-C3Ar|
+Nightsky NGS-6T|
+No-Dachi NDA-2KC|
+Piranha 4|
+Preta C-PRT-OU Exanimus|
+Quickdraw QKD-5Mr|
+Rakshasa MDG-1Ar|
+Raptor RTX1-OU|
+Raven RVN-4Lr|
+Snake SNK-2Br|
+Spider SDR-7Kr|
+Stalker STK-7C3BS|
+Starslayer STY-3Dr|
+Talon TLN-6W|
+Templar TLR1-OU|
+Tessen TSN-1Cr|
+Thor (Summoner) U|
+Turkina U|
+Uller (Kit Fox) U|
+UrbanMech UM-AIV|
+UrbanMech UM-R80|
+Victor VTR-9Ka|
+Victor VTR-Cr|
+Vindicator VND-3Lr|
+Vulcan VT-5Sr|
+Vulture (Mad Dog) U|
+Warlord BLR-2Dr|
+Archer ARC-6S|
+Archer ARC-6W|
+Archer ARC-7L|
+Archer ARC-7S|
+Archer ARC-8M|
+Archer ARC-9K|
+Archer ARC-9M|
+Archer ARC-9W|
+BattleMaster BLR-10S|
+BattleMaster BLR-10S2|
+BattleMaster BLR-2C|
+BattleMaster BLR-3M|
+BattleMaster BLR-3S|
+BattleMaster BLR-4L|
+BattleMaster BLR-4S|
+BattleMaster BLR-5M|
+BattleMaster BLR-6X|
+BattleMaster BLR-CM|
+BattleMaster BLR-K3|
+BattleMaster BLR-K4|
+BattleMaster BLR-M3|
+BattleMaster C|
+Crusader CRD-4L|
+Crusader CRD-5K|
+Crusader CRD-6M|
+Crusader CRD-7L|
+Crusader CRD-7W|
+Crusader CRD-8L|
+Crusader CRD-8S|
+Goliath GOL-2H|
+Goliath GOL-3L|
+Goliath GOL-3S|
+Goliath GOL-4S|
+Goliath GOL-5D|
+Goliath GOL-5W|
+Goliath GOL-6H|
+Goliath GOL-6M|
+Griffin GRF-1DS|
+Griffin GRF-3M|
+Griffin GRF-4N|
+Griffin GRF-4R|
+Griffin GRF-5K|
+Griffin GRF-5L|
+Griffin GRF-5M|
+Griffin GRF-6CS|
+Griffin GRF-6S|
+Griffin IIC 3|
+Griffin IIC 4|
+Griffin IIC 5|
+Griffin IIC 6|
+Griffin IIC 7|
+Griffin IIC 8|
+Locust IIC 4|
+Locust IIC 5|
+Locust IIC 6|
+Locust IIC 7|
+Locust IIC 8|
+Locust IIC 9|
+Locust LCT-1V2|
+Locust LCT-5M|
+Locust LCT-5T|
+Locust LCT-5V|
+Locust LCT-5W|
+Locust LCT-5W2|
+Locust LCT-6M|
+Longbow LGB-12C|
+Longbow LGB-12R|
+Longbow LGB-13C|
+Longbow LGB-13NAIS|
+Longbow LGB-14C|
+Marauder II (Bounty Hunter)|
+Marauder II C|
+Marauder II MAD-4H|
+Marauder II MAD-4K|
+Marauder II MAD-4S|
+Marauder II MAD-5W|
+Marauder II MAD-6D|
+Marauder II MAD-6M|
+Marauder IIC 2|
+Marauder IIC 3|
+Marauder IIC 4|
+Marauder IIC 5|
+Marauder IIC 6|
+Marauder IIC 7|
+Marauder MAD-5L|
+Marauder MAD-5M|
+Marauder MAD-5R|
+Marauder MAD-5T|
+Marauder MAD-6L|
+Marauder MAD-7D|
+Marauder MAD-9M|
+Marauder MAD-9M2|
+Marauder MAD-9S|
+Marauder MAD-9W|
+Marauder MAD-9W2|
+Ostroc OSR-4C|
+Ostroc OSR-4K|
+Ostroc OSR-4L|
+Ostroc OSR-5C|
+Ostroc OSR-5W|
+Ostscout OTT-10CS|
+Ostscout OTT-11J|
+Ostscout OTT-7K|
+Ostscout OTT-9CS|
+Ostscout OTT-9S|
+Ostsol OTL-5D|
+Ostsol OTL-6D|
+Ostsol OTL-7M|
+Ostsol OTL-8D|
+Ostsol OTL-8M|
+Ostsol OTL-9M|
+Ostsol OTL-9R|
+Phoenix Hawk IIC 3|
+Phoenix Hawk IIC 4|
+Phoenix Hawk IIC 5|
+Phoenix Hawk IIC 6|
+Phoenix Hawk IIC 7|
+Phoenix Hawk IIC 8|
+Phoenix Hawk PXH-2|
+Phoenix Hawk PXH-3M (Masters)|
+Phoenix Hawk PXH-3PL|
+Phoenix Hawk PXH-4L|
+Phoenix Hawk PXH-4W|
+Phoenix Hawk PXH-5L|
+Phoenix Hawk PXH-6D|
+Phoenix Hawk PXH-7CS|
+Phoenix Hawk PXH-7K|
+Phoenix Hawk PXH-7S|
+Phoenix Hawk PXH-8CS|
+Rifleman C 2|
+Rifleman IIC 2|
+Rifleman IIC 3|
+Rifleman IIC 4|
+Rifleman IIC 5|
+Rifleman IIC 6|
+Rifleman IIC 7|
+Rifleman IIC 8|
+Rifleman IIC|
+Rifleman RFL-3Cr|
+Rifleman RFL-6D|
+Rifleman RFL-6X|
+Rifleman RFL-7M|
+Rifleman RFL-7X|
+Rifleman RFL-8D|
+Rifleman RFL-8X|
+Rifleman RFL-9T|
+Scorpion SCP-10M|
+Scorpion SCP-12C|
+Scorpion SCP-12K|
+Scorpion SCP-12S|
+Shadow Hawk IIC 3|
+Shadow Hawk IIC 4|
+Shadow Hawk IIC 5|
+Shadow Hawk IIC 6|
+Shadow Hawk IIC 7|
+Shadow Hawk IIC 8|
+Shadow Hawk SHD-11CS|
+Shadow Hawk SHD-12C|
+Shadow Hawk SHD-3K|
+Shadow Hawk SHD-5D|
+Shadow Hawk SHD-7CS|
+Shadow Hawk SHD-7M|
+Shadow Hawk SHD-8L|
+Shadow Hawk SHD-9D|
+Stinger STG-3P|
+Stinger STG-5R|
+Stinger STG-5T|
+Stinger STG-6L|
+Stinger STG-6S|
+Stinger STG-7S|
+Thunderbolt TDR-10M|
+Thunderbolt TDR-10SE|
+Thunderbolt TDR-11SE|
+Thunderbolt TDR-17S|
+Thunderbolt TDR-60-RLA|
+Thunderbolt TDR-7SE|
+Thunderbolt TDR-9M|
+Thunderbolt TDR-9NAIS|
+Thunderbolt TDR-9Nr|
+Thunderbolt TDR-9T|
+Valkyrie VLK-QD1|
+Valkyrie VLK-QD2|
+Valkyrie VLK-QD3|
+Valkyrie VLK-QD4|
+Valkyrie VLK-QS5|
+Valkyrie VLK-QT2|
+Valkyrie VLK-QW5|
+Warhammer IIC 3|
+Warhammer IIC 4|
+Warhammer IIC 5|
+Warhammer IIC 6|
+Warhammer IIC 7|
+Warhammer IIC 8|
+Warhammer IIC 9|
+Warhammer WHM-10T|
+Warhammer WHM-11T|
+Warhammer WHM-4L|
+Warhammer WHM-5L|
+Warhammer WHM-8D|
+Warhammer WHM-8K|
+Warhammer WHM-8M|
+Warhammer WHM-9D|
+Warhammer WHM-9S|
+Wasp WSP-3A|
+Wasp WSP-3L|
+Wasp WSP-3S|
+Wasp WSP-7MAF|
+Wasp WSP-8T|
+Wolverine WVR-8C|
+Wolverine WVR-8D|
+Wolverine WVR-8K|
+Wolverine WVR-9D|
+Wolverine WVR-9K|
+Wolverine WVR-9M|
+Wolverine WVR-9W|
+Wolverine WVR-9W2|
+Eyrie|
+Gravedigger GDR-1C|
+Gravedigger GDR-1D|
+Gyrfalcon|
+Gyrfalcon 2|
+Gyrfalcon 3|
+Gyrfalcon 4|
+Kodiak II 2|
+Kodiak II|
+Loki Mk II (Hel) (Prime)|
+Loki Mk II (Hel) A|
+Loki Mk II (Hel) B|
+Shrike 2|
+Shrike 3|
+Shrike|
+Thor II (Grand Summoner) (Prime)|
+Thor II (Grand Summoner) A|
+Thor II (Grand Summoner) B|
+Thor II (Grand Summoner) C|
+Thor II (Grand Summoner) D|
+Tomahawk (Prime)|
+Tomahawk A|
+Tomahawk B|
+Tomahawk C|
+Tomahawk II (Prime)|
+Tomahawk II A|
+Tomahawk II B|
+Tomahawk II C|
+Vulture Mk III (Mad Dog Mk III) (Prime)|
+Vulture Mk III (Mad Dog Mk III) B|
+Vulture Mk III (Mad Dog Mk III) C|
+Vulture Mk III (Mad Dog Mk III) D|
+Vulture Mk III (Mad Dog Mk III) A|
+Warwolf (Prime)|
+Warwolf A|
+Warwolf B|
+Warwolf C|
+Warwolf H|
+Wulfen (Prime)|
+Wulfen A|
+Wulfen B|
+Wulfen C|
+Wulfen D|
+Wulfen E|
+Wulfen H|
+Antlion LK-3D|
+Atlas III AS7-D2|
+Atlas III AS7-D3|
+Black Knight BLK-NT-2Y|
+Black Knight BLK-NT-3A|
+Black Knight BLK-NT-3B|
+Black Knight BLK-NT-4D|
+Black Knight BLK-NT-5H|
+Centurion CN11-O|
+Centurion CN11-OA|
+Centurion CN11-OB|
+Centurion CN11-OC|
+Centurion CN11-OD|
+Centurion CN11-OE|
+Gunsmith CH11-NG|
+Hollander III BZK-D1|
+Hollander III BZK-D2|
+Hollander III BZK-D3|
+Prey Seeker PY-SR10|
+Scarecrow UCU-F4r 'Hobbled Scarecrow'|
+Scarecrow UCU-F4|
+Templar III TLR2-O|
+Templar III TLR2-OA|
+Templar III TLR2-OB|
+Templar III TLR2-OC|
+Templar III TLR2-OD|
+Vulpes VLP-1D|
+Avalanche AVL-1O|
+Avalanche AVL-1OA|
+Avalanche AVL-1OB|
+Avalanche AVL-1OC|
+Avalanche AVL-1ON|
+Avalanche AVL-1OR|
+Dragon II DRG-11K|
+Dragon II DRG-11R|
+Exhumer EXR-2X|
+Exhumer EXR-3P|
+Hatamoto-Godai HTM-30Z|
+Hatamoto-Suna HTM-30S|
+Hitotsume Kozo HKZ-1F|
+Hitotsume Kozo HKZ-1P|
+Phoenix Hawk L 'Fenikkusu Taka' PXH-11K|
+Phoenix Hawk L 'Fenikkusu Taka' PXH-11K2|
+Rokurokubi RK-4K|
+Rokurokubi RK-4T|
+Rokurokubi RK-4X|
+Shiro SH-1V|
+Shiro SH-2P|
+Tenshi TN-10-O|
+Tenshi TN-10-OA|
+Tenshi TN-10-OB|
+Tenshi TN-10-OR|
+Wendigo (Prime)|
+Wendigo A|
+Wendigo B|
+Wendigo C|
+Wendigo-VP (Prime)|
+Wendigo-VP A|
+Anubis ABS-5Y|
+Anubis ABS-5Z|
+Calliope CAL-1MAF|
+Catapult II CPLT-L7|
+Catapult II CPLT-L7L|
+Gun GN-2O|
+Gun GN-2OA|
+Gun GN-2OB|
+Lu Wei Bing LN-4B|
+Mortis MS-1A|
+Mortis MS-1P|
+Raven II RVN-5X|
+Tian-Zong TNZ-N1|
+Tian-Zong TNZ-N2|
+Tian-Zong TNZ-N3|
+Vandal LI-O|
+Vandal LI-OA|
+Vandal LI-OB|
+Yinghuochong YHC-3E|
+Yinghuochong YHC-3Y|
+Anzu ZU-G60|
+Anzu ZU-J70|
+Carronade CRN-7M|
+Gambit GBT-1G|
+Gambit GBT-1L|
+Havoc HVC-P6|
+Juliano JLN-5A|
+Neanderthal NTL-AG|
+Neanderthal NTL-UG|
+Quasimodo QSM-3D|
+Sarath SRTH-1O|
+Sarath SRTH-1OA|
+Sarath SRTH-1OB|
+Stalker II STK-9A|
+Violator VT-U1|
+Violator VT-U3|
+Black Hawk (Standard) 2|
+Black Hawk (Standard) 3|
+Black Hawk (Standard)|
+Cadaver CVR-A1|
+Cadaver CVR-T1|
+HawkWolf HWK-4F|
+Hound HD-2F|
+Jade Hawk|
+Jade Hawk 2|
+Jade Hawk 3|
+Jade Hawk JHK-03|
+Jade Hawk JHK-04|
+Koshi (Standard) 2|
+Koshi (Standard) 3|
+Koshi (Standard)|
+Mad Cat Mk IV (Savage Wolf) (Prime)|
+Mad Cat Mk IV (Savage Wolf) A|
+Mad Cat Mk IV (Savage Wolf) B|
+Mad Cat Mk IV (Savage Wolf) C|
+Mad Cat Mk IV (Savage Wolf) PR 2|
+Mad Cat Mk IV (Savage Wolf) PR|
+Stalking Spider II|
+Tiburon|
+Vulture Mk IV (Mad Dog Mk IV) A|
+Vulture Mk IV (Mad Dog Mk IV) B|
+Vulture Mk IV (Mad Dog Mk IV) C|
+Vulture Mk IV (Mad Dog Mk IV) D|
+Vulture Mk IV (Mad Dog Mk IV) Prime|
+Archer ARC-9KC|
+Atlas AS7-K4|
+Avatar AV1-OJ|
+Balius E|
+Banshee BNC-9S2|
+Berserker BRZ-D4|
+Black Hawk (Nova) X|
+Black Hawk-KU BHKU-OG|
+Blackjack BJ-2r|
+Blackjack BJ2-OG|
+Blade BLD-7R|
+Commando COM-8S|
+Cougar X 2|
+Cougar X 3|
+Cougar X|
+Crimson Hawk 4|
+Cuirass CDR-2BC|
+Cuirass CDR-2X|
+Cygnus 4|
+Dasher II 3|
+Dasher II 4|
+Deimos D|
+Deimos E|
+Diomede D-M3D-M|
+Ebony MEB-12|
+Ebony MEB-13|
+Emperor EMP-8L|
+Fennec FEC-5CM|
+Flamberge D|
+Gallant GLT-10-0|
+Ghost GST-50|
+Ghost GST-90|
+Grand Dragon DRG-10K|
+Grand Titan T-IT-N13M|
+Griffin GRF-6S2|
+Hauptmann HA1-OF|
+Hauptmann HA1-OM|
+Hauptmann HA1-OT|
+Hellion G|
+Javelin JVN-11P|
+Jupiter 4|
+Karhu G|
+Koschei KSC-6L|
+Kuma 4|
+Legionnaire LGN-2K|
+Locust LCT-5M2|
+Locust LCT-5M3|
+Loki (Hellbringer) G|
+Longbow LGB-14C2|
+Mad Cat III 3|
+Mad Cat III 4|
+Mad Cat III 5|
+Mad Cat Mk II 4|
+Mad Cat Mk II 5|
+Mad Cat Mk II 6|
+Maelstrom MTR-7K|
+Man O' War (Gargoyle) X|
+Mangonel MNL-4S|
+Marauder II MAD-4L|
+Marauder MAD-9D|
+Marshal MHL-3MC|
+Men Shen MS1-OG|
+Morrigan 4|
+Morrigan 5|
+Nobori-nin (Huntsman) F|
+Nova Cat H|
+Nova Cat I|
+Awesome AWS-11V|
+BattleMaster BLR-6M|
+BattleMaster C 2|
+Bombard BMB-016|
+Brahma BRM-6T|
+Caesar CES-5D|
+Cerberus MR-7K|
+Devastator DVS-10|
+Enforcer III ENF-6R|
+Goshawk II 4|
+Hatamoto-Kaze HTM-27V2|
+Hatchetman HCT-7D|
+Helios HEL-7L|
+Hercules HRC-LS-9003|
+Hercules HRC-LS-9004|
+Hollander BZK-G2|
+Hunchback HBK-6P|
+Huron Warrior HUR-WO-R5L|
+Icarus II ICR-2R|
+Lineholder KW2-LH10|
+Omega SHP-5R|
+Orion C|
+Orochi OR-3K|
+Pendragon PDG-3R|
+Penetrator PTR-7D|
+Shogun C 2|
+Shogun SHG-3E|
+Striker STC-2L|
+Tempest C|
+Tempest TMP-4M|
+Venom SDR-9KE|
+Vixen (Incubus) 6|
+Watchman WTC-4DM2|
+Yu Huang Y-H12GC|
+Nyx NX-100|
+Nyx NX-110|
+Ocelot 4|
+Omen 2|
+Onager 2|
+Owens OW-1G|
+Pack Hunter II 4|
+Panther PNT-12KC|
+Peacekeeper PKP-2K|
+Prefect PRF-3R|
+Quickdraw QKD-9M|
+Raptor II RPT-2X2|
+Sagittaire SGT-14D|
+Salamander PPR-7T|
+Shadow Cat F|
+Shadow Cat II 3|
+Shadow Cat II 4|
+Shadow Hawk IIC 9|
+Shen Yi SHY-5B|
+Shockwave SKW-6H|
+Shockwave SKW-8X|
+Sphinx 3|
+Sphinx 4|
+Spider SDR-10K|
+Spider SDR-8Xr|
+Strider SR1-OH|
+Strider SR1-OM|
+Sun Cobra 2|
+Sunder SD1-OF|
+Sunder SD1-OG|
+Tarantula ZPH-5A|
+Targe TRG-3M|
+Templar TLR1-OR|
+Thunder Fox TFT-F11|
+Thunderbolt TDR-10S|
+Ti Ts'ang TSG-10L|
+Titan TI-1Aj|
+Titan TI-1Ar|
+Trebaruna TR-XH|
+Trebuchet TBT-9R|
+Tundra Wolf 5|
+Uller (Kit Fox) I|
+Valkyrie VLK-QD8|
+Warhammer IIC 10|
+Warhammer IIC 11|
+Warhammer IIC 12|
+Warhammer WHM-8D2|
+Wasp WSP-3K|
+Wasp WSP-3P|
+Xanthos XNT-6O|
+Xanthos XNT-7O|
+Ares ARS-V1C Aphrodite|
+Ares ARS-V1B Hades|
+Ares ARS-V1D Hephaestus|
+Ares ARS-V1A Hera|
+Ares ARS-V1 Zeus|
+Celerity CLR-03-O|
+Celerity CLR-03-OA|
+Celerity CLR-03-OB|
+Celerity CLR-03-OC|
+Celerity CLR-03-OD|
+Celerity CLR-03-OE|
+Celerity CLR-04-R|
+Celerity CLR-05-X|
+Doloire DLR-O|
+Doloire DLR-OA|
+Doloire DLR-OB|
+Doloire DLR-OC|
+Doloire DLR-OD|
+Jackalope JLP-BD|
+Jackalope JLP-C|
+Jackalope JLP-KW 'Wolpertinger'|
+Jackalope JLP-KA|
+Kheper KHP-7R|
+Lament LMT-2R|
+Lament LMT-3C|
+Lament LMT-3R|
+Lament LMT-4RC|
+Malice MAL-XP|
+Malice MAL-XT|
+Malice MAL-XV|
+Malice MAL-YZ|
+Night Stalker NSR-K1|
+Night Stalker NSR-K3|
+Night Stalker NSR-K4|
+Night Stalker NSR-K7|
+Night Stalker NSR-KC|
+Poseidon PSD-V2|
+Revenant UBM-2R|
+Revenant UBM-2R2|
+Revenant UBM-2R3|
+Revenant UBM-2R4|
+Revenant UBM-2R7|
+Uraeus UAE-7R|
+Firestarter FS9-M2|
+Firestarter FS9-M3|
+Firestarter FS9-M4|
+Gauntlet GTL-1O|
+Gauntlet GTL-1OA|
+Gauntlet GTL-1OB|
+Gauntlet GTL-1OC|
+Gotterdammerung GTD-20S|
+Jaguar|
+Jaguar 2|
+King Crab KGC-009|
+Mongrel MGL-T1|
+Mongrel MGL-T2|
+Scourge SCG-WD1|
+Scourge SCG-WF1|
+Storm Raider STM-R1|
+Storm Raider STM-R2|
+Storm Raider STM-R3|
+Storm Raider STM-R4|
+Ursa URA-2A|
+Ursa URA-2C|
+Viking IIC|
+Zeus-X ZEU-X|
+Zeus-X ZEU-X2|
+Zeus-X ZEU-X3|
+Zeus-X ZEU-X4|
+Gotterdammerung GTD-20C|
+Gotterdammerung GTD-30S|
+Juliano JLN-5B|
+Juliano JLN-5C|
+King Crab KGC-009C|
+Kodiak II 3|
+Prey Seeker PY-SR20|
+Prey Seeker PY-SR30|
+Raider JL-3A|
+Raider JL-3B|
+Raider Mk II JL-3C|
+Shrike 'Black Rose'|
+Atlas II AS7-D-HT|
+Banshee BNC-9S|
+Orion ON1-K (Kerensky)|
+Ti Ts'ang TSG-9 'China Doll'|
+Agrotera AGT-1A|
+Atlas AS7-K2 (Jedra)|
+Legionnaire LGN-2D (Raul)|
+Mad Cat III (Eve)|
+Mad Cat III 2 (MWDA)|
+Mad Cat III (Dark Age RS)|
+Pack Hunter II (Isis)|
+Ryoken II (Tassa)|
+Yu Huang (Carson)|
+Ares ARS-V1E Apollo|
+Javelin JVN-11D (Farrell)|
+Mad Cat (Timber Wolf) (Bounty Hunter 2)|
+Phoenix Hawk PXH-4L (Sante)|
+Shadow Hawk SHD-5D (Sandy)|
+Ti Ts'ang Jason|
+Karhu (Syngman)|
+Osprey OSP-26 (Lawrence)|
+Prefect PRF-1R (Veronica)|
+Thunderbolt TDR-10M (Ilyena)|
+Thunderbolt TDR-10M (Salazar)|
+Duan Gung (Vaughn)|
+Men Shen (Li)|
+Sha Yu (Bulldog)|
+Snake (Arthur)|
+BattleMaster BLR-1Gd|
+BattleMaster BLR-1GHE 'HellSlinger'|
+Crab CRB-27sl|
+Dervish DV-6Md|
+Hammerhands HMH-3D (Kessem)|
+Lancelot LNC25-01sl|
+Mackie MSK-9HKR 'Kill-Roy's Little Buddy'|
+Phoenix Hawk PXH-1Kk|
+Stalker STK-3Fk|
+Thunderbolt TDR-5Sd|
+Victor VTR-9B (Shoji)|
+Warhammer WHM-6Rk|
+Wyvern WVE-5Nsl|
+Hector HOR-1B|
+Hector HOR-1C|
+Cave Lion|
+Raider JL-1|
+Raider Mk II JL-2|
+UrbanMech UM-R27|
+Archer C 2|
+Blackjack C|
+Cestus CTS-6Y-EC|
+Coyotl A|
+Coyotl B|
+Coyotl C|
+Coyotl D|
+Coyotl Prime|
+Devastator DVS-2-EC|
+Drift Shag|
+Emperor EMP-6A-EC|
+Enfield END-6J-EC|
+Excalibur EXC-B2b-EC|
+Exterminator EXT-4Db-EC|
+Fox CS-1|
+Fox|
+Lancelot C 2|
+Lancelot C|
+Lupus A|
+Lupus B|
+Lupus C|
+Lupus D|
+Lupus Prime|
+Lynx C|
+Masauwu|
+Minsk 2|
+Minsk MNK-101|
+Minsk|
+Mongoose C 2|
+Mongoose C|
+Naja KTO-19b-EC|
+Naja|
+Night Hawk NTK-2Q-EC|
+Omni-Corvis A|
+Omni-Corvis B|
+Omni-Corvis Prime|
+Phoenix Hawk PXH-1-EC|
+Pulverizer PUL-3R|
+Pulverizer|
+Redback|
+Spartan C|
+Starslayer STY-2C-EC|
+Storm Giant 2|
+Storm Giant|
+Sun Bear A|
+Sun Bear B|
+Sun Bear Prime|
+Talon TLN-5W-EC|
+Vision Quest 2|
+Vision Quest VQ-1NC|
+Vision Quest|
+Wakazashi|
+Woodsman A|
+Woodsman B|
+Woodsman C|
+Woodsman D|
+Woodsman Prime|
+Rock Hound ProspectorMech AM-PRM-RH7 'Rock Possum'|
+Rock Hound ProspectorMech AM-PRM-RH7|
+Rock Hound ProspectorMech AM-PRM-RH7A 'Rock Otter'|
+Space Hound ProspectorMech AM-PRM-SH1|
+Thunderbolt TDR-5L|
+Thunderbolt TDR-5LS|
+Dragoon AEM-01|
+Dragoon AEM-02|
+Dragoon AEM-03|
+Dragoon AEM-04|
+Alfar AL-A1|
+Alfar AL-D1 'Dokkalfar'|
+Talos TLS-1B|
+Bakeneko BKN-1K|
+Thor II (Grand Summoner) E|
+Thunderbolt IIC 2|
+Burrower DTM-1 MiningMech|
+Burrower DTM-1M MiningMech MOD|
+Buster BC XXI-M HaulerMech MOD|
+Carbine CON-9M Karenna|
+Carbine CON-9M-J ConstructionMech MOD|
+Carbine CON-9M-JB ConstructionMech MOD|
+Centurion CN9-H2 MilitiaMech|
+Centurion CN9-H2H MilitiaMech|
+Centurion CN9-H3 MilitiaMech|
+Crosscut ED-X4M-A LoggerMech MOD|
+Crosscut ED-X4M-E LoggerMech MOD|
+Crosscut ED-X4M-L LoggerMech MOD|
+Deep Lord MilitiaMech RCL-Z1M-B|
+Demeter WLD-1 AgroMech|
+Demeter WLD-1-M AgroMech MOD|
+DemolitionMech WI-DMM MOD|
+Dig Lord RCL-4M MiningMech MOD|
+Dig Lord RCL-4M-B MiningMech MOD|
+Exo HaulerMech HMX-1|
+Exo HaulerMech HMX-2|
+Exo HaulerMech HMX-3|
+Exo HaulerMech HMX-3M|
+Firebee WI-WAM MilitiaMech|
+Ground Pounder DVM-2 MiningMech|
+Ground Pounder DVM-2M MiningMech MOD|
+Guard SecurityMech GS-107X|
+Guard SecurityMech GS-54|
+Gulon SolahmaMech C|
+Gulon MiningMech GLN-1A|
+Gulon SecurityMech GLN-1B|
+Harvester HVR-199 AgroMech|
+Harvester HVR-199M AgroMech MOD|
+Harvester HVR-199M-A AgroMech MOD|
+Harvester HVR-199M-B AgroMech MOD|
+Harvester HVR-199M-M AgroMech MOD|
+Heavy Forester HFL-1 LoggerMech|
+Heavy Forester HFL-1M LoggerMech MOD|
+Heavy Lifter HCL-1M CargoMech MOD|
+Heavy Lifter HCL-1MM MilitiaMech|
+Inquisitor ITW-80 SecurityMech|
+Inquisitor ITW-85 SecurityMech|
+MuckRaker GMMM-2 MiningMech|
+MuckRaker GMMM-2M MiningMech MOD|
+MuckRaker GMMM-2M-B MiningMech MOD|
+Opossum SalvageMech OPO-2|
+Opossum SalvageMech OPO-3 MOD|
+Pacifier SecurityMech CCU-36|
+Pacifier SecurityMech CCU-40|
+Pompier PoliceMech GM-4P|
+St. Florian FLN-366 FireMech|
+St. Florian FLN-366-M FireMech MOD|
+StrongArm SC CV ConstructionMech|
+StrongArm SC CV-M ConstructionMech MOD|
+StrongArm SC CVI ConstructionMech|
+Mad Cat (Timber Wolf) (Bounty Hunter)|
+Rampage RMP-2G|
+Rampage RMP-4G|
+Rampage RMP-5G|
+Arana MilitiaMech ARA-S-1|
+Reptar MilitiaMech EPT-C-1|
+'Gestalt' D2X-G|
+Omega SHP-4X|
+Archangel C-ANG-OS Caelestis|
+Deva C-DVA-OS Caelestis|
+Grigori C-GRG-OS Caelestis|
+Malak C-MK-OS Caelestis|
+Mercury II MCY-100|
+Preta C-PRT-OS Caelestis|
+Pulverizer PUL-2V|
+Seraph C-SRP-OS Caelestis|
+Stag II ST-24G|
+Stag ST-14G|
+Phoenix Hawk LAM Mk I PHX-HK1|
+Phoenix Hawk LAM Mk I PHX-HK1R|
+Phoenix Hawk LAM PHX-HK1RB|
+Phoenix Hawk LAM PHX-HK2|
+Phoenix Hawk LAM PHX-HK2M|
+Pwwka S-PW-1LAM|
+Screamer LAM SCR-1X-LAM|
+Shadow Hawk LAM SHD-X1|
+Shadow Hawk LAM SHD-X2|
+Stinger LAM Mk I STG-A1|
+Stinger LAM STG-A10|
+Stinger LAM STG-A5|
+Waneta S-WN-1LAM|
+Waneta S-WN-2LAM|
+Wasp LAM Mk I WSP-100|
+Wasp LAM Mk I WSP-100A|
+Wasp LAM Mk I WSP-100b|
+Wasp LAM WSP-105|
+Wasp LAM WSP-105M|
+Wasp LAM WSP-110|
+Yurei S-YR-1LAM|
+Annihilator ANH-1G|
+Annihilator ANH-1X|
+Annihilator C 'Gausszilla'|
+Annihilator C 2|
+Carbine CON-1 ConstructionMech (RL)|
+Carbine CON-1 ConstructionMech|
+Champion CHP-1Nb|
+Champion CHP-1Nb2|
+Crockett CRK-5003-1b|
+Crosscut ED-X2 (Flamer)|
+Crosscut ED-X2 (RL)|
+Crosscut ED-X2 LoggerMech|
+Daedalus GTX2 (Militarized)|
+Daedalus GTX2A 'Stevedore'|
+Daedalus GTX2B 'Navvy'|
+Exterminator EXT-4Db|
+Falcon FLC-4Nb (Saho)|
+Falcon FLC-4Nb-PP|
+Falcon FLC-4Nb-PP2|
+Falcon FLC-4Nb|
+Firefly FFL-3A|
+Firefly FFL-3PP|
+Firefly FFL-3PP2|
+Firefly FFL-3PP3|
+Firefly FFL-3SLE|
+Griffin GRF-2N|
+Griffin GRF-2N2|
+Harvester Ant KIC-3M AgroMech (MG)|
+Harvester Ant KIC-3M-B AgroMech (LRM)|
+Hermes HER-1Sb|
+Highlander HGN-732 (Colleen)|
+Hoplite HOP-4Bb|
+Hoplite HOP-4Cb|
+Imp IMP-1A|
+Imp IMP-1B|
+Imp IMP-1C|
+Marco MR-8C ExplorerMech|
+Marco MR-8D|
+Marco MR-8E|
+Powerman SC XI LoaderMech|
+Sentinel STN-3Lb|
+Shogun SHG-2H|
+Sling SL-1G|
+Sling SL-1H|
+Stalker STK-3Fb|
+Thorn THE-Nb|
+Thunderbolt TDR-5Sb|
+Thunderbolt TDR-5Sb2|
+Apollo APL-4M|
+Axman AXM-6T|
+Barghest BGS-4T|
+Beowulf IIC|
+Deep Lord MilitiaMech RCL-Z1M|
+Dola DOL-1A1|
+Dola DOL-1A2 'Yoh Ti Ts'angs'|
+Grasshopper GHR-7P|
+Hatamoto-Kaeru HTM-35K|
+Hunchback HBK-7R|
+Incubus II|
+Legionnaire LGN-2F|
+Mad Cat III|
+Mad Cat III 2|
+Mad Cat III X|
+Mad Cat Mk II Enhanced|
+Orion ON3-M|
+Pandarus LFA-1A|
+Patron MilitiaMech PTN-2M|
+Pendragon PDG-1R|
+Quickdraw QKD-8P|
+Sarissa SecurityMech MN2-A|
+Spindrift Aquatic SecurityMech SDT-1A|
+Stiletto STO-6S|
+Stinger IIC 2|
+Stinger IIC|
+Thunder THR-C4|
+Thunderbolt IIC|
+Ti Ts'ang TSG-9DDC|
+Trebuchet TBT-K7R|
+Ursus 3|
+Wolf Trap (Tora) WFT-2B|
+Wolfhound WLF-2H|
+Arion|
+Boreas A|
+Boreas B|
+Boreas C|
+Boreas D|
+Boreas Prime|
+Cyllaros|
+Harpagos|
+Notos A|
+Notos B|
+Notos C|
+Notos D|
+Notos Prime|
+Commando COM-9S|
+Dominator 2|
+Dominator|
+Goliath C|
+Grasshopper GHR-8K|
+Griffin C|
+Griffin GRF-1RG|
+Griffin GRF-3N|
+Griffin GRF-3RG|
+Griffin GRF-6R|
+Loki (Hellbringer) J|
+Loki (Hellbringer) T|
+Pack Hunter 5|
+Archer (Wolf)|
+Archer ARC-2Rb|
+Archer ARC-4M|
+Archer ARC-4M2|
+Archer ARC-5R|
+Archer ARC-5S|
+Archer ARC-5W|
+Archer ARC-7C|
+Archer ARC-9R|
+Archer C|
+Centurion CN10-D|
+Crucible|
+Crucible 2|
+Crucible 3|
+Hermit Crab HMC-13|
+Hermit Crab HMC-14|
+Hermit Crab HMC-15|
+Highlander HGN-740|
+Mongoose MON-96|
+Vulture (Mad Dog) DD|
+Vulture (Mad Dog) G|
+Vulture (Mad Dog) I|
+Vulture (Mad Dog) T|
+Vulture (Mad Dog) V|
+Butcherbird (Ion Sparrow) A|
+Butcherbird (Ion Sparrow) B|
+Butcherbird (Ion Sparrow) C|
+Butcherbird (Ion Sparrow) D|
+Butcherbird (Ion Sparrow) Prime|
+Man O' War (Gargoyle) F|
+Man O' War (Gargoyle) I|
+Man O' War (Gargoyle) J|
+Man O' War (Gargoyle) K|
+Man O' War (Gargoyle) P|
+Man O' War (Gargoyle) T|
+Peregrine (Horned Owl) 2|
+Peregrine (Horned Owl) 3|
+Peregrine (Horned Owl) 6|
+Peregrine (Horned Owl) 7|
+Peregrine (Horned Owl)|
+Phoenix Hawk C 2|
+Phoenix Hawk C|
+Phoenix Hawk PXH-2K|
+Phoenix Hawk PXH-3D|
+Phoenix Hawk PXH-3K|
+Phoenix Hawk PXH-3M|
+Phoenix Hawk PXH-3S|
+Phoenix Hawk PXH-4M|
+Phoenix Hawk PXH-9|
+Uller (Kit Fox) G|
+Uller (Kit Fox) J|
+Uller (Kit Fox) K|
+Uller (Kit Fox) R|
+Uller (Kit Fox) T|
+Uller (Kit Fox) V|
+Axman AXM-5N|
+Black Knight BL-18-KNT|
+Carrion Crow A|
+Carrion Crow B|
+Carrion Crow C|
+Carrion Crow D|
+Carrion Crow Prime|
+Hatchetman HCT-8S|
+Nobori-nin (Huntsman) E|
+Nobori-nin (Huntsman) G|
+Nobori-nin (Huntsman) I|
+Nobori-nin (Huntsman) T|
+Shadow Hawk C|
+Shadow Hawk SHD-2D2|
+Shadow Hawk SHD-2Hb|
+Shadow Hawk SHD-4H|
+Shadow Hawk SHD-5M|
+Shadow Hawk SHD-5R|
+Shadow Hawk SHD-5S|
+Shadow Hawk SHD-6D|
+Shadow Hawk SHD-7H|
+Viper (Black Python)|
+Viper (Black Python) 2|
+Viper (Black Python) 5|
+White Raven 2|
+White Raven|
+Daishi (Dire Wolf) E|
+Daishi (Dire Wolf) T|
+Daishi (Dire Wolf) X|
+Firestorm|
+Galahad (Glass Spider) 2|
+Galahad (Glass Spider) 4|
+Galahad (Glass Spider)|
+Hunchback IIC 5|
+Piranha 5|
+Stinger C 2|
+Stinger C|
+Stinger STG-3Gb|
+Stinger STG-4G|
+Stinger STG-5G|
+Stinger STG-5M|
+Stinger STG-6G|
+Stinger STG-6M|
+Stinger STG-6R|
+Supernova 5|
+Black Hawk (Nova) G|
+Black Hawk (Nova) I|
+Black Hawk (Nova) J|
+Black Hawk (Nova) K|
+Black Hawk (Nova) L|
+Black Hawk (Nova) R|
+Black Hawk (Nova) T|
+Exterminator EXT-7X|
+Griffin IIC 2|
+Griffin IIC 9|
+Griffin IIC|
+Lightning LHN-C5|
+Ostsol C|
+Ostsol OTL-5M|
+Ostsol OTL-8E|
+Ostsol OTL-8E3|
+Ostsol OTL-8F|
+Sentinel STN-6S|
+Thug THG-13U|
+Black Lanner F|
+Black Lanner G|
+Black Lanner I|
+Black Lanner J|
+Black Lanner T|
+Black Lanner X|
+Fire Falcon F|
+Fire Falcon G|
+Fire Falcon I|
+Fire Falcon L|
+Fire Falcon R|
+Fire Falcon T|
+Phoenix Hawk IIC 10|
+Phoenix Hawk IIC 2|
+Phoenix Hawk IIC 9|
+Phoenix Hawk IIC|
+Rawhide RWD-R1|
+Thunderbolt C 2|
+Thunderbolt C|
+Thunderbolt TDR-11S|
+Thunderbolt TDR-12R|
+Thunderbolt TDR-7M|
+Thunderbolt TDR-7S|
+Thunderbolt TDR-8M|
+Thunderbolt TDR-9S|
+Thunderbolt TDR-9SE|
+Thunderbolt TDR-9W|
+Cauldron-Born (Ebon Jaguar) E|
+Cauldron-Born (Ebon Jaguar) F|
+Cauldron-Born (Ebon Jaguar) G|
+Cauldron-Born (Ebon Jaguar) T|
+Cauldron-Born (Ebon Jaguar) X|
+Locust C|
+Locust IIC 10|
+Locust IIC 2|
+Locust IIC 3|
+Locust IIC|
+Locust LCT-1Vb|
+Locust LCT-3D|
+Locust LCT-3M|
+Locust LCT-3S|
+Locust LCT-5S|
+Locust LCT-7S|
+Locust LCT-7V|
+Locust LCT-7V2|
+Stormwolf A|
+Stormwolf B|
+Stormwolf C|
+Stormwolf D|
+Stormwolf Prime|
+Turkina E|
+Turkina M|
+Turkina T|
+Turkina X|
+Amarok|
+Amarok 2|
+Amarok 3|
+Banshee BNC-12S|
+Crossbow E|
+Crossbow F|
+Crossbow G|
+Crossbow J|
+Crossbow T|
+Crossbow W|
+Crusader CRD-3R (Crael)|
+Crusader CRD-4BR|
+Crusader CRD-4D|
+Crusader CRD-4K|
+Crusader CRD-5M|
+Crusader CRD-5S|
+Crusader CRD-6D|
+Crusader CRD-6T|
+Crusader CRD-7D|
+Crusader CRD-7M|
+Crusader CRD-7M2|
+Crusader CRD-8R|
+Crusader CRD-9BR|
+Crusader CRD-9R|
+Kraken (Bane) 2|
+Kraken (Bane) 3|
+Kraken (Bane) 5|
+Kraken (Bane) 6|
+Kraken (Bane) 7|
+Kraken (Bane)|
+Panther PNT-14R|
+Wolfhound WLF-6S|
+Enforcer ENF-5R|
+Eris ERS-2H|
+Eris ERS-2N|
+Eris ERS-3R|
+Jenner IIC|
+Jenner IIC 2|
+Jenner IIC 3|
+Jenner IIC 5|
+Jenner JR7-N|
+Kingfisher F|
+Kingfisher G|
+Kingfisher I|
+Kingfisher T|
+Kingfisher X|
+Victor VTR-12D|
+Wolverine WVR-10D|
+Wolverine WVR-10R|
+Wolverine WVR-10V2|
+Wolverine WVR-11M|
+Wolverine WVR-7D|
+Wolverine WVR-7K|
+Wolverine WVR-7M|
+Wolverine WVR-7M2|
+Wolverine WVR-9R|
+Cougar E|
+Cougar F|
+Cougar G|
+Cougar H|
+Cougar I|
+Cougar T|
+Iron Cheetah A|
+Iron Cheetah B|
+Iron Cheetah C|
+Iron Cheetah D|
+Iron Cheetah L|
+Iron Cheetah Prime|
+Mercury MCY-105|
+Orion C 2|
+Rime Otter A|
+Rime Otter B|
+Rime Otter C|
+Rime Otter D|
+Rime Otter Prime|
+Scorpion C|
+Scorpion SCP-1BR|
+Scorpion SCP-1O|
+Scorpion SCP-1TB|
+Scorpion SCP-2N|
+Spider SDR-9M|
+Behemoth (Stone Rhino) 7|
+Behemoth (Stone Rhino) 8|
+Behemoth BHN-6H|
+Bushwacker BSW-X4|
+Grendel (Mongrel) G|
+Grendel (Mongrel) I|
+Grendel (Mongrel) J|
+Grendel (Mongrel) M|
+Grendel (Mongrel) T|
+Ostscout OTT-12R|
+Ostscout OTT-8J|
+Sojourner A|
+Sojourner B|
+Sojourner C|
+Sojourner D|
+Sojourner Prime|
+UrbanMech UM-R96|
+Zeus ZEU-11S|
+Hellion D|
+Hellion E|
+Hellion F|
+Hellion P|
+Hellion T|
+Longbow LGB-0H|
+Longbow LGB-0W2|
+Longbow LGB-10C|
+Longbow LGB-10K|
+Longbow LGB-14Q|
+Longbow LGB-14V|
+Longbow LGB-8C|
+Masakari (Warhawk) F|
+Masakari (Warhawk) G|
+Masakari (Warhawk) I|
+Masakari (Warhawk) L|
+Masakari (Warhawk) T|
+Mastodon A|
+Mastodon B|
+Mastodon C|
+Mastodon D|
+Mastodon Prime|
+Shadow Hawk IIC 10|
+Shadow Hawk IIC 11|
+Shadow Hawk IIC 2|
+Shadow Hawk IIC|
+Cyclops C|
+Hankyu (Arctic Cheetah) E|
+Hankyu (Arctic Cheetah) F|
+Hankyu (Arctic Cheetah) I|
+Hankyu (Arctic Cheetah) J|
+Hankyu (Arctic Cheetah) T|
+Hunchback C|
+Kodiak 6|
+Kontio|
+Ostroc OSR-2D|
+Ostroc OSR-3M|
+Ostroc OSR-6R|
+Ostroc OSR-9C|
+Regent A|
+Regent B|
+Regent C|
+Regent D|
+Regent Prime|
+Battle Cobra F|
+Battle Cobra G|
+Battle Cobra I|
+Battle Cobra J|
+Battle Cobra T|
+Battle Cobra X|
+Doom Courser A|
+Doom Courser B|
+Doom Courser C|
+Doom Courser D|
+Doom Courser Prime|
+Goliath GOL-3M|
+Goliath GOL-3M2|
+Goliath GOL-7C|
+Goliath GOL-7K|
+Goliath GOL-7R|
+Jade Phoenix A|
+Jade Phoenix B|
+Jade Phoenix C|
+Jade Phoenix D|
+Jade Phoenix E|
+Jade Phoenix Prime|
+Night Gyr F|
+Night Gyr G|
+Night Gyr T|
+Night Gyr X|
+Fujin RJN-301-F|
+Grand Crusader GRN-D-01-X|
+Grand Crusader GRN-D-02-B|
+Guillotine GLT-7M|
+Katana (Crockett) CRK-5006-1|
+Lancelot LNC25-09|
+Nexus NXS1-C|
+Nova Cat M|
+Nova Cat T|
+Raijin RJN-101-B|
+Raijin RJN-101-C|
+Raijin RJN-101-X|
+Raijin RJN-301-B|
+Rifleman IIC 10|
+Rifleman IIC 9|
+Star Crusader A|
+Star Crusader B|
+Star Crusader Prime|
+Star Python|
+Ryoken III (Skinwalker) A|
+Ryoken III (Skinwalker) B|
+Ryoken III (Skinwalker) C|
+Ryoken III (Skinwalker) D|
+Ryoken III (Skinwalker) E|
+Ryoken III (Skinwalker) F|
+Ryoken III (Skinwalker) Prime|
+Alpha Wolf A|
+Alpha Wolf B|
+Alpha Wolf C|
+Alpha Wolf Prime|
+Annihilator ANH-5W|
+Atlas AS7-K-DC|
+Atlas AS7-S3-DC|
+Atlas AS7-S3|
+Atlas AS7-S4|
+Atlas AS8-K|
+Atlas AS8-KE|
+Atlas AS8-S|
+Atlas C 2|
+Atlas C 3|
+Atlas C|
+Atlas II AS7-DK-H|
+Flashman FLS-10E|
+Grand Dragon DRG-12K|
+Stalker STK-9F|
+Chameleon CLN-8V|
+Chameleon CLN-9V|
+Chameleon TRC-4B|
+Chameleon TRC-4C|
+Pouncer F|
+Pouncer G|
+Pouncer I|
+Pouncer T|
+Pouncer W|
+Pouncer X|
+Vindicator VND-7L|
+Wraith TR5|
+Caesar CES-5R|
+Flea FLE-21|
+Hermes II HER-7A|
+Merlin C|
+Merlin MLN-1D|
+Merlin MLN-1E|
+Merlin MLN-1P|
+Naga II A|
+Naga II B|
+Naga II C|
+Naga II H|
+Naga II Prime|
+Naga II W|
+Quickdraw QKD-9G|
+Starslayer STY-4C|
+Gunslinger GUN-3ERD|
+Nightsky NGS-7S|
+Penetrator PTR-8D|
+Phantom F|
+Phantom G|
+Phantom I|
+Phantom J|
+Phantom K|
+Phantom L|
+Phantom R|
+Phantom T|
+Cicada CDA-4A|
+Devastator DVS-11|
+Firestarter FS9-M 'Mirage II'|
+Spector SPR-6F|
+Assassin ASN-109|
+Charger C|
+Dervish DV-11DK|
+Firefly FFL-5A|
+Sagittaire SGT-14R|
+BattleMaster BLR-3M-DC|
+BattleMaster BLR-6C|
+BattleMaster BLR-6G|
+BattleMaster BLR-6R|
+BattleMaster C 3|
+Hierofalcon A|
+Hierofalcon B|
+Hierofalcon C|
+Hierofalcon D|
+Hierofalcon Prime|
+Puma (Adder) I|
+Puma (Adder) K|
+Puma (Adder) L|
+Puma (Adder) S|
+Puma (Adder) T|
+Shadow Cat III A|
+Shadow Cat III B|
+Shadow Cat III C|
+Shadow Cat III Prime|
+Thor (Summoner) AA|
+Thor (Summoner) J|
+Thor (Summoner) Q|
+Thor (Summoner) T|
+Grizzly 3|
+Hellcat (Hellhound II)|
+Hellhound (Conjurer) 6|
+Hellhound II-P (Hellcat-P)|
+Highlander IIC 4|
+Hoplite HOP-5C|
+Vulcan VT-7T|
+Whitworth WTH-2H|
+Clint CLNT-3-4T|
+Javelin JVN-12N|
+Pillager PLG-6Z|
+Shogun C 3|
+JagerMech JM7-DD|
+Star Adder (Blood Asp) E|
+Star Adder (Blood Asp) F|
+Star Adder (Blood Asp) G|
+Star Adder (Blood Asp) I|
+Star Adder (Blood Asp) T|
+Viper VP-1|
+Viper VP-5|
+Viper VP-7|
+Viper VP-8|
+Viper VP-9|
+Awesome AWS-11H|
+Blackjack BJ-5|
+Fenris (Ice Ferret) F|
+Fenris (Ice Ferret) G|
+Fenris (Ice Ferret) I|
+Fenris (Ice Ferret) J|
+Fenris (Ice Ferret) K|
+Fenris (Ice Ferret) T|
+Thresher Mk II|
+Trebuchet TBT-9N|
+Warhammer IIC|
+Warhammer IIC 13|
+Warhammer IIC 2|
+Wasp C|
+Wasp WSP-1S|
+Wasp WSP-3M|
+Wasp WSP-3W|
+Wasp WSP-4W|
+Wasp WSP-5A|
+Catapult CPLT-K6|
+Crab CRB-54|
+Hammerhead|
+Hellhound (Conjurer) 7|
+Hellhound (Conjurer) 8|
+Hellhound (Conjurer)|
+King Crab KGC-011|
+Mad Cat (Timber Wolf) M|
+Mad Cat (Timber Wolf) N|
+Mad Cat (Timber Wolf) T|
+Mad Cat (Timber Wolf) W|
+Marauder II MAD-10D|
+Marauder II MAD-5A|
+Marauder II MAD-5B|
+Marauder II MAD-5C|
+Marauder II MAD-6A|
+Marauder II MAD-6C|
+Marauder II MAD-8K|
+Cataphract CTF-5L|
+Cataphract CTF-5LL|
+Cricket RWN-01|
+Cricket RWN-02|
+Linebacker F|
+Linebacker G|
+Linebacker I|
+Linebacker T|
+Marauder (Bounty Hunter-3015)|
+Marauder (Bounty Hunter-3044)|
+Marauder (Bounty Hunter-3138)|
+Marauder C|
+Marauder IIC 10|
+Marauder IIC 8|
+Marauder IIC 9|
+Marauder IIC|
+Marauder MAD-11D|
+Marauder MAD-2T|
+Marauder MAD-5D-DC|
+Marauder MAD-5D|
+Marauder MAD-5S|
+Marauder MAD-7C|
+Marauder MAD-7M|
+Marauder MAD-7R|
+Marauder MAD-7S|
+Marauder Red Hunter|
+Nightstar NSR-10D|
+Raven RVN-5L|
+Koshi (Mist Lynx) I|
+Koshi (Mist Lynx) J|
+Koshi (Mist Lynx) K|
+Koshi (Mist Lynx) L|
+Koshi (Mist Lynx) M|
+Koshi (Mist Lynx) N|
+Koshi (Mist Lynx) T|
+Ryoken (Stormcrow) I|
+Ryoken (Stormcrow) J|
+Ryoken (Stormcrow) K|
+Ryoken (Stormcrow) P|
+Ryoken (Stormcrow) T|
+Vixen (Incubus) 2|
+Vixen (Incubus) 3|
+Vixen (Incubus) 7|
+Vixen (Incubus) 8|
+Vixen (Incubus) 9|
+War Crow A|
+War Crow B|
+War Crow C|
+War Crow Prime|
+Warhammer C 2|
+Warhammer C 3|
+Warhammer C|
+Warhammer WHM-10K|
+Warhammer WHM-7A|
+Warhammer WHM-7K|
+Warhammer WHM-7M-DC|
+Warhammer WHM-7M|
+Warhammer WHM-7S|
+Warhammer WHM-8R|
+Warhammer WHM-9K|
+Baboon (Howler) 4|
+Baboon (Howler) 5|
+Baboon (Howler) 6|
+Dasher (Fire Moth) G|
+Dasher (Fire Moth) I|
+Dasher (Fire Moth) J|
+Dasher (Fire Moth) M|
+Dasher (Fire Moth) P|
+Dasher (Fire Moth) R|
+Dasher (Fire Moth) T|
+Devil|
+Dragonfly (Viper) J|
+Dragonfly (Viper) K|
+Dragonfly (Viper) L|
+Dragonfly (Viper) M|
+Dragonfly (Viper) R|
+Dragonfly (Viper) T|
+Rifleman C 3|
+Rifleman C|
+Rifleman RFL-5D|
+Rifleman RFL-5M|
+Rifleman RFL-7G|
+Rifleman RFL-7N|
+Rifleman RFL-7N2|
+Gladiator (Executioner) F|
+Gladiator (Executioner) G|
+Gladiator (Executioner) I|
+Gladiator (Executioner) J|
+Gladiator (Executioner) L|
+Gladiator (Executioner) T|
+Goshawk (Vapor Eagle) 2|
+Goshawk (Vapor Eagle) 5|
+Goshawk (Vapor Eagle) 6|
+Goshawk (Vapor Eagle) 7|
+Goshawk (Vapor Eagle)|
+Inferno INF-NO|
+Inferno INF-NOA|
+Inferno INF-NOB|
+Inferno INF-NOC|
+Inferno INF-NOR|
+Shadow Cat D|
+Shadow Cat E|
+Shadow Cat I|
+Shadow Cat J|
+Shadow Cat M|
+Shadow Cat T|
+Valkyrie C|
+Valkyrie VLK-QD|
+Valkyrie VLK-QD6|
+Valkyrie VLK-QDD|
+Deimos H|
+Shadow Hawk SHD-11CS2|
+Atlas AS7-A|
+Javelin JVN-10A|
+Thunderbolt TDR-5D|
+Wolverine WVR-6D|
+Zeus ZEU-6A|
+Assassin ASN-30 (Alice)|
+Bandersnatch BNDR-01A (Horus)|
+Daikyu DAI-01 (Tabitha)|
+Emperor EMP-6A (Nerran)|
+Excalibur EXC-C1 (Cernunnos)|
+Grand Dragon DRG-1G (Douglas)|
+Great Wyrm (Aemelia)|
+Gunslinger GUN-1ERD (Jared)|
+Hercules HRC-LS-9000 (Julius)|
+Jenner JR7-K (Samuli)|
+Merlin MLN-1B (Porter)|
+Snake SNK-1V (Alexi)|
+Stealth STH-1D (Anna)|
+Thanatos TNS-4S (Felix)|
+Wolf Trap (Tora) WFT-1 (Daitama)|
+Templar III TLR2-J 'Arthur'|
+Hel HL-1|
+Hel HL-2|
+Tiburon 2|
+Toro TR-B-12|
+Toro TR-B-9|
+Battle Cobra BTL-C-2OG|
+Battle Cobra BTL-C-2OH|
+Battle Cobra BTL-C-2OI|
+Battle Cobra BTL-C-2OJ|
+Jinggau JN-G7Lr|
+Jinggau JN-G8Ar|
+Jinggau JN-G9B|
+Jinggau JN-G9CCr|
+Centurion CN10-J|
+Centurion CN10-W|
+Gyrfalcon 5|
+Thunder Stallion 4|
+SuburbanMech UM-R100|
+SuburbanMech UM-R90|
+Crusader CRD-10S|
+Crusader CRD-9S|
+Victor C|
+Hatchetman HCT-5DT|
+Gladiator-B (Executioner-B) A|
+Gladiator-B (Executioner-B) B|
+Gladiator-B (Executioner-B) C|
+Gladiator-B (Executioner-B) Prime|
+Longshot LNG-2 (Reskov)|
+Rattlesnake II RSN-1|
+Rattlesnake II RSN-2|
+Rattlesnake JR7-31|
+Rattlesnake JR7-31P|
+Rattlesnake JR7-31R (Gideon)|
+Nightstar NSR-9J (Holt)|
+Avatar AV1-OBLO|
+Doloire DLR-OBLO|
+Mad Cat (Timber Wolf) BLO|
+Templar TLR1-OBLO|
+Uller (Kit Fox) BLO|
+Vulture Mk III (Mad Dog Mk III) BLO|
+Black Knight BL-6-KNT (Ian)|
+Cataphract CTF-2X (George)|
+Enforcer ENF-4R (Daniel)|
+Grand Dragon DRG-1G (Emory)|
+Grand Dragon DRG-5K (Emory)|
+Hatamoto-Chi HTM-27T (Daniel)|
+Hatchetman HCT-3F (Austin)|
+Hunchback HBK-4G (Shakir)|
+Black Knight BL-10-KNT (Ross)|
+Cataphract CTF-3X (Sara)|
+Enforcer ENF-5D (Daniel)|
+Grand Dragon DRG-7K (Mark)|
+Hatamoto-Chi HTM-27T (Daniel II)|
+Hatchetman HCT-5S (Austin)|
+Hunchback HBK-4G (Hohiro)|
+Jenner JR7-K (Grace II)|
+Commando COM-1AK|
+Copper SecurityMech CPK-65KM|
+Crosscut ED-X4K LoggerMech|
+Phoenix PX-1KC|
+Phoenix PX-1KL|
+Phoenix PX-1KR|
+Phoenix PX-1KT|
+Reconquista|
+Atlas II AS7-D-H (Devlin)|
+Awesome AWS-10KM (Cameron)|
+Buster BC XV HaulerMech|
+Buster BC XV-M HaulerMech MOD|
+Buster BC XV-M-B HaulerMech MOD|
+Buster BC XV-M-C HaulerMech MOD|
+Buster BC XV-M-W HaulerMech MOD|
+Buster BC XXI HaulerMech|
+Carbine CON-7 ConstructionMech|
+Carbine CON-7M ConstructionMech MOD|
+Carbine CON-8 ConstructionMech|
+Carbine CON-8H HaulerMech|
+Carbine CON-9 ConstructionMech|
+Carbine CON-9M ConstructionMech MOD|
+Carbine CON-9M-B ConstructionMech MOD|
+CattleMaster CTL-3R 'Herder' IndustrialMech|
+CattleMaster CTL-3R2 'Hunter' IndustrialMech|
+CattleMaster CTL-3R3 SecurityMech|
+Chaffee Servicemech BT1|
+Copper SecurityMech CPK-19|
+Copper SecurityMech CPK-65|
+Crosscut ED-X1 LoggerMech|
+Crosscut ED-X2M LoggerMech MOD|
+Crosscut ED-X4 LoggerMech|
+Crosscut ED-X4B DemolitionMech|
+Crosscut ED-X4D DemolitionMech|
+Crosscut ED-X4M LoggerMech MOD|
+Crosscut ED-X4X LoggerMech|
+Crosscut ED-X5M LoggerMech MOD|
+Crosscut ED-X5M-B DemolitionMech MOD|
+Dig King RCL-1 MiningMech MOD|
+Dig King RCL-1 MiningMech|
+Dig Lord RCL-4 MiningMech|
+ForestryMech ED-X3|
+Grommet D90 MilitiaMech|
+Harvester HVR-99 AgroMech|
+Harvester Ant KIC-3 AgroMech|
+Harvester Ant KIC-3M AgroMech MOD|
+Harvester Ant KIC-3M-B AgroMech MOD|
+Heavy Lifter HCL-1 CargoMech|
+Jabberwocky MilitiaMech JAW-67|
+Lumberjack LM5/M|
+Marco MR-6 ExplorerMech|
+Marco MR-7 ExplorerMech|
+Peacekeeper PK-6 SecurityMech|
+Peacemaker PM-6 PoliceMech|
+Pompier Firemech GM-3CD|
+Pompier Firemech GM-3HT|
+Pompier Firemech GM-3A|
+Powerman SC XI-M LoaderMech MOD|
+Powerman SC XI-M-B LoaderMech MOD|
+Powerman SC XV HaulerMech|
+Powerman SC XVI HaulerMech|
+ScavengerMech SC-V SalvageMech|
+ScavengerMech SC-V-M MilitiaMech|
+Shugosha LAW-QM1 Q-Mech|
+Shugosha LAW-QM2 Q-Mech|
+Shugosha LAW-QM3 Q-Mech|
+Shugosha PTN-LAW LoaderMech|
+Uni ATAE-70 CargoMech|
+Uni ATAE-70 MilitiaMech|
+Uni ATAE-70T CargoMech|
+Vampyr SC-V-1 SalvageMech|
+Flea FLE-16|
+Archer ARC-5CS|
+Black Knight BL-9-KNT|
+Gladiator (Executioner) TC|
+Loki (Hellbringer) M|
+Mad Cat (Timber Wolf) TC|
+Marauder MAD-5CS|
+Phoenix Hawk PXH-1bC|
+Puma (Adder) TC|
+Rifleman RFL-5CS|
+Ryoken (Stormcrow) Attwater|
+Ryoken (Stormcrow) TC|
+Shadow Cat TC|
+Shadow Hawk SHD-2Ht|
+Vulture (Mad Dog) S|
+Warhammer WHM-7CS|
+Annihilator ANH-1E|
+Victor VTR-9B (Li)|
+Atlas AS7-WGS (Samsonov)|
+Dragon DRG-2Y (Yoriyoshi)|
+Marauder MAD-SD (Douglass)|
+Thunderbolt TDR-5S-T (Tallman)|
+Zeus (Leonidas)|
+Cauldron-Born (Ebon Jaguar) (Samantha)|
+Grasshopper (Reynolds)|
+Atlas AS7-D (Danielle)|
+Ostroc OSR-2C (Michi)|
+Stalker STK-3F (Jagawen)|
+Rampage RMP-4G (Benboudaoud)|
+Victor VTR-9B (Kataga)|
+Awesome AWS-8Q (Buck)|
+Brigand LDT-5|
+Brigand LDT-XPR1|
+Brigand LDT-XPR2|
+Brigand LDT-XPR3|
+Brigand LDT-XPR4|
+Brigand LDT-XPR5|
+Albatross ALB-5W (Dantalion)|
+Emperor EMP-6ME 'Mercury Elite'|
+Dasher (Fire Moth) (Aletha)|
+Kodiak (Cale)|
+Galahad GLH-3D (Laodices)|
+Black Hawk-KU BHKU-O (Albert)|
+Thresher (Edward)|
+Griffin GRF-1E2 'Sparky 2.0'|
+Grim Reaper GRM-R-PR62A|
+Cataphract CTF-5MOC (Naomi)|
+Jinggau JN-G8BX (Rush)|
+Seraph C-SRP-OR (Ravana)|
+Dragon Fire DGR-6FC2 (Gregory)|
+Fafnir FNR-4A (Peter)|
+Centurion CN9-YLW3 'Yen Lo Wang'|
+Orion IIC 'Burton'|
+Tian-Zong TNZ-N3 'Jasminda'|
+BattleMaster BLR-3M (Rogers)|
+Nightstar NSR-9J (Brubaker)|
+Marauder MAD-7D (Von Staskov)|
+Marshal MHL-6FR|
+Phoenix Hawk PXH-3D (Jiemin)|
+Cazador|
+Rhino|
+Snow Fox (Omni) A|
+Snow Fox (Omni) B|
+Snow Fox (Omni) Prime|
+Surtur SUR-T1|
+Tolva|
+BattleMaster BLR-1G (Red Corsair)|
+Man O' War (Gargoyle) (Conal)|
+Atlas II AS7-D-H (Kerensky)|
+Highlander HGN-732 (Jorgensson)|
+Vanquisher VQR-7V (Pravuil)|
+Dragoon AEM-05C|
+Lament LMT-2R (Manes)|
+Night Chanter A|
+Night Chanter Prime|
+Spirit Walker A|
+Spirit Walker Prime|
+Inquisitor II ITW-200|
+Marauder II MAD-6S|
+Jenner JR7-F (Smith)|
+Panther PNT-9ALAG|
+Vulcan VL-2T (Timms)|
+Warhammer WHM-6K (Olesko)|
+Bull Shark BSK-M3|
+Bull Shark BSK-MAZ|
+Corsair COR-5R|
+Corsair COR-5T|
+Corsair COR-6R|
+Corsair COR-7A|
+Corsair COR-7R|
+Corsair COR-BR Broadside|
+Corsair COR-RA Ravager|
+Roughneck RGH-1A|
+Roughneck RGH-1B|
+Roughneck RGH-1C|
+Roughneck RGH-2A|
+Roughneck RGH-3A|
+Roughneck RGH-BLT Bolt|
+Roughneck RGH-PH Powerhouse|
+Roughneck RGH-R Reaver|
+Sun Spider A|
+Sun Spider Ambush|
+Sun Spider B|
+Sun Spider C|
+Sun Spider D|
+Sun Spider Manul|
+Sun Spider Prime|
+Sun Spider Vanguard|
+Archangel C-ANG-O (Berith)|
+BattleMaster BLR-4S (Calvin II)|
+BattleMaster BLR-4S (Calvin)|
+Deva C-DVA-O (Achilleus)|
+Gallowglas GAL-4GLSA|
+Griffin GRF-6S (Francine II)|
+Griffin GRF-6S (Francine)|
+Grigori C-GRG-O (Rufus)|
+Lightray LGH-6W|
+Malak C-MK-O (Mi)|
+Preta C-PRT-O (Kendali)|
+Seraph C-SRP-O (Havalah)|
+Uziel UZL-2S (Jacob II)|
+Uziel UZL-2S (Jacob)|
+Wolfhound WLF-4WA|
+Zeus-X ZEU-9WD (Stacy)|
+Cephalus A|
+Cephalus B|
+Cephalus C|
+Cephalus D|
+Cephalus E|
+Cephalus Prime|
+Cephalus U|
+Dragonfly (Viper) Z|
+Koshi (Mist Lynx) Z|
+Mad Cat (Timber Wolf) Z|
+Osteon (Jaguar)|
+Osteon A|
+Osteon B|
+Osteon C|
+Osteon D|
+Osteon E|
+Osteon F|
+Osteon G|
+Osteon Prime|
+Osteon U|
+Pariah (Septicemia) A-Z|
+Pariah (Septicemia) B-Z|
+Pariah (Septicemia) C-Z|
+Pariah (Septicemia) D-Z|
+Pariah (Septicemia) E|
+Pariah (Septicemia) F|
+Pariah (Septicemia) US|
+Pariah (Septicemia) UW|
+Pariah (Septicemia) Z|
+Ryoken (Stormcrow) Z|
+Savage Coyote Z|
+Thor (Summoner) Z|
+Turkina Z|
+Talon TLN-5VNO|
+Merlin MLN-SX|
+Spindrift Aquatic SecurityMech SDT-1|
+Whitworth WTH-5S|
+Liberator LIB-4T|
+Ostscout IIC|
+Aquagladius AQS-5 MAM|
+Carbine CON-9M-D ConstructionMech MOD|
+Crosscut IIC SolahmaMech|
+Daedalus DAD-DX|
+Gauss-Buster MilitiaMech|
+OmniMarauder MAD-BR-OA|
+OmniMarauder MAD-BR-O|
+Phoenix Hawk PXH-99|
+Porcupine PRC-3N|
+Scourge SCG-WX1|
+Uni ATAE-70 ArtilleryMech|
+Valkyrie VLK-QD5|
+Volkh VKH-68|
+Wasp WSP-3X|
+Cougar XR|
+Ha Otoko-HR|
+Kraken-XR|
+Ursus PR|
+Beowulf BEO-X-7a|
+Celerity CLR-02-X-D|
+Exterminator EXT-6CS|
+Grim Reaper GRM-R (Einar)|
+Highlander HGN-641-X-2|
+Tessen TSN-X-4|
+Arbiter SecurityMech ARB-001|
+Charger CGR-1X1|
+Firestarter FS9-X81|
+Hunchback HBK-7X-4|
+Quickdraw QKD-8X|
+Devastator DVS-X10 MUSE EARTH|
+Enforcer III ENF-7X MUSE COMPACT|
+Legionnaire LGN-2X1 MUSE FIRE|
+Pendragon PDG-1X MUSE RED|
+Rifleman RFL-X3 MUSE WIND|
+Crosscut ED-XX 'Ichabod'|
+Juggernaut JG-R9TX1 'Leapin' Lil'|
+Spatha SP2-X 'Warlord'|
+Valiant VAL-NT-JX 'Hot Knife'|
+Warhammer WHM-X7 'The Lich'|
+Wraith TR2-X 'Alexander'|
+Exterminator EXT-4DX|
+Mongoose MON-66GX|
+Rifleman III RF2-A|
+Thug THG-11ECX (Jose)|
+Wyvern WVE-5UX|
+Banzai BNZ-X|
+Hatamoto-Kaeru HTM-35X|
+Jenner JR10-X|
+No-Dachi NDA-3X|
+Wolf Trap (Tora) WFT-2X 'Bear Trap'|
+Dola DOL-1A|
+Pillager PLG-4X 'Anvil'|
+Raven X RVN-3X|
+Ti Ts'ang TSG-9DDC 'Prototype'|
+Vindicator VND-3LD (Dao)|
+Awesome AWS-11M|
+Hermes II HER-7S|
+Jackal JA-KL-1579|
+Orion ON3-MX|
+Pandarus LFA-1X|
+Sarissa MN1-D|
+Annihilator ANH-2AX|
+Grasshopper GHR-7X|
+Hoplite HOP-4X|
+Wolfhound WLF-2X|
+Black Knight BL-X-KNT 'Red Reaper'|
+Fireball ALM-XF|
+Huron Warrior HUR-WO-RX4|
+Mauler MAL-4X 'Todesbote'|
+Pompier Firemech GM-FL|
+Anubis ABS-3MC|
+Atlas AS7-00 (Jurn)|
+Dig Lord RCL-Z1 Armed MiningMech|
+Trebuchet TBT-XK7|
+Chameleon CLN-7VQ 'Q-'Mech'|
+Grand Titan T-IT-N14R 'Vengeance'|
+Warlord BLR-2XC|
+Wight WGT-4NC 'Dezgra'|
+Commando COM-7S2 (Freyr)|
+Daimyo DMO-1K2 (Al-Shahab)|
+Dervish DV-8D2 'Lightbringer'|
+Hellspawn HSN-7D2 (Halperin)|
+Victor VTR-9K2 (St. James)|
+Commando COM-1A|
+Helepolis HEP-1H|
+Kyudo KY2-D-01|
+Mackie MSK-5S|
+Shadow Hawk SHD-1R|
+Banshee BNC-1E|
+BattleAxe BKX-1X|
+Crossbow CRS-X|
+Gladiator GLD-1R|
+Icarus ICR-1X|
+Wasp WSP-1|
+Bellerophon BEL-1X|
+Dervish DV-1S|
+Eisenfaust EFT-2|
+Firebee FRB-1E (WAM-B)|
+Longbow LGB-0C|
+Thunderbolt TDR-1C|
+Emperor EMP-1A|
+Griffin GRF-1A|
+Rifleman RFL-1N|
+Rifleman RFL-2N|
+Swordsman SWD-1|
+Swordsman SWD-2|
+Toro TR-A-1|
+Xanthos XNT-2O|
+Archer ARC-1A|
+Orion ON1-C|
+Orion ON1-H|
+Phoenix PX-1R|
+Trooper TP-1R|
+Wolverine WVR-1R|
+Wolverine WVR-3R|
+Ymir BWP-X1 'Bipedal Weapons Platform'|
+Beowulf IIC PR|
+Roadrunner (Emerald Harrier) RD-1R|
+Enforcer III ENF-7D|
+Hatchetman HCT-7R|
+Valiant VLT-3E|
+Awesome AWS-11R|
+Blade BLD-XR|
+Hatamoto-Ku HTM-27W2|
+Hornet HNT-181|
+Hornet HNT-182|
+Hunchback HBK-7S|
+Orca OC-1X|
+Penthesilea PEN-3H|
+Prefect PRF-1C|
+UrbanMech UM-R93|
+Goshawk II RISC|
+Lament LMT-2D|
+Lich UABM-2R|
+Osprey OSP-36|
+Parash 3|
+Ryoken III-XP (Skinwalker) A|
+Ryoken III-XP (Skinwalker) B|
+Ryoken III-XP (Skinwalker) C|
+Ryoken III-XP (Skinwalker) D|
+Ryoken III-XP (Skinwalker) Prime|
+Triskelion TRK-4V|
+Centurion CN9-H|
+HawkWolf HWK-3F|
+Pathfinder PFF-2|
+Pathfinder PFF-2T|
+Patron MilitiaMech PTN-2|
+Rook NH-1X 'Rook-X'|
+Agrotera AGT-UA 'Ariel'|
+Buccaneer BCN-6PX 'Pan'|
+Calliope CAL-1MAFSW 'Snow White'|
+Celerity CLR-03OMM 'Rajah'|
+Clint IIC 2L 'Leia'|
+Ghost GST-10A 'Aurora'|
+Gunsmith CH11-NGC 'Cinderella'|
+Hitotsume Kozo HKZ-1FM 'Mulan'|
+Hunchback HBK-LGN-Pin 'Anastasia'|
+Hunchback HBK-LGN-Pin 'Drizella'|
+Phoenix Hawk PXH-7KJ 'Jasmine'|
+Tessen TSN-X4R 'Rapunzel'|
+Trebuchet TBT-7MM 'Merida'|
+Vulcan VT-5ML 'Aladdin'|
+Vulpes VLP-1DX 'Beast'|
+Watchman WTC-4MB 'Belle'|
+Wraith TR2-P 'Pocahontas'|
+Axman AXM-6X|
+Banshee BNC-11X|
+Barghest BGS-4X|
+Slagmaiden SLG-X|
+Stealth STH-5X|
+Stiletto STO-6X|
+Cataphract CTF-0X|
+Flea FLE-14|
+Kiso Command Mech K-3N-KRHQ|
+Marauder MAD-4X|
+Super-Griffin GRF-2N-X|
+Super-Wasp WSP-2A-X|
+Zeus ZEU-6Y|
+Centaur 2|
+Centaur 3|
+Centaur 4|
+Centaur|
+Gorgon 2|
+Gorgon 3|
+Gorgon 4|
+Gorgon|
+Harpy 2|
+Harpy 3|
+Harpy 4|
+Harpy|
+Hydra 2|
+Hydra 3|
+Hydra 4|
+Hydra|
+Minotaur 2|
+Minotaur 3|
+Minotaur 4|
+Minotaur|
+Roc 2|
+Roc 3|
+Roc 4|
+Roc|
+Satyr 2|
+Satyr 3|
+Satyr 4|
+Satyr|
+Siren 2|
+Siren 3|
+Siren 4|
+Siren 5|
+Siren|
+Basilisk 2|
+Basilisk 3|
+Basilisk|
+Cecerops 2|
+Cecerops 3|
+Cecerops 4|
+Cecerops|
+Chrysaor 2|
+Chrysaor|
+Delphyne 2|
+Delphyne 3|
+Delphyne|
+Erinyes 2|
+Erinyes 3|
+Erinyes|
+Orc 2|
+Orc 3|
+Orc 4|
+Orc|
+Procyon 2|
+Procyon 3|
+Procyon 4|
+Procyon 5|
+Procyon|
+Triton 2|
+Triton 3|
+Triton 4|
+Triton|
+Hippogriff|
+Cecerops 5|
+Gorgon 5|
+Gorgon 6|
+Roc 5|
+Svartalfa 3|
+Minotaur P2|
+Procyon (Quad)|
+Satyr XP|
+Svartalfa 2|
+Svartalfa|
+Basilisk ProtoMech (Quad) B|
+Basilisk ProtoMech (Quad)|
+Boggart Ultraheavy ProtoMech 2|
+Boggart Ultraheavy ProtoMech|
+Centaur Z|
+Hobgoblin Ultraheavy ProtoMech 2|
+Hobgoblin Ultraheavy ProtoMech|
+Minotaur Z|
+Procyon Z|
+Roc Z|
+Sprite Ultraheavy ProtoMech 2|
+Sprite Ultraheavy ProtoMech 3|
+Sprite Ultraheavy ProtoMech|
+Minotaur XP|
+Dragonstar Assault Transport (3060)|
+Dragonstar Passenger Transport|
+Mowang Courier|
+'Astrolux' Staryacht LC-100|
+Tigress Close Patrol Craft TIG-15|
+Foxhound Gunboat TIG-40|
+Ares Assault Craft Mark VII-C|
+Ares Assault Craft Mark VII|
+Bus S-7AC|
+DropShuttle K-1|
+DropShuttle K-1C|
+Escape Pod|
+Life Boat|
+Long-Range Shuttlecraft KR-61|
+Long-Range Shuttlecraft KR-61C|
+Battle Taxi NL-42|
+Bus S-7A|
+Shuttle ST-46|
+Shuttle ST-46C|
+Aquarius Escort M1|
+Aquarius Escort W1|
+Aquarius Escort|
+Lyonesse Escort M1|
+Lyonesse Escort W1|
+Lyonesse Escort|
+Ares Attack Craft Mark IX|
+Oo-Suzumebachi|
+Zhen Niao|
+Caerleon|
+Condottiere Assault Craft|
+NL-45 Gunboat|
+Wurger Assault Craft|
+Mowang Courier (Clandestine)|
+S7-P Bus 'Scarab'|
+Ares Assault Craft Mk.III|
+Ares Close Assault Landing Craft Mk.II|
+Ares Landing Craft Mk.I|
+Intrepid Assault Craft (2331)|
+Intrepid Assault Craft (2478)|
+Crucible Station|
+Hong Lung Interdiction Station|
+Snowden Mining Station (MK I)|
+Snowden Mining Station|
+M-9 SDS Battle Station 'Pavise'|
+Drake SDS Control Station|
+Wheeler-Class Station (2556)|
+Alliance Space Station (2713)|
+Alliance Space Station (3061)|
+Bastion System Defense Station (2584)|
+Bastion System Defense Station (3058)|
+Bastion System Defense Station (3091)|
+BattleSat System Defense Station (3089)|
+BattleSat System Defense Station (3056)|
+Capitol System Defense Station (3051)|
+Factory Medium/Large (2400)|
+Factory Medium/Large (2750)|
+Factory Small (2300)|
+Habitat Small (2400)|
+Habitat Small (2750)|
+Habitat Large (2500)|
+Habitat Large (2750)|
+Olympus Recharge Station (2663)|
+Olympus Recharge Station (2942)|
+Olympus Recharge Station (3072)|
+Pressurized Yard Huge (2450)|
+Pressurized Yard Large (2400)|
+Pressurized Yard Medium (2350)|
+Pressurized Yard Small (2200)|
+Unpressurized Yard Huge (2350)|
+Unpressurized Yard Large (2300)|
+Unpressurized Yard Medium (2250)|
+Unpressurized Yard Small (2100)|
+Puma Assault Tank PAT-001|
+Puma Assault Tank PAT-002|
+Air Car|
+Ground Car|
+Heavy Transport B1|
+Hover Scout|
+Hover Tank|
+Jeep|
+Jet Sled|
+MASH Truck (Small)|
+Mobile Long Tom Artillery (+Carriages)(Unofficial)|
+Speeder|
+Weapons Carrier A (LL)|
+AC/2 Carrier|
+Armored Personnel Carrier (Hover LRM)|
+Armored Personnel Carrier (Hover MG)|
+Armored Personnel Carrier (Hover Sensors)|
+Armored Personnel Carrier (Hover SRM)|
+Armored Personnel Carrier (Hover)|
+Armored Personnel Carrier (Tracked LRM)|
+Armored Personnel Carrier (Tracked MG)|
+Armored Personnel Carrier (Tracked SRM)|
+Armored Personnel Carrier (Tracked)|
+Armored Personnel Carrier (Wheeled LRM)|
+Armored Personnel Carrier (Wheeled MG)|
+Armored Personnel Carrier (Wheeled SRM)|
+Armored Personnel Carrier (Wheeled)|
+Axel Heavy Tank Mk 1|
+Axel Heavy Tank Mk 2|
+Behemoth Heavy Tank (Armor)|
+Behemoth Heavy Tank (Flamer)|
+Behemoth Heavy Tank|
+Bulldog Medium Tank (AC2)|
+Bulldog Medium Tank (LRM)|
+Bulldog Medium Tank|
+Condor Heavy Hover Tank (Davion)|
+Condor Heavy Hover Tank (Flamer)|
+Condor Heavy Hover Tank (Liao)|
+Condor Heavy Hover Tank|
+Coolant Truck (Hover)|
+Coolant Truck (Tracked)|
+Coolant Truck 135-K|
+Demolisher Heavy Tank (Defensive)|
+Demolisher Heavy Tank (Standard Mk. I)|
+Demolisher Heavy Tank (Standard Mk. II)|
+Devastator Heavy Tank|
+Drillson Heavy Hover Tank (SRM)|
+Drillson Heavy Hover Tank|
+Engineering Vehicle (AC)|
+Engineering Vehicle (Flamer)|
+Engineering Vehicle|
+Ferret Light Scout VTOL (Armor) 'Wild Weasel'|
+Ferret Light Scout VTOL (Cargo)|
+Ferret Light Scout VTOL|
+Goblin Medium Tank (LRM)|
+Goblin Medium Tank (MG)|
+Goblin Medium Tank (SRM)|
+Goblin Medium Tank|
+Harasser Laser Platform|
+Harasser Missile Platform (Flamer)|
+Harasser Missile Platform (LRM)|
+Harasser Missile Platform 'Mini-Peggy'|
+Harasser Missile Platform 'Leaping Lisa'|
+Harasser Missile Platform|
+Hetzer Wheeled Assault Gun (AC10)|
+Hetzer Wheeled Assault Gun (Laser)|
+Hetzer Wheeled Assault Gun (LRM)|
+Hetzer Wheeled Assault Gun (Scout)|
+Hetzer Wheeled Assault Gun (SRM)|
+Hetzer Wheeled Assault Gun|
+Hi-Scout Drone (NapFind)|
+Hi-Scout Drone (PathTrak)|
+Hi-Scout Drone Carrier|
+Hunter Light Support Tank (Ammo)|
+Hunter Light Support Tank (LRM10)|
+Hunter Light Support Tank (LRM15)|
+Hunter Light Support Tank|
+J-27 Ordnance Transport (Armor)|
+J-27 Ordnance Transport (Fusion)|
+J-27 Ordnance Transport (Trailer)|
+J-27 Ordnance Transport|
+J. Edgar Light Hover Tank (Flamer)|
+J. Edgar Light Hover Tank (ICE)|
+J. Edgar Light Hover Tank (MG)|
+J. Edgar Light Hover Tank|
+J-27 Ordnance Transport K-27 'Killjoy'|
+Karnov UR Gunship|
+Karnov UR Transport (AC)|
+Karnov UR Transport (Artillery)|
+Karnov UR Transport|
+Laser Carrier|
+LRM Carrier|
+Manticore Heavy Tank|
+MASH Truck (ICE)|
+MASH Truck|
+Maxim Heavy Hover Transport (SRM2)|
+Maxim Heavy Hover Transport (SRM4)|
+Maxim Heavy Hover Transport|
+Mobile Headquarters (ICE - LL)|
+Mobile Headquarters (ICE - LRM)|
+Mobile Headquarters (ICE)|
+Mobile Headquarters (LL)|
+Mobile Headquarters (LRM)|
+Mobile Headquarters|
+Mobile Long Tom Artillery LT-MOB-25 (Ammunition Carriage)|
+Mobile Long Tom Artillery LT-MOB-25 (Support Carriage)|
+Mobile Long Tom Artillery LT-MOB-25|
+Monitor Naval Vessel|
+Neptune Submarine (LRT)|
+Neptune Submarine (SRT)|
+Neptune Submarine|
+Ontos Heavy Tank (Fusion)|
+Ontos Heavy Tank (LRM)|
+Ontos Heavy Tank|
+Packrat LRPV PKR-T5 (ICE)|
+Packrat LRPV PKR-T5 (ML)|
+Packrat LRPV PKR-T5 (SRM2)|
+Packrat LRPV PKR-T5|
+Partisan Heavy Tank (AC2)|
+Partisan Heavy Tank (LRM)|
+Partisan Heavy Tank|
+Patton Tank|
+Pegasus Scout Hover Tank (Missile)|
+Pegasus Scout Hover Tank (Sensors)|
+Pegasus Scout Hover Tank (Unarmed)|
+Pegasus Scout Hover Tank|
+Pike Support Vehicle (AC5)|
+Pike Support Vehicle (Missile)|
+Pike Support Vehicle|
+Rommel Tank|
+Saladin Assault Hover Tank (Armor)|
+Saladin Assault Hover Tank|
+Saracen Medium Hover Tank|
+Savannah Master Hovercraft (SL)|
+Savannah Master Hovercraft|
+Schrek PPC Carrier (Anti-Infantry)|
+Schrek PPC Carrier|
+Scimitar Medium Hover Tank (Missile)|
+Scimitar Medium Hover Tank|
+Scorpion Light Tank (LRM)|
+Scorpion Light Tank (ML)|
+Scorpion Light Tank (SRM)|
+Scorpion Light Tank|
+Sea Skimmer Hydrofoil (SRM2)|
+Sea Skimmer Hydrofoil (SRM6)|
+Sea Skimmer Hydrofoil|
+Skulker Wheeled Scout Tank (MG)|
+Skulker Wheeled Scout Tank (SRM)|
+Skulker Wheeled Scout Tank|
+SRM Carrier|
+Striker Light Tank (LRM)|
+Striker Light Tank (SRM)|
+Striker Light Tank|
+Swift Wind Scout Car (ICE - Cargo)|
+Swift Wind Scout Car (ICE - Speed)|
+Swift Wind Scout Car (ICE)|
+Swift Wind Scout Car|
+Vedette Medium Tank (AC2)|
+Vedette Medium Tank (Liao)|
+Vedette Medium Tank|
+Von Luckner Heavy Tank VNL-K100|
+Von Luckner Heavy Tank VNL-K65N|
+Von Luckner Heavy Tank VNL-K70|
+Warrior Attack Helicopter H-7|
+Warrior Attack Helicopter H-7A|
+Warrior Attack Helicopter H-7C|
+Beagle Hover Scout (C3i)|
+Beagle Hover Scout (TAG)|
+Beagle Hover Scout|
+Burke Defense Tank (HPPC)|
+Burke Defense Tank|
+Chaparral Missile Artillery Tank (ERML)|
+Chaparral Missile Artillery Tank (MG)|
+Chaparral Missile Artillery Tank (SRM)|
+Chaparral Missile Artillery Tank|
+Cyrano Gunship (ML)|
+Cyrano Gunship (Plasma)|
+Cyrano Gunship|
+Demon Tank (HGR)|
+Demon Tank (Horned Demon)|
+Demon Tank (PPC)|
+Demon Tank|
+Fury Command Tank (C3M)|
+Fury Command Tank (C3S)|
+Fury Command Tank (Fury II)|
+Fury Command Tank (Original)|
+Fury Command Tank|
+Gabriel Reconnaissance Hovercraft (ERSL)|
+Gabriel Reconnaissance Hovercraft (TDF)|
+Gabriel Reconnaissance Hovercraft|
+Kanga Medium Hovertank|
+Lightning Attack Hovercraft (ERML)|
+Lightning Attack Hovercraft (ERSL)|
+Lightning Attack Hovercraft (RL)|
+Lightning Attack Hovercraft|
+Magi Infantry Support Vehicle (UCSV)|
+Magi Infantry Support Vehicle|
+Marksman Artillery Vehicle (Light PPC)|
+Marksman Artillery Vehicle|
+Nightshade ECM VTOL (Armor)|
+Nightshade ECM VTOL (LAC)|
+Nightshade ECM VTOL (Light PPC)|
+Nightshade ECM VTOL|
+Puma Assault Tank PAT-005|
+Puma Assault Tank PAT-007|
+Puma Assault Tank PAT-008|
+Rhino Fire Support Tank (Flamer)|
+Rhino Fire Support Tank (MG)|
+Rhino Fire Support Tank (ML)|
+Rhino Fire Support Tank (SL)|
+Rhino Fire Support Tank|
+Ripper Infantry Transport (ERML)|
+Ripper Infantry Transport (Infantry)|
+Ripper Infantry Transport (Light PPC)|
+Ripper Infantry Transport (MG)|
+Ripper Infantry Transport (SPL)|
+Ripper Infantry Transport|
+Rotunda Scout Vehicle RND-J-1-11|
+Thor Artillery Vehicle (C3i)|
+Thor Artillery Vehicle (Clan)|
+Thor Artillery Vehicle|
+Zephyr Hovertank (C3i)|
+Zephyr Hovertank (LRM)|
+Zephyr Hovertank (SRM2)|
+Zephyr Hovertank|
+AC/2 Carrier (LB-X)|
+Alacorn Heavy Tank Mk III|
+Alacorn Heavy Tank Mk IV|
+Alacorn Heavy Tank Mk VI|
+Alacorn Heavy Tank Mk VII|
+Axel Heavy Tank IIC|
+Axel Heavy Tank IIC (XL)|
+Badger (C) Tracked Transport A|
+Badger (C) Tracked Transport B|
+Badger (C) Tracked Transport C|
+Badger (C) Tracked Transport D|
+Badger (C) Tracked Transport E|
+Badger (C) Tracked Transport F|
+Badger (C) Tracked Transport H|
+Badger (C) Tracked Transport Prime|
+Badger Tracked Transport A|
+Badger Tracked Transport B|
+Badger Tracked Transport C|
+Badger Tracked Transport D|
+Badger Tracked Transport E|
+Badger Tracked Transport F|
+Badger Tracked Transport G|
+Badger Tracked Transport Prime|
+Bandit (C) Hovercraft A|
+Bandit (C) Hovercraft B|
+Bandit (C) Hovercraft C|
+Bandit (C) Hovercraft D|
+Bandit (C) Hovercraft E|
+Bandit (C) Hovercraft F|
+Bandit (C) Hovercraft G|
+Bandit (C) Hovercraft H|
+Bandit (C) Hovercraft Prime|
+Bandit Hovercraft A|
+Bandit Hovercraft B|
+Bandit Hovercraft C|
+Bandit Hovercraft D|
+Bandit Hovercraft E|
+Bandit Hovercraft F|
+Bandit Hovercraft G|
+Bandit Hovercraft H|
+Bandit Hovercraft I|
+Bandit Hovercraft Prime|
+Blizzard Hover Transport (SRM)|
+Blizzard Hover Transport 'Black Blizzard'|
+Blizzard Hover Transport|
+Brutus Assault Tank (LRM)|
+Brutus Assault Tank (PPC 2)|
+Brutus Assault Tank (PPC)|
+Brutus Assault Tank|
+Cavalry Attack Helicopter (Infantry)|
+Cavalry Attack Helicopter (LRM)|
+Cavalry Attack Helicopter (SRM)|
+Cavalry Attack Helicopter (TAG)|
+Cavalry Attack Helicopter|
+Centipede Scout Car (SRM)|
+Centipede Scout Car (TAG)|
+Centipede Scout Car|
+Challenger MBT X|
+Challenger MBT XI|
+Challenger MBT XII|
+Fulcrum Heavy Hovertank II|
+Fulcrum Heavy Hovertank|
+Galleon Light Tank GAL-100|
+Galleon Light Tank GAL-102|
+Galleon Light Tank GAL-103|
+Galleon Light Tank GAL-104|
+Galleon Light Tank GAL-200|
+Goblin II Infantry Support Vehicle|
+Goblin Infantry Support Vehicle|
+Hetzer Wheeled Assault Gun (LB-X)|
+Hunter Light Support Tank (3054 Upgrade)|
+Hunter Light Support Tank (ERLL)|
+Hunter Light Support Tank (LPL)|
+Hunter Light Support Tank 'Assault Hunter'|
+Karnov UR Transport (3055 Upgrade)|
+Karnov UR Transport (BA)|
+Karnov UR Transport (Periphery)|
+Kestrel VTOL (Clan)|
+Kestrel VTOL (MedEvac)|
+Kestrel VTOL (ML)|
+Kestrel VTOL (SL)|
+Kestrel VTOL (SRM)|
+Kestrel VTOL|
+LRM Carrier (3055 Upgrade)|
+LRM Carrier (WoB)|
+Manticore Heavy Tank (3055 Upgrade)|
+Manticore Heavy Tank (C3M)|
+Manticore Heavy Tank (C3S)|
+Manticore Heavy Tank (LB-X)|
+Manticore Heavy Tank (RAC)|
+Maultier Hover APC (BA)|
+Maultier Hover APC (Basic)|
+Maultier Hover APC (Fusion)|
+Maultier Hover APC (Intermediate)|
+Maultier Hover APC (MG)|
+Maultier Hover APC|
+Maxim (I) Heavy Hover Transport (Company Command)|
+Maxim (I) Heavy Hover Transport|
+Maxim Heavy Hover Transport (3052 Upgrade)|
+Maxim Heavy Hover Transport (Anti-Infantry)|
+Maxim Heavy Hover Transport (BA Factory Upgrade)|
+Maxim Heavy Hover Transport (BA Field Upgrade)|
+Maxim Heavy Hover Transport (C3M)|
+Maxim Heavy Hover Transport (C3S)|
+Maxim Heavy Hover Transport (Clan)|
+Maxim Heavy Hover Transport (Fire Support)|
+MRM Carrier|
+Ontos Heavy Tank (3053 Upgrade)|
+Ontos Heavy Tank (Light Gauss)|
+Padilla Heavy Artillery Tank (LRM)|
+Padilla Heavy Artillery Tank|
+Partisan Air Defense Tank (Company Command)|
+Partisan Air Defense Tank (Lance Command)|
+Partisan Air Defense Tank (Quad RAC)|
+Partisan Air Defense Tank (RAC)|
+Partisan Air Defense Tank (XL)|
+Partisan Air Defense Tank|
+Partisan Heavy Tank (C3)|
+Patton Tank (Ultra)|
+Pegasus Scout Hover Tank (3058 Upgrade)|
+Pegasus Scout Hover Tank (C3)|
+Pegasus Scout Hover Tank (MRM)|
+Peregrine Attack VTOL (Cargo)|
+Peregrine Attack VTOL (Kurita)|
+Peregrine Attack VTOL|
+Pilum Heavy Tank (Arrow IV)|
+Pilum Heavy Tank|
+Plainsman Medium Hovertank (Scout)|
+Plainsman Medium Hovertank (Streak)|
+Plainsman Medium Hovertank|
+Po Heavy Tank (LB-X)|
+Po Heavy Tank (Light Gauss)|
+Po Heavy Tank|
+Regulator Hovertank (Arrow IV)|
+Regulator Hovertank (RAC)|
+Regulator Hovertank|
+Rommel Tank (Gauss)|
+Saladin Assault Hover Tank (Clan Cargo)|
+Saladin Assault Hover Tank (LB-X)|
+Saladin Assault Hover Tank (Ultra)|
+Saracen Medium Hover Tank (MRM)|
+Scimitar Medium Hover Tank (TAG)|
+Scorpion Light Tank (MRM)|
+Sprint Scout Helicopter (C3)|
+Sprint Scout Helicopter (C3i)|
+Sprint Scout Helicopter (Laser)|
+Sprint Scout Helicopter (Troop Transport)|
+Sprint Scout Helicopter|
+SRM Carrier (3054 Upgrade)|
+SRM Carrier (C3)|
+SRM Carrier (WoB)|
+Striker Light Tank (3053 Upgrade)|
+Striker Light Tank (3061 Upgrade)|
+Striker Light Tank (Ammo)|
+Striker Light Tank (Laser)|
+Striker Light Tank (Narc)|
+Tokugawa Heavy Tank (C3)|
+Tokugawa Heavy Tank (MRM)|
+Tokugawa Heavy Tank (Streak)|
+Tokugawa Heavy Tank TKG-150|
+Tokugawa Heavy Tank TKG-151|
+Tokugawa Heavy Tank|
+Typhoon Urban Assault Vehicle (LB-X)|
+Typhoon Urban Assault Vehicle (RAC)|
+Typhoon Urban Assault Vehicle (Tracked)|
+Typhoon Urban Assault Vehicle|
+Vedette Medium Tank (LB-X)|
+Vedette Medium Tank (Light Gauss)|
+Vedette Medium Tank (NETC)|
+Vedette Medium Tank (RAC)|
+Vedette Medium Tank (Ultra)|
+Vedette Medium Tank 'Doris' Delight'|
+Warrior Attack Helicopter H-10|
+Warrior Attack Helicopter H-8|
+Warrior Attack Helicopter H-9|
+Yellow Jacket Gunship (Ammo)|
+Yellow Jacket Gunship (Arrow IV)|
+Yellow Jacket Gunship (RAC)|
+Yellow Jacket Gunship|
+Zhukov Heavy Tank (WoB)|
+Zhukov Heavy Tank|
+Anhur Transport (BA)|
+Anhur Transport|
+Ares Medium Tank (Plasma)|
+Ares Medium Tank|
+Asshur Artillery Spotter|
+Asshur Fast Reconnaissance Vehicle (Proto AC)|
+Asshur Fast Reconnaissance Vehicle|
+Athena Combat Vehicle (HAG)|
+Athena Combat Vehicle|
+BattleMech Recovery Vehicle|
+Chevalier Light Tank (BAP)|
+Chevalier Light Tank (MML)|
+Chevalier Light Tank (Speed)|
+Chevalier Light Tank|
+Demolisher II Heavy Tank (Thunderbolt)|
+Demolisher II Heavy Tank|
+Donar Assault Helicopter (Close Support)|
+Donar Assault Helicopter (Recon)|
+Donar Assault Helicopter|
+Epona Pursuit Tank A|
+Epona Pursuit Tank B|
+Epona Pursuit Tank C|
+Epona Pursuit Tank D|
+Epona Pursuit Tank E|
+Epona Pursuit Tank Prime|
+Flatbed Truck (AC)|
+Flatbed Truck (Armor)|
+Flatbed Truck (Mortar)|
+Flatbed Truck (SRM)|
+Flatbed Truck|
+Gladius Medium Hover Tank Mk II|
+Gladius Medium Hover Tank|
+Hachiman Fire Support Tank (AAA)|
+Hachiman Fire Support Tank|
+Hawk Moth Gunship (Armor)|
+Hawk Moth Gunship (Thunderbolt)|
+Hawk Moth Gunship|
+Heavy BattleMech Recovery Vehicle|
+Heavy Hover APC (LRM)|
+Heavy Hover APC (MG)|
+Heavy Hover APC (Scout Tank)|
+Heavy Hover APC (SRM)|
+Heavy Hover APC|
+Heavy LRM Carrier|
+Heavy MML Carrier|
+Heavy Tracked APC (LRM)|
+Heavy Tracked APC (MG)|
+Heavy Tracked APC (SRM)|
+Heavy Tracked APC|
+Heavy Wheeled APC (LRM)|
+Heavy Wheeled APC (MG)|
+Heavy Wheeled APC (SRM)|
+Heavy Wheeled APC (WoB)|
+Heavy Wheeled APC|
+Huitzilopochtli Assault Tank 'Huey' (AAA)|
+Huitzilopochtli Assault Tank 'Huey'|
+Indra Infantry Transport (BA)|
+Indra Infantry Transport|
+Ishtar Heavy Fire Support Tank (Gauss)|
+Ishtar Heavy Fire Support Tank (Original)|
+Ishtar Heavy Fire Support Tank|
+Ku Wheeled Assault Tank (IFV) 'Turhan II'|
+Ku Wheeled Assault Tank|
+Light SRM Carrier|
+Light Thunderbolt Carrier|
+Mantis Light Attack VTOL (ECCM)|
+Mantis Light Attack VTOL|
+Mars Assault Vehicle (ATM)|
+Mars Assault Vehicle (HAG)|
+Mars Assault Vehicle (XL)|
+Mars Assault Vehicle|
+Mithras Light Tank (ERLL)|
+Mithras Light Tank|
+Myrmidon Medium Tank Type 2|
+Myrmidon Medium Tank|
+Odin Scout Tank (Spotter)|
+Odin Scout Tank|
+Oro Heavy Tank (HAG)|
+Oro Heavy Tank|
+Pinto Attack VTOL (WoB)|
+Pinto Attack VTOL|
+Schiltron Mobile Fire-Support Platform A|
+Schiltron Mobile Fire-Support Platform B|
+Schiltron Mobile Fire-Support Platform C|
+Schiltron Mobile Fire-Support Platform D|
+Schiltron Mobile Fire-Support Platform E|
+Schiltron Mobile Fire-Support Platform F|
+Schiltron Mobile Fire-Support Platform Prime|
+Shamash Reconnaissance Vehicle (Flamer)|
+Shamash Reconnaissance Vehicle|
+Svantovit Infantry Fighting Vehicle (ATM) 'Masada'|
+Svantovit Infantry Fighting Vehicle (Original)|
+Svantovit Infantry Fighting Vehicle|
+Zorya Light Tank (Ammo)|
+Zorya Light Tank (ATM)|
+Zorya Light Tank|
+Enyo Strike Tank|
+Heimdall Ground Monitor Tank A|
+Heimdall Ground Monitor Tank Prime|
+Hephaestus Scout Tank A|
+Hephaestus Scout Tank B|
+Hephaestus Scout Tank C|
+Hephaestus Scout Tank Prime|
+Morrigu Fire Support Vehicle (Laser)|
+Morrigu Fire Support Vehicle|
+Shoden Assault Vehicle (Streak)|
+Shoden Assault Vehicle|
+Tyr Infantry Support Tank|
+Ajax Assault Tank A|
+Ajax Assault Tank B|
+Ajax Assault Tank Prime|
+Fortune Wheeled Assault Vehicle|
+Glaive Medium Tank|
+Glory Heavy Fire Support Vehicle (Light Gauss)|
+Glory Heavy Fire Support Vehicle|
+Main Gauche Light Support Tank (C3)|
+Main Gauche Light Support Tank (XL)|
+Main Gauche Light Support Tank|
+Manteuffel Attack Tank A|
+Manteuffel Attack Tank B|
+Manteuffel Attack Tank Prime|
+Minion Advanced Tactical Vehicle (TAG)|
+Minion Advanced Tactical Vehicle (Targeting Computer)|
+Minion Advanced Tactical Vehicle|
+Morningstar City Command Vehicle (Company Command)|
+Morningstar City Command Vehicle (Laser)|
+Morningstar City Command Vehicle|
+Musketeer Hover Tank (Armor)|
+Musketeer Hover Tank|
+Stygian Strike Tank (Armor)|
+Stygian Strike Tank|
+Enyo Strike Tank (LB-X) 'Sholef'|
+Heimdall Ground Monitor Tank B|
+Heimdall Ground Monitor Tank C|
+Hephaestus Scout Tank D|
+Morrigu Fire Support Vehicle (HAG)|
+Shoden Assault Vehicle (LB-X)|
+Tyr Infantry Support Tank (Kurita)|
+Ajax Assault Tank C|
+Ajax Assault Tank D|
+Fortune Wheeled Assault Vehicle (Thunderbolt)|
+Glaive Medium Tank (MFB)|
+Glory Heavy Fire Support Vehicle (Arrow IV)|
+Main Gauche Light Support Tank (IFV)|
+Manteuffel Attack Tank C|
+Manteuffel Attack Tank D|
+Minion Advanced Tactical Vehicle (Gauss) 'Sandblaster'|
+Morningstar City Command Vehicle (HPG)|
+Musketeer Hover Tank (3080 Upgrade)|
+Stygian Strike Tank (WOB)|
+Bellona Hover Tank (Laser)|
+Bellona Hover Tank|
+Cobra Transport VTOL (Command)|
+Cobra Transport VTOL (MASH)|
+Cobra Transport VTOL (Original)|
+Cobra Transport VTOL|
+Condor Heavy Hover Tank (Upgrade) (Laser)|
+Condor Heavy Hover Tank (Upgrade)|
+Crow Scout Helicopter 'Dragonfly'|
+Crow Scout Helicopter (C3)|
+Crow Scout Helicopter (Export)|
+Crow Scout Helicopter|
+Cyrano Gunship (Royal)|
+Daimyo HQ 67-K|
+Daimyo HQ 67-K2|
+Daimyo HQ 67-NC|
+Daimyo HQ 67-R|
+Danai Support Vehicle|
+Darter Scout Car (BAP)|
+Darter Scout Car (C3)|
+Darter Scout Car (ECM)|
+Darter Scout Car (SRM)|
+Darter Scout Car (SRM-2)|
+Darter Scout Car|
+Demon Tank (Royal)|
+DI Morgan Assault Tank (Gauss)|
+DI Morgan Assault Tank (LRM)|
+DI Morgan Assault Tank|
+Fury Command Tank (Royal)|
+Hiryo Armored Infantry Transport (Light PPC)|
+Hiryo Armored Infantry Transport (MRM)|
+Hiryo Armored Infantry Transport|
+Ignis Infantry Support Tank (SRM)|
+Ignis Infantry Support Tank|
+JES I Tactical Missile Carrier|
+Korvin Tank KRV-3|
+Lightning Attack Hovercraft (Royal)|
+Marsden II MBT II (Primitive)|
+Marsden II MBT II-A (LB-X)|
+Marsden II MBT II-A|
+Marsden II MBT|
+Mauna Kea Command Vessel (LB-X)|
+Mauna Kea Command Vessel (LRM)|
+Mauna Kea Command Vessel (LRT)|
+Mauna Kea Command Vessel|
+Merkava Heavy Tank Mk IX|
+Merkava Heavy Tank Mk VIII|
+MIT23 MASH Vehicle|
+Nightshade ECM VTOL (Royal)|
+Puma Assault Tank PAT-005b|
+Rhino Fire Support Tank (Royal)|
+Ripper Infantry Transport (Royal)|
+Sabaku Kaze Heavy Scout Hover Tank|
+Saxon APC (HQ)|
+Saxon APC (Laser)|
+Saxon APC (MASH)|
+Saxon APC|
+SM1 Tank Destroyer SM1|
+SM1A Tank Destroyer SM1A|
+SM3 Tank Destroyer SM3|
+Tamerlane Strike Sled (Flamer)|
+Tamerlane Strike Sled (RL)|
+Tamerlane Strike Sled 2|
+Tamerlane Strike Sled|
+Thumper Artillery Vehicle TAV-1|
+Thumper Artillery Vehicle TAV-2|
+Thumper Artillery Vehicle|
+Turhan Urban Combat Vehicle (C3)|
+Turhan Urban Combat Vehicle (Original)|
+Turhan Urban Combat Vehicle|
+Zephyr Hovertank (Royal)|
+Buffel Engineering Support Vehicle VII (Cargo)|
+Buffel Engineering Support Vehicle VII (Reverse)|
+Buffel Engineering Support Vehicle VII|
+Buffel Engineering Support Vehicle VIII|
+Dromedary Water Transport|
+HMRV (Hazardous Materials Recovery Vehicle) DeConAid Trailer|
+HMRV (Hazardous Materials Recovery Vehicle) 'Oppie' O-65|
+HMRV (Hazardous Materials Recovery Vehicle) 'Oppie' O-66|
+HMRV (Hazardous Materials Recovery Vehicle) Salvage Bed|
+Jifty Transportable Field Repair Unit JI-50 (Hoist)|
+Jifty Transportable Field Repair Unit JI-50 (MG)|
+Jifty Transportable Field Repair Unit JI-50 (ML)|
+Jifty Transportable Field Repair Unit JI-50 (Q-Vehicle)|
+Jifty Transportable Field Repair Unit JI-50|
+Merkava Heavy Tank Mk VII|
+Paramour Mobile Repair Vehicle (MFB)|
+Paramour Mobile Repair Vehicle|
+Prometheus Combat Support Bridgelayer|
+Nifty Transportable Field Repair Unit|
+Aeron Strike VTOL (BAP)|
+Aeron Strike VTOL|
+Augustus MBT A3|
+Balac Strike VTOL (LRM)|
+Balac Strike VTOL (Spotter)|
+Balac Strike VTOL|
+Bolla Stealth Tank (RotS) A|
+Bolla Stealth Tank (RotS) B|
+Bolla Stealth Tank (RotS) C|
+Bolla Stealth Tank Comminus|
+Bolla Stealth Tank Dominus|
+Bolla Stealth Tank Infernus|
+Bolla Stealth Tank Invictus|
+Bolla Stealth Tank (RotS) Prime|
+Carnivore Assault Tank (HAG)|
+Carnivore Assault Tank (Second Line)|
+Carnivore Assault Tank|
+Chalchiuhtotolin Support Tank (Bombast Laser)|
+Chalchiuhtotolin Support Tank (Chemical Laser)|
+Chalchiuhtotolin Support Tank|
+Demon Medium Tank (Rifle)|
+Demon Medium Tank|
+Eldingar Hover Sled (Streak)|
+Eldingar Hover Sled|
+Fensalir Combat WiGE (HAG)|
+Fensalir Combat WiGE (Infantry)|
+Fensalir Combat WiGE|
+Fox Armored Car (Flamer)|
+Fox Armored Car (VSP)|
+Fox Armored Car|
+Giggins APC (Fire Support)|
+Giggins APC|
+Gurteltier MBT (C3M)|
+Gurteltier MBT|
+J-37 Ordnance Transport (Original)|
+J-37 Ordnance Transport|
+JES II Strategic Missile Carrier (Ammo)|
+JES II Strategic Missile Carrier|
+Joust Medium Tank BE700|
+Joust Medium Tank BE701|
+Kinnol MBT (PPC)|
+Kinnol MBT|
+Marksman MBT M1|
+Marksman MBT M1A|
+Maxim Mk II Transport (Infantry Support) 'Shiloh'|
+Maxim Mk II Transport|
+Moltke MBT M1|
+Moltke MBT M2|
+Moltke MBT M3|
+Padilla Tube Artillery Tank (LTC)|
+Padilla Tube Artillery Tank (Thumper)|
+Padilla Tube Artillery Tank|
+Palmoni Assault Infantry Fighting Vehicle|
+Pandion Combat WiGE (C3)|
+Pandion Combat WiGE (Infantry)|
+Pandion Combat WiGE|
+Po II Heavy Tank (Arrow IV)|
+Po II Heavy Tank|
+Prowler Multi-Terrain Vehicle (ECM)|
+Prowler Multi-Terrain Vehicle (RAF)|
+Prowler Multi-Terrain Vehicle (Sealed)|
+Prowler Multi-Terrain Vehicle (Succession Wars)|
+Prowler Multi-Terrain Vehicle (Support)|
+Prowler Multi-Terrain Vehicle (WoB)|
+Prowler Multi-Terrain Vehicle|
+Ranger Armored Fighting Vehicle VV1 (MG)|
+Ranger Armored Fighting Vehicle VV1|
+Ranger Armored Fighting Vehicle VV2|
+Ranger Armored Fighting Vehicle VV22|
+Regulator II Hovertank (RAC)|
+Regulator II Hovertank (Stealth)|
+Regulator II Hovertank|
+Tonbo Superheavy Transport|
+Trajan Assault Infantry Fighting Vehicle (ICE)|
+Trajan Assault Infantry Fighting Vehicle|
+Transportable Field Repair Unit JI-100|
+Trireme Infantry Transport (CS)|
+Trireme Infantry Transport|
+Tufana Hovercraft (iNarc)|
+Tufana Hovercraft|
+Winston Combat Vehicle (LAC)|
+Winston Combat Vehicle|
+Yasha VTOL (Interdictor)|
+Yasha VTOL 'Spectre'|
+Yasha VTOL|
+Zephyros Infantry Support Vehicle (Dual Turret)|
+Zephyros Infantry Support Vehicle|
+Zugvogel Omni Support Aircraft A|
+Zugvogel Omni Support Aircraft B|
+Zugvogel Omni Support Aircraft C|
+Zugvogel Omni Support Aircraft D 'Raubvogel'|
+Zugvogel Omni Support Aircraft E|
+Zugvogel Omni Support Aircraft Prime|
+Ajax Assault Tank (Sealed)|
+Beagle Hover Scout (Sealed)|
+Brutus Assault Tank (HPPC)|
+Challenger MBT XIVs|
+Chaparral Missile Artillery Tank (CASE)|
+Demolisher II Heavy Tank (MML)|
+Drillson Heavy Hover Tank (Sealed)|
+Fortune Wheeled Assault Vehicle (C3M)|
+Fulcrum Heavy Hovertank III|
+Goblin Infantry Support Vehicle (Sealed)|
+Hetzer Wheeled Assault Gun (Sealed)|
+JES I Tactical Missile Carrier (3082 Upgrade)|
+Manticore Heavy Tank (HPPC)|
+Ontos Heavy Tank (MML)|
+Ontos Heavy Tank (Sealed)|
+Partisan Air Defense Tank (Cell)|
+Partisan Air Defense Tank (LRM)|
+Pegasus Scout Hover Tank (Sealed)|
+Plainsman Medium Hovertank (Sealed)|
+Rommel Tank (Sealed)|
+Savannah Master Hovercraft (Interdictor)|
+Schrek PPC Carrier (Armor)|
+Schrek PPC Carrier (C3M)|
+Scimitar Medium Hover Tank (C3)|
+Scorpion Light Tank (LAC)|
+Shamash Reconnaissance Vehicle (Interdictor)|
+Skulker Wheeled Scout Tank (C3M)|
+Sprint Scout Helicopter (Interdictor)|
+Striker Light Tank (Sealed)|
+Vedette Medium Tank (Cell)|
+Yellow Jacket Gunship (PPC)|
+Zhukov Heavy Tank (LB-X)|
+Zhukov Heavy Tank (Liao)|
+Bokkusu Support Trailer|
+Manta Fast Attack Submarine|
+Manta Fast Attack Submarine (Support)|
+Moray Heavy Attack Submarine (Original)|
+Moray Heavy Attack Submarine|
+Tenmaku Command Trailer (Standard|
+Teppo Artillery Vehicle|
+Aesir Medium AA Vehicle (HAG)|
+Aesir Medium AA Vehicle|
+Anat APC|
+Gurzil Support Tank|
+Hadur Fast Support Vehicle|
+Nacon Armored Scout|
+Skadi Swift Attack VTOL|
+Skanda Light Tank|
+Ballista Artillery Trailer|
+Destrier Siege Vehicle|
+Hanse MBT|
+Hasek Mechanized Combat Vehicle|
+JI2A1 Attack APC (MML)|
+JI2A1 Attack APC|
+Kruger Combat Car (Original)|
+Kruger Combat Car|
+Marten Scout VTOL (Infantry)|
+Marten Scout VTOL|
+Paladin Defense System|
+Sniper Artillery|
+Sortek Assault Craft (Interdictor)|
+Sortek Assault Craft|
+Zibler Fast Strike Tank (A)|
+Zibler Fast Strike Tank (B)|
+Zibler Fast Strike Tank (C)|
+Zibler Fast Strike Tank (D)|
+Zibler Fast Strike Tank (Prime)|
+Cizin Hover Tank|
+Cizin Hover Tank (Support)|
+Kamakiri Attack VTOL (Gauss) 'Shi Kamakiri'|
+Kamakiri Attack VTOL|
+Mamono IFV|
+Narukami Heavy Tank NK-1C|
+Narukami Heavy Tank NK-BC3|
+Saladin Mk II HCV (BC3)|
+Saladin Mk II HCV|
+Saracen Mk II HCV (BC3)|
+Saracen Mk II HCV|
+Scimitar Mk II HCV (3136 Upgrade)|
+Scimitar Mk II HCV (BC3)|
+Scimitar Mk II HCV|
+Sekhmet Assault Vehicle|
+Shillelagh Missile Tank (Original)|
+Shillelagh Missile Tank|
+SM2 Heavy Artillery Vehicle (LTC)|
+SM2 Heavy Artillery Vehicle|
+Arrow IV Assault Vehicle|
+Behemoth II Heavy Tank|
+Behemoth II Heavy Tank (Support)|
+Luduan Scout Vehicle|
+Nisos Attack WIGE|
+Nisos Attack WIGE (Support)|
+Pixiu Heavy Tank|
+Predator Tank Destroyer (Original)|
+Predator Tank Destroyer|
+Sheriff Infantry Support Tank|
+Shun Transport VTOL|
+Zahn Heavy Transport|
+Bardiche Heavy Strike Tank (Minesweeper)|
+Bardiche Heavy Strike Tank|
+Bulwark Assault Vehicle (Original)|
+Bulwark Assault Vehicle|
+Partisan AA Vehicle (3134 Upgrade)|
+Partisan AA Vehicle|
+R10 Mechanized ICV (A)|
+R10 Mechanized ICV (B)|
+R10 Mechanized ICV (Coolant Truck)|
+R10 Mechanized ICV (Prime)|
+Red Kite Attack VTOL|
+Thang-Ta APC|
+Bishop Transport VTOL|
+Cardinal Transport (RAF)|
+Cardinal Transport|
+Garrot Superheavy Transport|
+Gossamer VTOL (XL)|
+Gossamer VTOL|
+Lamprey Transport Helicopter|
+Savior Repair Vehicle|
+Testudo Siege Tank|
+Gun Trailer (Ambush)|
+Gun Trailer (Artillery/AA)|
+Gun Trailer (LRM)|
+Gun Trailer (Mjolnir)|
+Gun Trailer (Siege)|
+Gun Trailer (Sniper Cannon)|
+Gun Trailer (Stronghold)|
+Gun Trailer (Thumper)|
+Gun Trailer (Thunderbolt)|
+Gun Trailer (Ultra)|
+Balac Strike VTOL (Hybrid)|
+Bolla Stealth Tank (RotS) D|
+Bulldog Medium Tank (Cell)|
+Chalchiuhtotolin Support Tank (XL)|
+Condor Heavy Hover Tank (Laser Upgrade)|
+Demon Medium Tank (Armor)|
+Eldingar Hover Sled 'HumHov'|
+Fox Armored Car (Interdictor)|
+Fury Command Tank (Fury III)|
+Fury Command Tank (Fury IIIm)|
+Glory Heavy Fire Support Vehicle (3090 Upgrade)|
+Harasser Missile Platform (MML)|
+Harasser Missile Platform (Thunderbolt)|
+Heimdall Ground Monitor Tank D|
+Huitzilopochtli Assault Tank 'Huey' (LRM)|
+Huitzilopochtli Assault Tank 'Huey' (Streak)|
+JES II Strategic Missile Carrier (Support)|
+Kinnol MBT (RAC)|
+Manteuffel Attack Tank E|
+Marksman MBT M1J|
+Maxim Mk II Transport (ECM)|
+MIT24 MASH Vehicle|
+Mobile Long Tom Artillery LT-MOB-95|
+Mortar Carrier|
+Padilla Tube Artillery Tank (AMS)|
+Pilum Heavy Tank (ELRM)|
+Po II Heavy Tank (Gauss)|
+Po II Heavy Tank (Stealth)|
+Prowler Multi-Terrain Vehicle (3140 Upgrade)|
+Prowler Multi-Terrain Vehicle (Security)|
+Ranger Armored Fighting Vehicle VV1 (Interdictor)|
+Vedette Medium Tank V9|
+Winston Combat Vehicle (Support)|
+Winston Combat Vehicle (TSEMP)|
+Winston Combat Vehicle (XXL)|
+Zugvogel Omni Support Aircraft F|
+Crane Heavy Transport|
+Hawk Moth II Gunship (MML)|
+Hawk Moth II Gunship (Sniper)|
+Hawk Moth II Gunship|
+JES III Missile Carrier (C3)|
+JES III Missile Carrier (MML)|
+JES III Missile Carrier (Speed)|
+JES III Missile Carrier|
+JES III Missile Carrier (Thunderbolt)|
+MHI Amphibious APC|
+MHI Defense AA Tank|
+Scapha Hovertank (A)|
+Scapha Hovertank (B)|
+Scapha Hovertank (C)|
+Scapha Hovertank (D)|
+Scapha Hovertank (E)|
+Scapha Hovertank (F)|
+Scapha Hovertank (G)|
+Scapha Hovertank (H)|
+Scapha Hovertank (I)|
+Scapha Hovertank (J)|
+Scapha Hovertank (Primary)|
+Shandra Advanced Scout Vehicle (Original)|
+Shandra Advanced Scout Vehicle|
+DI Multipurpose VTOL (Gunship)|
+DI Multipurpose VTOL|
+DI Schmitt Tank|
+DI Schmitt Tank (Targeting Computer)|
+Gulltoppr OmniMonitor (A)|
+Gulltoppr OmniMonitor (B)|
+Gulltoppr OmniMonitor (Prime)|
+Kelswa Assault Tank|
+Manticore II Heavy Tank|
+Schildkröte Line Tank|
+Swallow Attack WIGE (Original)|
+Swallow Attack WIGE|
+Winterhawk APC|
+Bardiche Heavy Strike Tank C|
+Bellona Hover Tank (XL)|
+Devastator II Superheavy Tank|
+Fensalir Combat WiGE (3132 Upgrade)|
+Fensalir Combat WiGE (3137 Upgrade)|
+Fensalir Combat WiGE (Stealth)|
+Galleon Light Tank GAL-105|
+Hadur Fast Support Vehicle (LRM)|
+Hadur Fast Support Vehicle (Reactive)|
+Kite Reconnaissance Vehicle (Fusion)|
+Kite Reconnaissance Vehicle|
+Pandion Combat WiGE (3135 Upgrade)|
+Pandion Combat WiGE (3140 Upgrade)|
+Predator Tank Destroyer (Elite)|
+Schildkröte Line Tank (HPPC)|
+Schildkröte Line Tank (Light Gauss)|
+Schildkröte Line Tank (Plasma)|
+Sekhmet Assault Vehicle (Streak)|
+Shun Transport VTOL (Support)|
+Skanda Light Tank (TSEMP)|
+Swallow Attack WiGE (Spotter)|
+Boreas Cavalry Hovercraft A|
+Boreas Cavalry Hovercraft B|
+Boreas Cavalry Hovercraft (Prime)|
+Hoodling Sensor HoverJeep|
+HoverPod|
+JI-002 HoverBike|
+Harpoon ParaSub|
+Small Steamer|
+HTE Micro-Copter|
+Assuan Armored Bike|
+Beast Riot Car|
+Death Trike|
+Dune Buggy|
+Eagre Firefighting ATV|
+Tracked Quad|
+Mobile Tactical Command HQ|
+Shackleton AESV|
+Estevez MBT (Anti-Aircraft)|
+Estevez MBT|
+Marsden I|
+Praetorian Mobile Strategic Command HQ|
+Tribune Mobile Tactical Command HQ|
+Kokou Defense Tank (XL)|
+Kokou Defense Tank|
+Manticore Heavy Tank EC|
+Rhino Fire Support Tank EC|
+Zephyr Hovertank EC|
+Apocalypse World Rover|
+Generic Expandable Services Vehicle (Command Post)|
+Generic Expandable Services Vehicle (Field Kitchen)|
+Generic Expandable Services Vehicle (MASH)|
+Generic Expandable Services Vehicle Trailer (Bunk)|
+Generic Expandable Services Vehicle Trailer (Cargo)|
+Heavy Combat ATV|
+Obuzaabaa Tactical Vehicle|
+Sasayaku Control Transport|
+Apple-Churchill Surveillance VTOL|
+C-85 Sprinter Delivery Vehicle|
+Hector Road Train Tractor|
+Hector Road Train Trailer Module (Liquid)|
+Hector Road Train Trailer Module (Livestock)|
+Hector Road Train Trailer Module (Passenger)|
+Hector Road Train Trailer Module (Refrigerated)|
+Hector Road Train Trailer Module|
+Ibex RV (Militarized:Gauss)|
+Ibex RV (Militarized:MG)|
+Ibex RV|
+Ballista Self-Propelled Artillery Tank|
+Pollux ADA Heavy Tank|
+Vali Artillery Vehicle|
+Vector Combat Support VTOL (Attack)|
+Vector Combat Support VTOL (EW)|
+Vector Combat Support VTOL (Scout)|
+Vector Combat Support VTOL|
+Weapon Carrier (Tracked) (AC/20)|
+Weapon Carrier (Tracked) (LB-10X)|
+Weapon Carrier (Tracked) (Ultra/5)|
+Gallant Urban Assault Tank|
+Hipparch Cavalry Tank|
+Tiger Medium Tank T-12|
+Wayland Mobile Base|
+Sleipnir APC Tank (SRM)|
+Sleipnir APC Tank|
+Vargr APC Tank (LRM)|
+Vargr APC Tank|
+Hoverbike (Laser)|
+Hoverbike (MG)|
+Hoverbike|
+Minigun Cycle (SRM)|
+Minigun Cycle|
+Monocycle|
+Scout ATV|
+TrackBike|
+Trike|
+Prime Mover (Original)|
+Prime Mover (Succession Wars)|
+Prime Mover|
+Sturmvogel Gunship WiGE|
+Sturmvogel Maritime Patrol WiGE (LB-10X)|
+Sturmvogel Maritime Patrol WiGE (LB-2X)|
+Sturmvogel Maritime Patrol WiGE|
+Wheeled Scout (Camera)|
+Wheeled Scout (Sensors)|
+Wheeled Scout|
+Brunel Dump Truck (AC)|
+Brunel Dump Truck (LRM)|
+Burke Defense Tank (Royal)|
+Flatbed Truck (LRM)|
+Flatbed Truck (RL)|
+Galleon Light Tank GAL-200 (RL)|
+Kanga Medium Hovertank (AC)|
+Marksman Artillery Vehicle (AC)|
+Rotunda Scout Vehicle RND-J-1-11 (LRM)|
+Rotunda Scout Vehicle RND-J-1-11 (RL)|
+Rotunda Scout Vehicle RND-J-1-11 (SRM)|
+Thor Artillery Vehicle (AC)|
+Von Luckner Heavy Tank (Royal)|
+Von Luckner Heavy Tank (Star League)|
+Aithon Assault Transport|
+Bandit Hovercraft Mk 2|
+Cavalry Attack Helicopter (Infiltrator)|
+Challenger MBT Mk. XV|
+Enyo Strike Tank (ER Pulse)|
+Fulcrum Heavy HoverTank (Hybrid)|
+Garuda Heavy VTOL|
+Heavy NLRM Carrier|
+Hephaestus Jump Tank (AP)|
+Hephaestus Jump Tank|
+Hiryo Armored Infantry Transport 'BloodHound'|
+Hunter Light Support Tank (Amphibious)|
+Kalki Cruise Missile Launcher|
+Lexan Surveillance VTOL (Production)|
+Myrmidon Medium Tank (Anti-Infantry)|
+Nishikigoi Support Aircraft Koi Variant|
+Nuberu Anti Aircraft Tank 2 'Numantia'|
+Nuberu Anti Aircraft Tank|
+Ontos Heavy Tank HEAT|
+Pegasus Scout Hover Tank X-Pulse|
+Phalanx Support Tank (Production)|
+Phalanx Support Tank (Prototype)|
+Po Heavy Tank (HV)|
+Rommel Tank (Howitzer) Production|
+Scorpion Light Tank (Minesweeper)|
+Sea Skimmer Hydrofoil (ELRM)|
+Skulker Wheeled Scout Tank Mk II|
+Sokar Urban Combat Unit|
+Thumper Artillery Vehicle Angel|
+Vedette Medium Tank V7|
+Vidar Heavy Defense Tank|
+Warrior Stealth Helicopter S-9|
+Bulldog Medium Tank (Chemical)|
+Bulldog Medium Tank (ERLL)|
+Bulldog Medium Tank (LB-X)|
+Bulldog Medium Tank (Plasma)|
+Demolisher Heavy Tank (Arrow IV)|
+Demolisher Heavy Tank (Cell)|
+Demolisher Heavy Tank (Clan)|
+Demolisher Heavy Tank (Gauss)|
+Demolisher Heavy Tank (MRM)|
+Demolisher Heavy Tank (Reinforced)|
+Pegasus Scout Hover Tank (Upgrade)|
+Condor Heavy Hover Tank (Fusion)|
+Condor Heavy Hover Tank (LAC)|
+Condor Heavy Hover Tank (Laser)|
+Condor Heavy Hover Tank (Ultra)|
+Condor Heavy Hover Tank C|
+Maxim Heavy Hover Transport (Escort)|
+Buzzard Hover Tank|
+Falcon Hover Tank|
+Galleon Light Tank C|
+Galleon Light Tank GAL-106|
+Galleon Light Tank GAL-106M|
+Galleon Light Tank GAL-200R|
+Galleon Light Tank GAL-201|
+Galleon Light Tank GAL-300|
+Hawk Hover Tank (LTV-4)|
+Kamisori Light Tank A|
+Kamisori Light Tank B|
+Kamisori Light Tank C|
+Kamisori Light Tank Prime|
+Kamisori Light Tank R|
+Patton Tank (Taurian)|
+Patton Tank (XL)|
+Mobile Long Tom Artillery LT-MOB-25F (Ammunition Carriage)|
+Mobile Long Tom Artillery LT-MOB-25F (Ammunition Loader Carriage)|
+Mobile Long Tom Artillery LT-MOB-25F (Drone Command Carriage)|
+Mobile Long Tom Artillery LT-MOB-25F (Support Carriage)|
+Mobile Long Tom Artillery LT-MOB-25F|
+Skulker Wheeled Scout Tank C|
+SturmFeur Heavy Tank (Assault)|
+SturmFeur Heavy Tank (Cell)|
+SturmFeur Heavy Tank (Heavy Gauss)|
+SturmFeur Heavy Tank (SRM)|
+SturmFeur Heavy Tank (Steiner)|
+SturmFeur Heavy Tank (Support) 'Gilmore'|
+SturmFeur Heavy Tank (WoB)|
+SturmFeur Heavy Tank|
+Warrior Attack Helicopter H-7F|
+Whirlwind Scout Hover Tank (AAA)|
+Whirlwind Scout Hover Tank (IFV)|
+Whirlwind Scout Hover Tank|
+Browning Mobile HQ (Half Track)|
+Browning Mobile HQ|
+Command Van (ICE)|
+Command Van (Q-Vehicle)|
+Command Van|
+Eurus MBT A|
+Eurus MBT B|
+Eurus MBT C|
+Eurus MBT D|
+Eurus MBT Prime|
+Hetzer Wheeled Assault Gun (Cell)|
+Hetzer Wheeled Assault Gun C|
+Ontos Heavy Tank (Chemical Laser)|
+LRM Carrier C|
+Onuris Attack VTOL A|
+Onuris Attack VTOL B|
+Onuris Attack VTOL C|
+Onuris Attack VTOL D|
+Onuris Attack VTOL E|
+Onuris Attack VTOL Prime|
+Pike Support Vehicle (Clan)|
+Pike Support Vehicle (LB-X)|
+Pike Support Vehicle (Plasma)|
+Pike Support Vehicle (RAC) 'Assault Pike'|
+SRM Carrier C|
+Behemoth Heavy Tank (Davion)|
+Behemoth Heavy Tank (Kurita Upgrade)|
+Behemoth Heavy Tank (Kurita)|
+Behemoth Heavy Tank (Liao)|
+Behemoth Heavy Tank (Refit)|
+Harrier Heavy Hover Tank (PPC)|
+Harrier Heavy Hover Tank (Re-Laser)|
+Harrier Heavy Hover Tank|
+Manticore Heavy Tank (XL)|
+MASH Truck (AMS)|
+Savannah Master Hovercraft (Reflective)|
+Skimmer|
+Drillson Heavy Hover Tank C 2|
+Drillson Heavy Hover Tank C|
+Drillson Heavy Hover Tank (ERLL)|
+Drillson Heavy Hover Tank (MML)|
+Drillson Heavy Hover Tank (Streak)|
+J. Edgar Light Hover Tank (Chemical)|
+J. Edgar Light Hover Tank (Kurita)|
+J. Edgar Light Hover Tank (LAC)|
+J. Edgar Light Hover Tank (Light PPC)|
+J. Edgar Light Hover Tank (TAG)|
+J. Edgar Light Hover Tank (X-Pulse)|
+Schrek AC Carrier (Lothian)|
+Schrek AC Carrier|
+Schrek Gauss Carrier|
+Schrek PPC Carrier (LB-X)|
+Schrek PPC Carrier (XL)|
+Vedette Medium Tank (Armor)|
+Von Luckner Heavy Tank VNL-K65W|
+Von Luckner Heavy Tank VNL-K75N|
+Von Luckner Heavy Tank VNL-K85N|
+Von Luckner Heavy Tank VNL-K90|
+SM5 Field Commander Prime|
+Packrat LRPV PKR-T5 (TOC)|
+Awesome C|
+Auxiliary Defense Tank ADT-1|
+Auxiliary Defense Tank ADT-2|
+Desert Scorpion Light Tank|
+Outrider|
+Bayamo Hoverbike|
+BFFL 'Buffalo'|
+Champion Hoversports Crimson Streak Hover Racer|
+Champion Hoversports CS535 Hover Car|
+Deusenberg VIP Luxury Hovercar|
+Deusenberg VIP Luxury Hovercar (Original)|
+Freedom 900 Hover Jeep|
+Ina-du Swamp Skimmer|
+Kressly Dillinger Police Vehicle|
+Lewis Skimmer Bus|
+Routemaster Hover Shuttle|
+Slipper Hovercar LX-Series|
+Baleena Passenger Submarine|
+Jonah Submarine JN-002|
+Seahorse Cargo Sub|
+Atlantia Luxury Yacht|
+Silverback Coastal Cutter|
+Silverfin Coastal Cutter|
+Whitestreak Jetski|
+Whitestreak Speedboat|
+Adelante Passenger/Cargo Train|
+TGV Omni Railcar Primary Configuration|
+Cellco Ranger UPU-3000|
+Corx Mobile Tunnel Miner|
+Croyle Systems Cortez Series N|
+Donovan-Miter Magellan Series Four|
+Galaport Ground Trailer|
+Galaport Ground Tug|
+Gienah-Durapaq Elite Land Train (Tractor) Series 3|
+Gienah-Durapaq Elite Land Train (Trailer) Series 3T|
+Hesiod Utility Vehicle B (Bulldozer)|
+Hesiod Utility Vehicle Prime (Cargo)|
+Hesiod Utility Vehicle C (Crane)|
+Hesiod Utility Vehicle A (Harvester)|
+Kallon UL-series Construction Vehicle UL-10 'Backhoe'|
+Luciano White Wolverine|
+Raptor RRV|
+RRV 'Rock Rover' Half-Track|
+Saturn Harvester|
+Sherpa Armored Truck (MASH)|
+Sherpa Armored Truck|
+Blackstone Baronet Passenger VTOL|
+Blackstone Pegasus Passenger VTOL|
+Cal-Boeing Swiftran RTC-215M (Passenger)|
+Lexan Oceanic Luxury VTOL Series VI|
+Lexan Oceanic Personal VTOL Series II|
+Peacekeeper SWAT Carrier|
+Pion-Laurier Cascatelle|
+Lama-Deux Firefighting VTOL|
+Sky Eye News Helicopter|
+SOAR|
+St. Christopher Cargo Lifter C1|
+St. Christopher Cargo Lifter C2|
+Aston-Martin Fiver Roadster|
+Aston-Martin Fiver Traveler|
+Bailey Armored Car|
+Brunel Dump Truck|
+Bulldog Medium Truck|
+Ceres-Bikes Flashbang ZZ10000|
+Durandel-British 'Blue Nova' Convertible|
+Iveco Burro Heavy Support Truck|
+Iveco Burro II Super Heavy Cargo Truck|
+Knox Armored Car|
+Lesseps Dump Truck|
+Mao-Heng Charioteer (Original)|
+Motuo Che Shang No.2|
+Pit Bull Medium Truck|
+Prairie Schooner Land Train|
+Prairie Schooner Module|
+Saturnus V Grande Circuit Racer|
+Saurer-Bucher Fire Engine TLF-LL6500|
+Simca Ambulance|
+Skoda 'Growler' Service Utility Truck|
+Coanda Personal Sports Craft|
+Cormorant Medium Cargo Craft (Cargo)|
+Cormorant Medium Cargo Craft|
+Fulmar Patrol Craft (Original)|
+Fulmar Patrol Craft|
+Koi Heavy Transport|
+Quicksilver Personal Sports Craft|
+Ryu Heavy Transport|
+Koryu Submarine (Civilian)|
+Koryu Submarine (Military)|
+Neptune Submarine (Hunter-Killer)|
+Heavy Weapons Carrier (PPC)|
+Tokugawa Heavy Tank SD2|
+Pollux II ADA Heavy Tank|
+Vedette Medium Tank (AC/10)|
+Weapons/Troop Carrier (LRM)|
+Flatbed Railcar|
+Goblin Medium Tank X|
+Heavy LRM Carrier (EN Variant)|
+Jagdpanzer II|
+Lexan Surveillance Helo|
+Sea Hunter Maritime Tank|
+Athena Combat Vehicle XR|
+Enyo Strike Tank XR|
+Demon Tank CX-2|
+Fury Command Tank CX-17|
+Lightning Attack Hovercraft CX-3|
+Maxim Flanker|
+Partisan Hull Defense|
+Sea Skimmer Hydrofoil 'Sniper'|
+Skulker Wheeled Scout Tank X-5|
+SturmFeur 'Kalki' Cruise Missile Launcher|
+Cavalry Attack Helicopter Cadence Rain|
+Challenger MBT XVc|
+Fulcrum Heavy HoverTank X|
+Bandit Hovercraft 'Warthog'|
+Manticore Heavy Tank 'The Ballista'|
+Minion Advanced Tactical Vehicle 'Silver Bullet'|
+Beagle Hover Scout (LRRP)|
+Burke II Superheavy Tank|
+Cyrano Gunship (Fury)|
+Rhino Fire Support Tank (Hagar)|
+Hiryo Armored Infantry Transport 'Hound'|
+Pegasus Scout Hover Tank X|
+Tokugawa Heavy Tank Yumi|
+Po Heavy Tank (HV Prototype)|
+Regulator Hovertank (Alan)|
+Scorpion Light Tank (Minesweeper Prototype)|
+Galleon Light Tank Maxwell|
+Thumper Artillery Vehicle Maxwell|
+Kanga-X Jump Tank|
+Schrek II-X PPC Carrier|
+Vedette Medium Tank V-G7X|
+Warrior Attack Helicopter HX-9|
+Fensalir Combat WiGE (XXL)|
+Harasser Missile Platform (Fuel Cell)|
+Hawk Moth Gunship 'Vedwandlung'|
+Karnov UR Transport (Heavy Stealth)|
+Von Luckner Heavy Tank VNL-X71 (Yakuza)|
+Danai Support Vehicle (Arrow)|
+Dreadnought Mk II Land Trailer Configuration #1|
+Dreadnought Mk II Land Trailer Configuration #2|
+Dreadnought Mk II Land Trailer Configuration #3|
+Dreadnought Mk II Land Trailer Configuration #4|
+Dreadnought Mk II Land Train|
+Patton Tank -SB|
+Saladin Assault Hover Tank Ifrit|
+Ferret Light Scout VTOL 'Fermi'|
+Hi-Scout Drone Carrier (Cunnington)|
+Packrat LRPV 'Gespenst'|
+SM1 Tank Destroyer (Telos)|
+Anhur (P-Stealth)|
+Myrmidon Medium Tank P (Tate)|
+Ontos Heavy Tank X 'All-Aspect Assault Tank'|
+Striker Light Tank 'Wet Striker'|
+Armored Personnel Carrier (Hover Primitive)|
+Armored Personnel Carrier (Tracked Primitive)|
+Armored Personnel Carrier (Wheeled Primitive)|
+Merkava Heavy Tank Mk VI|
+Sand Devil Hover Tank|
+Stoat Scout Car|
+AC/2 Carrier (Primitive)|
+LRM Carrier (Primitive)|
+LTV-4 Hover Tank|
+Mosquito Light Fighter|
+Randolph Support Vehicle|
+SRM Carrier (Primitive)|
+Strike Falcon Attack VTOL|
+Alacorn Heavy Tank Mk I|
+Alacorn Heavy Tank Mk II|
+Caravan Heavy Transport|
+Carter Medical Emergency Response Vehicle|
+Korvin Tank KRV-2|
+Chi-Ha Infantry Combat Vehicle (Original)|
+Chi-Ha Infantry Combat Vehicle|
+Cobra VTOL Transport (Fusion)|
+Cobra VTOL Transport|
+Sturmblitz Assault Gun|
+Apostle Self-Propelled Artillery|
+Asher Hover Scout|
+Dunning Mobile Tactical Command Post|
+Reaper Self-Propelled Artillery|
+RR-3 Recovery Vehicle|
+UTR-588 Recovery Vehicle|
+Condor Multi-Purpose Tank (Reactive)|
+Condor Multi-Purpose Tank|
+Diggs Drone Control Tank|
+Hexareme HQ Hovercraft|
+Quaestor Mobile Tactical Command HQ|
+Strix Stealth VTOL|
+Zephyr Hovertank (Omnidrone) A|
+Zephyr Hovertank (Omnidrone) B|
+Zephyr Hovertank (Omnidrone) C|
+Zephyr Hovertank (Omnidrone) Prime|
+Padilla Anti-Missile Tank|
+Barouche Military Transport|
+Humming Bird VTOL (Rescue)|
+Hwacha Urban Combat Vehicle HW1|
+Nike Air Defense Platform|
+White Tip Submarine|
+Centipede Scout Car Commando|
+Demolisher II Heavy Tank II-X|
+Rommel Tank (Howitzer) Prototype|
+Buffalo Drone Bomb|
+Condor Heavy Hover Tank (Fission)|
+J. Edgar Light Hover Tank (Cell)|
+Kestrel VTOL (Scout)|
+Soarece Superheavy MBT|
+Aegis Heavy Cruiser (2843)|
+Black Lion II Battlecruiser (2843)|
+Cameron Battlecruiser (2851)|
+Carrack Transport (Merchant 2985)|
+Congress Frigate (2914)|
+Essex II Destroyer (2862)|
+Fredasa Corvette Raider (2962)|
+Liberator Cruiser (3024)|
+Lola III Destroyer (2841)|
+McKenna Battleship (2851)|
+Nightlord Battleship (2932)|
+Potemkin Troop Cruiser (2875)|
+Sovetskii Soyuz Heavy Cruiser (2845)|
+Sovetskii Soyuz Heavy Cruiser (Dire Wolf) (2845)|
+Texas Battleship (2835)|
+Vincent Corvette Mk 42|
+Volga Transport (2836)|
+Whirlwind Destroyer (2901)|
+York Destroyer Carrier (2947)|
+Aegis Heavy Cruiser (2372)|
+Aegis Heavy Cruiser (2582)|
+Atreus Battleship (2552)|
+Avatar Heavy Cruiser (2531)|
+Baron Destroyer (2520)|
+Black Lion II Battlecruiser (2691)|
+Bonaventure Corvette (2317)|
+Cameron Battlecruiser (2688)|
+Carrack Transport (2600)|
+Carson Destroyer (2632)|
+Congress Frigate (2542)|
+Dart Light Cruiser (2305)|
+Davion Destroyer Block I|
+Davion Destroyer Block II|
+Essex II Destroyer (2711)|
+Farragut Battleship (2448)|
+Fox Corvette (3057)|
+Impavido Destroyer (3058)|
+Kimagure Pursuit Cruiser (2582)|
+Kirishima Cruiser (3061)|
+Kyushu Frigate (3057)|
+Lola I Destroyer (2345)|
+Lola II Destroyer (2622)|
+Lola III Destroyer (2662)|
+Luxor Heavy Cruiser (2727)|
+Mako Corvette (2692)|
+McKenna Battleship (2652)|
+Monsoon Battleship (2368)|
+Monsoon Battleship (LF) (2574)|
+Naga Destroyer (2645)|
+Nightwing Surveillance (2447)|
+Pinto Corvette (2502)|
+Potemkin Troop Cruiser (2611)|
+Quixote Frigate (2350)|
+Riga Frigate (2440)|
+Sovetskii Soyuz Heavy Cruiser (2742)|
+Suffren Destroyer (3062)|
+Sylvester Transport (2499)|
+Texas Battleship (2618)|
+Tracker Surveillance (2407)|
+Vigilant Corvette (2320)|
+Vincent Corvette Mk 39|
+Volga Transport (2709)|
+Wagon Wheel Frigate (2570)|
+Whirlwind Destroyer (2606)|
+Winchester Cruiser (2364)|
+Carrack Transport (Clan)|
+Conqueror Battlecruiser Carrier|
+Leviathan Heavy Transport|
+Leviathan II Battleship|
+Dante Frigate|
+Avalon Cruiser|
+Inazuma Corvette|
+Tatsumaki Destroyer|
+Feng Huang Cruiser (Upgrade)|
+Feng Huang Cruiser|
+Agamemnon Heavy Cruiser|
+Eagle Frigate|
+Thera Carrier|
+Zechetinu Corvette|
+Zechetinu II Corvette|
+Mjolnir Battlecruiser|
+Du Shi Wang Battleship|
+Robinson Transport Block I|
+Robinson Transport Block II|
+Samarkand Carrier Block I|
+Samarkand Carrier Block II|
+Tharkad Battlecruiser (2690)|
+Tharkad Battlecruiser (WoB)|
+Newgrange III Yardship (2700)|
+Quicksilver Mongoose Battleship|
+Black Lion I Battlecruiser|
+Soyal Heavy Cruiser|
+Congress D Frigate|
+Defender Battlecruiser|
+Cruiser|
+Narukami Destroyer (Block I)|
+Narukami Destroyer (Block II)|
+League Destroyer (Block I)|
+League Destroyer (Block II)|
+Athena Cruiser (2569)|
+Essex I Destroyer (2351)|
+Riga II Destroyer/Carrier (2747)|
+Commonwealth Light Cruiser (Block I)|
+Commonwealth Light Cruiser (Block II)|
+Corone Destroyer (2915)|
+Molniya Corvette (2951)|
+Peregrine Corvette (2969)|
+Capital Drone M-5 'Caspar'|
+Capital Drone M-5C 'Caspar'|
+Stefan Amaris Battleship|
+Concordat Frigate (2506)|
+Dreadnought Battleship (2330)|
+New Syrtis Carrier (2557)|
+Bug-Eye Surveillance Ship|
+Faslane Yardship|
+Newgrange Yardship|
+Newgrange III Yardship 'Eyrines'|
+Naga Destroyer (Caspar II Control Ship)|
+Conestoga Transport Jumpship|
+Kimagure Pursuit Cruiser (Surprise)|
+Leviathan III Battleship|
diff --git a/megamek/docs/Sprite Stuff/Unit Shading Scripts.txt b/megamek/docs/Sprite Stuff/Unit Shading Scripts.txt
index 8705c518806..4e91f8f4844 100644
--- a/megamek/docs/Sprite Stuff/Unit Shading Scripts.txt	
+++ b/megamek/docs/Sprite Stuff/Unit Shading Scripts.txt	
@@ -4,7 +4,7 @@ Sept 17/2016
 The scripts are located in the megamek\data\images\widgets\Unit Shading Scripts folder.
 
 These are the new scripts used in GIMP to convert any of the sprites to the new shaded look.
-The original unshaded Sprites are located in the data\unused\units_original folder. As new units are added shaded units will be used in game and unshaded units will be added that folder.
+The original unshaded Sprites are stored on Github with the Megamek extras. The extra's folder is updated a couple of times a year. 
 
 NOTES ON USE:
 These go in C:\Program Files\GIMP 2\share\gimp\2.0\scripts
diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
index 068440c360d..0686ec872da 100644
--- a/megamek/docs/history.txt
+++ b/megamek/docs/history.txt
@@ -6,6 +6,18 @@ VERSION HISTORY:
 + PR #4458: When clicking on report hyperlink, center board on entity if possible
 + Fix #4460: Prevent blank lobby after adding custom units in multi-player games
 + PR #4454: End-round report shows visible active unit data (as displayed in tooltip)
++ Fix #4473: Realign phase done buttons
++ Fix #4471: Dont filter patchwork it causes the index to get out of sync
++ Fix #4467: Add client setting for Max Range to Draw Sensor / Visual Rings
++ PR #4468: Limit the width of the unit tooltip so that it does not grow really wide
++ Fix #4481: Incorrect availability ratings for Clan electronic warfare equipment
++ PR #4482: Minimap updates
++ Fix #4449: Delete PilotToolTip cache on client start and when portrait is set
++ Fix #4479: In fire phases, solo torso twist no longer triggers Done button enabling; corrected Done button handling during movement
++ Fix #4480, #3494: Selecting BA Anti-Personnel weapons during the firing phase no longer results in an error
++ PR #4474: Improvements to Battle Value calculation and reports
++ PR #4502: Map generator parameter dialog now loads theme from preset; various bugfixes to map generator parameter dialog
++ Fix #4462: Use bilinear interpol. instead of bicubic to remove the lag
 
 0.49.13 (2023-05-23 2000 UTC)
 + Fix #3914: LAM fuel tanks will now correctly provide fuel to the LAM
diff --git a/megamek/i18n/megamek/client/messages.properties b/megamek/i18n/megamek/client/messages.properties
index 2b796b082b1..95214d41238 100644
--- a/megamek/i18n/megamek/client/messages.properties
+++ b/megamek/i18n/megamek/client/messages.properties
@@ -1241,6 +1241,8 @@ CommonSettingsDialog.seenby.PlayerDetailed=Player Detailed
 CommonSettingsDialog.seenby.Someone=Someone
 CommonSettingsDialog.seenby.Team=Team
 CommonSettingsDialog.seenby.label=Seen by Resolution:
+CommonSettingsDialog.sensorMaxDrawRange=Max Range to Draw Sensor / Visual Rings
+CommonSettingsDialog.sensorMaxDrawRange.tooltip=large values will slow down game, can set to 0 to turn off completely
 CommonSettingsDialog.showArmorMiniVisTT=Show mini armor visualization in the tooltip.
 CommonSettingsDialog.showDamageDecal=Show damage to units on the unit icon
 CommonSettingsDialog.showDamageLevel=Show damage to units on the unit label
@@ -1278,6 +1280,8 @@ CommonSettingsDialog.translucentHiddenUnits=Make unseen units translucent
 CommonSettingsDialog.uiTheme=UI Theme:
 CommonSettingsDialog.unitDisplay=Unit Tooltip / Unit Display
 CommonSettingsDialog.unitDisplayHeatToolTip=Max heat value for each level
+CommonSettingsDialog.unitTooltipMaxWidth=Max Width for Unit Tooltip
+CommonSettingsDialog.unitTooltipMaxWidth.tooltip=keeps tool tip from growing too wide
 CommonSettingsDialog.useAverageSkills=Use the current random skill settings when adding units in the lobby.
 CommonSettingsDialog.useCamoOverlay=Use Camo Overlay
 CommonSettingsDialog.useInclines=Show incline highlighting and shadows at hex borders
@@ -1627,10 +1631,10 @@ FiringDisplay.More=More...
 FiringDisplay.NextTarget=Next Target
 FiringDisplay.NextUnit=Next Unit 
 FiringDisplay.Searchlight=Searchlight
-FiringDisplay.Skip=Skip Firing
+FiringDisplay.SkipTurn=Skip Firing
 FiringDisplay.Spot=Spot
 FiringDisplay.Twist=Twist
-FiringDisplay.AimedShotDialog.message=Aim at:
+FiringDisplay.AimedShotDialog.message=Aim at:W
 FiringDisplay.AimedShotDialog.title=Aimed shot
 FiringDisplay.alreadyFired=Already fired
 FiringDisplay.autoFiringWeapon=Auto-firing weapon
@@ -1648,7 +1652,7 @@ FiringDisplay.ClearWeaponJam.question=Which weapon do you want to clear repair?\
 FiringDisplay.ChooseTargetDialog.message=Hex {0} contains the following targets.\n\nWhich target do you want to attack?
 FiringDisplay.ChooseTargetDialog.title=Choose Target
 FiringDisplay.ChooseCounterbatteryTargetDialog.message=The following targets are eligible for counter-battery fire.\n\nWhich target do you want to attack?
-FiringDisplay.Done=Done
+FiringDisplay.DoneTurn=Done Firing
 FiringDisplay.DontFireDialog.message=This unit has not taken any actions.\n\nAre you really done?\r\n
 FiringDisplay.DontFireDialog.title=Don't fire?
 FiringDisplay.fireFindClub=Find Club
@@ -2462,6 +2466,7 @@ MovementDisplay.FlyOffDialog.message=Do you want to fly off the map?
 MovementDisplay.FlyOffDialog.title=Fly Away?
 MovementDisplay.IceLanding=Landing on ice will break through on 4+ on 1d6.\n
 MovementDisplay.IceMoving=Crossing ice will break through on 6+ on 1d6.\n
+MovementDisplay.IllegalMove=Illegal Move
 MovementDisplay.its_others_turn=It''s {0}''s turn to move.
 MovementDisplay.its_your_turn=It's your turn to move.
 MovementDisplay.loadUnitBayNumberDialog.message=Which of {0}'s bays do you wish to load into?
diff --git a/megamek/i18n/megamek/client/messages_de.properties b/megamek/i18n/megamek/client/messages_de.properties
index d0c81d434b2..5574ecce8a6 100644
--- a/megamek/i18n/megamek/client/messages_de.properties
+++ b/megamek/i18n/megamek/client/messages_de.properties
@@ -584,7 +584,7 @@ FiringDisplay.Mode=Modus
 FiringDisplay.More=Mehr...
 FiringDisplay.NextTarget=Nächstes Ziel
 FiringDisplay.NextUnit=\ Nächste Einheit 
-FiringDisplay.Skip=Überspringen
+FiringDisplay.SkipTurn=Überspringen
 FiringDisplay.Spot=Sichten
 FiringDisplay.SpotForInderectDialog.message=Soll diese Einheit für indirektes Feuer sichten?
 FiringDisplay.SpotForInderectDialog.title=Für indirektes Feuer Sichten?
diff --git a/megamek/i18n/megamek/client/messages_es.properties b/megamek/i18n/megamek/client/messages_es.properties
index caec77fff7b..284272a96bf 100644
--- a/megamek/i18n/megamek/client/messages_es.properties
+++ b/megamek/i18n/megamek/client/messages_es.properties
@@ -1316,7 +1316,7 @@ CustomMechDialog.join2=Unirse {0} (netid {1}: {2} libre)
 CustomMechDialog.labAntiMech=Anti-Mech: 
 CustomMechDialog.labArtillery=H. Disparo: 
 CustomMechDialog.labAutoEject=¿Deshabilitar la eyección automática?
-#Both 
+#Both
 CustomMechDialog.labConditional_Ejection_Ammo=Eyección por Explosión de municiones
 #Mechs
 CustomMechDialog.labConditional_Ejection_Engine=Eyección por Explosión del reactor
@@ -1563,7 +1563,7 @@ FiringDisplay.More=Más...
 FiringDisplay.NextTarget=Siguiente Objetivo
 FiringDisplay.NextUnit=Siguiente Unidad 
 FiringDisplay.Searchlight=Reflector
-FiringDisplay.Skip=Saltarse
+FiringDisplay.SkipTurn=Saltarse
 FiringDisplay.Spot=Detectar
 FiringDisplay.Twist=Rotar
 FiringDisplay.AimedShotDialog.message=Apuntar a:
@@ -3410,7 +3410,7 @@ TankMapSet.RearIS=Trasera E.I.
 TankMapSet.TurretArmor=Blindaje Torreta
 TankMapSet.TurretIS=Torreta E.I.
 TankMapSet.BARRating=Calificación BAR
- 
+
 #Large Support Tank Widget
 LargeSupportTankMapSet.FrontArmor=Blindaje Delantero
 LargeSupportTankMapSet.FrontIS=Delantera E.I.
diff --git a/megamek/i18n/megamek/client/messages_ru.properties b/megamek/i18n/megamek/client/messages_ru.properties
index 616172e1db8..56cd6e9484d 100644
--- a/megamek/i18n/megamek/client/messages_ru.properties
+++ b/megamek/i18n/megamek/client/messages_ru.properties
@@ -808,7 +808,7 @@ FiringDisplay.More=Еще...
 FiringDisplay.NextTarget=След. цель
 FiringDisplay.NextUnit=След. юнит 
 FiringDisplay.Searchlight=Прожектор
-FiringDisplay.Skip=Пропу�тить
+FiringDisplay.SkipTurn=Пропу�тить
 FiringDisplay.Spot=�аве�ти
 FiringDisplay.Twist=Развернуть
 FiringDisplay.AimedShotDialog.message=Целить�� в:
diff --git a/megamek/src/megamek/client/bot/princess/NewtonianAerospacePathRanker.java b/megamek/src/megamek/client/bot/princess/NewtonianAerospacePathRanker.java
index f66d58b2347..09ed7003015 100644
--- a/megamek/src/megamek/client/bot/princess/NewtonianAerospacePathRanker.java
+++ b/megamek/src/megamek/client/bot/princess/NewtonianAerospacePathRanker.java
@@ -46,7 +46,7 @@ public Entity findClosestEnemy(Entity me, Coords position, Game game) {
             // If a unit has not moved, assume it will move away from me.
             int unmovedDistMod = 0;
             if (e.isSelectableThisTurn() && !e.isImmobile()) {
-                unmovedDistMod = e.getWalkMP(true, false, false);
+                unmovedDistMod = e.getWalkMP();
             }
 
             if ((position.distance(e.getPosition()) + unmovedDistMod) < range) {
diff --git a/megamek/src/megamek/client/bot/princess/PathRanker.java b/megamek/src/megamek/client/bot/princess/PathRanker.java
index ac4ef09c935..a56eb5d8cc8 100644
--- a/megamek/src/megamek/client/bot/princess/PathRanker.java
+++ b/megamek/src/megamek/client/bot/princess/PathRanker.java
@@ -254,7 +254,7 @@ public Targetable findClosestEnemy(Entity me, Coords position, Game game,
             // If a unit has not moved, assume it will move away from me.
             int unmovedDistMod = 0;
             if (e.isSelectableThisTurn() && !e.isImmobile()) {
-                unmovedDistMod = e.getWalkMP(true, false, false);
+                unmovedDistMod = e.getWalkMP();
             }
 
             int distance = position.distance(e.getPosition());
diff --git a/megamek/src/megamek/client/bot/princess/Princess.java b/megamek/src/megamek/client/bot/princess/Princess.java
index fab7bff93bf..33b55d40963 100644
--- a/megamek/src/megamek/client/bot/princess/Princess.java
+++ b/megamek/src/megamek/client/bot/princess/Princess.java
@@ -827,9 +827,9 @@ protected Vector<Minefield> calculateMinefieldDeployment() {
         double total = 0;
         try {
             // Find out how fast this unit can move.
-            int fastestMove = entity.getRunMP(true, false, false);
-            if (entity.getJumpMP(true) > fastestMove) {
-                fastestMove = entity.getJumpMP(true);
+            int fastestMove = entity.getRunMP(MPCalculationSetting.STANDARD);
+            if (entity.getJumpMP() > fastestMove) {
+                fastestMove = entity.getJumpMP();
             }
             msg.append("\n\t\tFastest Move = ").append(fastestMove);
 
diff --git a/megamek/src/megamek/client/ui/SharedUtility.java b/megamek/src/megamek/client/ui/SharedUtility.java
index 13d52fd4042..5387a1239c3 100644
--- a/megamek/src/megamek/client/ui/SharedUtility.java
+++ b/megamek/src/megamek/client/ui/SharedUtility.java
@@ -359,9 +359,9 @@ private static Object doPSRCheck(MovePath md, boolean stringResult) {
                             checkNag(rollTarget, nagReport, psrList);
                         }
                     } else if (moveType == EntityMovementType.MOVE_JUMP) {
-                        int origWalkMP = entity.getWalkMP(false, false);
+                        int origWalkMP = entity.getWalkMP(MPCalculationSetting.NO_GRAVITY);
                         int gravWalkMP = entity.getWalkMP();
-                        if (step.getMpUsed() > entity.getJumpMP(false)) {
+                        if (step.getMpUsed() > entity.getJumpMP(MPCalculationSetting.NO_GRAVITY)) {
                             rollTarget = entity.checkMovedTooFast(step, overallMoveType);
                             checkNag(rollTarget, nagReport, psrList);
                         } else if ((game.getPlanetaryConditions().getGravity() > 1)
@@ -380,7 +380,7 @@ private static Object doPSRCheck(MovePath md, boolean stringResult) {
                             SharedUtility.checkNag(rollTarget, nagReport,
                                     psrList);
                         }
-                        if (step.getMpUsed() > entity.getSprintMP(false, false, false)) {
+                        if (step.getMpUsed() > entity.getSprintMP(MPCalculationSetting.NO_GRAVITY)) {
                             rollTarget = entity.checkMovedTooFast(step, overallMoveType);
                             checkNag(rollTarget, nagReport, psrList);
                         }
diff --git a/megamek/src/megamek/client/ui/swing/ActionPhaseDisplay.java b/megamek/src/megamek/client/ui/swing/ActionPhaseDisplay.java
index 743c04e7106..a1944192870 100644
--- a/megamek/src/megamek/client/ui/swing/ActionPhaseDisplay.java
+++ b/megamek/src/megamek/client/ui/swing/ActionPhaseDisplay.java
@@ -47,8 +47,8 @@ protected UIUtil.FixedXPanel setupDonePanel() {
         butSkipTurn.setPreferredSize(new Dimension(DONE_BUTTON_WIDTH, MIN_BUTTON_SIZE.height * 1));
         String f = guiScaledFontHTML(UIUtil.uiLightViolet()) +  KeyCommandBind.getDesc(KeyCommandBind.DONE_NO_ACTION)+ "</FONT>";
         butSkipTurn.setToolTipText("<html><body>" + f + "</body></html>");
+        addToDonePanel(donePanel, butSkipTurn);
 
-        donePanel.add(butSkipTurn);
         if (clientgui != null) {
             butSkipTurn.addActionListener(new AbstractAction() {
                 private static final long serialVersionUID = -5034474968902280850L;
@@ -151,8 +151,10 @@ protected void updateDonePanelButtons(String doneButtonLabel, String skipButtonL
         }
         butSkipTurn.setText("<html><b>" + skipButtonLabel + "</b></html>");
 
-        // enable/disable
-        if (this.isDoingAction || ignoreNoActionNag) {
+        if (!clientgui.getClient().isMyTurn()) {
+            butDone.setEnabled(false);
+            butSkipTurn.setEnabled(false);
+        } else if (this.isDoingAction || ignoreNoActionNag) {
             butDone.setEnabled(true);
             butSkipTurn.setEnabled(false);
         } else {
diff --git a/megamek/src/megamek/client/ui/swing/AimedShotDialog.java b/megamek/src/megamek/client/ui/swing/AimedShotDialog.java
index 31de0b3bf6b..adf6847bf0c 100644
--- a/megamek/src/megamek/client/ui/swing/AimedShotDialog.java
+++ b/megamek/src/megamek/client/ui/swing/AimedShotDialog.java
@@ -29,6 +29,7 @@
 
 import megamek.client.ui.Messages;
 import megamek.client.ui.swing.tooltip.UnitToolTip;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.client.ui.swing.widget.IndexedRadioButton;
 import megamek.common.Targetable;
 import megamek.common.annotations.Nullable;
@@ -44,6 +45,8 @@ public class AimedShotDialog extends JDialog {
     private IndexedRadioButton[] checkboxes;
     private boolean[] boxEnabled;
 
+    private static final GUIPreferences GUIP = GUIPreferences.getInstance();
+
     public AimedShotDialog(JFrame parent, String title, String message,
                            String[] choices, boolean[] enabled, int selectedIndex,
                            ClientGUI clientGUI, Targetable target,
@@ -66,8 +69,9 @@ public AimedShotDialog(JFrame parent, String title, String message,
         gridbag.setConstraints(labMessage, c);
         getContentPane().add(labMessage);
 
-        JLabel labTarget = new JLabel("<html>" + UnitToolTip.getTargetTipDetail(target, clientGUI.getClient()) + "</hmtl>",
-                SwingConstants.LEFT);
+        String div = "<DIV WIDTH=" + UIUtil.scaleForGUI(500) + ">" + UnitToolTip.getTargetTipDetail(target, clientGUI.getClient()) + "</DIV>";
+        JLabel labTarget = new JLabel("<html>" + div + "</hmtl>", SwingConstants.LEFT);
+
         c.weightx = 1.0;
         c.weighty = 1.0;
         c.gridwidth = 0;
diff --git a/megamek/src/megamek/client/ui/swing/AttackPhaseDisplay.java b/megamek/src/megamek/client/ui/swing/AttackPhaseDisplay.java
index 8da94e4b28f..e1689a9ce60 100644
--- a/megamek/src/megamek/client/ui/swing/AttackPhaseDisplay.java
+++ b/megamek/src/megamek/client/ui/swing/AttackPhaseDisplay.java
@@ -50,7 +50,12 @@ protected AttackPhaseDisplay(ClientGUI cg) {
     @Override
     protected void updateDonePanel()
     {
-        updateDonePanelButtons(getDoneButtonLabel(), getSkipTurnButtonLabel(), !attacks.isEmpty());
+        if (attacks.isEmpty() || (attacks.size() == 1 && attacks.firstElement() instanceof TorsoTwistAction)){
+            // a torso twist alone should not trigger Done button
+            updateDonePanelButtons(getDoneButtonLabel(), getSkipTurnButtonLabel(), false);
+        } else {
+            updateDonePanelButtons(getDoneButtonLabel(), getSkipTurnButtonLabel(), true);
+        }
     }
 
     protected void removeAttack(Object o)
diff --git a/megamek/src/megamek/client/ui/swing/BoardEditor.java b/megamek/src/megamek/client/ui/swing/BoardEditor.java
index d95f7db5770..e5d918b5ff0 100644
--- a/megamek/src/megamek/client/ui/swing/BoardEditor.java
+++ b/megamek/src/megamek/client/ui/swing/BoardEditor.java
@@ -1861,6 +1861,7 @@ public void actionPerformed(ActionEvent ae) {
             setExitsState(texTerrExits.getNumber() != 0);
             updateWhenSelected();
         } else if (ae.getActionCommand().equals(ClientGUI.VIEW_MINI_MAP)) {
+            guip.toggleMinimapEnabled();
             minimapW.setVisible(guip.getMinimapEnabled());
         } else if (ae.getActionCommand().equals(ClientGUI.HELP_ABOUT)) {
             showAbout();
diff --git a/megamek/src/megamek/client/ui/swing/EntityChoiceDialog.java b/megamek/src/megamek/client/ui/swing/EntityChoiceDialog.java
index a9aa7c533eb..9758571e022 100644
--- a/megamek/src/megamek/client/ui/swing/EntityChoiceDialog.java
+++ b/megamek/src/megamek/client/ui/swing/EntityChoiceDialog.java
@@ -15,6 +15,7 @@
 
 import megamek.client.ui.enums.DialogResult;
 import megamek.client.ui.swing.tooltip.UnitToolTip;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.Entity;
 import megamek.common.annotations.Nullable;
 
@@ -26,6 +27,7 @@
  * in brief or in detail.
  */
 public class EntityChoiceDialog extends AbstractChoiceDialog<Entity> {
+    private static final GUIPreferences GUIP = GUIPreferences.getInstance();
 
     /**
      * This creates a modal dialog to pick one or more entities.
@@ -45,7 +47,8 @@ protected EntityChoiceDialog(JFrame frame, String title, String message,
 
     @Override
     protected void detailLabel(JToggleButton button, Entity target) {
-        button.setText("<html>" + UnitToolTip.getTargetTipDetail(target, null) + "</html>");
+        String div = "<DIV WIDTH=" + UIUtil.scaleForGUI(500) + ">" + UnitToolTip.getEntityTipAsTarget(target, null) + "</DIV>";
+        button.setText("<html>" + div + "</html>");
     }
 
     @Override
diff --git a/megamek/src/megamek/client/ui/swing/FiringDisplay.java b/megamek/src/megamek/client/ui/swing/FiringDisplay.java
index f63cdbb2ce4..aa5cbe76206 100644
--- a/megamek/src/megamek/client/ui/swing/FiringDisplay.java
+++ b/megamek/src/megamek/client/ui/swing/FiringDisplay.java
@@ -228,12 +228,12 @@ public FiringDisplay(final ClientGUI clientgui) {
 
     @Override
     protected String getDoneButtonLabel() {
-        return Messages.getString("FiringDisplay.Fire");
+        return Messages.getString("FiringDisplay.DoneTurn");
     }
 
     @Override
     protected String getSkipTurnButtonLabel() {
-        return Messages.getString("FiringDisplay.Skip");
+        return Messages.getString("FiringDisplay.SkipTurn");
     }
 
     @Override
diff --git a/megamek/src/megamek/client/ui/swing/GUIPreferences.java b/megamek/src/megamek/client/ui/swing/GUIPreferences.java
index 0155c931329..22c4ad66396 100644
--- a/megamek/src/megamek/client/ui/swing/GUIPreferences.java
+++ b/megamek/src/megamek/client/ui/swing/GUIPreferences.java
@@ -469,7 +469,7 @@ protected GUIPreferences() {
         setDefault(BOARD_FIELD_OF_FIRE_LONG_COLOR, new Color(60, 150, 60));
         setDefault(BOARD_FIELD_OF_FIRE_EXTREME_COLOR, new Color(40, 100, 40));
         setDefault(BOARD_SENSOR_RANGE_COLOR, new Color(105, 105, 245));
-        setDefault(BOARD_VISUAL_RANGE_COLOR, new Color(100, 100, 150));
+        setDefault(BOARD_VISUAL_RANGE_COLOR, new Color(255, 204, 255));
         setDefault(BOARD_UNIT_SELECTED_COLOR, DEFAULT_MAGENTA);
         setDefault(BOARD_UNIT_VALID_COLOR, DEFAULT_CYAN);
         setDefault(BOARD_UNIT_TEXT_COLOR, Color.white);
diff --git a/megamek/src/megamek/client/ui/swing/MegaMekGUI.java b/megamek/src/megamek/client/ui/swing/MegaMekGUI.java
index 424d7a0f07b..d720c5d9196 100644
--- a/megamek/src/megamek/client/ui/swing/MegaMekGUI.java
+++ b/megamek/src/megamek/client/ui/swing/MegaMekGUI.java
@@ -32,6 +32,7 @@
 import megamek.client.ui.swing.gameConnectionDialogs.ConnectDialog;
 import megamek.client.ui.swing.gameConnectionDialogs.HostDialog;
 import megamek.client.ui.swing.skinEditor.SkinEditorMainGUI;
+import megamek.client.ui.swing.tooltip.PilotToolTip;
 import megamek.client.ui.swing.util.MegaMekController;
 import megamek.client.ui.swing.util.UIUtil;
 import megamek.client.ui.swing.widget.MegamekButton;
@@ -457,6 +458,9 @@ public void startClient(String playerName, String serverAddress, int port) {
             return;
         }
 
+        // delete PilotToolTip cache
+        PilotToolTip.deleteImageCache();
+
         client = new Client(playerName, serverAddress, port);
         ClientGUI gui = new ClientGUI(client, controller);
         controller.clientgui = gui;
diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java
index 560d2c724da..706a761bdff 100644
--- a/megamek/src/megamek/client/ui/swing/MovementDisplay.java
+++ b/megamek/src/megamek/client/ui/swing/MovementDisplay.java
@@ -426,7 +426,7 @@ public void performAction() {
                         shiftheld = true;
                         currentMove(target);
                         shiftheld = false;
-                        clientgui.getBoardView().drawMovementData(ce(), cmd);
+                        updateMove();
                     }
                 });
 
@@ -456,7 +456,7 @@ public void performAction() {
                         shiftheld = true;
                         currentMove(target);
                         shiftheld = false;
-                        clientgui.getBoardView().drawMovementData(ce(), cmd);
+                        updateMove();
                     }
                 });
 
@@ -575,7 +575,7 @@ public void performAction() {
                                     clear();
                                 }
                                 if (!cmd.isJumping()) {
-                                    cmd.addStep(MoveStepType.START_JUMP);
+                                    addStepToMovePath(MoveStepType.START_JUMP);
                                 }
                                 gear = MovementDisplay.GEAR_JUMP;
                                 Color jumpColor = GUIP.getMoveJumpColor();
@@ -626,7 +626,6 @@ public void performAction() {
                             }
                         }
                         adjustConvertSteps(nextMode);
-                        clientgui.getBoardView().drawMovementData(ce(), cmd);
                     }
                 });
     }
@@ -957,6 +956,76 @@ private void updateButtons() {
         updateDonePanel();
     }
 
+    private void addStepToMovePath(MoveStepType moveStep) {
+        cmd.addStep(moveStep);
+        updateMove();
+    }
+
+    private void addStepsToMovePath(MoveStepType ... moveSteps ) {
+        for (MoveStepType moveStep : moveSteps) {
+            cmd.addStep(moveStep);
+        }
+        updateMove();
+    }
+
+    private void addStepToMovePath(MoveStepType moveStep, Entity entity) {
+        cmd.addStep(moveStep, entity);
+        updateMove();
+    }
+
+    private void addStepToMovePath(MoveStepType moveStep, TreeMap<Integer,Vector<Integer>> targets) {
+        cmd.addStep(moveStep, targets);
+        updateMove();
+    }
+
+    private void addStepToMovePath(MoveStepType moveStep, boolean noCost) {
+        cmd.addStep(moveStep, noCost);
+        updateMove();
+    }
+
+    private void addStepToMovePath(MoveStepType moveStep, boolean noCost,  boolean isManeuver) {
+        cmd.addStep(moveStep, noCost, isManeuver);
+        updateMove();
+    }
+
+    private void addStepsToMovePath(boolean noCost, boolean isManeuver, MoveStepType ... moveSteps) {
+        for (MoveStepType moveStep : moveSteps) {
+            cmd.addStep(moveStep, noCost, isManeuver);
+        }
+        updateMove();
+    }
+
+    private void addStepToMovePath(MoveStepType moveStep, Entity entity, Coords coords) {
+        cmd.addStep(moveStep, entity, coords);
+        updateMove();
+    }
+
+    private void addStepToMovePath(MoveStepType moveStep, Minefield minefield) {
+        cmd.addStep(moveStep, minefield);
+        updateMove();
+    }
+
+    private void addStepToMovePath(MoveStepType moveStep, int additionalIntData) {
+        cmd.addStep(moveStep, additionalIntData);
+        updateMove();
+    }
+
+    private void addStepToMovePath(MoveStepType moveStep, int recover ,int mineToLay) {
+        cmd.addStep(moveStep, recover, mineToLay);
+        updateMove();
+    }
+
+    private void updateMove() {
+        updateMove(true);
+    }
+
+    private void updateMove(boolean redrawMovement) {
+        if (redrawMovement) {
+            clientgui.getBoardView().drawMovementData(ce(), cmd);
+        }
+        updateDonePanel();
+    }
+
     private void updateAeroButtons() {
         if (ce() != null && ce().isAero()) {
             getBtn(MoveCommand.MOVE_THRUST).setEnabled(true);
@@ -980,18 +1049,22 @@ private void updateAeroButtons() {
     protected void updateDonePanel() {
         if (cmd == null || cmd.length() == 0) {
             updateDonePanelButtons( Messages.getString("MovementDisplay.Move"), Messages.getString("MovementDisplay.Skip"), false);
+            return;
         } else {
-            boolean psrCheck = (!SharedUtility.doPSRCheck(cmd.clone()).isBlank())
-                    || (!SharedUtility.doThrustCheck(cmd.clone(), clientgui.getClient()).isBlank());
-            boolean damageCheck = cmd.shouldMechanicalJumpCauseFallDamage()
-                    || cmd.hasActiveMASC()
-                    || (!(ce() instanceof VTOL) && cmd.hasActiveSupercharger())
-                    || cmd.willCrushBuildings();
-
-            String moveMsg =  Messages.getString("MovementDisplay.Move")
-                    + (psrCheck ? "*" : "")
-                    + (damageCheck ? " !" : "");
-            updateDonePanelButtons(moveMsg, Messages.getString("MovementDisplay.Skip"), true);
+            MovePath possible = cmd.clone();
+            possible.clipToPossible();
+            if (possible.length() == 0) {
+                updateDonePanelButtons(Messages.getString("MovementDisplay.Move"), Messages.getString("MovementDisplay.Skip"), false);
+            } else if (!possible.isMoveLegal()) {
+                updateDonePanelButtons(Messages.getString("MovementDisplay.IllegalMove"), Messages.getString("MovementDisplay.Skip"), false);
+            } else {
+                int mp = possible.countMp(possible.isJumping());
+                boolean psrCheck = (!SharedUtility.doPSRCheck(cmd.clone()).isBlank()) || (!SharedUtility.doThrustCheck(cmd.clone(), clientgui.getClient()).isBlank());
+                boolean damageCheck = cmd.shouldMechanicalJumpCauseFallDamage() || cmd.hasActiveMASC() || (!(ce() instanceof VTOL) && cmd.hasActiveSupercharger()) || cmd.willCrushBuildings();
+                String moveMsg = Messages.getString("MovementDisplay.Move")
+                        + " (" + mp + "MP)" + (psrCheck ? "*" : "") + (psrCheck ? "*" : "") + (damageCheck ? "!" : "");
+                updateDonePanelButtons(moveMsg, Messages.getString("MovementDisplay.Skip"), true);
+            }
         }
     }
 
@@ -1161,7 +1234,7 @@ public void clear() {
             Color walkColor = GUIP.getMoveDefaultColor();
             clientgui.getBoardView().setHighlightColor(walkColor);
         } else if (!cmd.isJumping()) {
-            cmd.addStep(MoveStepType.START_JUMP);
+            addStepToMovePath(MoveStepType.START_JUMP);
         }
 
         // update some GUI elements
@@ -1234,9 +1307,9 @@ private void removeLastStep() {
         } else if (cmd.length() == 0) {
             clear();
             if ((gear == MovementDisplay.GEAR_JUMP) && !cmd.isJumping()) {
-                cmd.addStep(MoveStepType.START_JUMP);
+                addStepToMovePath(MoveStepType.START_JUMP);
             } else if (entity.isConvertingNow()) {
-                cmd.addStep(MoveStepType.CONVERT_MODE);
+                addStepToMovePath(MoveStepType.CONVERT_MODE);
             }
         } else {
             // clear board cursors
@@ -1246,6 +1319,7 @@ private void removeLastStep() {
             clientgui.getBoardView().setWeaponFieldOfFire(entity, cmd);
             clientgui.getBoardView().setSensorRange(entity, cmd.getFinalCoords());
 
+            //FIXME what is this
             // Set the button's label to "Done"
             // if the entire move is impossible.
             MovePath possible = cmd.clone();
@@ -1554,7 +1628,7 @@ && ce().getGame().getBoard().getHex(cmd.getFinalCoords())
         }
 
         if (isUsingChaff) {
-            cmd.addStep(MoveStepType.CHAFF);
+            addStepToMovePath(MoveStepType.CHAFF);
             isUsingChaff = false;
         }
 
@@ -1661,7 +1735,7 @@ private void currentMove(Coords dest) {
             if (cmd.getFinalCoords().equals(dest)
                 && (cmd.getLastStep().getType() != MoveStepType.CHARGE)) {
                 cmd.removeLastStep();
-                cmd.addStep(MoveStepType.CHARGE);
+                addStepToMovePath(MoveStepType.CHARGE);
             }
         } else if (gear == GEAR_DFA) {
             cmd.findPathTo(dest, MoveStepType.DFA);
@@ -1669,23 +1743,25 @@ private void currentMove(Coords dest) {
             if (cmd.getFinalCoords().equals(dest)
                 && (cmd.getLastStep().getType() != MoveStepType.DFA)) {
                 cmd.removeLastStep();
-                cmd.addStep(MoveStepType.DFA);
+                addStepToMovePath(MoveStepType.DFA);
             }
         } else if (gear == GEAR_SWIM) {
             cmd.findPathTo(dest, MoveStepType.SWIM);
         } else if (gear == GEAR_RAM) {
             cmd.findPathTo(dest, MoveStepType.FORWARDS);
         } else if (gear == GEAR_IMMEL) {
-            cmd.addStep(MoveStepType.UP, true, true);
-            cmd.addStep(MoveStepType.UP, true, true);
-            cmd.addStep(MoveStepType.DEC, true, true);
-            cmd.addStep(MoveStepType.DEC, true, true);
+            addStepsToMovePath(true, true,
+                    MoveStepType.UP,
+                    MoveStepType.UP,
+                    MoveStepType.DEC,
+                    MoveStepType.DEC);
             cmd.rotatePathfinder(cmd.getFinalCoords().direction(dest), true);
             gear = GEAR_LAND;
         } else if (gear == GEAR_SPLIT_S) {
-            cmd.addStep(MoveStepType.DOWN, true, true);
-            cmd.addStep(MoveStepType.DOWN, true, true);
-            cmd.addStep(MoveStepType.ACC, true, true);
+            addStepsToMovePath(true, true,
+                    MoveStepType.DOWN,
+                    MoveStepType.DOWN,
+                    MoveStepType.ACC);
             cmd.rotatePathfinder(cmd.getFinalCoords().direction(dest), true);
             gear = GEAR_LAND;
         }
@@ -1766,15 +1842,16 @@ public synchronized void hexMoused(BoardViewEvent b) {
                 // either turn or move
                 if (ce != null) {
                     currentMove(b.getCoords());
-                    clientgui.getBoardView().drawMovementData(ce, cmd);
+                    updateMove();
                 }
             }
         } else if (b.getType() == BoardViewEvent.BOARD_HEX_CLICKED) {
             Coords moveto = b.getCoords();
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            updateMove();
             if (shiftheld || (gear == MovementDisplay.GEAR_TURN)) {
                 updateDonePanel();
 
+                //FIXME what is this
                 // Set the button's label to "Done"
                 // if the entire move is impossible.
                 MovePath possible = cmd.clone();
@@ -1804,7 +1881,7 @@ public synchronized void hexMoused(BoardViewEvent b) {
                     cmd.clipToPossible();
                 }
 
-                cmd.addStep(MoveStepType.RAM);
+                addStepToMovePath(MoveStepType.RAM);
 
                 ToHitData toHit = new RamAttackAction(cen,
                         target.getTargetType(), target.getId(),
@@ -1956,7 +2033,6 @@ public synchronized void hexMoused(BoardViewEvent b) {
                 return;
             }
             updateDonePanel();
-            butDone.setEnabled(clientgui.getClient().isMyTurn());
             updateProneButtons();
             updateChaffButton();
             updateRACButton();
@@ -4082,13 +4158,13 @@ private boolean addManeuver(int type) {
         cmd.addManeuver(type);
         switch (type) {
             case ManeuverType.MAN_HAMMERHEAD:
-                cmd.addStep(MoveStepType.YAW, true, true);
+                addStepToMovePath(MoveStepType.YAW, true, true);
                 return true;
             case ManeuverType.MAN_HALF_ROLL:
-                cmd.addStep(MoveStepType.ROLL, true, true);
+                addStepToMovePath(MoveStepType.ROLL, true, true);
                 return true;
             case ManeuverType.MAN_BARREL_ROLL:
-                cmd.addStep(MoveStepType.DEC, true, true);
+                addStepToMovePath(MoveStepType.DEC, true, true);
                 return true;
             case ManeuverType.MAN_IMMELMAN:
                 gear = MovementDisplay.GEAR_IMMEL;
@@ -4107,23 +4183,23 @@ private boolean addManeuver(int type) {
                     vel = last.getVelocityLeft();
                 }
                 while (vel > 0) {
-                    cmd.addStep(MoveStepType.DEC, true, true);
+                    addStepToMovePath(MoveStepType.DEC, true, true);
                     vel--;
                 }
-                cmd.addStep(MoveStepType.UP);
+                addStepToMovePath(MoveStepType.UP);
                 return true;
             case ManeuverType.MAN_SIDE_SLIP_LEFT:
                 // If we are on a ground map, slide slip works slightly differently
                 // See Total Warfare pg 85
                 if (clientgui.getClient().getGame().getBoard().getType() == Board.T_GROUND) {
                     for (int i = 0; i < 8; i++) {
-                        cmd.addStep(MoveStepType.LATERAL_LEFT, true, true);
+                        addStepToMovePath(MoveStepType.LATERAL_LEFT, true, true);
                     }
                     for (int i = 0; i < 8; i++) {
-                        cmd.addStep(MoveStepType.FORWARDS, true, true);
+                        addStepToMovePath(MoveStepType.FORWARDS, true, true);
                     }
                 } else {
-                    cmd.addStep(MoveStepType.LATERAL_LEFT, true, true);
+                    addStepToMovePath(MoveStepType.LATERAL_LEFT, true, true);
                 }
                 return true;
             case ManeuverType.MAN_SIDE_SLIP_RIGHT:
@@ -4131,17 +4207,17 @@ private boolean addManeuver(int type) {
                 // See Total Warfare pg 85
                 if (clientgui.getClient().getGame().getBoard().getType() == Board.T_GROUND) {
                     for (int i = 0; i < 8; i++) {
-                        cmd.addStep(MoveStepType.LATERAL_RIGHT, true, true);
+                        addStepToMovePath(MoveStepType.LATERAL_RIGHT, true, true);
                     }
                     for (int i = 0; i < 8; i++) {
-                        cmd.addStep(MoveStepType.FORWARDS, true, true);
+                        addStepToMovePath(MoveStepType.FORWARDS, true, true);
                     }
                 } else {
-                    cmd.addStep(MoveStepType.LATERAL_RIGHT, true, true);
+                    addStepToMovePath(MoveStepType.LATERAL_RIGHT, true, true);
                 }
                 return true;
             case ManeuverType.MAN_LOOP:
-                cmd.addStep(MoveStepType.LOOP, true, true);
+                addStepToMovePath(MoveStepType.LOOP, true, true);
                 return true;
             default:
                 return false;
@@ -4381,7 +4457,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                 // gear = Compute.GEAR_LAND;
                 setUnjamEnabled(false);
             } else  if (clientgui.doYesNoDialog(title, msg)) {
-                cmd.addStep(MoveStepType.UNJAM_RAC);
+                addStepToMovePath(MoveStepType.UNJAM_RAC);
                 isUnJammingRAC = true;
                 ready();
                 // If ready() fires, it will call endMyTurn, which sets cen to
@@ -4394,7 +4470,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                 }
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_SEARCHLIGHT.getCmd())) {
-            cmd.addStep(MoveStepType.SEARCHLIGHT);
+            addStepToMovePath(MoveStepType.SEARCHLIGHT);
         } else if (actionCmd.equals(MoveCommand.MOVE_WALK.getCmd())) {
             if ((gear == MovementDisplay.GEAR_JUMP) || (gear == MovementDisplay.GEAR_SWIM)) {
                 gear = MovementDisplay.GEAR_LAND;
@@ -4412,7 +4488,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                 clear();
             }
             if (!cmd.isJumping()) {
-                cmd.addStep(MoveStepType.START_JUMP);
+                addStepToMovePath(MoveStepType.START_JUMP);
             }
             gear = MovementDisplay.GEAR_JUMP;
             Color jumpColor = GUIP.getMoveJumpColor();
@@ -4422,7 +4498,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
             if (gear != MovementDisplay.GEAR_SWIM) {
                 clear();
             }
-            // dcmd.addStep(MoveStepType.SWIM);
+            // daddStepToMovePath(MoveStepType.SWIM);
             gear = MovementDisplay.GEAR_SWIM;
             ce.setMovementMode((ce instanceof BipedMech) ? EntityMovementMode.BIPED_SWIM
                     : EntityMovementMode.QUAD_SWIM);
@@ -4438,7 +4514,6 @@ public synchronized void actionPerformed(ActionEvent ev) {
                 }
             }
             adjustConvertSteps(nextMode);
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
         } else if (actionCmd.equals(MoveCommand.MOVE_MODE_LEG.getCmd())) {
             if ((ce.getEntityType() & Entity.ETYPE_QUAD_MECH) == Entity.ETYPE_QUAD_MECH) {
                 adjustConvertSteps(EntityMovementMode.QUAD);
@@ -4447,7 +4522,6 @@ public synchronized void actionPerformed(ActionEvent ev) {
             } else if ((ce.getEntityType() & Entity.ETYPE_BIPED_MECH) == Entity.ETYPE_BIPED_MECH) {
                 adjustConvertSteps(EntityMovementMode.BIPED);
             }
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
         } else if (actionCmd.equals(MoveCommand.MOVE_MODE_VEE.getCmd())) {
             if (ce instanceof QuadVee && ((QuadVee) ce).getMotiveType() == QuadVee.MOTIVE_WHEEL) {
                 adjustConvertSteps(EntityMovementMode.WHEELED);
@@ -4458,12 +4532,10 @@ public synchronized void actionPerformed(ActionEvent ev) {
                     && ((LandAirMech) ce).getLAMType() == LandAirMech.LAM_STANDARD) {
                 adjustConvertSteps(EntityMovementMode.WIGE);
             }
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
         } else if (actionCmd.equals(MoveCommand.MOVE_MODE_AIR.getCmd())) {
             if (ce instanceof LandAirMech) {
                 adjustConvertSteps(EntityMovementMode.AERODYNE);
             }
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
         } else if (actionCmd.equals(MoveCommand.MOVE_TURN.getCmd())) {
             gear = MovementDisplay.GEAR_TURN;
         } else if (actionCmd.equals(MoveCommand.MOVE_BACK_UP.getCmd())) {
@@ -4539,7 +4611,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
             String title = Messages.getString("MovementDisplay.ClearMinefieldDialog.title");
             String msg = Messages.getString("MovementDisplay.ClearMinefieldDialog.message", clear, boom);
             if ((null != mf) && clientgui.doYesNoDialog(title, msg)) {
-                cmd.addStep(MoveStepType.CLEAR_MINEFIELD, mf);
+                addStepToMovePath(MoveStepType.CLEAR_MINEFIELD, mf);
                 ready();
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_CHARGE.getCmd())) {
@@ -4555,7 +4627,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
             gear = MovementDisplay.GEAR_DFA;
             computeMovementEnvelope(ce);
             if (!cmd.isJumping()) {
-                cmd.addStep(MoveStepType.START_JUMP);
+                addStepToMovePath(MoveStepType.START_JUMP);
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_RAM.getCmd())) {
             if (gear != MovementDisplay.GEAR_LAND) {
@@ -4582,40 +4654,33 @@ public synchronized void actionPerformed(ActionEvent ev) {
                 if (response.getAnswer()) {
                     ce.setCarefulStand(true);
                     if (cmd.getFinalProne() || cmd.getFinalHullDown()) {
-                        cmd.addStep(MoveStepType.CAREFUL_STAND);
+                        addStepToMovePath(MoveStepType.CAREFUL_STAND);
                     }
                 } else {
                     if (cmd.getFinalProne() || cmd.getFinalHullDown()) {
-                        cmd.addStep(MoveStepType.GET_UP);
+                        addStepToMovePath(MoveStepType.GET_UP);
                     }
                 }
             } else {
                 updateDonePanel();
                 if (cmd.getFinalProne() || cmd.getFinalHullDown()) {
-                    cmd.addStep(MoveStepType.GET_UP);
+                    addStepToMovePath(MoveStepType.GET_UP);
                 }
             }
-
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
         } else if (actionCmd.equals(MoveCommand.MOVE_GO_PRONE.getCmd())) {
             gear = MovementDisplay.GEAR_LAND;
             if (!cmd.getFinalProne()) {
-                cmd.addStep(MoveStepType.GO_PRONE);
+                addStepToMovePath(MoveStepType.GO_PRONE);
             }
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
-            updateDonePanel();
         } else if (actionCmd.equals(MoveCommand.MOVE_HULL_DOWN.getCmd())) {
             gear = MovementDisplay.GEAR_LAND;
             if (!cmd.getFinalHullDown()) {
-                cmd.addStep(MoveStepType.HULL_DOWN);
+                addStepToMovePath(MoveStepType.HULL_DOWN);
             }
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
-            updateDonePanel();
         } else if (actionCmd.equals(MoveCommand.MOVE_BRACE.getCmd())) {
             var options = ce().getValidBraceLocations();
             if (options.size() == 1) {
-                cmd.addStep(MoveStepType.BRACE, options.get(0));
-                updateDonePanel();
+                addStepToMovePath(MoveStepType.BRACE, options.get(0));
             } else if (options.size() > 1) {
                 String[] locationNames = new String[options.size()];
 
@@ -4632,7 +4697,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                 // Verify that we have a valid option...
                 if (option != null) {
                     int id = options.get(Arrays.asList(locationNames).indexOf(option));
-                    cmd.addStep(MoveStepType.BRACE, id);
+                    addStepToMovePath(MoveStepType.BRACE, id);
                     updateDonePanel();
                 }
             }
@@ -4642,7 +4707,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                         Messages.getString("MovementDisplay.EscapeDialog.message"))) {
 
             clear();
-            cmd.addStep(MoveStepType.FLEE);
+            addStepToMovePath(MoveStepType.FLEE);
             ready();
         } else if (actionCmd.equals(MoveCommand.MOVE_FLY_OFF.getCmd())
                 && clientgui.doYesNoDialog(
@@ -4652,9 +4717,9 @@ public synchronized void actionPerformed(ActionEvent ev) {
                     && clientgui.doYesNoDialog(
                             Messages.getString("MovementDisplay.ReturnFly.title"),
                             Messages.getString("MovementDisplay.ReturnFly.message"))) {
-                cmd.addStep(MoveStepType.RETURN);
+                addStepToMovePath(MoveStepType.RETURN);
             } else {
-                cmd.addStep(MoveStepType.OFF);
+                addStepToMovePath(MoveStepType.OFF);
             }
             ready();
         } else if (actionCmd.equals(MoveCommand.MOVE_EJECT.getCmd())) {
@@ -4663,7 +4728,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                         Messages.getString("MovementDisplay.AbandonDialog.title"),
                         Messages.getString("MovementDisplay.AbandonDialog.message"))) {
                     clear();
-                    cmd.addStep(MoveStepType.EJECT);
+                    addStepToMovePath(MoveStepType.EJECT);
                     ready();
                 }
             } else if (ce.isLargeCraft()) {
@@ -4674,9 +4739,9 @@ public synchronized void actionPerformed(ActionEvent ev) {
                     // If we're abandoning while grounded, find a legal position to put an EjectedCrew unit
                     if (!ce.isSpaceborne() && ce.getAltitude() == 0) {
                         Coords pos = getEjectPosition(ce);
-                        cmd.addStep(MoveStepType.EJECT, ce, pos);
+                        addStepToMovePath(MoveStepType.EJECT, ce, pos);
                     } else {
-                        cmd.addStep(MoveStepType.EJECT);
+                        addStepToMovePath(MoveStepType.EJECT);
                     }
                     ready();
                 }
@@ -4685,7 +4750,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                             Messages.getString("MovementDisplay.AbandonDialog1.title"),
                             Messages.getString("MovementDisplay.AbandonDialog1.message"))) {
                 clear();
-                cmd.addStep(MoveStepType.EJECT);
+                addStepToMovePath(MoveStepType.EJECT);
                 ready();
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_LOAD.getCmd())) {
@@ -4693,8 +4758,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
             // to our local list of loaded units, and then stop.
             Entity other = getLoadedUnit();
             if (other != null) {
-                cmd.addStep(MoveStepType.LOAD);
-                clientgui.getBoardView().drawMovementData(ce(), cmd);
+                addStepToMovePath(MoveStepType.LOAD);
                 gear = MovementDisplay.GEAR_LAND;
             } // else - didn't find a unit to load
         } else if (actionCmd.equals(MoveCommand.MOVE_TOW.getCmd())) {
@@ -4702,20 +4766,18 @@ public synchronized void actionPerformed(ActionEvent ev) {
             // to our local list of loaded units, and then stop.
             Entity other = getTowedUnit();
             if (other != null) {
-                cmd.addStep(MoveStepType.TOW);
-                clientgui.getBoardView().drawMovementData(ce(), cmd);
+                addStepToMovePath(MoveStepType.TOW);
             } // else - didn't find a unit to tow
         } else if (actionCmd.equals(MoveCommand.MOVE_DISCONNECT.getCmd())) {
             // Ask the user if we're carrying multiple units.
             Entity other = getDisconnectedUnit();
             if (other != null) {
-                cmd.addStep(MoveStepType.DISCONNECT, other);
-                clientgui.getBoardView().drawMovementData(ce(), cmd);
+                addStepToMovePath(MoveStepType.DISCONNECT, other);
             } // else - didn't find a unit to tow
         } else if (actionCmd.equals(MoveCommand.MOVE_MOUNT.getCmd())) {
             Entity other = getMountedUnit();
             if (other != null) {
-                cmd.addStep(MoveStepType.MOUNT, other);
+                addStepToMovePath(MoveStepType.MOUNT, other);
                 ready();
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_UNLOAD.getCmd())) {
@@ -4730,20 +4792,17 @@ public synchronized void actionPerformed(ActionEvent ev) {
                         // set other's position and end this turn - the
                         // unloading unit will get
                         // another turn for further unloading later
-                        cmd.addStep(MoveStepType.UNLOAD, other, pos);
-                        clientgui.getBoardView().drawMovementData(ce(), cmd);
+                        addStepToMovePath(MoveStepType.UNLOAD, other, pos);
                         ready();
                     }
                 } else {
                     // some different handling for small craft/dropship
                     // unloading
-                    cmd.addStep(MoveStepType.UNLOAD, other);
-                    clientgui.getBoardView().drawMovementData(ce(), cmd);
+                    addStepToMovePath(MoveStepType.UNLOAD, other);
                 }
             } // else - Player canceled the unload.
         } else if (actionCmd.equals(MoveCommand.MOVE_RAISE_ELEVATION.getCmd())) {
-            cmd.addStep(MoveStepType.UP);
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
+            addStepToMovePath(MoveStepType.UP);
         } else if (actionCmd.equals(MoveCommand.MOVE_LOWER_ELEVATION.getCmd())) {
             if (ce.isAero()
                     && (null != cmd.getLastStep())
@@ -4751,10 +4810,9 @@ public synchronized void actionPerformed(ActionEvent ev) {
                     && (cmd.getLastStep().getVelocity() < 12)
                     && !(((IAero) ce).isSpheroid() || clientgui.getClient()
                             .getGame().getPlanetaryConditions().isVacuum())) {
-                cmd.addStep(MoveStepType.ACC, true);
+                addStepToMovePath(MoveStepType.ACC, true);
             }
-            cmd.addStep(MoveStepType.DOWN);
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
+            addStepToMovePath(MoveStepType.DOWN);
         } else if (actionCmd.equals(MoveCommand.MOVE_CLIMB_MODE.getCmd())) {
             MoveStep ms = cmd.getLastStep();
             if ((ms != null)
@@ -4767,16 +4825,15 @@ public synchronized void actionPerformed(ActionEvent ev) {
                 // This affects how the StepSprite gets rendered, so it's more clear to keep a climb step
                 // once one has been added
                 if (lastStep.getType() == MoveStepType.CLIMB_MODE_ON) {
-                    cmd.addStep(MoveStepType.CLIMB_MODE_OFF);
+                    addStepToMovePath(MoveStepType.CLIMB_MODE_OFF);
                 } else {
-                    cmd.addStep(MoveStepType.CLIMB_MODE_ON);
+                    addStepToMovePath(MoveStepType.CLIMB_MODE_ON);
                 }
             } else if (cmd.getFinalClimbMode()) {
-                cmd.addStep(MoveStepType.CLIMB_MODE_OFF);
+                addStepToMovePath(MoveStepType.CLIMB_MODE_OFF);
             } else {
-                cmd.addStep(MoveStepType.CLIMB_MODE_ON);
+                addStepToMovePath(MoveStepType.CLIMB_MODE_ON);
             }
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
             computeMovementEnvelope(ce);
         } else if (actionCmd.equals(MoveCommand.MOVE_LAY_MINE.getCmd())) {
             int i = chooseMineToLay();
@@ -4791,64 +4848,53 @@ public synchronized void actionPerformed(ActionEvent ev) {
                 if (cmd.getLastStep() == null
                         && ce instanceof BattleArmor
                         && ce.getMovementMode().equals(EntityMovementMode.INF_JUMP)) {
-                    cmd.addStep(MoveStepType.START_JUMP);
+                    addStepToMovePath(MoveStepType.START_JUMP);
                     gear = GEAR_JUMP;
                     Color jumpColor = GUIP.getMoveJumpColor();
                     clientgui.getBoardView().setHighlightColor(jumpColor);
                     computeMovementEnvelope(ce);
                 }
-                cmd.addStep(MoveStepType.LAY_MINE, i);
-                clientgui.getBoardView().drawMovementData(ce, cmd);
+                addStepToMovePath(MoveStepType.LAY_MINE, i);
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_CALL_SUPPORT.getCmd())) {
             ((Infantry) ce).createLocalSupport();
             clientgui.getClient().sendUpdateEntity(ce());
         } else if (actionCmd.equals(MoveCommand.MOVE_DIG_IN.getCmd())) {
-            cmd.addStep(MoveStepType.DIG_IN);
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
+            addStepToMovePath(MoveStepType.DIG_IN);
         } else if (actionCmd.equals(MoveCommand.MOVE_FORTIFY.getCmd())) {
-            cmd.addStep(MoveStepType.FORTIFY);
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
+            addStepToMovePath(MoveStepType.FORTIFY);
         } else if (actionCmd.equals(MoveCommand.MOVE_TAKE_COVER.getCmd())) {
-            cmd.addStep(MoveStepType.TAKE_COVER);
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
+            addStepToMovePath(MoveStepType.TAKE_COVER);
         } else if (actionCmd.equals(MoveCommand.MOVE_SHAKE_OFF.getCmd())) {
-            cmd.addStep(MoveStepType.SHAKE_OFF_SWARMERS);
-            clientgui.getBoardView().drawMovementData(ce(), cmd);
+            addStepToMovePath(MoveStepType.SHAKE_OFF_SWARMERS);
         } else if (actionCmd.equals(MoveCommand.MOVE_RECKLESS.getCmd())) {
             cmd.setCareful(false);
         } else if (actionCmd.equals(MoveCommand.MOVE_STRAFE.getCmd())) {
             gear = GEAR_STRAFE;
         } else if (actionCmd.equals(MoveCommand.MOVE_BOMB.getCmd())) {
             if (cmd.getLastStep() == null) {
-                cmd.addStep(MoveStepType.NONE);
+                addStepToMovePath(MoveStepType.NONE);
             }
             cmd.setVTOLBombStep(cmd.getFinalCoords());
             cmd.compile(clientgui.getClient().getGame(), ce, false);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            updateMove();
         } else if (actionCmd.equals(MoveCommand.MOVE_ACCN.getCmd())) {
-            cmd.addStep(MoveStepType.ACCN);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.ACCN);
         } else if (actionCmd.equals(MoveCommand.MOVE_DECN.getCmd())) {
-            cmd.addStep(MoveStepType.DECN);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.DECN);
         } else if (actionCmd.equals(MoveCommand.MOVE_ACC.getCmd())) {
-            cmd.addStep(MoveStepType.ACC);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.ACC);
         } else if (actionCmd.equals(MoveCommand.MOVE_DEC.getCmd())) {
-            cmd.addStep(MoveStepType.DEC);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.DEC);
         } else if (actionCmd.equals(MoveCommand.MOVE_EVADE.getCmd())) {
-            cmd.addStep(MoveStepType.EVADE);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.EVADE);
         } else if (actionCmd.equals(MoveCommand.MOVE_BOOTLEGGER.getCmd())) {
-            cmd.addStep(MoveStepType.BOOTLEGGER);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.BOOTLEGGER);
         } else if (actionCmd.equals(MoveCommand.MOVE_SHUTDOWN.getCmd())) {
             if (clientgui.doYesNoDialog(
                     Messages.getString("MovementDisplay.ShutdownDialog.title"),
                     Messages.getString("MovementDisplay.ShutdownDialog.message"))) {
-                cmd.addStep(MoveStepType.SHUTDOWN);
+                addStepToMovePath(MoveStepType.SHUTDOWN);
                 ready();
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_STARTUP.getCmd())) {
@@ -4856,31 +4902,28 @@ public synchronized void actionPerformed(ActionEvent ev) {
                     Messages.getString("MovementDisplay.StartupDialog.title"),
                     Messages.getString("MovementDisplay.StartupDialog.message"))) {
                 clear();
-                cmd.addStep(MoveStepType.STARTUP);
+                addStepToMovePath(MoveStepType.STARTUP);
                 ready();
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_SELF_DESTRUCT.getCmd())) {
             if (clientgui.doYesNoDialog(
                     Messages.getString("MovementDisplay.SelfDestructDialog.title"),
                     Messages.getString("MovementDisplay.SelfDestructDialog.message"))) {
-                cmd.addStep(MoveStepType.SELF_DESTRUCT);
+                addStepToMovePath(MoveStepType.SELF_DESTRUCT);
                 ready();
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_EVADE_AERO.getCmd())) {
-            cmd.addStep(MoveStepType.EVADE);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.EVADE);
             setEvadeAeroEnabled(false);
         } else if (actionCmd.equals(MoveCommand.MOVE_ROLL.getCmd())) {
-            cmd.addStep(MoveStepType.ROLL);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.ROLL);
         } else if (actionCmd.equals(MoveCommand.MOVE_HOVER.getCmd())) {
-            cmd.addStep(MoveStepType.HOVER);
+            addStepToMovePath(MoveStepType.HOVER);
             if (ce instanceof LandAirMech
                     && ce.getMovementMode() == EntityMovementMode.WIGE
                     && ce.isAirborne()) {
                 gear = GEAR_LAND;
             }
-            clientgui.getBoardView().drawMovementData(ce, cmd);
         } else if (actionCmd.equals(MoveCommand.MOVE_MANEUVER.getCmd())) {
             ManeuverChoiceDialog choiceDialog = new ManeuverChoiceDialog(
                     clientgui.frame,
@@ -4910,20 +4953,15 @@ public synchronized void actionPerformed(ActionEvent ev) {
                     distance, clientgui.getClient().getGame(), cmd);
             choiceDialog.setVisible(true);
             int manType = choiceDialog.getChoice();
-            if ((manType > ManeuverType.MAN_NONE) && addManeuver(manType)) {
-                clientgui.getBoardView().drawMovementData(ce, cmd);
-            }
+            updateMove((manType > ManeuverType.MAN_NONE) && addManeuver(manType));
         } else if (actionCmd.equals(MoveCommand.MOVE_LAUNCH.getCmd())) {
             TreeMap<Integer, Vector<Integer>> undocked = getUndockedUnits();
             if (!undocked.isEmpty()) {
-                cmd.addStep(MoveStepType.UNDOCK, undocked);
+                addStepToMovePath(MoveStepType.UNDOCK, undocked);
             }
             TreeMap<Integer, Vector<Integer>> launched = getLaunchedUnits();
             if (!launched.isEmpty()) {
-                cmd.addStep(MoveStepType.LAUNCH, launched);
-            }
-            if (!launched.isEmpty() || !undocked.isEmpty()) {
-                clientgui.getBoardView().drawMovementData(ce, cmd);
+                addStepToMovePath(MoveStepType.LAUNCH, launched);
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_RECOVER.getCmd())
                 || actionCmd.equals(MoveCommand.MOVE_DOCK.getCmd())) {
@@ -4931,8 +4969,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
             // then bring up an option dialog
             int recoverer = getRecoveryUnit();
             if (recoverer != -1) {
-                cmd.addStep(MoveStepType.RECOVER, recoverer, -1);
-                clientgui.getBoardView().drawMovementData(ce, cmd);
+                addStepToMovePath(MoveStepType.RECOVER, recoverer, -1);
             }
             if (actionCmd.equals(MoveCommand.MOVE_DOCK.getCmd())) {
                 cmd.getLastStep().setDocking(true);
@@ -4940,33 +4977,25 @@ public synchronized void actionPerformed(ActionEvent ev) {
         } else if (actionCmd.equals(MoveCommand.MOVE_DROP.getCmd())) {
             TreeMap<Integer, Vector<Integer>> dropped = getDroppedUnits();
             if (!dropped.isEmpty()) {
-                cmd.addStep(MoveStepType.DROP, dropped);
-                clientgui.getBoardView().drawMovementData(ce, cmd);
+                addStepToMovePath(MoveStepType.DROP, dropped);
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_JOIN.getCmd())) {
             // if more than one unit is available as a carrier
             // then bring up an option dialog
             int joined = getUnitJoined();
             if (joined != -1) {
-                cmd.addStep(MoveStepType.JOIN, joined, -1);
-                clientgui.getBoardView().drawMovementData(ce, cmd);
+                addStepToMovePath(MoveStepType.JOIN, joined, -1);
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_TURN_LEFT.getCmd())) {
-            cmd.addStep(MoveStepType.TURN_LEFT);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.TURN_LEFT);
         } else if (actionCmd.equals(MoveCommand.MOVE_TURN_RIGHT.getCmd())) {
-            cmd.addStep(MoveStepType.TURN_RIGHT);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.TURN_RIGHT);
         } else if (actionCmd.equals(MoveCommand.MOVE_THRUST.getCmd())) {
-            cmd.addStep(MoveStepType.THRUST);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.THRUST);
         } else if (actionCmd.equals(MoveCommand.MOVE_YAW.getCmd())) {
-            cmd.addStep(MoveStepType.YAW);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepToMovePath(MoveStepType.YAW);
         } else if (actionCmd.equals(MoveCommand.MOVE_END_OVER.getCmd())) {
-            cmd.addStep(MoveStepType.YAW);
-            cmd.addStep(MoveStepType.ROLL);
-            clientgui.getBoardView().drawMovementData(ce, cmd);
+            addStepsToMovePath(MoveStepType.YAW, MoveStepType.ROLL);
         } else if (actionCmd.equals(MoveCommand.MOVE_DUMP.getCmd())) {
             dumpBombs();
         } else if (actionCmd.equals(MoveCommand.MOVE_TAKE_OFF.getCmd())) {
@@ -4983,7 +5012,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                         Messages.getString("MovementDisplay.TakeOffDialog.title"),
                         Messages.getString("MovementDisplay.TakeOffDialog.message"))) {
                     clear();
-                    cmd.addStep(MoveStepType.TAKEOFF);
+                    addStepToMovePath(MoveStepType.TAKEOFF);
                     ready();
                 }
             }
@@ -4992,7 +5021,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                     Messages.getString("MovementDisplay.TakeOffDialog.title"),
                     Messages.getString("MovementDisplay.TakeOffDialog.message"))) {
                 clear();
-                cmd.addStep(MoveStepType.VTAKEOFF);
+                addStepToMovePath(MoveStepType.VTAKEOFF);
                 ready();
             }
         } else if (actionCmd.equals(MoveCommand.MOVE_LAND.getCmd())) {
@@ -5007,7 +5036,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                         Messages.getString("MovementDisplay.LandDialog.title"),
                         Messages.getString("MovementDisplay.LandDialog.message"))) {
                     clear();
-                    cmd.addStep(MoveStepType.LAND);
+                    addStepToMovePath(MoveStepType.LAND);
                     ready();
                 }
             }
@@ -5023,7 +5052,7 @@ public synchronized void actionPerformed(ActionEvent ev) {
                         Messages.getString("MovementDisplay.LandDialog.title"),
                         Messages.getString("MovementDisplay.LandDialog.message"))) {
                     clear();
-                    cmd.addStep(MoveStepType.VLAND);
+                    addStepToMovePath(MoveStepType.VLAND);
                     ready();
                 }
             }
@@ -5145,13 +5174,14 @@ private void adjustConvertSteps(EntityMovementMode endMode) {
         }
         clear();
         ce().setConvertingNow(true);
-        cmd.addStep(MoveStepType.CONVERT_MODE);
+        addStepToMovePath(MoveStepType.CONVERT_MODE);
         if (cmd.getFinalConversionMode() != endMode) {
-            cmd.addStep(MoveStepType.CONVERT_MODE);
+            addStepToMovePath(MoveStepType.CONVERT_MODE);
         }
         if (ce() instanceof Mech && ((Mech) ce()).hasTracks()) {
             ce().setMovementMode(endMode);
         }
+        updateMove();
     }
 
     /**
diff --git a/megamek/src/megamek/client/ui/swing/RandomMapDialog.java b/megamek/src/megamek/client/ui/swing/RandomMapDialog.java
index 40773ae9cc8..9d258c49d44 100644
--- a/megamek/src/megamek/client/ui/swing/RandomMapDialog.java
+++ b/megamek/src/megamek/client/ui/swing/RandomMapDialog.java
@@ -353,8 +353,9 @@ private void doLoad() {
             return;
         }
 
-        // Cache the selected boards, so we can restore them
-        List<String> selectedBoards = mapSettings.getBoardsSelectedVector();
+        // Cache the selected boards if they exist, so we can restore them
+        List<String> selectedBoards = mapSettings != null ? mapSettings.getBoardsSelectedVector() : null;
+
         // Load the file.  If there is an error, log it and return.
         try (InputStream is = new FileInputStream(selectedFile)) {
             mapSettings = MapSettings.getInstance(is);
@@ -362,9 +363,13 @@ private void doLoad() {
             LogManager.getLogger().error("", e);
             return;
         }
-        mapSettings.setBoardsSelectedVector(selectedBoards);
+
+        if(selectedBoards != null) {
+            mapSettings.setBoardsSelectedVector(selectedBoards);
+        }
 
         // Pass the loaded settings into the two different views.
+        choTheme.setSelectedItem(mapSettings.getTheme());
         basicPanel.setMapSettings(mapSettings);
         advancedPanel.setMapSettings(mapSettings);
     }
diff --git a/megamek/src/megamek/client/ui/swing/RandomMapPanelAdvanced.java b/megamek/src/megamek/client/ui/swing/RandomMapPanelAdvanced.java
index 4114900bfd2..8ecb6482c87 100644
--- a/megamek/src/megamek/client/ui/swing/RandomMapPanelAdvanced.java
+++ b/megamek/src/megamek/client/ui/swing/RandomMapPanelAdvanced.java
@@ -27,6 +27,8 @@
 import javax.swing.border.LineBorder;
 import javax.swing.border.TitledBorder;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * @author Deric "Netzilla" Page (deric dot page at usa dot net)
@@ -610,6 +612,11 @@ private JPanel setupCityPanel() {
         JLabel cityTypeLabel = new JLabel(Messages.getString("RandomMapDialog.labCity"));
         panel.add(cityTypeLabel);
         cityTypeCombo.setToolTipText(Messages.getString("RandomMapDialog.cityTypeCombo.toolTip"));
+
+        // don't nag the user about city parameters if the city is NONE
+        cityTypeCombo.addActionListener(e -> {
+            setCityPanelState();
+        });
         panel.add(cityTypeCombo);
         panel.add(new JLabel());
         panel.add(new JLabel());
@@ -660,9 +667,25 @@ private JPanel setupCityPanel() {
                                          Messages.getString("RandomMapDialog.borderCity")));
 
         RandomMapPanelBasic.makeCompactGrid(panel, 6, 4, 6, 6, 6, 6);
+        setCityPanelState();
         return panel;
     }
 
+    /**
+     * Worker function that sets up the state of the city-related textboxes
+     */
+    private void setCityPanelState() {
+        boolean enableCityControls = cityTypeCombo.getSelectedIndex() != 0;
+
+        cityBlocks.setEnabled(enableCityControls);
+        cityCFMaxField.setEnabled(enableCityControls);
+        cityCFMinField.setEnabled(enableCityControls);
+        cityFloorsMaxField.setEnabled(enableCityControls);
+        cityFloorsMinField.setEnabled(enableCityControls);
+        cityDensityField.setEnabled(enableCityControls);
+        townSizeField.setEnabled(enableCityControls);
+    }
+
     private JScrollPane setupEffectsPanel() {
         JPanel panel = new JPanel(new SpringLayout());
 
diff --git a/megamek/src/megamek/client/ui/swing/StatusBarPhaseDisplay.java b/megamek/src/megamek/client/ui/swing/StatusBarPhaseDisplay.java
index d6affb1c93a..40fee9be54a 100644
--- a/megamek/src/megamek/client/ui/swing/StatusBarPhaseDisplay.java
+++ b/megamek/src/megamek/client/ui/swing/StatusBarPhaseDisplay.java
@@ -19,14 +19,15 @@
  */
 package megamek.client.ui.swing;
 
-import java.awt.Dimension;
-import java.awt.GridLayout;
+import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.swing.*;
 
+import megamek.client.ui.GBC;
 import megamek.client.ui.Messages;
 import megamek.client.ui.swing.util.CommandAction;
 import megamek.client.ui.swing.util.KeyCommandBind;
@@ -227,13 +228,21 @@ public void setupButtonPanel() {
     protected UIUtil.FixedXPanel setupDonePanel()
     {
         var donePanel = new UIUtil.FixedXPanel();
+        donePanel.setPreferredSize(new Dimension(DONE_BUTTON_WIDTH+5, MIN_BUTTON_SIZE.height*2+5));
         donePanel.setOpaque(false);
-        donePanel.setLayout(new GridLayout(2,1));
-        donePanel.add(butDone);
-        butDone.setPreferredSize(new Dimension(DONE_BUTTON_WIDTH, MIN_BUTTON_SIZE.height * 2));
+        donePanel.setBackground(Color.darkGray);
+        donePanel.setBorder( BorderFactory.createLoweredBevelBorder() );
+        donePanel.setLayout(new GridBagLayout());
+        addToDonePanel(donePanel, butDone);
         return donePanel;
     }
 
+    protected void addToDonePanel(JPanel donePanel, JComponent item) {
+        item.setPreferredSize(new Dimension(DONE_BUTTON_WIDTH, MIN_BUTTON_SIZE.height));
+        butDone.setAlignmentX(LEFT_ALIGNMENT);
+        donePanel.add(item, GBC.eol().fill(GridBagConstraints.BOTH).weighty(1));
+    }
+
     /** Clears the actions of this phase. */
     public abstract void clear();
 
diff --git a/megamek/src/megamek/client/ui/swing/TargetChoiceDialog.java b/megamek/src/megamek/client/ui/swing/TargetChoiceDialog.java
index 7c5d7528562..a9fcd1940d0 100644
--- a/megamek/src/megamek/client/ui/swing/TargetChoiceDialog.java
+++ b/megamek/src/megamek/client/ui/swing/TargetChoiceDialog.java
@@ -14,8 +14,8 @@
 package megamek.client.ui.swing;
 
 import megamek.client.ui.enums.DialogResult;
-import megamek.client.ui.swing.tooltip.HexTooltip;
 import megamek.client.ui.swing.tooltip.UnitToolTip;
+import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.*;
 import megamek.common.actions.WeaponAttackAction;
 import megamek.common.annotations.Nullable;
@@ -31,6 +31,8 @@ public class TargetChoiceDialog extends AbstractChoiceDialog<Targetable> {
     final ClientGUI clientGUI;
     Entity firingEntity;
 
+    private static final GUIPreferences GUIP = GUIPreferences.getInstance();
+
      /**
      * This creates a modal dialog to pick one or more Targetable objects.
      * @param frame         parent @JFrame that owns this dialog
@@ -73,8 +75,9 @@ protected TargetChoiceDialog(JFrame frame, String title, String message,
 
     @Override
     protected void detailLabel(JToggleButton button, Targetable target) {
-        button.setText("<html>" + infoText(target) + UnitToolTip.getTargetTipDetail(target,
-                clientGUI.getClient()) + "</html>");
+        String div = "<DIV WIDTH=" + UIUtil.scaleForGUI(500) + ">" +  infoText(target) + " " + UnitToolTip.getTargetTipDetail(target,
+                clientGUI.getClient()) + "</DIV>";
+        button.setText("<html>" + div + "</html>");
     }
 
     @Override
diff --git a/megamek/src/megamek/client/ui/swing/boardview/BoardView.java b/megamek/src/megamek/client/ui/swing/boardview/BoardView.java
index 4b328756c17..9efe8f40bb8 100644
--- a/megamek/src/megamek/client/ui/swing/boardview/BoardView.java
+++ b/megamek/src/megamek/client/ui/swing/boardview/BoardView.java
@@ -605,6 +605,7 @@ public void mouseDragged(MouseEvent e) {
                     newX = scrollpane.getViewport().getViewPosition().x;
                 }
                 scrollpane.getViewport().setViewPosition(new Point(newX, newY));
+                pingMinimap();
             }
         };
         addMouseMotionListener(mouseMotionListener);
@@ -6442,7 +6443,7 @@ public RangeHelper(int min, int max) {
 
     // prepares the sprites for visual and sensor ranges
     public void setSensorRange(Entity entity, Coords c) {
-        if (entity == null || c == null) {
+        if (entity == null || c == null || !GUIP.getShowSensorRange()) {
             clearSensorsRanges();
             return;
         }
@@ -6459,7 +6460,8 @@ public void setSensorRange(Entity entity, Coords c) {
         int minAirSensorRange = 0;
         int maxAirSensorRange = 0;
 
-        if (game.getOptions().booleanOption(OptionsConstants.ADVANCED_TACOPS_SENSORS)) {
+        if (game.getOptions().booleanOption(OptionsConstants.ADVANCED_TACOPS_SENSORS)
+                || game.getOptions().booleanOption(OptionsConstants.ADVAERORULES_STRATOPS_ADVANCED_SENSORS)) {
             Compute.SensorRangeHelper srh = Compute.getSensorRanges(entity.getGame(), entity);
 
             if (srh != null) {
@@ -6497,11 +6499,19 @@ public void setSensorRange(Entity entity, Coords c) {
         List<Set<Coords>> sensorRanges = new ArrayList<>(1);
         int j = 0;
 
+        // find max range possible on map, no need to check beyond it
+        int rangeToCorner = (new Coords(0, game.getBoard().getHeight())).distance(c);
+        rangeToCorner = Math.max(rangeToCorner, (new Coords(0, 0)).distance(c));
+        rangeToCorner = Math.max(rangeToCorner, (new Coords(game.getBoard().getWidth(), 0)).distance(c));
+        rangeToCorner = Math.max(rangeToCorner, (new Coords(game.getBoard().getWidth(), game.getBoard().getHeight())).distance(c));
+
         for (RangeHelper rangeH : lBrackets) {
             sensorRanges.add(new HashSet<>());
+            int rangeMin = Math.min(rangeH.min, rangeToCorner);
+            int rangeMax = Math.min(rangeH.max, rangeToCorner);
 
-            if (rangeH.max > 0) {
-                for (int i = rangeH.min; i <= rangeH.max; i++) {
+            if (rangeMin != rangeMax) {
+                for (int i = rangeMin; i <= rangeMax; i++) {
                     // Add all hexes up to the range to separate lists
                     sensorRanges.get(j).addAll(c.allAtDistance(i));
                 }
diff --git a/megamek/src/megamek/client/ui/swing/calculationReport/CalculationReport.java b/megamek/src/megamek/client/ui/swing/calculationReport/CalculationReport.java
index a58689bd205..db5a3a380ee 100644
--- a/megamek/src/megamek/client/ui/swing/calculationReport/CalculationReport.java
+++ b/megamek/src/megamek/client/ui/swing/calculationReport/CalculationReport.java
@@ -259,4 +259,18 @@ static String formatForReport(double d) {
      * has no effect.
      */
     void discardTentativeSection();
+
+    /**
+     * End the current section of lines, keeping or discarding the section depending on the given
+     * keepSection. Calls either {@link #endTentativeSection()} or {@link #discardTentativeSection()}.
+     *
+     * @param keepSection When true, keeps the current section, otherwise discards it.
+     */
+    default void finalizeTentativeSection(boolean keepSection) {
+        if (keepSection) {
+            endTentativeSection();
+        } else {
+            discardTentativeSection();
+        }
+    }
 }
\ No newline at end of file
diff --git a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java
index a783b05d9e0..a2bf6871f29 100644
--- a/megamek/src/megamek/client/ui/swing/minimap/Minimap.java
+++ b/megamek/src/megamek/client/ui/swing/minimap/Minimap.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2002-2005 Ben Mazur (bmazur@sev.org)
  * Copyright (c) 2013 Edward Cullen (eddy@obsessedcomputers.co.uk)
- * Copyright (c) 2021-2022 - The MegaMek Team. All Rights Reserved.
+ * Copyright (c) 2021-2023 - The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
@@ -263,12 +263,7 @@ private void initializeDialog() {
     }
 
     @Override
-    public synchronized void update(Graphics g) {
-        paint(g);
-    }
-
-    @Override
-    public void paint(Graphics g) {
+    protected void paintComponent(Graphics g) {
         if (mapImage != null) {
             g.drawImage(mapImage, 0, 0, this);
             paintVisibleSection(g);
@@ -474,7 +469,7 @@ public void run() {
     };
 
     /** Call this to schedule a minimap redraw. */
-    public synchronized void refreshMap() {
+    public void refreshMap() {
         lastDrawMapReq = System.currentTimeMillis();
         SwingUtilities.invokeLater(drawMapable);
     }
@@ -488,12 +483,12 @@ private void drawMap() {
     }
 
     /** 
-     * Draws the minimap to the backbuffer. When ignoreVisible is true,
+     * Draws the minimap to the backbuffer. When forceDraw is true,
      * the map will be drawn even if it is minimized or not visible.
      * This can be used to draw the minimap for saving it as an image regardless
      * of its visual status onscreen.
      */
-    private synchronized void drawMap(boolean forceDraw) {
+    private void drawMap(boolean forceDraw) {
         if ((lastDrawStarted > lastDrawMapReq) && !forceDraw) {
             return;
         }
@@ -629,7 +624,7 @@ private void paintVisibleSection(Graphics g) {
 
         // thin less translucent rectangle
         g.setColor(new Color(255, 255, 255, 180));
-        ((Graphics2D) g).setStroke(new BasicStroke(zoom / 2));
+        ((Graphics2D) g).setStroke(new BasicStroke(zoom / 2f));
         g.drawRect(x1, y1, x2, y2);
     }
 
@@ -664,7 +659,7 @@ private void drawButtons(Graphics g) {
 
         int[] xTriangle = new int[3];
         int[] yTriangle = new int[3];
-        xTriangle[0] = Math.round((w - 11) / 2);
+        xTriangle[0] = Math.round((w - 11) / 2f);
         xTriangle[1] = xTriangle[0] + 11;
         if (minimized) {
             yTriangle[0] = h - 10;
@@ -815,6 +810,7 @@ private int[] yPoints(int x, int y) {
 
     private void paintSingleCoordBorder(Graphics g, int x, int y, Color c) {
         g.setColor(c);
+        ((Graphics2D) g).setStroke(new BasicStroke(Math.max(1, zoom / 2f)));
         g.drawPolygon(xPoints(x), yPoints(x, y), 6);
     }
 
@@ -1472,7 +1468,7 @@ public void hexCursor(BoardViewEvent b) {
         
         @Override
         public void hexMoused(BoardViewEvent b) {
-            update();
+            repaint();
         }
 
         @Override
diff --git a/megamek/src/megamek/client/ui/swing/tileset/HexTileset.java b/megamek/src/megamek/client/ui/swing/tileset/HexTileset.java
index 9b93bf80749..295ea8859b7 100644
--- a/megamek/src/megamek/client/ui/swing/tileset/HexTileset.java
+++ b/megamek/src/megamek/client/ui/swing/tileset/HexTileset.java
@@ -288,7 +288,7 @@ public void loadFromFile(String filename) throws IOException {
                 incDepth++;
                 if (incDepth < 100) {
                     String incFile = st.sval;
-                    LogManager.getLogger().info("Including " + incFile);
+                    LogManager.getLogger().debug("Including " + incFile);
                     loadFromFile(incFile);
                 }
             }
@@ -299,10 +299,10 @@ public void loadFromFile(String filename) throws IOException {
         
         String loadInfo = String.format("Loaded %o base images, %o super images and %o ortho images", 
                 bases.size(), supers.size(), orthos.size());
-        LogManager.getLogger().info(loadInfo);
+        LogManager.getLogger().debug(loadInfo);
         
         if (incDepth == 0) {
-            LogManager.getLogger().info("HexTileset loaded in " + (endTime - startTime) + "ms.");
+            LogManager.getLogger().info("HexTileset " + filename + " loaded in " + (endTime - startTime) + "ms.");
         }
         incDepth--;
     }
diff --git a/megamek/src/megamek/client/ui/swing/tooltip/PilotToolTip.java b/megamek/src/megamek/client/ui/swing/tooltip/PilotToolTip.java
index e56bd7ee109..f64222d27f4 100644
--- a/megamek/src/megamek/client/ui/swing/tooltip/PilotToolTip.java
+++ b/megamek/src/megamek/client/ui/swing/tooltip/PilotToolTip.java
@@ -26,6 +26,11 @@
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.stream.StreamSupport;
 
 import static megamek.client.ui.swing.tooltip.TipUtil.getOptionList;
 import static megamek.client.ui.swing.tooltip.TipUtil.scaledHTMLSpacer;
@@ -38,6 +43,10 @@ public final class PilotToolTip {
     private final static int PORTRAIT_BASESIZE = 72;
     final static String BG_COLOR = "#313131";
 
+    final static String TEMP_DIR = "/temp/";
+    final static String PORTRAIT_PREFIX = "TT_Portrait_";
+    final static String PNG_EXT = ".png";
+
     public static StringBuilder lobbyTip(InGameObject unit) {
         if (unit instanceof Entity) {
             return getPilotTipDetailed((Entity) unit, true);
@@ -168,7 +177,7 @@ private static StringBuilder crewPortraits(final Entity entity, boolean showDefa
                 // Write the scaled portrait to file
                 // This is done to avoid using HTML rescaling on the portrait which does
                 // not do any smoothing and has extremely ugly results
-                String tempPath = Configuration.imagesDir() + "/temp/TT_Portrait_" + entity.getExternalIdAsString() + "_" + i + ".png";
+                String tempPath = Configuration.imagesDir() + TEMP_DIR + PORTRAIT_PREFIX + crew.getExternalIdAsString() + "_" + i + PNG_EXT;
                 File tempFile = new File(tempPath);
                 if (!tempFile.exists()) {
                     BufferedImage bufferedImage = new BufferedImage(portrait.getWidth(null), portrait.getHeight(null), BufferedImage.TYPE_INT_RGB);
@@ -201,4 +210,30 @@ private static StringBuilder crewAdvs(final Entity entity, boolean detailed) {
     }
 
     private PilotToolTip() { }
+
+    public static void deleteImageCache() {
+        String tempPath = Configuration.imagesDir() + TEMP_DIR;
+        String filter = PORTRAIT_PREFIX + "*" + PNG_EXT;
+
+        try {
+            StreamSupport.stream(Files.newDirectoryStream(Paths.get(tempPath), filter).spliterator(), true)
+                    .forEach(p -> {
+                                try {
+                                    Files.delete(p);
+                                } catch (Exception ex) {
+                                }
+                            }
+                    );
+        } catch (Exception ex) {
+        }
+    }
+
+    public static void deleteImageCache(Crew crew, int pos) {
+        String tempPath = Configuration.imagesDir() + TEMP_DIR + PORTRAIT_PREFIX + crew.getExternalIdAsString() + "_" + pos + PNG_EXT;
+        File tempFile = new File(tempPath);
+        try {
+            Files.deleteIfExists(tempFile.toPath());
+        } catch (Exception ex) {
+        }
+    }
 }
diff --git a/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java b/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
index b76b27f2ef2..75266defd8b 100644
--- a/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
+++ b/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
@@ -1379,7 +1379,8 @@ private static StringBuilder getMovement(Entity entity) {
                         paritalWingDistroyed += entity.getBadCriticals(CriticalSlot.TYPE_EQUIPMENT, eNum, Mech.LOC_RT);
                         paritalWingDistroyed += entity.getBadCriticals(CriticalSlot.TYPE_EQUIPMENT, eNum, Mech.LOC_LT);
 
-                        partialWingWeaterMod = ((Mech) entity).getPartialWingJumpAtmoBonus() - ((Mech) entity).getPartialWingJumpWeightClassBonus();
+                        partialWingWeaterMod = ((Mech) entity).getPartialWingJumpAtmoBonus()
+                                - ((Mech) entity).getPartialWingJumpWeightClassBonus();
                     }
                 }
 
@@ -1395,9 +1396,9 @@ private static StringBuilder getMovement(Entity entity) {
                 sMove += "/" + jumpMP;
             }
 
-            int walkMPModified = entity.getWalkMP(true, false,false);
-            int runMPModified = entity.getRunMP(true, false, false);
-            int jumpMPModified = entity.getJumpMP(true);
+            int walkMPModified = entity.getWalkMP();
+            int runMPModified = entity.getRunMP();
+            int jumpMPModified = entity.getJumpMP();
 
             if ((walkMP != walkMPModified) || (runMP != runMPModified) || (jumpMP != jumpMPModified)) {
                 sMove += DOT_SPACER + walkMPModified + "/" + runMPModified;
@@ -1416,8 +1417,8 @@ private static StringBuilder getMovement(Entity entity) {
                     String sGravity =  entity.getGame().getPlanetaryConditions().getGravity() + "g";
                     sMove += guiScaledFontHTML(GUIP.getWarningColor()) + sGravity + "</FONT>";
                 }
-                int walkMPNoHeat = entity.getWalkMP(true, true,false);
-                int runMPNoHeat = entity.getRunMP(true, true, false);
+                int walkMPNoHeat = entity.getWalkMP(MPCalculationSetting.NO_HEAT);
+                int runMPNoHeat = entity.getRunMP(MPCalculationSetting.NO_HEAT);
                 if ((walkMPNoHeat != walkMPModified) || (runMPNoHeat != runMPModified)) {
                     sMove += DOT_SPACER;
                     String sHeat = "\uD83D\uDD25";
diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/SummaryPanel.java b/megamek/src/megamek/client/ui/swing/unitDisplay/SummaryPanel.java
index 087f389a18d..9bbf444538f 100644
--- a/megamek/src/megamek/client/ui/swing/unitDisplay/SummaryPanel.java
+++ b/megamek/src/megamek/client/ui/swing/unitDisplay/SummaryPanel.java
@@ -23,7 +23,6 @@
 import megamek.client.ui.swing.boardview.BoardView;
 import megamek.client.ui.swing.tooltip.PilotToolTip;
 import megamek.client.ui.swing.tooltip.UnitToolTip;
-import megamek.client.ui.swing.util.UIUtil;
 import megamek.client.ui.swing.widget.*;
 import megamek.common.*;
 import megamek.common.util.fileUtils.MegaMekFile;
diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java
index 03ed8d75e59..79d85ed3c94 100644
--- a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java
+++ b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java
@@ -1999,7 +1999,7 @@ private void setFieldOfFire(Mounted mounted) {
         ranges[0] = wtype.getRanges(mounted);
 
         AmmoType atype = null;
-        if (mounted.getLinked() != null) {
+        if ((mounted.getLinked() != null) && (mounted.getLinked().getType() instanceof AmmoType)) {
             atype = (AmmoType) mounted.getLinked().getType();
         }
 
diff --git a/megamek/src/megamek/client/ui/swing/util/UIUtil.java b/megamek/src/megamek/client/ui/swing/util/UIUtil.java
index 11502ecc384..d0cbcd5d973 100644
--- a/megamek/src/megamek/client/ui/swing/util/UIUtil.java
+++ b/megamek/src/megamek/client/ui/swing/util/UIUtil.java
@@ -656,7 +656,7 @@ public static void setHighQualityRendering(Graphics graph) {
             ((Graphics2D) graph).setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
             ((Graphics2D) graph).setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
             ((Graphics2D) graph).setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-            ((Graphics2D) graph).setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+            ((Graphics2D) graph).setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
         }
     }
 
diff --git a/megamek/src/megamek/client/ui/swing/widget/VerifiableTextField.java b/megamek/src/megamek/client/ui/swing/widget/VerifiableTextField.java
index e0db468c1f0..18e9cdefa49 100644
--- a/megamek/src/megamek/client/ui/swing/widget/VerifiableTextField.java
+++ b/megamek/src/megamek/client/ui/swing/widget/VerifiableTextField.java
@@ -206,12 +206,12 @@ public void removeVerifier(DataVerifier verifier) {
     /**
      * Compares the text field's value to the list of {@link DataVerifier} objects to ensure the validity of the data.
      * If the text value passes all validation checks, a NULL value will be returned.  Otherwise a description of
-     * the failed validation will be returned.
+     * the failed validation will be returned. Does not verify if the field is disabled.
      *
      * @return NULL if the text in the field is valid. A description of the failure otherwise.
      */
     public String verifyTextS() {
-        if (verifiers.isEmpty()) {
+        if (verifiers.isEmpty() || !isEnabled()) {
             return null;
         }
 
diff --git a/megamek/src/megamek/common/Aero.java b/megamek/src/megamek/common/Aero.java
index aec1487c8c4..cb65699e247 100644
--- a/megamek/src/megamek/common/Aero.java
+++ b/megamek/src/megamek/common/Aero.java
@@ -14,7 +14,6 @@
 package megamek.common;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.battlevalue.AeroBVCalculator;
 import megamek.common.cost.AeroCostCalculator;
 import megamek.common.enums.AimingMode;
 import megamek.common.options.OptionsConstants;
@@ -319,62 +318,49 @@ public boolean isAeroSensorDestroyed() {
         return getSensorHits() >= 3;
     }
 
-    /**
-     * Returns this entity's safe thrust, factored for heat, extreme
-     * temperatures, gravity, partial repairs and bomb load.
-     */
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor, false);
-    }
-    
-    /**
-     * Returns this entity's safe thrust, factored for heat, extreme
-     * temperatures, gravity, partial repairs, bomb load and whether it's grounded or not.
-     */
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor, boolean ignoreGroundedStatus) {
-        int j = getOriginalWalkMP();
-        // adjust for engine hits
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = getOriginalWalkMP();
         if (engineHits >= getMaxEngineHits()) {
             return 0;
         }
+
         int engineLoss = 2;
         if ((this instanceof SmallCraft) || (this instanceof Jumpship)) {
             engineLoss = 1;
         }
-        j = Math.max(0, j - (engineHits * engineLoss));
-        j = Math.max(0, j - getCargoMpReduction(this));
-        if ((null != game) && gravity) {
+        mp = Math.max(0, mp - (engineHits * engineLoss));
+
+        if (!mpCalculationSetting.ignoreCargo) {
+            mp = Math.max(0, mp - getCargoMpReduction(this));
+        }
+
+        if ((null != game) && !mpCalculationSetting.ignoreWeather) {
             int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
-            if (weatherMod != 0) {
-                j = Math.max(j + weatherMod, 0);
-            }
+            mp = Math.max(mp + weatherMod, 0);
             if (getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
                     && (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_TORNADO_F13)) {
-                j += 1;
+                mp += 1;
             }
         }
-        // get bomb load
-        j = reduceMPByBombLoad(j);
 
-        if (hasModularArmor()) {
-            j--;
+        if (!mpCalculationSetting.ignoreCargo) {
+            mp = reduceMPByBombLoad(mp);
+        }
+
+        if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
+            mp--;
         }
-        // partially repaired engine
+
         if (getPartialRepairs().booleanOption("aero_engine_crit")) {
-            j--;
+            mp--;
         }
 
-        // if they are not airborne, then they get MP halved (aerodyne) or no MP
-        // and also if we're not ignoring the "grounded" status
-        if (!ignoreGroundedStatus && !isAirborne()) {
-            j = j / 2;
-            if (isSpheroid()) {
-                j = 0;
-            }
+        if (!mpCalculationSetting.ignoreGrounded && !isAirborne()) {
+            mp = isSpheroid() ? 0 : mp / 2;
         }
 
-        return j;
+        return mp;
     }
 
     /**
@@ -384,21 +370,7 @@ public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulara
      */
     @Override
     public int getCurrentThrust() {
-        int j = getOriginalWalkMP();
-        j = Math.max(0, j - getCargoMpReduction(this));
-        if (null != game) {
-            int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
-            if (weatherMod != 0) {
-                j = Math.max(j + weatherMod, 0);
-            }
-        }
-        // get bomb load
-        j = reduceMPByBombLoad(j);
-
-        if (hasModularArmor()) {
-            j--;
-        }
-        return j;
+        return getWalkMP(MPCalculationSetting.NO_GROUNDED);
     }
 
     /**
@@ -1342,11 +1314,6 @@ public int getDependentLocation(int loc) {
         return LOC_NONE;
     }
 
-    @Override
-    public int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return AeroBVCalculator.calculateBV(this, ignoreC3, ignoreSkill, calculationReport);
-    }
-
     public double getBVTypeModifier() {
         return 1.2;
     }
@@ -1505,21 +1472,13 @@ public int[] getNoOfSlots() {
         return NUM_OF_SLOTS;
     }
 
-    /**
-     * Fighters don't have MASC
-     */
     @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        return getRunMP(gravity, ignoreheat, ignoremodulararmor);
-    }
-
-    @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        // if aeros are on the ground, they can only move at cruising speed
-        if (!isAirborne()) {
-            return getWalkMP(gravity, ignoreheat, ignoremodulararmor);
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        if (isAirborne()) {
+            return super.getRunMP(mpCalculationSetting);
+        } else {
+            return getWalkMP(mpCalculationSetting);
         }
-        return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
     }
 
     @Override
@@ -3283,25 +3242,4 @@ public boolean isEjecting() {
     public void setEjecting(boolean ejecting) {
         this.ejecting = ejecting;
     }
-    
-    /**
-     * Aerospace units are considered permanently immobilized
-     *
-     * @return true if unit is permanently immobile
-     */
-    public boolean isPermanentlyImmobilized(boolean checkCrew) {
-        if (checkCrew && ((getCrew() == null) || getCrew().isDead())) {
-            return true;
-        } else if (((getOriginalWalkMP() > 0) || (getOriginalRunMP() > 0) || (getOriginalJumpMP() > 0))
-                /*
-                 * Need to make sure here that we're ignoring heat because
-                 * that's not actually "permanent":
-                 */
-                && ((getWalkMP(true, true, false, true) == 0)
-                    && (getRunMP(true, true, false) == 0) && (getJumpMP() == 0))) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/AmmoType.java b/megamek/src/megamek/common/AmmoType.java
index 054f5a55f61..8e3192faea0 100644
--- a/megamek/src/megamek/common/AmmoType.java
+++ b/megamek/src/megamek/common/AmmoType.java
@@ -13521,17 +13521,8 @@ public AmmoType createMunitionType(AmmoType base) {
         }
     } // End private class MunitionMutator
 
-    /**
-     * get bv for ProtoMek loads
-     */
-    public double getProtoBV(int shots) {
-        return ((kgPerShot * shots) / 1000) * bv;
-    }
-
-    /**
-     * @return BV for BA loads
-     */
-    public double getBABV() {
+    /** @return The battle value for ProtoMek or BA ammo loads. */
+    public double getKgPerShotBV(int shots) {
         return ((kgPerShot * shots) / 1000) * bv;
     }
 
diff --git a/megamek/src/megamek/common/BattleArmor.java b/megamek/src/megamek/common/BattleArmor.java
index 517f62da993..e5664d92c9d 100644
--- a/megamek/src/megamek/common/BattleArmor.java
+++ b/megamek/src/megamek/common/BattleArmor.java
@@ -15,7 +15,6 @@
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
 import megamek.client.ui.swing.calculationReport.DummyCalculationReport;
-import megamek.common.battlevalue.BattleArmorBVCalculator;
 import megamek.common.cost.BattleArmorCostCalculator;
 import megamek.common.enums.AimingMode;
 import megamek.common.options.OptionsConstants;
@@ -407,76 +406,57 @@ public int getOriginalJumpMP() {
         return jumpMP;
     }
 
-    /**
-     * Returns this entity's walking mp, factored for extreme temperatures and
-     * gravity.
-     */
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor, false, false);
-    }
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = getOriginalWalkMP();
 
-    public int getWalkMP(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor, boolean ignoreDWP,
-            boolean ignoreMyomerBooster) {
-        int j = getOriginalWalkMP();
         if (hasMyomerBooster()) {
-            if (!ignoreMyomerBooster) {
-                if (getWeightClass() >= EntityWeightClass.WEIGHT_HEAVY) {
-                    j++;
-                } else {
-                    j += 2;
-                }
+            if (!mpCalculationSetting.ignoreMyomerBooster) {
+                mp += (getWeightClass() >= EntityWeightClass.WEIGHT_HEAVY) ? 1 : 2;
             }
         } else if (hasWorkingMisc(MiscType.F_MECHANICAL_JUMP_BOOSTER)) {
-            // mechanical jump booster gives an extra MP
-            j++;
+            mp++;
         }
-        if (hasDWP() && !ignoreDWP) {
+
+        if (hasDWP() && !mpCalculationSetting.ignoreDWP) {
             if (getWeightClass() == EntityWeightClass.WEIGHT_MEDIUM) {
-                j -= 3;
+                mp -= 3;
             } else if (getWeightClass() >= EntityWeightClass.WEIGHT_HEAVY) {
-                j -= 2;
+                mp -= 2;
             }
-            if (j == 0) {
-                j++;
+            if (mp == 0) {
+                mp++;
             }
         }
-        if (null != game) {
-            int weatherMod = game.getPlanetaryConditions()
-                    .getMovementMods(this);
-            if (weatherMod != 0) {
-                j = Math.max(j + weatherMod, 0);
-            }
-        }
-        if (null != game) {
-            if ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_GUSTING_RAIN) && getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_RAIN)) {
-                j += 1;
+
+        if ((!mpCalculationSetting.ignoreWeather) && (null != game)) {
+            int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
+            mp = Math.max(mp + weatherMod, 0);
+
+            if ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_GUSTING_RAIN)
+                    && getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_RAIN)) {
+                mp += 1;
             }
 
             if (getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
                     && ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_STRONG_GALE)
                     || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_STORM))) {
-                j += 1;
+                mp += 1;
             }
         }
-        if (gravity) {
-            j = applyGravityEffectsOnMP(j);
+
+        if (!mpCalculationSetting.ignoreGravity) {
+            mp = applyGravityEffectsOnMP(mp);
         }
-        return j;
+
+        return mp;
     }
 
     @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        boolean fastMove = (game != null) &&
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        boolean fastMove = !mpCalculationSetting.ignoreOptionalRules && (game != null) &&
                 game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_TACOPS_FAST_INFANTRY_MOVE);
-        if (fastMove) {
-            return getWalkMP(gravity, ignoreheat, ignoremodulararmor, false,
-                    false) + 1;
-        }
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor, false, false);
+        return getWalkMP(mpCalculationSetting) + (fastMove ? 1 : 0);
     }
 
     /**
@@ -494,37 +474,21 @@ public boolean hasMyomerBooster() {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Infantry#getJumpMP(boolean)
-     */
     @Override
-    public int getJumpMP(boolean gravity) {
-        return getJumpMP(gravity, false, false);
-    }
-
-    /**
-     * get this BA's jump MP, possibly ignoring gravity and burden
-     *
-     * @param gravity
-     * @param ignoreBurden
-     * @return
-     */
-    public int getJumpMP(boolean gravity, boolean ignoreBurden,
-            boolean ignoreDWP) {
-        if (isBurdened() && !ignoreBurden) {
+    public int getJumpMP(MPCalculationSetting mpCalculationSetting) {
+        if (isBurdened() && !mpCalculationSetting.ignoreBurden) {
             return 0;
         }
-        if (hasDWP() && !ignoreDWP) {
+
+        if (hasDWP() && !mpCalculationSetting.ignoreDWP) {
             return 0;
         }
-        if (null != game) {
-            int windCond = game.getPlanetaryConditions().getWindStrength();
-            if (windCond >= PlanetaryConditions.WI_STORM) {
-                return 0;
-            }
+
+        if (!mpCalculationSetting.ignoreWeather && (null != game)
+                && (game.getPlanetaryConditions().getWindStrength() >= PlanetaryConditions.WI_STORM)) {
+            return 0;
         }
+
         int mp = 0;
         if (getMovementMode() != EntityMovementMode.INF_UMU) {
             mp = getOriginalJumpMP();
@@ -534,19 +498,21 @@ public int getJumpMP(boolean gravity, boolean ignoreBurden,
         if ((mp == 0) && hasWorkingMisc(MiscType.F_MECHANICAL_JUMP_BOOSTER)) {
             mp++;
         }
-        // partial wing gives extra MP in atmosphere
+
         if ((mp > 0)
                 && hasWorkingMisc(MiscType.F_PARTIAL_WING)
-                && ((game == null) || !game.getPlanetaryConditions().isVacuum())) {
+                && (mpCalculationSetting.ignoreWeather || (game == null) || !game.getPlanetaryConditions().isVacuum())) {
             mp++;
         }
+
         if ((mp > 0) && hasWorkingMisc(MiscType.F_JUMP_BOOSTER)) {
-            // jump booster gives an extra MP
             mp++;
         }
-        if (gravity) {
+
+        if (!mpCalculationSetting.ignoreGravity) {
             mp = applyGravityEffectsOnMP(mp);
         }
+
         return mp;
     }
 
@@ -868,33 +834,6 @@ public boolean hasHittableCriticals(int loc) {
         return super.hasHittableCriticals(loc);
     }
 
-    @Override
-    public int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return BattleArmorBVCalculator.calculateBV(this, ignoreC3, ignoreSkill, calculationReport);
-    }
-
-    /**
-     * Calculates the Battle Value of this BattleArmor. When singleTrooper is true the Battle Value of one
-     * trooper is returned, otherwise the BV of the whole unit. Calling this method with the value of
-     * singleTrooper being false is equivalent to calling the standard calculateBattleValue methods.
-     *
-     * <P> As in all other BV calculations, the other parameters can be used to ignore C3 / skill-based changes
-     * to the BV. When both are true, the "base" BV of the unit is calculated. Note that when a unit has a manual BV
-     * value set in its definition file, this manual BV value is returned instead of a calculated BV value.
-     *
-     * @param ignoreC3    When true, the BV contributions of any C3 computers are not added
-     * @param ignoreSkill When true, the skill of the crew / pilot is not taken into account for BV
-     * @param singleTrooper When true, returns the BV of a single trooper of this BA, otherwise of the full unit
-     * @return The Battle Value of this BattleArmor
-     */
-    public int calculateBattleValue(boolean ignoreC3, boolean ignoreSkill, boolean singleTrooper) {
-        if (useManualBV) {
-            return manualBV; // TODO : divide by the number of troopers when singleTrooper is true?
-        }
-        return BattleArmorBVCalculator.calculateBV(this, ignoreC3, ignoreSkill,
-                new DummyCalculationReport(), singleTrooper);
-    }
-
     /**
      * Prepare the entity for a new round of action.
      */
@@ -1013,8 +952,11 @@ public boolean hasDWP() {
      * pack. A <code>BattleArmor</code> must have 2 or more walking MP and be
      * Medium or heavier to mount DWP.
      *
-     * @return
+     * Used in MML!
+     *
+     * @return True if this BA can use a detachable weapon pack
      */
+    @SuppressWarnings("unused")
     public boolean canMountDWP() {
         return (getOriginalWalkMP() >= 2)
                 && (getWeightClass() >= EntityWeightClass.WEIGHT_MEDIUM);
diff --git a/megamek/src/megamek/common/BipedMech.java b/megamek/src/megamek/common/BipedMech.java
index f1d1def58af..4b91b7e0fe8 100644
--- a/megamek/src/megamek/common/BipedMech.java
+++ b/megamek/src/megamek/common/BipedMech.java
@@ -85,8 +85,8 @@ public boolean canFlipArms() {
     }
     
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        int wmp = getOriginalWalkMP();
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = getOriginalWalkMP();
         int legsDestroyed = 0;
         int hipHits = 0;
         int actuatorHits = 0;
@@ -100,7 +100,7 @@ public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulara
                     }
                 }
             }
-            wmp = (wmp * (2 - legsDestroyed)) / 2; 
+            mp = (mp * (2 - legsDestroyed)) / 2;
         } else {
             for (int i = 0; i < locations(); i++) {
                 if (locationIsLeg(i)) {
@@ -120,94 +120,91 @@ public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulara
 
             // leg damage effects
             if (legsDestroyed > 0) {
-                wmp = (legsDestroyed == 1) ? 1 : 0;
+                mp = (legsDestroyed == 1) ? 1 : 0;
             } else {
                 if (hipHits > 0) {
                     if ((game != null) && game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_TACOPS_LEG_DAMAGE)) {
-                        wmp = (hipHits >= 1) ? wmp - (2 * hipHits) : 0;
+                        mp = mp - 2 * hipHits;
                     } else {
-                        wmp = (hipHits == 1) ? (int) Math.ceil(wmp / 2.0) : 0;
+                        mp = (hipHits == 1) ? (int) Math.ceil(mp / 2.0) : 0;
                     }
                 }
-                wmp -= actuatorHits;
+                mp -= actuatorHits;
             }
         }
 
         if (hasShield()) {
-            wmp -= getNumberOfShields(MiscType.S_SHIELD_LARGE);
-            wmp -= getNumberOfShields(MiscType.S_SHIELD_MEDIUM);
+            mp -= getNumberOfShields(MiscType.S_SHIELD_LARGE);
+            mp -= getNumberOfShields(MiscType.S_SHIELD_MEDIUM);
         }
 
-        if (!ignoremodulararmor && hasModularArmor()) {
-            wmp--;
+        if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
+            mp--;
         }
 
-        if (!ignoreheat) {
+        if (!mpCalculationSetting.ignoreHeat) {
             // factor in heat
             if ((game != null) && game.getOptions().booleanOption(OptionsConstants.ADVCOMBAT_TACOPS_HEAT)) {
                 if (heat < 30) {
-                    wmp -= (heat / 5);
+                    mp -= (heat / 5);
                 } else if (heat >= 49) {
-                    wmp -= 9;
+                    mp -= 9;
                 } else if (heat >= 43) {
-                    wmp -= 8;
+                    mp -= 8;
                 } else if (heat >= 37) {
-                    wmp -= 7;
+                    mp -= 7;
                 } else if (heat >= 31) {
-                    wmp -= 6;
+                    mp -= 6;
                 } else {
-                    wmp -= 5;
+                    mp -= 5;
                 }
             } else {
-                wmp -= (heat / 5);
+                mp -= (heat / 5);
             }
-            // TSM negates some heat, but provides no benefit when using tracks.
-            if ((heat >= 9) && hasTSM(false) && legsDestroyed == 0 && movementMode != EntityMovementMode.TRACKED) {
-                wmp += 2;
+        }
+
+        // TSM negates some heat, but provides no benefit when using tracks.
+        if (((heat >= 9) || mpCalculationSetting.forceTSM) && hasTSM(false)
+                && (legsDestroyed == 0) && !movementMode.isTracked()) {
+            if (mpCalculationSetting.forceTSM && mpCalculationSetting.ignoreHeat) {
+                // When forcing TSM but ignoring heat we must assume heat to be 9 to activate TSM, this adds -1 MP!
+                mp += 1;
+            } else {
+                mp += 2;
             }
         }
-        wmp = Math.max(wmp - getCargoMpReduction(this), 0);
-        if (null != game) {
+
+        if (!mpCalculationSetting.ignoreCargo) {
+            mp = Math.max(mp - getCargoMpReduction(this), 0);
+        }
+
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
             int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
-            if (weatherMod != 0) {
-                wmp = Math.max(wmp + weatherMod, 0);
-            }
+            mp = Math.max(mp + weatherMod, 0);
+
             if (getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
                     && (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_TORNADO_F13)) {
-                wmp += 1;
+                mp += 1;
             }
         }
-        // gravity
-        if (gravity) {
-            wmp = applyGravityEffectsOnMP(wmp);
-        }
 
-        // For sanity sake...
-        wmp = Math.max(0, wmp);
+        if (!mpCalculationSetting.ignoreGravity) {
+            mp = applyGravityEffectsOnMP(mp);
+        }
 
-        return wmp;
+        return Math.max(0, mp);
     }
 
     /**
      * Returns this mech's running/flank mp modified for leg loss and stuff.
      */
     @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
         if (countBadLegs() == 0) {
-            return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
-        }
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor);
-    }
-
-    /**
-     * Returns run MP without considering MASC modified for leg loss and stuff.
-     */
-    @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        if (countBadLegs() == 0) {
-            return super.getRunMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
+            return super.getRunMP(mpCalculationSetting);
+        } else {
+            return getWalkMP(mpCalculationSetting);
         }
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor);
     }
 
     /**
@@ -497,7 +494,8 @@ public int getNumberOfShields(long size) {
 
         for (Mounted m : getMisc()) {
             EquipmentType type = m.getType();
-            if ((type instanceof MiscType) && type.hasFlag(MiscType.F_CLUB) && (type.hasSubType(size))) {
+            if ((type instanceof MiscType) && type.hasFlag(MiscType.F_CLUB)
+                    && (type.hasSubType(size))) {
                 // ok so we have a shield of certain size. no which arm is it.
                 if (m.getLocation() == Mech.LOC_RARM) {
                     raShield = 1;
diff --git a/megamek/src/megamek/common/BombType.java b/megamek/src/megamek/common/BombType.java
index 2ca30765e65..9150544f3cb 100644
--- a/megamek/src/megamek/common/BombType.java
+++ b/megamek/src/megamek/common/BombType.java
@@ -15,8 +15,11 @@
 package megamek.common;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import static java.util.stream.Collectors.toList;
+
 public class BombType extends AmmoType {
 
     public static final int B_NONE    = -1;
@@ -190,6 +193,17 @@ public static void initializeTypes() {
         EquipmentType.addType(BombType.createSmallFuelAirBomb());
         EquipmentType.addType(BombType.createLargeFuelAirBomb());
     }
+
+    /** @return All BombType equipment types as a List. The list is a copy and can safely be modified. */
+    public static List<BombType> allBombTypes() {
+        if (EquipmentType.allTypes == null) {
+            EquipmentType.initializeTypes();
+        }
+        return EquipmentType.allTypes.stream()
+                .filter(eType -> eType instanceof BombType)
+                .map(eType -> (BombType) eType)
+                .collect(toList());
+    }
     
     public static BombType createBombByType(int bType)    {
         switch (bType) {
@@ -340,10 +354,10 @@ private static BombType createArrowIVHomingBomb() {
         bomb.munitionType = AmmoType.M_HOMING;
         // Allow Homing munitions to instantly switch between modes
         bomb.instantModeSwitch = true;
-        bomb.setModes(new String[] { "Homing", "Non-Homing" });
+        bomb.setModes("Homing", "Non-Homing");
         bomb.flags = bomb.flags.or(AmmoType.F_SPACE_BOMB);
         bomb.shots = 1;
-        bomb.bv = 0;
+        bomb.bv = 30;
         bomb.cost = 3000;
         bomb.rulesRefs = "358, TO";
         bomb.techAdvancement.setTechBase(TECH_BASE_ALL)
@@ -650,6 +664,7 @@ private static BombType createTAGBomb() {
         return bomb;
     }
 
+    /** Thunder Standard Bombs, TO:AUE pg. 172, 197 */
     private static BombType createThunderBomb() {
         BombType bomb = new BombType();
 
@@ -662,9 +677,9 @@ private static BombType createThunderBomb() {
         bomb.bombType = BombType.B_THUNDER;
         bomb.flags = bomb.flags.or(AmmoType.F_GROUND_BOMB);
         bomb.shots = 1;
-        bomb.bv = 0;
+        bomb.bv = 112;
         bomb.cost = 12000;
-        bomb.rulesRefs = "360, TO";
+        bomb.rulesRefs = "172, TO:AUE";
         bomb.techAdvancement.setTechBase(TECH_BASE_ALL).setIntroLevel(false).setUnofficial(false)
                 .setTechRating(RATING_C).setAvailability(RATING_E, RATING_E, RATING_D, RATING_D)
                 .setISAdvancement(2600, 2623, DATE_NONE, 2850, 3052).setISApproximate(true, false, false, false, false)
diff --git a/megamek/src/megamek/common/Crew.java b/megamek/src/megamek/common/Crew.java
index b6a06cac253..682e3abffec 100644
--- a/megamek/src/megamek/common/Crew.java
+++ b/megamek/src/megamek/common/Crew.java
@@ -16,6 +16,7 @@
 package megamek.common;
 
 import megamek.client.generator.RandomGenderGenerator;
+import megamek.client.ui.swing.tooltip.PilotToolTip;
 import megamek.common.enums.Gender;
 import megamek.common.icons.Portrait;
 import megamek.common.options.IOption;
@@ -378,6 +379,9 @@ public Portrait getPortrait(final int pos) {
 
     public void setPortrait(final Portrait portrait, final int pos) {
         getPortraits()[pos] = portrait;
+
+        // delete PilotToolTip cache for this portrait
+        PilotToolTip.deleteImageCache(this, pos);
     }
 
     /**
@@ -1101,7 +1105,7 @@ public String getExternalIdAsString(int pos) {
      */
     public String getExternalIdAsString() {
         for (int i = 0; i < getSlotCount(); i++) {
-            if (!externalId[i].equals("-1")) {
+            if (externalId != null && !externalId[i].equals("-1")) {
                 return externalId[i];
             }
         }
diff --git a/megamek/src/megamek/common/Dropship.java b/megamek/src/megamek/common/Dropship.java
index 21d1326ee03..36b3b8bbb31 100644
--- a/megamek/src/megamek/common/Dropship.java
+++ b/megamek/src/megamek/common/Dropship.java
@@ -12,7 +12,6 @@
 package megamek.common;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.battlevalue.DropShipBVCalculator;
 import megamek.common.cost.DropShipCostCalculator;
 import megamek.common.options.OptionsConstants;
 
@@ -389,11 +388,6 @@ public double getPriceMultiplier() {
         return isSpheroid() ? 28.0 : 36.0;
     }
 
-    @Override
-    public int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return DropShipBVCalculator.calculateBV(this, ignoreC3, ignoreSkill, calculationReport);
-    }
-
     /**
      * need to check bay location before loading ammo
      */
@@ -433,72 +427,6 @@ public int getHQIniBonus() {
         return 2;
     }
 
-    /**
-     * find the adjacent firing arc location on this vessel clockwise
-     */
-    public int getAdjacentLocCW(int loc) {
-        switch (loc) {
-            case LOC_NOSE:
-                return LOC_RWING;
-            case LOC_LWING:
-                return LOC_NOSE;
-            case LOC_RWING:
-                return (LOC_RWING + 3);
-            case LOC_AFT:
-                return (LOC_LWING + 3);
-            case 4:
-                return LOC_LWING;
-            case 5:
-                return LOC_AFT;
-            default:
-                return Integer.MIN_VALUE;
-        }
-    }
-
-    /**
-     * find the adjacent firing arc on this vessel counter-clockwise
-     */
-    public int getAdjacentLocCCW(int loc) {
-        switch (loc) {
-            case LOC_NOSE:
-                return LOC_LWING;
-            case LOC_LWING:
-                return (LOC_LWING + 3);
-            case LOC_RWING:
-                return LOC_NOSE;
-            case LOC_AFT:
-                return (LOC_RWING + 3);
-            case 4:
-                return LOC_AFT;
-            case 5:
-                return LOC_RWING;
-            default:
-                return Integer.MIN_VALUE;
-        }
-    }
-
-    /**
-     * find the adjacent firing arc location on this vessel clockwise
-     */
-    public int getOppositeLoc(int loc) {
-        switch (loc) {
-            case LOC_NOSE:
-                return LOC_AFT;
-            case LOC_LWING:
-                return (LOC_RWING + 3);
-            case LOC_RWING:
-                return (LOC_LWING + 3);
-            case LOC_AFT:
-                return LOC_NOSE;
-            case 4:
-                return LOC_RWING;
-            case 5:
-                return LOC_LWING;
-            default:
-                return Integer.MIN_VALUE;
-        }
-    }
-
     /**
      * All military dropships automatically have ECM if in space
      */
diff --git a/megamek/src/megamek/common/Engine.java b/megamek/src/megamek/common/Engine.java
index 9a111511b1b..42aa631dd20 100644
--- a/megamek/src/megamek/common/Engine.java
+++ b/megamek/src/megamek/common/Engine.java
@@ -297,17 +297,18 @@ public static int getEngineTypeByString(String type) {
         }
     }
 
-    /**
-     * returns true if and only if this engine is a fusion engine
-     *
-     * @return true if it is not an internal combustion engine.
-     */
+    /** @return True if this engine is a fusion engine. */
     public boolean isFusion() {
         return (engineType != COMBUSTION_ENGINE) && (engineType != FISSION) && (engineType != FUEL_CELL)
                 && (engineType != NONE) && (engineType != BATTERY) && (engineType != SOLAR)
                 && (engineType != STEAM) && (engineType != MAGLEV) && (engineType != EXTERNAL);
     }
 
+    /** @return True if this engine is a fission engine. */
+    public boolean isFission() {
+        return engineType == FISSION;
+    }
+
     public boolean isSolar() {
         return engineType == SOLAR;
     }
diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
index ba806a49e5e..1ef187d5ae9 100644
--- a/megamek/src/megamek/common/Entity.java
+++ b/megamek/src/megamek/common/Entity.java
@@ -23,6 +23,7 @@
 import megamek.common.MovePath.MoveStepType;
 import megamek.common.actions.*;
 import megamek.common.annotations.Nullable;
+import megamek.common.battlevalue.BVCalculator;
 import megamek.common.enums.*;
 import megamek.common.event.GameEntityChangeEvent;
 import megamek.common.force.Force;
@@ -797,7 +798,12 @@ public abstract class Entity extends TurnOrdered implements Transporter, Targeta
      * The location the unit is bracing as per TacOps:AR page 82
      */
     private int braceLocation = Entity.LOC_NONE;
-    
+
+    /**
+     * The persistent (except for client/server-transmission and saving) battle value calculator for this entity.
+     */
+    private transient BVCalculator bvCalculator = BVCalculator.getBVCalculator(this);
+
     /**
      * Generates a new, blank, entity.
      */
@@ -1761,12 +1767,11 @@ public boolean isPermanentlyImmobilized(boolean checkCrew) {
         if (checkCrew && ((getCrew() == null) || getCrew().isDead())) {
             return true;
         } else if (((getOriginalWalkMP() > 0) || (getOriginalRunMP() > 0) || (getOriginalJumpMP() > 0))
-                /*
-                 * Need to make sure here that we're ignoring heat because
-                 * that's not actually "permanent":
-                 */
-                && ((getWalkMP(true, true, false) == 0)
-                    && (getRunMP(true, true, false) == 0) && (getJumpMP() == 0))) {
+                // Need to make sure here that we're ignoring heat because
+                // that's not actually "permanent":
+                && ((getWalkMP(MPCalculationSetting.PERM_IMMOBILIZED) == 0)
+                && (getRunMP(MPCalculationSetting.PERM_IMMOBILIZED) == 0)
+                && (getJumpMP(MPCalculationSetting.PERM_IMMOBILIZED) == 0))) {
             return true;
         } else {
             return false;
@@ -2692,43 +2697,31 @@ public void setOriginalWalkMP(int walkMP) {
         this.walkMP = walkMP;
     }
 
-    /**
-     * Returns this entity's walking/cruising mp, factored for heat and gravity.
-     */
-
+    /** @return this entity's walking/cruising mp, factoring in all MP-changing effects. */
     public int getWalkMP() {
-        return getWalkMP(true, false);
+        return getWalkMP(MPCalculationSetting.STANDARD);
     }
 
-    /**
-     * Returns this entity's walking/cruising mp, factored for heat and possibly
-     * gravity.
-     *
-     * @param gravity    Should the movement be factored for gravity
-     * @param ignoreHeat Should heat be ignored?
-     */
-    public int getWalkMP(boolean gravity, boolean ignoreHeat) {
-        return getWalkMP(gravity, ignoreHeat, false);
-    }
-
-    public int getWalkMP(boolean gravity, boolean ignoreHeat,
-                         boolean ignoreModularArmor) {
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
         int mp = getOriginalWalkMP();
 
-        if (!ignoreHeat) {
+        if (!mpCalculationSetting.ignoreHeat) {
             mp = Math.max(0, mp - getHeatMPReduction());
         }
-        mp = Math.max(mp - getCargoMpReduction(this), 0);
-        if (null != game) {
-            int weatherMod = game.getPlanetaryConditions()
-                                 .getMovementMods(this);
-            if (weatherMod != 0) {
-                mp = Math.max(mp + weatherMod, 0);
-            }
+
+        if (!mpCalculationSetting.ignoreCargo) {
+            mp = Math.max(mp - getCargoMpReduction(this), 0);
         }
-        if (gravity) {
+
+        if (!mpCalculationSetting.ignoreWeather && (game != null)) {
+            int weatherModifier = game.getPlanetaryConditions().getMovementMods(this);
+            mp = Math.max(mp + weatherModifier, 0);
+        }
+
+        if (!mpCalculationSetting.ignoreGravity) {
             mp = applyGravityEffectsOnMP(mp);
         }
+
         return mp;
     }
 
@@ -2775,56 +2768,27 @@ public int getWalkHeat() {
         return 0;
     }
 
-    /**
-     * Returns this entity's unmodified running/flank mp.
-     */
+    /** @return This entity's unmodified running/flank mp. */
     public int getOriginalRunMP() {
         return (int) Math.ceil(getOriginalWalkMP() * 1.5);
     }
 
-    /**
-     * Returns this entity's running/flank mp modified for heat and gravity.
-     */
+    /** @return This entity's running/flank mp modified for all in-game effects. */
     public int getRunMP() {
-        return getRunMP(true, false, false);
+        return getRunMP(MPCalculationSetting.STANDARD);
     }
 
-    public int getRunMP(boolean gravity, boolean ignoreHeat,
-                        boolean ignoreModularArmor) {
-        return (int) Math.ceil(getWalkMP(gravity, ignoreHeat,
-                                         ignoreModularArmor) * 1.5);
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        return (int) Math.ceil(getWalkMP(mpCalculationSetting) * 1.5);
     }
 
-    /**
-     * Returns run MP with only one MASC system
-     */
-    public int getRunMPwithOneMASC() {
-        return getRunMPwithOneMASC(true, false, false);
-    }
-
-    /**
-     * Returns run MP with one MASC system, optionally figuring in gravity
-     * and possibly ignoring heat
-     */
-    public int getRunMPwithOneMASC(boolean gravity,
-                                            boolean ignoreHeat, boolean ignoreModularArmor) {
-    // only Mechs need to check if multiple systmes are availaible
-        return getRunMP(gravity, ignoreHeat, ignoreModularArmor);
-    }
     /**
      * Returns run MP without considering any MASC systems
      */
     public int getRunMPwithoutMASC() {
-        return getRunMPwithoutMASC(true, false, false);
+        return getRunMP(MPCalculationSetting.NO_MASC);
     }
 
-    /**
-     * Returns run MP without considering MASC, optionally figuring in gravity
-     * and possibly ignoring heat
-     */
-    public abstract int getRunMPwithoutMASC(boolean gravity,
-                                            boolean ignoreHeat, boolean ignoreModularArmor);
-
     /**
      * Returns this entity's running/flank mp as a string.
      */
@@ -2840,38 +2804,31 @@ public int getRunHeat() {
     }
 
     /**
-     * Returns this entity's unmodified sprint mp.
+     * Returns this entity's sprinting MP, modified for all its current circumstances such
+     * as gravity and damage. See {@link MPCalculationSetting#STANDARD}.
+     * For units that can't sprint, this is equal to the modified run/flank MP.
+     *
+     * @return This entity's modified sprinting MP
      */
-    protected int getOriginalSprintMP() {
-        return getOriginalRunMP();
+    public int getSprintMP() {
+        return getSprintMP(MPCalculationSetting.STANDARD);
     }
 
     /**
-     * Returns this entity's running/flank mp modified for heat and gravity.
+     * Returns this entity's sprinting MP, modified according to the given setting.
+     * For units that can't sprint, this is equal to the modified run/flank MP.
+     *
+     * @return This entity's modified sprinting MP
      */
-    public int getSprintMP() {
-        return getRunMP();
-    }
-
-    public int getSprintMP(boolean gravity, boolean ignoreHeat,
-                           boolean ignoreModularArmor) {
-        return getRunMP(gravity, ignoreHeat, ignoreModularArmor);
+    public int getSprintMP(MPCalculationSetting mpCalculationSetting) {
+        return getRunMP(mpCalculationSetting);
     }
 
     /**
      * Returns sprint MP without considering MASC
      */
     public int getSprintMPwithOneMASC() {
-        return getRunMPwithOneMASC();
-    }
-
-    /**
-     * Returns sprint MP without considering MASC, optionally figuring in
-     * gravity and possibly ignoring heat
-     */
-    public int getSprintMPwithOneMASC(boolean gravity, boolean ignoreHeat,
-                                      boolean ignoreModularArmor) {
-        return getRunMPwithOneMASC(gravity, ignoreHeat, ignoreModularArmor);
+        return getSprintMP(MPCalculationSetting.ONE_MASC);
     }
 
     /**
@@ -2881,22 +2838,6 @@ public int getSprintMPwithoutMASC() {
         return getRunMPwithoutMASC();
     }
 
-    /**
-     * Returns sprint MP without considering MASC, optionally figuring in
-     * gravity and possibly ignoring heat
-     */
-    public int getSprintMPwithoutMASC(boolean gravity, boolean ignoreHeat,
-                                      boolean ignoreModularArmor) {
-        return getRunMPwithoutMASC(gravity, ignoreHeat, ignoreModularArmor);
-    }
-
-    /**
-     * Returns this entity's sprint mp as a string.
-     */
-    public String getSprintMPasString() {
-        return Integer.toString(getSprintMP());
-    }
-
     /**
      * get the heat generated by this Entity when sprinting
      */
@@ -2908,7 +2849,7 @@ public int getSprintHeat() {
      * get the gravity limit for ground movement
      */
     public int getRunningGravityLimit() {
-        return getRunMP(false, false, false);
+        return getRunMP(MPCalculationSetting.NO_GRAVITY);
     }
 
     /**
@@ -2939,20 +2880,15 @@ public void setOriginalJumpMP(int jumpMP) {
      * factored for gravity.
      */
     public int getJumpMP() {
-        return getJumpMP(true);
+        return getJumpMP(MPCalculationSetting.STANDARD);
     }
 
-    /**
-     * return this entity's current jump MP, possibly affected by gravity
-     *
-     * @param gravity
-     * @return
-     */
-    public int getJumpMP(boolean gravity) {
-        if (gravity) {
+    public int getJumpMP(MPCalculationSetting mpCalculationSetting) {
+        if (mpCalculationSetting.ignoreGravity) {
+            return getOriginalJumpMP();
+        } else {
             return applyGravityEffectsOnMP(getOriginalJumpMP());
         }
-        return getOriginalJumpMP();
     }
 
     public int getJumpType() {
@@ -2974,7 +2910,7 @@ public int getJumpHeat(int movedMP) {
      * water.)
      */
     public int getJumpMPWithTerrain() {
-        return getJumpMP();
+        return getJumpMP(MPCalculationSetting.DEDUCT_SUBMERGED_JJ);
     }
 
     /**
@@ -5566,22 +5502,29 @@ public boolean hasC3S() {
     }
 
     /**
-     * Only Meks can have CASE II so all other entities return false.
+     * True if the unit has CASE II (on any location in the case of Meks).
+     * Only Meks and Fighters can have CASE II so all other entities should return false.
      *
-     * @return true iff the mech has CASE II.
+     * @return True if the unit has CASE II
      */
     public boolean hasCASEII() {
-        return false;
+        return getMisc().stream()
+                .filter(m -> m.getType() instanceof MiscType)
+                .anyMatch(m -> m.getType().hasFlag(MiscType.F_CASEII));
     }
 
     /**
-     * Only Meks have CASE II so all other entities return false.
+     * True if the unit has CASE II in the given location.
+     * Only Meks and Fighters can have CASE II so all other entities should return false.
      *
-     * @param location
-     * @return true iff the mech has CASE II at this location.
+     * @param location The location to check
+     * @return True if the unit has CASE II in the given location
      */
     public boolean hasCASEII(int location) {
-        return false;
+        return getMisc().stream()
+                .filter(m -> m.getLocation() == location)
+                .filter(m -> m.getType() instanceof MiscType)
+                .anyMatch(m -> m.getType().hasFlag(MiscType.F_CASEII));
     }
 
     /**
@@ -6807,7 +6750,9 @@ private int manualOrCalculateBV(boolean ignoreC3, boolean ignoreSkill, Calculati
      * @param calculationReport A CalculationReport to write the BV calculation to
      * @return The Battle Value of this unit calculated from its current state
      */
-    protected abstract int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport);
+    protected int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
+        return getBvCalculator().calculateBV(ignoreC3, ignoreSkill, calculationReport);
+    }
 
     /**
      * Generates a vector containing reports on all useful information about
@@ -7450,11 +7395,11 @@ public PilotingRollData checkMovedTooFast(MoveStep step,
         int maxSafeMP = 0;
         switch (moveType) {
             case MOVE_JUMP:
-                maxSafeMP = getJumpMP(false);
+                maxSafeMP = getJumpMP(MPCalculationSetting.NO_GRAVITY);
                 break;
             case MOVE_SPRINT:
             case MOVE_VTOL_SPRINT:
-                maxSafeMP = getSprintMP(false, true, true) + wigeBonus;
+                maxSafeMP = getSprintMP(MPCalculationSetting.SAFE_MOVE) + wigeBonus;
                 if (isEligibleForPavementBonus() && gotPavementBonus) {
                     maxSafeMP++;
                 }
@@ -7462,7 +7407,7 @@ public PilotingRollData checkMovedTooFast(MoveStep step,
             default:
                 // Max safe MP is based on whatever is the current maximum.
                 // http://bg.battletech.com/forums/index.php?topic=6681.msg154097#msg154097
-                maxSafeMP = getRunMP(false, true, true) + wigeBonus;
+                maxSafeMP = getRunMP(MPCalculationSetting.SAFE_MOVE) + wigeBonus;
                 if (isEligibleForPavementBonus() && gotPavementBonus) {
                     maxSafeMP++;
                 }
@@ -14262,16 +14207,19 @@ public void newPhase(GamePhase phase) {
         setIsJumpingNow(false);
     }
 
-    /**
-     * Checks to see if the entities' elevation is below the surface of a water
-     * hex.
-     *
-     * @return True if the entity is underwater, else false.
-     */
+    /** @return True if this entity is completely submerged. */
     public boolean isUnderwater() {
+        if (!hasOccupiedHex()) {
+            return false;
+        }
         Hex occupiedHex = game.getBoard().getHex(getPosition());
-        return occupiedHex.containsTerrain(Terrains.WATER)
-                && (relHeight() < occupiedHex.getLevel());
+        return occupiedHex.containsTerrain(Terrains.WATER) && (relHeight() < occupiedHex.getLevel());
+    }
+
+    /** @return True if this entity has a non-null occupied hex, i.e. it has a game, a position, a board etc. */
+    public boolean hasOccupiedHex() {
+        return !isOffBoard() && (getPosition() != null) && (game != null) && (game.getBoard() != null)
+                && (game.getBoard().getHex(getPosition()) != null);
     }
 
     public int getTechLevelYear() {
@@ -15417,7 +15365,7 @@ public int getForceId() {
     public void setForceId(int newId) {
         forceId = newId;
     }
-    
+
     public void setBloodStalkerTarget(int value) {
         bloodStalkerTarget = value;
     }
@@ -15582,4 +15530,13 @@ public boolean getsAutoExternalSearchlight() {
     public int getStrength() {
         return calculateBattleValue();
     }
-}
+
+
+    /** @return The persistent BV Calculator object for this entity. */
+    public BVCalculator getBvCalculator() {
+        if (bvCalculator == null) {
+            bvCalculator = BVCalculator.getBVCalculator(this);
+        }
+        return bvCalculator;
+    }
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/EquipmentType.java b/megamek/src/megamek/common/EquipmentType.java
index 835a0706d9a..ae4d1328aa1 100644
--- a/megamek/src/megamek/common/EquipmentType.java
+++ b/megamek/src/megamek/common/EquipmentType.java
@@ -737,6 +737,14 @@ public static Enumeration<EquipmentType> getAllTypes() {
         return EquipmentType.allTypes.elements();
     }
 
+    /** @return All equipment types as a List. The list is a copy and can safely be modified. */
+    public static List<EquipmentType> allTypes() {
+        if (EquipmentType.allTypes == null) {
+            EquipmentType.initializeTypes();
+        }
+        return new ArrayList<>(EquipmentType.allTypes);
+    }
+
     protected static void addType(EquipmentType type) {
         if (null == EquipmentType.allTypes) {
             EquipmentType.initializeTypes();
@@ -1518,6 +1526,6 @@ public static List<String> getStructureNames() {
     }
 
     public static List<String> getArmorNames() {
-        return Arrays.stream(armorNames).filter(s -> !s.equals("Patchwork")).collect(Collectors.toList());
+        return Arrays.stream(armorNames).collect(Collectors.toList());
     }
 }
diff --git a/megamek/src/megamek/common/FighterSquadron.java b/megamek/src/megamek/common/FighterSquadron.java
index 5aa11bf8bac..cfc75153b43 100644
--- a/megamek/src/megamek/common/FighterSquadron.java
+++ b/megamek/src/megamek/common/FighterSquadron.java
@@ -123,9 +123,9 @@ public double getArmorRemainingPercent() {
     }
 
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
         return getActiveSubEntities().stream()
-                .mapToInt(ent -> ent.getWalkMP(gravity, ignoreheat))
+                .mapToInt(ent -> ent.getWalkMP(mpCalculationSetting))
                 .min()
                 .orElse(0);
     }
diff --git a/megamek/src/megamek/common/Game.java b/megamek/src/megamek/common/Game.java
index 2410faf6097..f28667b4f29 100644
--- a/megamek/src/megamek/common/Game.java
+++ b/megamek/src/megamek/common/Game.java
@@ -1238,7 +1238,7 @@ public synchronized void addEntity(Entity entity, boolean genEvent) {
         if ((entity instanceof Mech)
                 && getOptions().booleanOption(OptionsConstants.RPG_CONDITIONAL_EJECTION)) {
             ((Mech) entity).setAutoEject(true);
-            ((Mech) entity).setCondEjectAmmo(!entity.hasCase() && !((Mech) entity).hasCASEIIAnywhere());
+            ((Mech) entity).setCondEjectAmmo(!entity.hasCase() && !entity.hasCASEII());
             ((Mech) entity).setCondEjectEngine(true);
             ((Mech) entity).setCondEjectCTDest(true);
             ((Mech) entity).setCondEjectHeadshot(true);
diff --git a/megamek/src/megamek/common/GunEmplacement.java b/megamek/src/megamek/common/GunEmplacement.java
index 79eff07af25..0edacfee39d 100644
--- a/megamek/src/megamek/common/GunEmplacement.java
+++ b/megamek/src/megamek/common/GunEmplacement.java
@@ -15,7 +15,6 @@
 package megamek.common;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.battlevalue.GunEmplacementBVCalculator;
 import megamek.common.cost.CostCalculator;
 import megamek.common.enums.AimingMode;
 import org.apache.logging.log4j.LogManager;
@@ -113,8 +112,23 @@ public boolean isLocationProhibited(Coords c, int currElevation) {
     }
 
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreHeat) {
-        return 0;
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        return 0; // Overridden for performance and to keep it from being made non-zero by any rule
+    }
+
+    @Override
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        return 0; // Overridden for performance and to keep it from being made non-zero by any rule
+    }
+
+    @Override
+    public int getSprintMP(MPCalculationSetting mpCalculationSetting) {
+        return 0; // Overridden for performance and to keep it from being made non-zero by any rule
+    }
+
+    @Override
+    public int getJumpMP(MPCalculationSetting mpCalculationSetting) {
+        return 0; // Overridden for performance and to keep it from being made non-zero by any rule
     }
 
     @Override
@@ -161,11 +175,6 @@ public HitData rollHitLocation(int table, int side) {
         return new HitData(LOC_GUNS, false, HitData.EFFECT_NONE);
     }
 
-    @Override
-    public int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return GunEmplacementBVCalculator.calculateBV(this, ignoreC3, ignoreSkill, calculationReport);
-    }
-
     @Override
     public PilotingRollData addEntityBonuses(PilotingRollData prd) {
         return prd;
@@ -176,11 +185,6 @@ public int[] getNoOfSlots() {
         return CRITICAL_SLOTS;
     }
 
-    @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        return 0;
-    }
-
     @Override
     public int getHeatCapacity() {
         return DOES_NOT_TRACK_HEAT;
diff --git a/megamek/src/megamek/common/IBomber.java b/megamek/src/megamek/common/IBomber.java
index 7a4c270bb4c..ea42e39496a 100644
--- a/megamek/src/megamek/common/IBomber.java
+++ b/megamek/src/megamek/common/IBomber.java
@@ -1,5 +1,20 @@
-/**
- * 
+/*
+ * Copyright (c) 2022 - The MegaMek Team. All Rights Reserved.
+ *
+ * This file is part of MegaMek.
+ *
+ * MegaMek is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MegaMek is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
  */
 package megamek.common;
 
@@ -13,13 +28,12 @@
  * LandAirMech, and VTOL.
  * 
  * @author Neoancient
- *
  */
 public interface IBomber {
     
-    public static final String SPACE_BOMB_ATTACK = "SpaceBombAttack";
-    public static final String DIVE_BOMB_ATTACK = "DiveBombAttack";
-    public static final String ALT_BOMB_ATTACK = "AltBombAttack";
+    String SPACE_BOMB_ATTACK = "SpaceBombAttack";
+    String DIVE_BOMB_ATTACK = "DiveBombAttack";
+    String ALT_BOMB_ATTACK = "AltBombAttack";
 
     /**
      * @return The total number of bomb points that the bomber can carry.
@@ -68,11 +82,12 @@ default int getMaxBombSize() {
      * Used by VTOLs and LAMs in airmech mode to declare the target hex for a bomb attack during the movement
      * phase.
      */
-    
     default void setVTOLBombTarget(Targetable target) {}
+
     default Targetable getVTOLBombTarget() {
         return null;
     }
+
     default boolean isVTOLBombing() {
         return getVTOLBombTarget() != null;
     }
@@ -122,7 +137,7 @@ default void applyBombs() {
                 // some bombs need an associated weapon and if so
                 // they need a weapon for each bomb
                 if (null != BombType.getBombWeaponName(type)) {
-                    Mounted m = null;
+                    Mounted m;
                     try {
                         m = ((Entity) this).addBomb(EquipmentType.get(BombType
                                 .getBombWeaponName(type)), loc);
diff --git a/megamek/src/megamek/common/Infantry.java b/megamek/src/megamek/common/Infantry.java
index 576a654231d..870520a5b89 100644
--- a/megamek/src/megamek/common/Infantry.java
+++ b/megamek/src/megamek/common/Infantry.java
@@ -21,7 +21,6 @@
 
 import megamek.MMConstants;
 import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.battlevalue.InfantryBVCalculator;
 import megamek.common.cost.InfantryCostCalculator;
 import megamek.common.enums.AimingMode;
 import megamek.common.enums.GamePhase;
@@ -345,7 +344,7 @@ public boolean getIsCallingSupport() {
     }
 
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
         int mp = getOriginalWalkMP();
         // Encumbering armor (TacOps, pg. 318)
         if (encumbering) {
@@ -371,17 +370,15 @@ && isConventionalInfantry()) {
                 && ((getMovementMode().isLegInfantry()) || (getMovementMode().isJumpInfantry()))) {
             mp += 1;
         }
+
         if (hasActiveFieldArtillery()) {
             mp = Math.min(mp, 1);
         }
-        if (null != game) {
+
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
             int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
-            if (weatherMod != 0) {
-                mp = Math.max(mp + weatherMod, 0);
-            }
-        }
+            mp = Math.max(mp + weatherMod, 0);
 
-        if (null != game) {
             if ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_GUSTING_RAIN)
                     && getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_RAIN)) {
                 if ((mp !=0) || getMovementMode().isMotorizedInfantry()) {
@@ -409,16 +406,17 @@ && getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equ
             }
         }
 
-        if (gravity) {
+        if (!mpCalculationSetting.ignoreGravity) {
             mp = applyGravityEffectsOnMP(mp);
         }
+
         return mp;
     }
 
     @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        int walkMP = getWalkMP(gravity, ignoreheat, ignoremodulararmor);
-        if ((game != null)
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        int walkMP = getWalkMP(mpCalculationSetting);
+        if (!mpCalculationSetting.ignoreOptionalRules && (game != null)
                 && game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_TACOPS_FAST_INFANTRY_MOVE)) {
             return (walkMP > 0) ? walkMP + 1 : walkMP + 2;
         } else {
@@ -427,12 +425,7 @@ public int getRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodularar
     }
 
     @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        return getRunMP(gravity, ignoreheat, ignoremodulararmor);
-    }
-
-    @Override
-    public int getJumpMP(boolean gravity) {
+    public int getJumpMP(MPCalculationSetting mpCalculationSetting) {
         int mp = hasUMU() ? 0 : getOriginalJumpMP();
         if ((getSecondaryWeaponsPerSquad() > 1)
                 && !hasAbility(OptionsConstants.MD_TSM_IMPLANT)
@@ -443,11 +436,12 @@ public int getJumpMP(boolean gravity) {
         } else if (movementMode.isVTOL() && getSecondaryWeaponsPerSquad() > 0) {
             mp = Math.max(mp - 1, 0);
         }
-        if (gravity) {
+
+        if (!mpCalculationSetting.ignoreGravity) {
             mp = applyGravityEffectsOnMP(mp);
         }
 
-        if (null != game) {
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
             int windCond = game.getPlanetaryConditions().getWindStrength();
             if (windCond >= PlanetaryConditions.WI_STRONG_GALE) {
                 return 0;
@@ -753,11 +747,6 @@ public boolean hasHittableCriticals(int loc) {
         return false;
     }
 
-    @Override
-    protected int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return InfantryBVCalculator.calculateBV(this, ignoreSkill, calculationReport);
-    }
-
     @Override
     public Vector<Report> victoryReport() {
         Vector<Report> vDesc = new Vector<>();
diff --git a/megamek/src/megamek/common/Jumpship.java b/megamek/src/megamek/common/Jumpship.java
index 894b84f9b3d..34770663aa2 100644
--- a/megamek/src/megamek/common/Jumpship.java
+++ b/megamek/src/megamek/common/Jumpship.java
@@ -12,7 +12,6 @@
 package megamek.common;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.battlevalue.JumpShipBVCalculator;
 import megamek.common.cost.JumpShipCostCalculator;
 import megamek.common.options.OptionsConstants;
 
@@ -1108,11 +1107,6 @@ public int getMaxEngineHits() {
         return 6;
     }
 
-    @Override
-    public int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return JumpShipBVCalculator.calculateBV(this, ignoreC3, ignoreSkill, calculationReport);
-    }
-
     public int getArcswGuns() {
         // return the number
         int nArcs = 0;
@@ -1349,9 +1343,9 @@ public void newRound(int roundNumber) {
     }
 
     @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
         if (!hasStationKeepingDrive()) {
-            return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
+            return super.getRunMP(mpCalculationSetting);
         }
         return (int) Math.floor(getAccumulatedThrust());
     }
diff --git a/megamek/src/megamek/common/LandAirMech.java b/megamek/src/megamek/common/LandAirMech.java
index 977c7992ef4..a1189075b86 100644
--- a/megamek/src/megamek/common/LandAirMech.java
+++ b/megamek/src/megamek/common/LandAirMech.java
@@ -233,52 +233,31 @@ public boolean doomedInSpace() {
      * ground movement.
      */
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
         int mp;
-        if (getConversionMode() == CONV_MODE_FIGHTER) {
-            mp = getFighterModeWalkMP(gravity, ignoremodulararmor);
-        } else if (getConversionMode() == CONV_MODE_AIRMECH) {
-            mp = getAirMechCruiseMP(gravity, ignoremodulararmor);
+        if (!mpCalculationSetting.ignoreConversion && (getConversionMode() == CONV_MODE_FIGHTER)) {
+            mp = getFighterModeWalkMP(mpCalculationSetting);
+        } else if (!mpCalculationSetting.ignoreConversion && (getConversionMode() == CONV_MODE_AIRMECH)) {
+            mp = getAirMechCruiseMP(mpCalculationSetting);
         } else {
-            mp = super.getWalkMP(gravity, ignoreheat, ignoremodulararmor);
+            mp = super.getWalkMP(mpCalculationSetting);
         }
-        if (convertingNow) {
+        if (!mpCalculationSetting.ignoreConversion && convertingNow) {
             mp /= 2;
         }
         return mp;
     }
-    
-    // Use Mech mode to determine walk MP for BV calculations
-    public int getBVWalkMP() {
-        return super.getWalkMP(false, true, true);
-    }
 
     @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
         int mp;
-        if (getConversionMode() == CONV_MODE_FIGHTER) {
-            mp = getFighterModeRunMP(gravity, ignoremodulararmor);
-        } else if (getConversionMode() == CONV_MODE_AIRMECH) {
-            mp = getAirMechFlankMP(gravity, ignoremodulararmor);
+        if (!mpCalculationSetting.ignoreConversion && (getConversionMode() == CONV_MODE_FIGHTER)) {
+            mp = getFighterModeRunMP(mpCalculationSetting);
+        } else if (!mpCalculationSetting.ignoreConversion && (getConversionMode() == CONV_MODE_AIRMECH)) {
+            mp = getAirMechFlankMP(mpCalculationSetting);
         } else {
             // conversion reduction has already been done at this point
-            return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
-        }
-        if (convertingNow) {
-            mp /= 2;
-        }
-        return mp;
-    }
-
-    @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        int mp;
-        if (getConversionMode() == CONV_MODE_FIGHTER) {
-            mp = getFighterModeRunMP(gravity, ignoremodulararmor);
-        } else if (getConversionMode() == CONV_MODE_AIRMECH) {
-            mp = getAirMechFlankMP(gravity, ignoremodulararmor);
-        } else {
-            return super.getRunMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
+            return super.getRunMP(mpCalculationSetting);
         }
         if (convertingNow) {
             mp /= 2;
@@ -286,98 +265,72 @@ public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat, boolean igno
         return mp;
     }
 
-    /**
-     * This value should only be used for biped and airmech ground movement.
-     */
     @Override
-    public int getSprintMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        if (getConversionMode() == CONV_MODE_FIGHTER) {
+    public int getSprintMP(MPCalculationSetting mpCalculationSetting) {
+        if (!mpCalculationSetting.ignoreConversion && (getConversionMode() == CONV_MODE_FIGHTER)) {
             return getRunMP();
-        } else if (getConversionMode() == CONV_MODE_AIRMECH) {
+        } else if (!mpCalculationSetting.ignoreConversion && (getConversionMode() == CONV_MODE_AIRMECH)) {
             if (hasHipCrit()) {
-                return getAirMechRunMP(gravity, ignoreheat, ignoremodulararmor);
+                return getAirMechRunMP(mpCalculationSetting);
             }
-            return getArmedMPBoosters().calculateSprintMP(getAirMechWalkMP(gravity, ignoreheat, ignoremodulararmor));
-        }
-        return super.getSprintMP(gravity, ignoreheat, ignoremodulararmor);
-    }
-
-    /**
-     * This value should only be used for biped and airmech ground movement.
-     */
-    @Override
-    public int getSprintMPwithoutMASC(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        if (getConversionMode() == CONV_MODE_FIGHTER) {
-            return getRunMP();
-        } else if (getConversionMode() == CONV_MODE_AIRMECH) {
-            if (hasHipCrit()) {
-                return getAirMechRunMP(gravity, ignoreheat, ignoremodulararmor);
+            if (!mpCalculationSetting.ignoreMASC) {
+                return getArmedMPBoosters().calculateSprintMP(getAirMechWalkMP(mpCalculationSetting));
             }
-            return getAirMechWalkMP(gravity, ignoreheat, ignoremodulararmor) * 2;
         }
-        return super.getSprintMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
+        return super.getSprintMP(mpCalculationSetting);
     }
 
-    @Override
-    public int getOriginalSprintMPwithoutMASC() {
-        if (getConversionMode() == CONV_MODE_MECH) {
-            return (int) Math.ceil(getOriginalWalkMP() * 2.0);
-        } else {
-            return getOriginalRunMP();
-        }
-    }
-
-    public int getAirMechCruiseMP(boolean gravity, boolean ignoremodulararmor) {
+    public int getAirMechCruiseMP(MPCalculationSetting mpCalculationSetting) {
         if (game != null && game.getBoard().inAtmosphere()
                 && (isLocationBad(Mech.LOC_LT) || isLocationBad(Mech.LOC_RT))) {
             return 0;
         }
-        return getJumpMP(gravity, ignoremodulararmor) * 3;
+        return getJumpMP(mpCalculationSetting) * 3;
     }
 
-    public int getAirMechFlankMP(boolean gravity, boolean ignoremodulararmor) {
+    public int getAirMechFlankMP(MPCalculationSetting mpCalculationSetting) {
         if (game != null && game.getBoard().inAtmosphere()
                 && (isLocationBad(Mech.LOC_LT) || isLocationBad(Mech.LOC_RT))) {
             return 0;
         }
-        return (int) Math.ceil(getAirMechCruiseMP(gravity, ignoremodulararmor) * 1.5);
+        return (int) Math.ceil(getAirMechCruiseMP(mpCalculationSetting) * 1.5);
     }
 
     public int getAirMechWalkMP() {
-        return getAirMechWalkMP(true, false, false);
+        return getAirMechWalkMP(MPCalculationSetting.STANDARD);
     }
 
-    public int getAirMechWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        int mp = (int) Math.ceil(super.getWalkMP(gravity, ignoreheat, ignoremodulararmor) * 0.33);
-        if (convertingNow) {
+    public int getAirMechWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = (int) Math.ceil(super.getWalkMP(mpCalculationSetting) * 0.33);
+        if (!mpCalculationSetting.ignoreConversion && convertingNow) {
             mp /= 2;
         }
         return mp;
     }
 
     public int getAirMechRunMP() {
-        return getAirMechRunMP(true, false, false);
+        return getAirMechRunMP(MPCalculationSetting.STANDARD);
     }
 
-    public int getAirMechRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        int mp = (int) Math.ceil(getAirMechWalkMP(gravity, ignoreheat, ignoremodulararmor) * 1.5);
-        if (convertingNow) {
+    public int getAirMechRunMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = (int) Math.ceil(getAirMechWalkMP(mpCalculationSetting) * 1.5);
+        if (!mpCalculationSetting.ignoreConversion && convertingNow) {
             mp /= 2;
         }
         return mp;
     }
 
-    public int getFighterModeWalkMP(boolean gravity, boolean ignoremodulararmor) {
-        int thrust = getCurrentThrust();
-        if (!isAirborne()) {
+    public int getFighterModeWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int thrust = getCurrentThrust(mpCalculationSetting);
+        if (!mpCalculationSetting.ignoreGrounded && !isAirborne()) {
             thrust /= 2;
         }
         return thrust;
     }
 
-    public int getFighterModeRunMP(boolean gravity, boolean ignoremodulararmor) {
-        int walk = getFighterModeWalkMP(gravity, ignoremodulararmor);
-        if (isAirborne()) {
+    public int getFighterModeRunMP(MPCalculationSetting mpCalculationSetting) {
+        int walk = getFighterModeWalkMP(mpCalculationSetting);
+        if (mpCalculationSetting.ignoreGrounded || isAirborne()) {
             return (int) Math.ceil(walk * 1.5);
         } else {
             return walk; // Grounded asfs cannot use flanking movement
@@ -405,20 +358,30 @@ public int getCurrentThrust() {
         return j;
     }
 
-    public int getAirMechCruiseMP() {
-        return getAirMechCruiseMP(true, false);
-    }
+    public int getCurrentThrust(MPCalculationSetting mpCalculationSetting) {
+        // Cannot fly in atmosphere with missing side torso
+        if (!isSpaceborne() && (isLocationBad(LOC_RT) || isLocationBad(LOC_LT))) {
+            return 0;
+        }
+        int j = getJumpMP();
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
+            int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
+            j = Math.max(j + weatherMod, 0);
 
-    public int getAirMechFlankMP() {
-        return getAirMechFlankMP(true, false);
+            if(getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
+                    && (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_TORNADO_F13)) {
+                j += 1;
+            }
+        }
+        return j;
     }
 
-    public int getFighterModeWalkMP() {
-        return getFighterModeWalkMP(true, false);
+    public int getAirMechCruiseMP() {
+        return getAirMechCruiseMP(MPCalculationSetting.STANDARD);
     }
 
-    public int getFighterModeRunMP() {
-        return getFighterModeRunMP(true, false);
+    public int getAirMechFlankMP() {
+        return getAirMechFlankMP(MPCalculationSetting.STANDARD);
     }
 
     /**
diff --git a/megamek/src/megamek/common/MPCalculationSetting.java b/megamek/src/megamek/common/MPCalculationSetting.java
new file mode 100644
index 00000000000..c3a51b762fb
--- /dev/null
+++ b/megamek/src/megamek/common/MPCalculationSetting.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2023 - The MegaMek Team. All Rights Reserved.
+ *
+ * This file is part of MegaMek.
+ *
+ * MegaMek is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MegaMek is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
+ */
+package megamek.common;
+
+/**
+ * This class represents a setting used to calculate walk, run, jump or sprint MP. The setting contains
+ * info on whether to include gravity, MASC, weather, current heat and other circumstances in the MP
+ * calculation. All MPCalculationSettings can be used for all calculations though some settings may have
+ * no special effect; e.g. checking for submerged jump jets will not ever change the walk MP result.
+ * The baseline setting for in-game calculations is {@link #STANDARD}.
+ *
+ * @implNote This class is immutable.
+ */
+public class MPCalculationSetting {
+
+    /**
+     * The standard in-game setting, taking into account every circumstance except submerged jump jets
+     * (in this setting, submerged jump jets will not reduce the result of jump MP calculation).
+     */
+    public static final MPCalculationSetting STANDARD = new Builder().build();
+
+    /** A setting that excludes heat effects on MP. */
+    public static final MPCalculationSetting NO_HEAT = new Builder().noHeat().build();
+
+    /** A setting that excludes myomer booster effects on BA/PM. */
+    public static final MPCalculationSetting NO_MYOMERBOOSTER = new Builder().noMyomerBooster().build();
+
+    /** A setting that excludes MASC effects on run MP. */
+    public static final MPCalculationSetting NO_MASC = new Builder().noMASC().build();
+
+    /** A setting that excludes gravity effects on MP. (Use: e.g. gravity-related PSRs) */
+    public static final MPCalculationSetting NO_GRAVITY = new Builder().noGravity().build();
+
+    /** A setting that includes the effect of at most a single MASC on run MP. */
+    public static final MPCalculationSetting ONE_MASC = new Builder().singleMASC().build();
+
+    /** A setting that excludes the effects of being grounded for Aeros. */
+    public static final MPCalculationSetting NO_GROUNDED = new Builder().noGrounded().build();
+
+    /** A setting for checking if a unit moved too fast under the effects of low gravity. */
+    public static final MPCalculationSetting SAFE_MOVE = new Builder().noGravity().noHeat().noModularArmor().build();
+
+    /**
+     * A setting for testing if a unit is permanently immobilized. It excludes transient effects such as
+     * being grounded for Aeros and the effects of heat and cargo.
+     */
+    public static final MPCalculationSetting PERM_IMMOBILIZED = new Builder().noGrounded().noHeat().noCargo().build();
+
+    /** A setting that reduces calculated jump MP for submerged jump jets. */
+    public static final MPCalculationSetting DEDUCT_SUBMERGED_JJ = new Builder().deductSubmergedJumpJets().build();
+
+    /** A setting for finding full MP on BA, disregarding burdened status and DWP (Use: printing BA record sheets). */
+    public static final MPCalculationSetting BA_UNBURDENED = new Builder().noHeat().baNoBurden().noDWP().build();
+
+    /**
+     * The setting for Alpha Strike conversion, excluding scenario circumstances as well as
+     * myomer boosters, DWP, BA burden and modular armor.
+     */
+    public static final MPCalculationSetting AS_CONVERSION = new Builder().noGravity().noWeather()
+            .noHeat().noCargo().baNoBurden().noMyomerBooster().noDWP().noModularArmor().noGrounded()
+            .noConversion().noOptionalRules().build();
+
+    /**
+     * The setting for Battle Value calculation, excluding scenario circumstances and heat as well as
+     * myomer boosters, DWP, MASC, Cargo and Bombs and grounded state of Aeros.
+     */
+    public static final MPCalculationSetting BV_CALCULATION = new Builder().noGravity().noWeather()
+            .noHeat().noCargo().noDWP().noGrounded().noOptionalRules()
+            .noConversion().noModularArmor().forceTSM().baNoBurden().build();
+
+    public final boolean ignoreGravity;
+    public final boolean ignoreHeat;
+    public final boolean ignoreModularArmor;
+    public final boolean ignoreDWP;
+    public final boolean ignoreMyomerBooster;
+    public final boolean ignoreMASC;
+    public final boolean ignoreBurden;
+    public final boolean ignoreCargo;
+    public final boolean ignoreWeather;
+    public final boolean ignoreGrounded;
+    public final boolean ignoreOptionalRules;
+    public final boolean ignoreConversion;
+    public final boolean singleMASC;
+    public final boolean ignoreSubmergedJumpJets;
+    public final boolean forceTSM;
+
+    private MPCalculationSetting(boolean ignoreGravity, boolean ignoreHeat, boolean ignoreModularArmor,
+                                 boolean ignoreMASC, boolean ignoreMyomerBooster, boolean ignoreDWP,
+                                 boolean ignoreBurden, boolean ignoreCargo, boolean ignoreWeather,
+                                 boolean singleMASC, boolean ignoreSubmergedJumpJets, boolean ignoreGrounded,
+                                 boolean ignoreOptionalRules, boolean ignoreConversion, boolean forceTSM) {
+        this.ignoreGravity = ignoreGravity;
+        this.ignoreHeat = ignoreHeat;
+        this.ignoreModularArmor = ignoreModularArmor;
+        this.ignoreMASC = ignoreMASC;
+        this.ignoreMyomerBooster = ignoreMyomerBooster;
+        this.ignoreDWP = ignoreDWP;
+        this.ignoreBurden = ignoreBurden;
+        this.ignoreCargo = ignoreCargo;
+        this.ignoreWeather = ignoreWeather;
+        this.singleMASC = singleMASC;
+        this.ignoreSubmergedJumpJets = ignoreSubmergedJumpJets;
+        this.ignoreGrounded = ignoreGrounded;
+        this.ignoreOptionalRules = ignoreOptionalRules;
+        this.ignoreConversion = ignoreConversion;
+        this.forceTSM = forceTSM;
+    }
+
+    private static class Builder {
+
+        private boolean ignoreGravity = false;
+        private boolean ignoreHeat = false;
+        private boolean ignoreModularArmor = false;
+        private boolean ignoreBADWP = false;
+        private boolean ignoreMyomerBooster = false;
+        private boolean ignoreMASC = false;
+        private boolean ignoreBABurden = false;
+        private boolean ignoreCargo = false;
+        private boolean ignoreWeather = false;
+        private boolean singleMASC = false;
+        private boolean ignoreSubmergedJumpJets = true;
+        private boolean ignoreGrounded = false;
+        private boolean ignoreOptionalRules = false;
+        private boolean ignoreConversion = false;
+        private boolean forceTSM = false;
+
+        MPCalculationSetting build() {
+            return new MPCalculationSetting(ignoreGravity, ignoreHeat, ignoreModularArmor, ignoreMASC,
+                    ignoreMyomerBooster, ignoreBADWP, ignoreBABurden, ignoreCargo, ignoreWeather, singleMASC,
+                    ignoreSubmergedJumpJets, ignoreGrounded, ignoreOptionalRules, ignoreConversion, forceTSM);
+        }
+
+        /** Disregards the effects of the current heat of the unit. */
+        private Builder noHeat() {
+            ignoreHeat = true;
+            return this;
+        }
+
+        /** Disregards the effects of gravity. */
+        private Builder noGravity() {
+            ignoreGravity = true;
+            return this;
+        }
+
+        /** Disregards the effects of MASC systems. */
+        private Builder noMASC() {
+            ignoreMASC = true;
+            singleMASC = false;
+            return this;
+        }
+
+        /** Disregards the effects of DWP on BA. */
+        private Builder noDWP() {
+            ignoreBADWP = true;
+            return this;
+        }
+
+        /** Disregards the effects of being burdened by equipment that can be jettisoned on BA. */
+        private Builder baNoBurden() {
+            ignoreBABurden = true;
+            return this;
+        }
+
+        /** Disregards the effects of myomer boosters on BA and PM. */
+        private Builder noMyomerBooster() {
+            ignoreMyomerBooster = true;
+            return this;
+        }
+
+        /** Disregards the effects of carried or towed cargo and units, including bomb load. */
+        private Builder noCargo() {
+            ignoreCargo = true;
+            return this;
+        }
+
+        /** Disregards the effects of wind, temperature and other planetary conditions (but not gravity). */
+        private Builder noWeather() {
+            ignoreWeather = true;
+            return this;
+        }
+
+        /** Disregards the effects of modular armor. */
+        private Builder noModularArmor() {
+            ignoreModularArmor = true;
+            return this;
+        }
+
+        /** Allows the effects of at most one MASC system if the unit has any MASC. */
+        private Builder singleMASC() {
+            singleMASC = true;
+            ignoreMASC = false;
+            return this;
+        }
+
+        /** Reduces jump MP for submerged jump jets. Does not affect any other MP calculation. */
+        private Builder deductSubmergedJumpJets() {
+            ignoreSubmergedJumpJets = false;
+            return this;
+        }
+
+        /** Ignores the effects of flying units being grounded (considers them airborne). */
+        private Builder noGrounded() {
+            ignoreGrounded = true;
+            return this;
+        }
+
+        /** Ignores some baseline movement-enhancing optional rules (Use: BV calculation). */
+        private Builder noOptionalRules() {
+            ignoreOptionalRules = true;
+            return this;
+        }
+
+        /** Ignores the current conversion state of the entity and considers it to be in its base state. */
+        private Builder noConversion() {
+            ignoreConversion = true;
+            return this;
+        }
+
+        /** Applies the effects of TSM (if the entity has it!) regardless of the current heat of the entity (Use: BV calculation). */
+        private Builder forceTSM() {
+            forceTSM = true;
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/Mech.java b/megamek/src/megamek/common/Mech.java
index 3ae9d5b7e66..c7507f1222c 100644
--- a/megamek/src/megamek/common/Mech.java
+++ b/megamek/src/megamek/common/Mech.java
@@ -16,7 +16,6 @@
 package megamek.common;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.battlevalue.MekBVCalculator;
 import megamek.common.cost.MekCostCalculator;
 import megamek.common.enums.AimingMode;
 import megamek.common.enums.MPBoosters;
@@ -961,52 +960,20 @@ public int getWalkHeat() {
     }
 
     @Override
-    public int getRunMP(boolean gravity, boolean ignoreHeat, boolean ignoreModularArmor) {
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        int mp;
         MPBoosters mpBoosters = getArmedMPBoosters();
-        if (!mpBoosters.isNone()) {
-            return mpBoosters.calculateRunMP(
-                    getWalkMP(gravity, ignoreHeat, ignoreModularArmor))
-                            - (hasMPReducingHardenedArmor() ? 1 : 0);
-        }
-        return Math.max(0, super.getRunMP(gravity, ignoreHeat, ignoreModularArmor)
-                - (hasMPReducingHardenedArmor() ? 1 : 0));
-    }
-
-    @Override
-    public int getRunMPwithOneMASC(boolean gravity, boolean ignoreHeat,
-                                   boolean ignoreModularArmor) {
-        MPBoosters mpBoosters = getArmedMPBoosters();
-        if (!mpBoosters.isNone()) {
-            return MPBoosters.MASC_ONLY.calculateRunMP(
-                    getWalkMP(gravity, ignoreHeat, ignoreModularArmor))
-                    - (hasMPReducingHardenedArmor() ? 1 : 0);
+        if (!mpCalculationSetting.ignoreMASC && !mpBoosters.isNone()) {
+            if (mpCalculationSetting.singleMASC) {
+                mp = MPBoosters.MASC_ONLY.calculateRunMP(getWalkMP(mpCalculationSetting));
+            } else {
+                mp = mpBoosters.calculateRunMP(getWalkMP(mpCalculationSetting));
+            }
+        } else {
+            mp = super.getRunMP(mpCalculationSetting);
         }
 
-        return super.getRunMP(gravity, ignoreHeat, ignoreModularArmor)
-                - (hasMPReducingHardenedArmor() ? 1 : 0);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getRunMPwithoutMASC(boolean, boolean, boolean)
-     */
-    @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreHeat,
-            boolean ignoreModularArmor) {
-        return super.getRunMP(gravity, ignoreHeat, ignoreModularArmor)
-                - (hasMPReducingHardenedArmor() ? 1 : 0);
-    }
-
-
-
-    /**
-     * @return The mech's run MP without MASC or supercharger, but with any reduction
-     *         due to hardened armor.
-     */
-    public int getOriginalRunMPwithoutMASC() {
-        return super.getOriginalRunMP()
-                - (hasMPReducingHardenedArmor() ? 1 : 0);
+        return Math.max(0, mp - hardenedArmorMPReduction());
     }
 
     /**
@@ -1039,116 +1006,34 @@ public int getRunHeat() {
         return extra + (hasEngine() ? getEngine().getRunHeat(this) : 0);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getSprintMP()
-     */
-    @Override
-    public int getSprintMP() {
-        if (hasHipCrit()) {
-            return getRunMP();
-        }
-        return getSprintMP(true, false, false);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getSprintMP(boolean, boolean, boolean)
-     */
-    @Override
-    public int getSprintMP(boolean gravity, boolean ignoreHeat,
-            boolean ignoreModularArmor) {
-        if (hasHipCrit()) {
-            return getRunMP(gravity, ignoreHeat, ignoreModularArmor);
-        }
-
-        MPBoosters mpBoosters = getArmedMPBoosters();
-        if (!mpBoosters.isNone()) {
-            return mpBoosters.calculateSprintMP(
-                    getWalkMP(gravity, ignoreHeat, ignoreModularArmor))
-            - (hasMPReducingHardenedArmor() ? 1 : 0);
-        }
-
-        return getSprintMPwithoutMASC(gravity, ignoreHeat, ignoreModularArmor);
-    }
-
     @Override
-    public int getSprintMPwithOneMASC() {
-        return getSprintMPwithOneMASC(true, false, false);
-    }
-
-    @Override
-    public int getSprintMPwithOneMASC(boolean gravity, boolean ignoreHeat,
-                                      boolean ignoreModularArmor) {
+    public int getSprintMP(MPCalculationSetting mpCalculationSetting) {
         if (hasHipCrit()) {
-            return getRunMPwithoutMASC(gravity, ignoreHeat, ignoreModularArmor);
+            return getRunMP(mpCalculationSetting);
         }
 
+        int mp;
         MPBoosters mpBoosters = getArmedMPBoosters();
-        if (!mpBoosters.isNone()) {
-            return MPBoosters.MASC_ONLY.calculateSprintMP(
-                    getWalkMP(gravity, ignoreHeat, ignoreModularArmor))
-                    - (hasMPReducingHardenedArmor() ? 1 : 0);
-        }
-
-        return super.getRunMP(gravity, ignoreHeat, ignoreModularArmor)
-                - (hasMPReducingHardenedArmor() ? 1 : 0);
-    }
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getSprintMPwithoutMASC(boolean, boolean)
-     */
-    @Override
-    public int getSprintMPwithoutMASC() {
-        return getSprintMPwithoutMASC(true, false, false);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getSprintMPwithoutMASC(boolean, boolean,
-     * boolean)
-     */
-    @Override
-    public int getSprintMPwithoutMASC(boolean gravity, boolean ignoreHeat,
-            boolean ignoreModularArmor) {
-        if (hasHipCrit()) {
-            return getRunMPwithoutMASC(gravity, ignoreHeat, ignoreModularArmor);
+        if (!mpCalculationSetting.ignoreMASC && !mpBoosters.isNone()) {
+            if (mpCalculationSetting.singleMASC) {
+                mp = MPBoosters.MASC_ONLY.calculateSprintMP(getWalkMP(mpCalculationSetting));
+            } else {
+                mp = mpBoosters.calculateSprintMP(getWalkMP(mpCalculationSetting));
+            }
+        } else {
+            mp = super.getSprintMP(mpCalculationSetting);
         }
-        return ((int) Math.ceil(getWalkMP(gravity, ignoreHeat,
-                ignoreModularArmor) * 2.0))
-                - (hasMPReducingHardenedArmor() ? 1 : 0);
-    }
 
-    public int getOriginalSprintMPwithoutMASC() {
-        return ((int) Math.ceil(getOriginalWalkMP() * 2.0)) - (hasMPReducingHardenedArmor() ? 1 : 0);
+        return Math.max(0, mp - hardenedArmorMPReduction());
     }
 
-    /**
-     * Returns this entity's Sprint mp as a string.
-     */
-    @Override
-    public String getSprintMPasString() {
-        MPBoosters armedBoosters = getArmedMPBoosters();
-        return !armedBoosters.isNone()
-                ? getRunMPwithoutMASC() + "(" + getSprintMP() + ")"
-                : Integer.toString(getSprintMP());
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getRunningGravityLimit()
-     */
     @Override
     public int getRunningGravityLimit() {
         if (game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_TACOPS_SPRINT)) {
-            return getSprintMP(false, false, false);
+            return getSprintMP(MPCalculationSetting.NO_GRAVITY);
+        } else {
+            return getRunMP(MPCalculationSetting.NO_GRAVITY);
         }
-        return getRunMP(false, false, false);
     }
 
     /**
@@ -1160,79 +1045,73 @@ public int getSprintHeat() {
         return extra + (hasEngine() ? getEngine().getSprintHeat(this) : 0);
     }
 
-    /**
-     * This mech's jumping MP modified for missing jump jets and gravity
-     */
     @Override
-    public int getJumpMP() {
-        return getJumpMP(true);
-    }
-
-    /**
-     * This mech's jumping MP modified for missing jump jets and possibly
-     * gravity
-     */
-    @Override
-    public int getJumpMP(boolean gravity) {
-        return getJumpMP(gravity, false);
-    }
-
-    public int getJumpMP(boolean gravity, boolean ignoreModularArmor) {
-        int jump = 0;
-
+    public int getJumpMP(MPCalculationSetting mpCalculationSetting) {
         if (hasShield() && (getNumberOfShields(MiscType.S_SHIELD_LARGE) > 0)) {
             return 0;
         }
 
+        int mp = 0;
+        boolean isJumpBooster = false;
+
         for (Mounted mounted : getMisc()) {
             if (mounted.getType().hasFlag(MiscType.F_JUMP_JET)
                     && !mounted.isDestroyed() && !mounted.isBreached()) {
-                jump++;
+                mp++;
             } else if (mounted.getType().hasFlag(MiscType.F_JUMP_BOOSTER)
                     && !mounted.isDestroyed() && !mounted.isBreached()) {
-                jump = getOriginalJumpMP();
+                mp = getOriginalJumpMP();
+                isJumpBooster = true;
                 break;
             }
         }
 
+        if (!mpCalculationSetting.ignoreSubmergedJumpJets && hasOccupiedHex()
+                && !isJumpBooster && getElevation() < 0) {
+            int waterLevel = game.getBoard().getHex(getPosition()).terrainLevel(Terrains.WATER);
+            if (waterLevel > 1) {
+                return 0;
+            } else if (waterLevel == 1) {
+                mp = torsoJumpJets();
+            }
+        }
+
         // apply Partial Wing bonus if we have the ability to jump
-        if (jump > 0) {
+        if (mp > 0) {
             for (Mounted mount : getMisc()) {
                 if (mount.getType().hasFlag(MiscType.F_PARTIAL_WING)) {
-                    jump += getPartialWingJumpBonus(mount);
+                    mp += getPartialWingJumpBonus(mount, mpCalculationSetting);
                     break;
                 }
             }
         }
+
         // Medium shield reduces jump mp by 1/shield
-        jump -= getNumberOfShields(MiscType.S_SHIELD_MEDIUM);
+        mp -= getNumberOfShields(MiscType.S_SHIELD_MEDIUM);
 
-        if (hasModularArmor() && !ignoreModularArmor) {
-            jump--;
+        if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
+            mp--;
         }
         
-        if (gravity) {
-            return Math.max(applyGravityEffectsOnMP(jump), 0);
+        if (!mpCalculationSetting.ignoreGravity) {
+            return Math.max(applyGravityEffectsOnMP(mp), 0);
         }
-        return Math.max(jump, 0);
-    }
 
+        return Math.max(mp, 0);
+    }
 
     public int getPartialWingJumpWeightClassBonus()  {
-        int bonus;
-
-        if ((getWeightClass() <= EntityWeightClass.WEIGHT_MEDIUM)) {
-            bonus = 2;
-        } else {
-            bonus = 1;
-        }
+        return (getWeightClass() <= EntityWeightClass.WEIGHT_MEDIUM) ? 2 : 1;
+    }
 
-        return bonus;
+    public int getPartialWingJumpAtmoBonus() {
+        return getPartialWingJumpAtmoBonus(MPCalculationSetting.STANDARD);
     }
-    public int getPartialWingJumpAtmoBonus()  {
+
+    public int getPartialWingJumpAtmoBonus(MPCalculationSetting mpCalculationSetting)  {
         int bonus;
 
-        if (game != null) {
+        if (!mpCalculationSetting.ignoreWeather && (game != null)) {
             if ((getWeightClass() <= EntityWeightClass.WEIGHT_MEDIUM)) {
                 switch (game.getPlanetaryConditions().getAtmosphere()) {
                     case PlanetaryConditions.ATMO_VACUUM:
@@ -1281,20 +1160,17 @@ public int getPartialWingJumpAtmoBonus()  {
      *            The mounted location of the Wing
      * @return The Jump MP bonus conferred by the wing
      */
-    public int getPartialWingJumpBonus(Mounted mount) {
-        int bonus;
-
-        bonus = getPartialWingJumpAtmoBonus();
-
-        // subtract jumping bonus for damaged criticals
-        bonus -= getBadCriticals(CriticalSlot.TYPE_EQUIPMENT,
-                getEquipmentNum(mount), Mech.LOC_RT);
-        bonus -= getBadCriticals(CriticalSlot.TYPE_EQUIPMENT,
-                getEquipmentNum(mount), Mech.LOC_LT);
-
+    public int getPartialWingJumpBonus(Mounted mount, MPCalculationSetting mpCalculationSetting) {
+        int bonus = getPartialWingJumpAtmoBonus(mpCalculationSetting);
+        bonus -= getBadCriticals(CriticalSlot.TYPE_EQUIPMENT, getEquipmentNum(mount), Mech.LOC_RT);
+        bonus -= getBadCriticals(CriticalSlot.TYPE_EQUIPMENT, getEquipmentNum(mount), Mech.LOC_LT);
         return Math.max(bonus, 0);
     }
 
+    public int getPartialWingJumpBonus(Mounted mount) {
+        return getPartialWingJumpBonus(mount, MPCalculationSetting.STANDARD);
+    }
+
     /**
      * Gives the heat capacity bonus conferred by a mech partial wing.
      *
@@ -1388,28 +1264,6 @@ public int getJumpHeat(int movedMP) {
         }
     }
 
-    /**
-     * Returns this mech's jumping MP, modified for missing and underwater jets
-     * and gravity.
-     */
-    @Override
-    public int getJumpMPWithTerrain() {
-        if ((getPosition() == null) || (game.getBoard().getHex(getPosition()) == null) || (getJumpType() == JUMP_BOOSTER)) {
-            return getJumpMP();
-        }
-        int waterLevel = 0;
-        if (!isOffBoard()) {
-            waterLevel = game.getBoard().getHex(getPosition()).terrainLevel(Terrains.WATER);
-        }
-        if ((waterLevel <= 0) || (getElevation() >= 0)) {
-            return getJumpMP();
-        } else if (waterLevel > 1) {
-            return 0;
-        } else { // waterLevel == 1
-            return applyGravityEffectsOnMP(torsoJumpJets());
-        }
-    }
-
     /**
      * Returns the number of (working) jump jets mounted in the torsos.
      */
@@ -3281,11 +3135,6 @@ private int getContiguousNumberOfCrits(int loc, int startingSlot) {
         return contiguousCrits;
     }
 
-    @Override
-    protected int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return MekBVCalculator.calculateBV(this, ignoreC3, ignoreSkill, calculationReport);
-    }
-
     @Override
     public double getCost(CalculationReport calcReport, boolean ignoreAmmo) {
         return MekCostCalculator.calculateCost(this, calcReport, ignoreAmmo);
@@ -5422,29 +5271,6 @@ public void destroyLocation(int loc, boolean blownOff) {
         }
     }
 
-    @Override
-    public boolean hasCASEII(int location) {
-        for (Mounted mount : getEquipment()) {
-            if ((mount.getLocation() == location)
-                    && (mount.getType() instanceof MiscType)
-                    && mount.getType().hasFlag(MiscType.F_CASEII)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /* Check to see if case II exists anywhere on the mech */
-    public boolean hasCASEIIAnywhere() {
-        for (Mounted mount : getEquipment()) {
-            if ((mount.getType() instanceof MiscType)
-                    && mount.getType().hasFlag(MiscType.F_CASEII)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void setGrappleSide(int side) {
         grappledSide = side;
@@ -5799,6 +5625,11 @@ public boolean hasFullHeadEject() {
 
     public abstract boolean hasMPReducingHardenedArmor();
 
+    /** @return The MP reduction due to hardened armor on this unit; 1 if it has HA, 0 if not. */
+    protected int hardenedArmorMPReduction() {
+        return hasMPReducingHardenedArmor() ? 1 : 0;
+    }
+
     @Override
     public int getEngineHits() {
         int engineHits = 0;
@@ -6136,7 +5967,7 @@ public boolean isPermanentlyImmobilized(boolean checkCrew) {
         // modular armor since they're reasonably permanent but ignoring heat
         // effects -- have dropped to 0, we're stuck even if we still have
         // jump jets because we can't get up anymore to *use* them.
-        if ((getWalkMP(true, true, false) <= 0) && isProne()) {
+        if ((getWalkMP(MPCalculationSetting.PERM_IMMOBILIZED) <= 0) && isProne()) {
             return true;
         }
         // Gyro destroyed? TW p. 258 at least heavily implies that that counts
diff --git a/megamek/src/megamek/common/MechFileParser.java b/megamek/src/megamek/common/MechFileParser.java
index 864cf556f35..17d0513d13f 100644
--- a/megamek/src/megamek/common/MechFileParser.java
+++ b/megamek/src/megamek/common/MechFileParser.java
@@ -425,7 +425,7 @@ else if (m.getType().hasFlag(MiscType.F_APOLLO)
                     ent.getSensors().add(new Sensor(Sensor.TYPE_NOVA));
                     ent.setNextSensor(ent.getSensors().lastElement());
                 } else if (m.getType().getInternalName().equals(Sensor.CLAN_AP)) {
-                    ent.getSensors().add(new Sensor(Sensor.TYPE_CLAN_BAP));
+                    ent.getSensors().add(new Sensor(Sensor.TYPE_CLAN_AP));
                     ent.setNextSensor(ent.getSensors().lastElement());
                 } else if (m.getType().getInternalName()
                         .equals(Sensor.LIGHT_AP)) {
diff --git a/megamek/src/megamek/common/MechSummaryCache.java b/megamek/src/megamek/common/MechSummaryCache.java
index 3f927f44f28..8167c43a6bb 100644
--- a/megamek/src/megamek/common/MechSummaryCache.java
+++ b/megamek/src/megamek/common/MechSummaryCache.java
@@ -433,9 +433,9 @@ private MechSummary getSummary(Entity e, File f, String entry) {
         ms.setDryCost((long) e.getCost(true));
         ms.setAlternateCost((int) e.getAlternateCost());
         ms.setCanon(e.isCanon());
-        ms.setWalkMp(e.getWalkMP(false, false));
-        ms.setRunMp(e.getRunMP(false, false, false));
-        ms.setJumpMp(e.getJumpMP(false));
+        ms.setWalkMp(e.getWalkMP());
+        ms.setRunMp(e.getRunMP(MPCalculationSetting.NO_GRAVITY));
+        ms.setJumpMp(e.getJumpMP());
         ms.setClan(e.isClan());
         if (e.isSupportVehicle()) {
             ms.setSupport(true);
diff --git a/megamek/src/megamek/common/MiscType.java b/megamek/src/megamek/common/MiscType.java
index 92f918f1d20..4d7c7f677f0 100644
--- a/megamek/src/megamek/common/MiscType.java
+++ b/megamek/src/megamek/common/MiscType.java
@@ -5651,7 +5651,7 @@ public static MiscType createISRemoteDroneCommandConsole() {
         misc.cost = 50000;
         misc.flags = misc.flags.or(F_MECH_EQUIPMENT).or(F_TANK_EQUIPMENT).or(F_FIGHTER_EQUIPMENT)
                 .or(F_FIGHTER_EQUIPMENT).or(F_DS_EQUIPMENT).or(F_JS_EQUIPMENT).or(F_SS_EQUIPMENT)
-                .or(F_SUPPORT_TANK_EQUIPMENT).or(F_REMOTE_DRONE_COMMAND_CONSOLE);
+                .or(F_WS_EQUIPMENT).or(F_SUPPORT_TANK_EQUIPMENT).or(F_REMOTE_DRONE_COMMAND_CONSOLE);
         misc.rulesRefs = "90, IO";
         misc.techAdvancement.setTechBase(TECH_BASE_IS).setIntroLevel(false).setUnofficial(false).setTechRating(RATING_E)
                 .setAvailability(RATING_X, RATING_X, RATING_X, RATING_F)
@@ -5673,7 +5673,7 @@ public static MiscType createSmartRoboticControlSystem() {
         misc.cost = COST_VARIABLE;
         misc.rulesRefs = "140, IO";
         misc.flags = misc.flags.or(F_SRCS).or(F_MECH_EQUIPMENT).or(F_TANK_EQUIPMENT).or(F_FIGHTER_EQUIPMENT)
-                .or(F_JS_EQUIPMENT).or(F_SS_EQUIPMENT).or(F_SUPPORT_TANK_EQUIPMENT);
+                .or(F_DS_EQUIPMENT).or(F_JS_EQUIPMENT).or(F_WS_EQUIPMENT).or(F_SS_EQUIPMENT).or(F_SUPPORT_TANK_EQUIPMENT);
         misc.subType = S_STANDARD;
         misc.omniFixedOnly = true;
         misc.techAdvancement.setTechBase(TECH_BASE_ALL)
@@ -5695,7 +5695,7 @@ public static MiscType createImprovedSmartRoboticControlSystem() {
         misc.cost = COST_VARIABLE;
         misc.rulesRefs = "140, IO";
         misc.flags = misc.flags.or(F_SRCS).or(F_MECH_EQUIPMENT).or(F_TANK_EQUIPMENT).or(F_FIGHTER_EQUIPMENT)
-                .or(F_JS_EQUIPMENT).or(F_SS_EQUIPMENT).or(F_SUPPORT_TANK_EQUIPMENT);
+                .or(F_JS_EQUIPMENT).or(F_SS_EQUIPMENT).or(F_SUPPORT_TANK_EQUIPMENT).or(F_WS_EQUIPMENT);
         misc.subType = S_IMPROVED;
         misc.omniFixedOnly = true;
         misc.techAdvancement.setTechBase(TECH_BASE_ALL)
@@ -7780,10 +7780,10 @@ public static MiscType createISNavalTugAdaptor() {
         misc.addLookupName("CLNavalTugAdaptor");
         misc.flags = misc.flags.or(F_NAVAL_TUG_ADAPTOR).or(F_SC_EQUIPMENT).or(F_DS_EQUIPMENT).or(F_WS_EQUIPMENT);
         misc.rulesRefs = "334, TO";
-        misc.techAdvancement.setTechBase(TECH_BASE_IS).setIntroLevel(false).setUnofficial(false).setTechRating(RATING_F)
+        misc.techAdvancement.setTechBase(TECH_BASE_ALL).setIntroLevel(false).setUnofficial(false).setTechRating(RATING_F)
                 .setAvailability(RATING_C, RATING_C, RATING_C, RATING_C)
-                .setISAdvancement(DATE_ES, DATE_ES, DATE_ES, DATE_NONE, DATE_NONE)
-                .setISApproximate(false, false, false, false, false).setStaticTechLevel(SimpleTechLevel.ADVANCED);
+                .setAdvancement(DATE_ES, DATE_ES, DATE_ES, DATE_NONE, DATE_NONE)
+                .setApproximate(false, false, false, false, false).setStaticTechLevel(SimpleTechLevel.ADVANCED);
 
         return misc;
     }
@@ -8283,6 +8283,7 @@ public static MiscType createISHarJel() {
 
     public static MiscType createHarJelII() {
         MiscType misc = new MiscType();
+        misc.shortName = "HarJel II";
         misc.name = "HarJel Repair Systems (HarJel II)";
         misc.setInternalName(misc.name);
         misc.addLookupName("HarJel II Self-Repair System");
@@ -8308,6 +8309,7 @@ public static MiscType createHarJelII() {
 
     public static MiscType createHarJelIII() {
         MiscType misc = new MiscType();
+        misc.shortName = "HarJel III";
         misc.name = "HarJel Repair Systems (HarJel III)";
         misc.addLookupName("HarJel III Self-Repair System");
         misc.setInternalName(misc.name);
@@ -10432,7 +10434,7 @@ public static MiscType createBABattleClaw() {
         misc.criticals = 0;
         misc.hittable = false;
         misc.flags = misc.flags.or(F_BA_EQUIPMENT).or(F_BATTLE_CLAW).or(F_BA_MANIPULATOR);
-        misc.bv = 1;
+        misc.bv = 0;
         misc.cost = 10000;
         misc.rulesRefs = "259, TM";
         misc.techAdvancement.setTechBase(TECH_BASE_ALL).setIntroLevel(false).setUnofficial(false)
diff --git a/megamek/src/megamek/common/Protomech.java b/megamek/src/megamek/common/Protomech.java
index 960705dd47c..ff944d8ef76 100644
--- a/megamek/src/megamek/common/Protomech.java
+++ b/megamek/src/megamek/common/Protomech.java
@@ -14,7 +14,6 @@
 package megamek.common;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.battlevalue.ProtoMekBVCalculator;
 import megamek.common.cost.ProtoMekCostCalculator;
 import megamek.common.enums.AimingMode;
 import megamek.common.preference.PreferenceManager;
@@ -226,70 +225,52 @@ public boolean shaded(int loc, int numHit) {
     }
 
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
         if (isEngineHit()) {
             return 0;
         }
-        int wmp = getOriginalWalkMP();
-        int j;
-        if (null != game) {
-            int weatherMod = game.getPlanetaryConditions()
-                    .getMovementMods(this);
-            if (weatherMod != 0) {
-                wmp = Math.max(wmp + weatherMod, 0);
-            }
+        int mp = getOriginalWalkMP();
+
+        if (!mpCalculationSetting.ignoreWeather && (game != null)) {
+            int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
+            mp = Math.max(mp + weatherMod, 0);
         }
         // Gravity, Protos can't get faster
-        if (gravity) {
-            j = applyGravityEffectsOnMP(wmp);
-        } else {
-            j = wmp;
-        }
-        if (j < wmp) {
-            wmp = j;
+        if (!mpCalculationSetting.ignoreGravity) {
+            mp = Math.min(mp, applyGravityEffectsOnMP(mp));
         }
+
         if (isGlider()) {
             // Torso crits reduce glider mp as jump
-            int torsoCrits = getCritsHit(LOC_TORSO);
-            switch (torsoCrits) {
-                case 0:
-                    break;
-                case 1:
-                    if (wmp > 0) {
-                        wmp--;
-                    }
-                    break;
-                case 2:
-                    wmp /= 2;
-                    break;
+            int torsoCrits = getCritsHit(Protomech.LOC_TORSO);
+            if (torsoCrits == 1) {
+                mp--;
+            } else if (torsoCrits == 2) {
+                mp /= 2;
             }
             // Near misses damage the wings/flight systems, which reduce MP by one per hit.
-            wmp = Math.max(0, wmp - wingHits);
+            mp -= getWingHits();
         } else {
-            int legCrits = getCritsHit(LOC_LEG);
-            switch (legCrits) {
-                case 0:
-                    break;
-                case 1:
-                    wmp--;
-                    break;
-                case 2:
-                    wmp = wmp / 2;
-                    break;
-                case 3:
-                    wmp = 0;
-                    break;
+            int legCrits = getCritsHit(Protomech.LOC_LEG);
+            if (legCrits == 1) {
+                mp--;
+            } else if (legCrits == 2) {
+                mp /= 2;
+            } else if (legCrits == 3) {
+                mp = 0;
             }
         }
-        return wmp;
+
+        return Math.max(mp, 0);
     }
 
     @Override
     public String getRunMPasString() {
         if (hasMyomerBooster()) {
-            return getRunMPwithoutMyomerBooster(true, false, false) + "(" + getRunMP() + ")";
+            return getRunMP(MPCalculationSetting.NO_MYOMERBOOSTER) + "(" + getRunMP() + ")";
+        } else {
+            return Integer.toString(getRunMP());
         }
-        return Integer.toString(getRunMP());
     }
 
     /**
@@ -419,11 +400,11 @@ public void newRound(int roundNumber) {
 
     } // End public void newRound()
 
-    /**
-     * This pmech's jumping MP modified for missing jump jets and gravity.
-     */
     @Override
-    public int getJumpMP(boolean gravity) {
+    public int getJumpMP(MPCalculationSetting mpCalculationSetting) {
+        if (mpCalculationSetting.ignoreSubmergedJumpJets && isUnderwater()) {
+            return 0;
+        }
         int jump = jumpMP;
         int torsoCrits = getCritsHit(LOC_TORSO);
         switch (torsoCrits) {
@@ -438,7 +419,7 @@ public int getJumpMP(boolean gravity) {
                 jump = jump / 2;
                 break;
         }
-        if (hasWorkingMisc(MiscType.F_PARTIAL_WING)) {
+        if (!mpCalculationSetting.ignoreWeather && hasWorkingMisc(MiscType.F_PARTIAL_WING)) {
             int atmo = PlanetaryConditions.ATMO_STANDARD;
             if (game != null) {
                 atmo = game.getPlanetaryConditions().getAtmosphere();
@@ -457,35 +438,8 @@ public int getJumpMP(boolean gravity) {
                     break;
             }
         }
-        if (!gravity) {
-            return jump;
-        } else {
-            if (applyGravityEffectsOnMP(jump) > jump) {
-                return jump;
-            }
-            return applyGravityEffectsOnMP(jump);
-        }
-    }
-
-    public int getJumpJets() {
-        return jumpMP;
-    }
-
-    /**
-     * Returns this mech's jumping MP, modified for missing and underwater jets.
-     */
-    @Override
-    public int getJumpMPWithTerrain() {
-        if (getPosition() == null) {
-            return getJumpMP();
-        }
 
-        int waterLevel = game.getBoard().getHex(getPosition())
-                .terrainLevel(Terrains.WATER);
-        if ((waterLevel <= 0) || (getElevation() >= 0)) {
-            return getJumpMP();
-        }
-        return 0;
+        return mpCalculationSetting.ignoreGravity ? jump : Math.min(applyGravityEffectsOnMP(jump), jump);
     }
 
     @Override
@@ -600,33 +554,16 @@ public boolean hasRearArmor(int loc) {
         return false;
     }
 
-    /**
-     * get this ProtoMech's run MP without factoring in a possible myomer
-     * booster
-     *
-     * @param gravity
-     * @param ignoreheat
-     * @return
-     */
-    public int getRunMPwithoutMyomerBooster(boolean gravity,
-            boolean ignoreheat, boolean ignoremodulararmor) {
-        return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
-    }
-
     @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        if (hasMyomerBooster()) {
-            return (getWalkMP(gravity, ignoreheat, ignoremodulararmor) * 2);
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        if (!mpCalculationSetting.ignoreMyomerBooster && hasMyomerBooster()) {
+            return (getWalkMP(mpCalculationSetting) * 2);
+        } else {
+            return super.getRunMP(mpCalculationSetting);
         }
-        return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
     }
 
-    /**
-     * does this protomech mount a myomer booster?
-     *
-     * @return
-     */
+    /** @return True if this ProtoMek mounts an operable Myomer Booster. See {@link Mounted#isOperable()}. */
     public boolean hasMyomerBooster() {
         for (Mounted mEquip : getMisc()) {
             MiscType mtype = (MiscType) mEquip.getType();
@@ -998,11 +935,6 @@ public int maxWeapons(int location) {
         }
     }
 
-    @Override
-    protected int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return ProtoMekBVCalculator.calculateBV(this, ignoreSkill, calculationReport);
-    }
-
     @Override
     public Vector<Report> victoryReport() {
         Vector<Report> vDesc = new Vector<>();
@@ -1307,12 +1239,6 @@ public PilotingRollData checkGliderLanding() {
         return new PilotingRollData(getId(), 4, "Attempting to land");
     }
 
-    @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        return getRunMP(gravity, ignoreheat, ignoremodulararmor);
-    }
-
     @Override
     public int getEngineHits() {
         if (this.isEngineHit()) {
diff --git a/megamek/src/megamek/common/QuadMech.java b/megamek/src/megamek/common/QuadMech.java
index 8387cf26c49..e9886f5bd2f 100644
--- a/megamek/src/megamek/common/QuadMech.java
+++ b/megamek/src/megamek/common/QuadMech.java
@@ -17,6 +17,7 @@
 package megamek.common;
 
 import megamek.common.enums.AimingMode;
+import megamek.common.enums.MPBoosters;
 import megamek.common.options.OptionsConstants;
 import megamek.common.preference.PreferenceManager;
 import org.apache.logging.log4j.LogManager;
@@ -81,8 +82,8 @@ public boolean cannotStandUpFromHullDown() {
     }
 
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        int wmp = getOriginalWalkMP();
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = getOriginalWalkMP();
 
         int legsDestroyed = 0;
         int hipHits = 0;
@@ -97,7 +98,7 @@ public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulara
                     }
                 }
             }
-            wmp = (wmp * (4 - legsDestroyed)) / 4;
+            mp = (mp * (4 - legsDestroyed)) / 4;
         } else {
             for (int i = 0; i < locations(); i++) {
                 if (locationIsLeg(i)) {
@@ -117,101 +118,89 @@ public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulara
             // leg damage effects
             if (legsDestroyed > 0) {
                 if (legsDestroyed == 1) {
-                    wmp--;
+                    mp--;
                 } else if (legsDestroyed == 2) {
-                    wmp = 1;
+                    mp = 1;
                 } else {
-                    wmp = 0;
+                    mp = 0;
                 }
             }        
-            if (wmp > 0) {
+            if (mp > 0) {
                 if (hipHits > 0) {
                     if ((game != null) && game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_TACOPS_LEG_DAMAGE)) {
-                        wmp = wmp - (2 * hipHits);
+                        mp = mp - (2 * hipHits);
                     } else {
                         for (int i = 0; i < hipHits; i++) {
-                            wmp = (int) Math.ceil(wmp / 2.0);
+                            mp = (int) Math.ceil(mp / 2.0);
                         }
                     }
                 }
-                wmp -= actuatorHits;
+                mp -= actuatorHits;
             }
         }
 
-        if (!ignoremodulararmor && hasModularArmor()) {
-            wmp--;
+        if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
+            mp--;
         }
 
-        if (!ignoreheat) {
+        if (!mpCalculationSetting.ignoreHeat) {
             // factor in heat
             if ((game != null) && game.getOptions().booleanOption(OptionsConstants.ADVCOMBAT_TACOPS_HEAT)) {
                 if (heat < 30) {
-                    wmp -= (heat / 5);
+                    mp -= (heat / 5);
                 } else if (heat >= 49) {
-                    wmp -= 9;
+                    mp -= 9;
                 } else if (heat >= 43) {
-                    wmp -= 8;
+                    mp -= 8;
                 } else if (heat >= 37) {
-                    wmp -= 7;
+                    mp -= 7;
                 } else if (heat >= 31) {
-                    wmp -= 6;
+                    mp -= 6;
                 } else {
-                    wmp -= 5;
+                    mp -= 5;
                 }
             } else {
-                wmp -= (heat / 5);
+                mp -= (heat / 5);
             }
-            // TSM negates some heat but has no benefit for 'Mechs using tracks or QuadVees in vehicle mode.
-            if ((heat >= 9) && hasTSM(false) && legsDestroyed < 2
-                    && movementMode != EntityMovementMode.TRACKED
-                    && movementMode != EntityMovementMode.WHEELED) {
-                wmp += 2;
+        }
+
+        // TSM negates some heat, but provides no benefit when using tracks.
+        if (((heat >= 9) || mpCalculationSetting.forceTSM) && hasTSM(false) && (legsDestroyed < 2)
+                && !movementMode.isTracked() && !movementMode.isWheeled()) {
+            if (mpCalculationSetting.forceTSM && mpCalculationSetting.ignoreHeat) {
+                // When forcing TSM but ignoring heat we must assume heat to be 9 to activate TSM, this adds -1 MP!
+                mp += 1;
+            } else {
+                mp += 2;
             }
         }
-        if (null != game) {
+
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
             int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
-            if (weatherMod != 0) {
-                wmp = Math.max(wmp + weatherMod, 0);
-            }
+            mp = Math.max(mp + weatherMod, 0);
 
             if(getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
                     && (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_TORNADO_F13)) {
-                wmp += 1;
+                mp += 1;
             }
         }
-        // gravity
-        if (gravity) {
-            wmp = applyGravityEffectsOnMP(wmp);
-        }
-        // For sanity sake...
-        wmp = Math.max(0, wmp);
-        return wmp;
-    }
 
-    /**
-     * @return this mek's running/flank mp modified for leg loss and stuff.
-     */
-    @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        if (countBadLegs() <= 1
-                || (this instanceof QuadVee && getConversionMode() == QuadVee.CONV_MODE_VEHICLE
-                && !convertingNow)) {
-            return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
+        if (!mpCalculationSetting.ignoreGravity) {
+            mp = applyGravityEffectsOnMP(mp);
         }
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor);
+
+        return Math.max(0, mp);
     }
 
-    /**
-     * Returns run MP without considering MASC modified for leg loss and stuff.
-     */
     @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
         if (countBadLegs() <= 1
                 || (this instanceof QuadVee && getConversionMode() == QuadVee.CONV_MODE_VEHICLE
                 && !convertingNow)) {
-            return super.getRunMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
+            return super.getRunMP(mpCalculationSetting);
+        } else {
+            return getWalkMP(mpCalculationSetting);
         }
-        return getWalkMP(gravity, ignoreheat);
     }
 
     @Override
diff --git a/megamek/src/megamek/common/QuadVee.java b/megamek/src/megamek/common/QuadVee.java
index 6b8fb9bcc95..053c4db3094 100644
--- a/megamek/src/megamek/common/QuadVee.java
+++ b/megamek/src/megamek/common/QuadVee.java
@@ -132,17 +132,16 @@ public boolean hasTracks() {
         return false;
     }
     
-    /**
-     * Current MP is calculated differently depending on whether the QuadVee is in Mech
-     * or vehicle mode. During conversion we use the mode we started in:
-     * bg.battletech.com/forums/index.php?topic=55261.msg1271935#msg1271935
-     */
+
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        if (getConversionMode() == CONV_MODE_VEHICLE) {
-            return getCruiseMP(gravity, ignoreheat, ignoremodulararmor);
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        // Current MP is calculated differently depending on whether the QuadVee is in Mech
+        // or vehicle mode. During conversion we use the mode we started in:
+        // bg.battletech.com/forums/index.php?topic=55261.msg1271935#msg1271935
+        if (!mpCalculationSetting.ignoreConversion && (getConversionMode() == CONV_MODE_VEHICLE)) {
+            return getCruiseMP(mpCalculationSetting);
         } else {
-            return super.getWalkMP(gravity, ignoreheat, ignoremodulararmor);
+            return super.getWalkMP(mpCalculationSetting);
         }
     }
     
@@ -150,11 +149,10 @@ public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulara
      * In vehicle mode the QuadVee ignores actuator and hip criticals, but is subject to track/wheel
      * damage and various effects of vehicle motive damage.
      */
-    public int getCruiseMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        int wmp = getOriginalWalkMP();
-        //Bonus for wheeled movement
+    public int getCruiseMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = getOriginalWalkMP();
         if (getMotiveType() == MOTIVE_WHEEL) {
-            wmp++;
+            mp++;
         }
         
         // If a leg or its track/wheel is destroyed, it is treated as major motive system damage,
@@ -162,8 +160,7 @@ public int getCruiseMP(boolean gravity, boolean ignoreheat, boolean ignoremodula
         // bg.battletech.com/forums/index.php?topic=55261.msg1271935#msg1271935
         int badTracks = 0;
         for (int loc = 0; loc < locations(); loc++) {
-            if (locationIsLeg(loc)
-                    && (isLocationBad(loc) || getCritical(loc, 5).isHit())) {
+            if (locationIsLeg(loc) && (isLocationBad(loc) || getCritical(loc, 5).isHit())) {
                 badTracks++;
             }
         }
@@ -171,106 +168,72 @@ public int getCruiseMP(boolean gravity, boolean ignoreheat, boolean ignoremodula
         if (badTracks == 4) {
             return 0;
         } else if (badTracks > 1) {
-            wmp = wmp / (1 << badTracks);
+            mp = mp / (1 << badTracks);
         }
 
-        // Now apply modifiers
-        if (!ignoremodulararmor && hasModularArmor()) {
-            wmp--;
+        if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
+            mp--;
         }
 
-        if (!ignoreheat) {
-            // factor in heat
+        if (!mpCalculationSetting.ignoreHeat) {
             if ((game != null) && game.getOptions().booleanOption(OptionsConstants.ADVCOMBAT_TACOPS_HEAT)) {
                 if (heat < 30) {
-                    wmp -= (heat / 5);
+                    mp -= (heat / 5);
                 } else if (heat >= 49) {
-                    wmp -= 9;
+                    mp -= 9;
                 } else if (heat >= 43) {
-                    wmp -= 8;
+                    mp -= 8;
                 } else if (heat >= 37) {
-                    wmp -= 7;
+                    mp -= 7;
                 } else if (heat >= 31) {
-                    wmp -= 6;
+                    mp -= 6;
                 } else {
-                    wmp -= 5;
+                    mp -= 5;
                 }
             } else {
-                wmp -= (heat / 5);
+                mp -= (heat / 5);
             }
         }
-        if (null != game) {
+
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
             int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
-            if (weatherMod != 0) {
-                wmp = Math.max(wmp + weatherMod, 0);
-            }
+            mp = Math.max(mp + weatherMod, 0);
 
             if(getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
                     && (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_TORNADO_F13)) {
-                wmp += 1;
+                mp += 1;
             }
         }
-        // gravity
-        if (gravity) {
-            wmp = applyGravityEffectsOnMP(wmp);
-        }
-        // For sanity sake...
-        wmp = Math.max(0, wmp);
-        return wmp;        
-    }
 
-    @Override
-    public int getSprintMP() {
-        if (getConversionMode() == CONV_MODE_VEHICLE && (game == null || !game.getOptions()
-                .booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS))) {
-            return getRunMP();
+        if (!mpCalculationSetting.ignoreGravity) {
+            mp = applyGravityEffectsOnMP(mp);
         }
-        return getSprintMP(true, false, false);
-    }
 
-    @Override
-    public int getSprintMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        if (getConversionMode() == CONV_MODE_VEHICLE && (game == null || !game.getOptions()
-                .booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS))) {
-            return getRunMP(gravity, ignoreheat, ignoremodulararmor);
-        }
-        return super.getSprintMP(gravity, ignoreheat, ignoremodulararmor);
+        return Math.max(0, mp);
     }
 
     @Override
-    public int getSprintMPwithoutMASC(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        if (getConversionMode() == CONV_MODE_VEHICLE) {
-            if (game == null || !game.getOptions()
-                    .booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS)) {
-                return getRunMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
-            } else {
-                return (int) Math.ceil(getWalkMP(gravity, ignoreheat,
-                        ignoremodulararmor) * 2.0);
-            }
+    public int getSprintMP(MPCalculationSetting mpCalculationSetting) {
+        if (!mpCalculationSetting.ignoreConversion && (getConversionMode() == CONV_MODE_VEHICLE)
+                && ((game == null) ||
+                !game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS))) {
+            return getRunMP(mpCalculationSetting);
         } else {
-            return super.getSprintMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
+            return super.getSprintMP(mpCalculationSetting);
         }
     }
 
-    @Override
-    public int getOriginalSprintMPwithoutMASC() {
-        if (getConversionMode() == CONV_MODE_VEHICLE && (game == null || !game.getOptions()
-                .booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS))) {
-            return getOriginalRunMP();
-        } else {
-            return (int) Math.ceil(getOriginalWalkMP() * 2.0);
-        }
-    }
     /*
      * No jumping in vehicle mode.
      */
     @Override
-    public int getJumpMP(boolean gravity, boolean ignoremodulararmor) {
-        if (getConversionMode() == CONV_MODE_VEHICLE || convertingNow) {
+    public int getJumpMP(MPCalculationSetting mpCalculationSetting) {
+        if (!mpCalculationSetting.ignoreConversion
+                && ((getConversionMode() == CONV_MODE_VEHICLE) || convertingNow)) {
             return 0;
+        } else {
+            return super.getJumpMP(mpCalculationSetting);
         }
-        return super.getJumpMP(gravity, ignoremodulararmor);
     }
 
     /*
diff --git a/megamek/src/megamek/common/Sensor.java b/megamek/src/megamek/common/Sensor.java
index 373edab2a46..58b672ab13f 100644
--- a/megamek/src/megamek/common/Sensor.java
+++ b/megamek/src/megamek/common/Sensor.java
@@ -32,7 +32,7 @@ public class Sensor implements Serializable {
     public static final int TYPE_MEK_RADAR = 0;
     public static final int TYPE_VEE_RADAR = 1;
     public static final int TYPE_BAP = 2;
-    public static final int TYPE_CLAN_BAP = 3;
+    public static final int TYPE_CLAN_AP = 3;
     public static final int TYPE_BLOODHOUND = 4;
     public static final int TYPE_WATCHDOG = 5;
     public static final int TYPE_LIGHT_AP = 6;
@@ -67,7 +67,7 @@ public class Sensor implements Serializable {
     public static final String EW_EQUIPMENT = "ISElectronicWarfareEquipment";
 
     private static String[] sensorNames = { "Mech Radar", "Vehicle Radar",
-            "Beagle Active Probe", "Clan BAP", "Bloodhound AP", "Watchdog",
+            "Beagle Active Probe", "Clan AP", "Bloodhound AP", "Watchdog",
             "Light AP", "Mech IR", "Vehicle IR", "Mech Magscan",
             "Vehicle Magscan", "Heat Sensors", "Improved Sensors",
             "Mech Seismic", "Vehicle Seismic", "EW Equipment", "Nova CEWS", "Beagle Active Probe Prototype", 
@@ -104,7 +104,7 @@ public String getDisplayName() {
 
     public boolean isBAP() {
         return (type == TYPE_BAP) || (type == TYPE_BLOODHOUND)
-                || (type == TYPE_CLAN_BAP) || (type == TYPE_WATCHDOG)
+                || (type == TYPE_CLAN_AP) || (type == TYPE_WATCHDOG)
                 || (type == TYPE_LIGHT_AP) || (type == TYPE_EW_EQUIPMENT)
                 || (type == TYPE_NOVA) || (type == TYPE_BAPP);
     }
@@ -118,7 +118,7 @@ public int getRangeByBracket() {
                 return 12;
             case TYPE_BLOODHOUND:
                 return 16;
-            case TYPE_CLAN_BAP:
+            case TYPE_CLAN_AP:
                 return 15;
             case TYPE_WATCHDOG:
             case TYPE_LIGHT_AP:
@@ -283,7 +283,7 @@ public int getModsForStealth(Entity te) {
                     mod += 1;
                 }
                 break;
-            case TYPE_CLAN_BAP:
+            case TYPE_CLAN_AP:
                 if (te.isVoidSigActive()) {
                     mod += 5;
                 }
@@ -443,7 +443,7 @@ public int getModForECM(Entity en, List<ECMInfo> allECMInfo) {
         switch (type) {
             case TYPE_BAP:
             case TYPE_BAPP:
-            case TYPE_CLAN_BAP:
+            case TYPE_CLAN_AP:
             case TYPE_WATCHDOG:
                 // as above, no data, assuming watchdog quality
             case TYPE_NOVA:
diff --git a/megamek/src/megamek/common/SupportTank.java b/megamek/src/megamek/common/SupportTank.java
index 2b770a33c21..3120a3bfe46 100644
--- a/megamek/src/megamek/common/SupportTank.java
+++ b/megamek/src/megamek/common/SupportTank.java
@@ -19,8 +19,6 @@
  */
 package megamek.common;
 
-import megamek.common.options.OptionsConstants;
-
 /**
  * This is a support vehicle
  *
@@ -245,82 +243,8 @@ public int getTotalCommGearTons() {
         return getExtraCommGearTons();
     }
 
-    @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat,
-                         boolean ignoremodulararmor) {
-        int mp = getOriginalWalkMP();
-        if (engineHit || isImmobile()) {
-            return 0;
-        }
-        if (hasWorkingMisc(MiscType.F_HYDROFOIL)) {
-            mp = (int) Math.round(mp * 1.25);
-        }
-        mp = Math.max(0, mp - motiveDamage);
-        mp = Math.max(0, mp - getCargoMpReduction(this));
-        if (null != game) {
-            int weatherMod = game.getPlanetaryConditions()
-                    .getMovementMods(this);
-            if (weatherMod != 0) {
-                mp = Math.max(mp + weatherMod, 0);
-            }
-
-            if (getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_SNOW)) {
-                if ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_ICE_STORM)) {
-                    mp += 2;
-                }
-
-                if ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_SLEET)
-                        || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_LIGHT_SNOW)
-                        || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_MOD_SNOW)
-                        || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_HEAVY_SNOW)
-                        || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_SNOW_FLURRIES)) {
-                    mp += 1;
-                }
-            }
-
-            if(getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
-                    && (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_TORNADO_F13)) {
-                mp += 1;
-            }
-        }
-
-        if (!ignoremodulararmor && hasModularArmor()) {
-            mp--;
-        }
-        if (hasWorkingMisc(MiscType.F_DUNE_BUGGY) && (game != null)) {
-            mp--;
-        }
-
-        if (gravity) {
-            mp = applyGravityEffectsOnMP(mp);
-        }
-
-        //If the unit is towing trailers, adjust its walkMP, TW p205
-        if ((null != game) && !getAllTowedUnits().isEmpty()) {
-            double trainWeight = getWeight();
-            int lowestSuspensionFactor = getSuspensionFactor();
-            //Add up the trailers
-            for (int id : getAllTowedUnits()) {
-                Entity tr = game.getEntity(id);
-                if (tr == null) {
-                    //this isn't supposed to happen, but it can in rare cases when tr is destroyed
-                    continue;
-                }
-                if (tr instanceof Tank) {
-                    Tank trailer = (Tank) tr;
-                    if (trailer.getSuspensionFactor() < lowestSuspensionFactor) {
-                        lowestSuspensionFactor = trailer.getSuspensionFactor();
-                    }
-                }
-                trainWeight += tr.getWeight();
-            }
-            mp = (int) ((getEngine().getRating() + lowestSuspensionFactor) / trainWeight);
-        }
-
-        return mp;
-
-    }
-    
+    // CONSTRUCTION INFORMATION
+    //Support Vee Engine Information
     @Override
     public double getBaseChassisValue() {
         switch (movementMode) {
diff --git a/megamek/src/megamek/common/Tank.java b/megamek/src/megamek/common/Tank.java
index 77769ca330a..d01e5e11d2e 100644
--- a/megamek/src/megamek/common/Tank.java
+++ b/megamek/src/megamek/common/Tank.java
@@ -14,7 +14,6 @@
 package megamek.common;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.battlevalue.CombatVehicleBVCalculator;
 import megamek.common.cost.CombatVehicleCostCalculator;
 import megamek.common.enums.AimingMode;
 import megamek.common.enums.GamePhase;
@@ -262,33 +261,28 @@ protected void addSystemTechAdvancement(CompositeTechLevel ctl) {
         }
     }
 
-    /**
-     * Returns this entity's walking/cruising mp, factored for heat, extreme
-     * temperatures, and gravity.
-     */
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat) {
-        return getWalkMP(gravity, ignoreheat, false);
-    }
-
-    @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        int j = getOriginalWalkMP();
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = getOriginalWalkMP();
         if (engineHit || isImmobile()) {
             return 0;
         }
-        j = Math.max(0, j - motiveDamage);
-        j = Math.max(0, j - getCargoMpReduction(this));
-        if (null != game) {
-            int weatherMod = game.getPlanetaryConditions()
-                    .getMovementMods(this);
-            if (weatherMod != 0) {
-                j = Math.max(j + weatherMod, 0);
-            }
+        if (hasWorkingMisc(MiscType.F_HYDROFOIL)) {
+            mp = (int) Math.round(mp * 1.25);
+        }
+        mp = Math.max(0, mp - motiveDamage);
+
+        if (!mpCalculationSetting.ignoreCargo) {
+            mp = Math.max(0, mp - getCargoMpReduction(this));
+        }
+
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
+            int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
+            mp = Math.max(mp + weatherMod, 0);
+
             if (getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_SNOW)) {
                 if ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_ICE_STORM)) {
-                    j += 2;
+                    mp += 2;
                 }
 
                 if ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_SLEET)
@@ -296,29 +290,30 @@ public int getWalkMP(boolean gravity, boolean ignoreheat,
                         || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_MOD_SNOW)
                         || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_HEAVY_SNOW)
                         || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_SNOW_FLURRIES)) {
-                    j += 1;
+                    mp += 1;
                 }
             }
 
             if(getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
                     && (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_TORNADO_F13)) {
-                j += 1;
+                mp += 1;
             }
         }
 
-        if (!ignoremodulararmor && hasModularArmor()) {
-            j--;
+        if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
+            mp--;
         }
-        if (hasWorkingMisc(MiscType.F_DUNE_BUGGY) && (game != null)) {
-            j--;
+
+        if (hasWorkingMisc(MiscType.F_DUNE_BUGGY)) {
+            mp--;
         }
 
-        if (gravity) {
-            j = applyGravityEffectsOnMP(j);
+        if (!mpCalculationSetting.ignoreGravity) {
+            mp = applyGravityEffectsOnMP(mp);
         }
 
         //If the unit is towing trailers, adjust its walkMP, TW p205
-        if (!getAllTowedUnits().isEmpty()) {
+        if (!mpCalculationSetting.ignoreCargo && (null != game) && !getAllTowedUnits().isEmpty()) {
             double trainWeight = getWeight();
             int lowestSuspensionFactor = getSuspensionFactor();
             //Add up the trailers
@@ -336,11 +331,10 @@ public int getWalkMP(boolean gravity, boolean ignoreheat,
                 }
                 trainWeight += tr.getWeight();
             }
-            j = (int) ((getEngine().getRating() + lowestSuspensionFactor) / trainWeight);
+            mp = (int) ((getEngine().getRating() + lowestSuspensionFactor) / trainWeight);
         }
 
-        return j;
-
+        return Math.max(mp, 0);
     }
 
     @Override
@@ -1271,11 +1265,6 @@ public int getDependentLocation(int loc) {
         return LOC_NONE;
     }
 
-    @Override
-    protected int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
-        return CombatVehicleBVCalculator.calculateBV(this, ignoreC3, ignoreSkill, calculationReport);
-    }
-
     @Override
     public PilotingRollData addEntityBonuses(PilotingRollData prd) {
         if (motivePenalty > 0) {
@@ -1357,121 +1346,40 @@ public int[] getNoOfSlots() {
         return NUM_OF_SLOTS;
     }
 
-    /**
-     * Tanks have Superchargers but don't have MASC
-     */
     @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getRunMP(boolean, boolean, boolean)
-     */
-    @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        if (hasArmedMASC()) {
-            return (getWalkMP(gravity, ignoreheat, ignoremodulararmor) * 2);
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        if (!mpCalculationSetting.ignoreMASC && hasArmedMASC()) {
+            return (getWalkMP(mpCalculationSetting) * 2);
+        } else {
+            return super.getRunMP(mpCalculationSetting);
         }
-        return getRunMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getSprintMP()
-     */
     @Override
     public int getSprintMP() {
-        // Overdrive
-        if (game != null
-                && game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS)) {
-            return getSprintMP(true, false, false);
-        }
-        return getSprintMP(true, false, false);
+        return getSprintMP(MPCalculationSetting.STANDARD);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getSprintMP(boolean, boolean, boolean)
-     */
     @Override
-    public int getSprintMP(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        if (game != null && game.getOptions()
-                .booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS)) {
-            if (hasArmedMASC()) {
-                return (int) Math.ceil(getWalkMP(gravity, ignoreheat,
-                        ignoremodulararmor) * 2.5);
+    public int getSprintMP(MPCalculationSetting mpCalculationSetting) {
+        if ((game != null) && game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS)) {
+            if (!mpCalculationSetting.ignoreMASC && hasArmedMASC()) {
+                return (int) Math.ceil(getWalkMP(mpCalculationSetting) * 2.5);
             } else {
-                return getSprintMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
+                return getWalkMP(mpCalculationSetting) * 2;
             }
         } else {
-            return getRunMP(gravity, ignoreheat, ignoremodulararmor);
+            return getRunMP(mpCalculationSetting);
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getSprintMPwithoutMASC(boolean, boolean)
-     */
-    @Override
-    public int getSprintMPwithoutMASC() {
-        return getSprintMPwithoutMASC(true, false, false);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see megamek.common.Entity#getSprintMPwithoutMASC(boolean, boolean,
-     * boolean)
-     */
-    @Override
-    public int getSprintMPwithoutMASC(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        if (game != null && game.getOptions()
-                .booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS)) {
-            return (int) Math.ceil(getWalkMP(gravity, ignoreheat,
-                    ignoremodulararmor) * 2.0);
-        } else {
-            return getRunMPwithoutMASC(gravity, ignoreheat, ignoremodulararmor);
-        }
-    }
-
-    public int getOriginalSprintMPwithoutMASC() {
-        if (game != null && game.getOptions()
-                .booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS)) {
-            return (int) Math.ceil(getOriginalWalkMP() * 2.0);
-        } else {
-            return getOriginalRunMP();
-        }
-    }
-
-
-    /**
-     * Returns this entity's Sprint mp as a string.
-     */
-    @Override
-    public String getSprintMPasString() {
-        if (hasArmedMASC()) {
-            return getRunMPwithoutMASC() + "(" + getSprintMP() + ")";
-        }
-        return Integer.toString(getSprintMP());
-    }
-
     @Override
     public int getRunningGravityLimit() {
         if (game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_VEHICLE_ADVANCED_MANEUVERS)) {
-            return getSprintMP(false, false, false);
+            return getSprintMP(MPCalculationSetting.NO_GRAVITY);
+        } else {
+            return getRunMP(MPCalculationSetting.NO_GRAVITY);
         }
-        return getRunMP(false, false, false);
     }
 
     @Override
@@ -2443,7 +2351,7 @@ public int getFreeSlots() {
             }
         }
         // JJs take just 1 slot
-        if (this.getJumpMP(false) > 0) {
+        if (this.getJumpMP(MPCalculationSetting.NO_GRAVITY) > 0) {
             usedSlots++;
         }
         // So do fuel tanks
diff --git a/megamek/src/megamek/common/TeleMissile.java b/megamek/src/megamek/common/TeleMissile.java
index 44711781a1f..971146e3f92 100644
--- a/megamek/src/megamek/common/TeleMissile.java
+++ b/megamek/src/megamek/common/TeleMissile.java
@@ -160,15 +160,15 @@ public boolean hasStealth() {
     public int doBattleValueCalculation(boolean ignoreC3, boolean ignoreSkill, CalculationReport calculationReport) {
         return 0;
     }
-    
+
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
         return getCurrentFuel();
     }
 
     @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat, boolean ignoremodulararmor) {
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor);
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
+        return getWalkMP(mpCalculationSetting);
     }
 
     @Override
diff --git a/megamek/src/megamek/common/TripodMech.java b/megamek/src/megamek/common/TripodMech.java
index 5a47d8f4417..fa8989d7beb 100644
--- a/megamek/src/megamek/common/TripodMech.java
+++ b/megamek/src/megamek/common/TripodMech.java
@@ -129,9 +129,8 @@ public boolean canFlipArms() {
     }
 
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat,
-                         boolean ignoremodulararmor) {
-        int wmp = getOriginalWalkMP();
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = getOriginalWalkMP();
         int legsDestroyed = 0;
         int hipHits = 0;
         int actuatorHits = 0;
@@ -146,7 +145,7 @@ public int getWalkMP(boolean gravity, boolean ignoreheat,
                     }
                 }
             }
-            wmp = (wmp * (3 - legsDestroyed)) / 3; 
+            mp = (mp * (3 - legsDestroyed)) / 3;
         } else {
             for (int i = 0; i < locations(); i++) {
                 if (locationIsLeg(i)) {
@@ -168,101 +167,82 @@ public int getWalkMP(boolean gravity, boolean ignoreheat,
 
             // leg damage effects
             if (legsDestroyed > 0) {
-                wmp = (legsDestroyed == 1) ? 1 : 0;
+                mp = (legsDestroyed == 1) ? 1 : 0;
             } else {
                 if (hipHits > 0) {
                     if ((game != null)
                         && game.getOptions().booleanOption(OptionsConstants.ADVGRNDMOV_TACOPS_LEG_DAMAGE)) {
-                        wmp = (hipHits >= 1) ? wmp - (2 * hipHits) : 0;
+                        mp = mp - 2 * hipHits;
                     } else {
-                        wmp = (hipHits == 1) ? (int) Math.ceil(wmp / 2.0) : 0;
+                        mp = (hipHits == 1) ? (int) Math.ceil(mp / 2.0) : 0;
                     }
                 }
-                wmp -= actuatorHits;
+                mp -= actuatorHits;
             }
         }
 
         if (hasShield()) {
-            wmp -= getNumberOfShields(MiscType.S_SHIELD_LARGE);
-            wmp -= getNumberOfShields(MiscType.S_SHIELD_MEDIUM);
+            mp -= getNumberOfShields(MiscType.S_SHIELD_LARGE);
+            mp -= getNumberOfShields(MiscType.S_SHIELD_MEDIUM);
         }
 
-        if (!ignoremodulararmor && hasModularArmor()) {
-            wmp--;
+        if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
+            mp--;
         }
 
-        if (!ignoreheat) {
+        if (!mpCalculationSetting.ignoreHeat) {
             // factor in heat
             if ((game != null)
                 && game.getOptions().booleanOption(OptionsConstants.ADVCOMBAT_TACOPS_HEAT)) {
                 if (heat < 30) {
-                    wmp -= (heat / 5);
+                    mp -= (heat / 5);
                 } else if (heat >= 49) {
-                    wmp -= 9;
+                    mp -= 9;
                 } else if (heat >= 43) {
-                    wmp -= 8;
+                    mp -= 8;
                 } else if (heat >= 37) {
-                    wmp -= 7;
+                    mp -= 7;
                 } else if (heat >= 31) {
-                    wmp -= 6;
+                    mp -= 6;
                 } else {
-                    wmp -= 5;
+                    mp -= 5;
                 }
             } else {
-                wmp -= (heat / 5);
+                mp -= (heat / 5);
             }
             // TSM negates some heat
             if ((heat >= 9) && hasTSM(false) && legsDestroyed == 0 && movementMode != EntityMovementMode.TRACKED) {
-                wmp += 2;
+                mp += 2;
             }
         }
-        wmp = Math.max(wmp - getCargoMpReduction(this), 0);
-        if (null != game) {
-            int weatherMod = game.getPlanetaryConditions()
-                                 .getMovementMods(this);
-            if (weatherMod != 0) {
-                wmp = Math.max(wmp + weatherMod, 0);
-            }
+
+        if (!mpCalculationSetting.ignoreCargo) {
+            mp = Math.max(mp - getCargoMpReduction(this), 0);
+        }
+
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
+            int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
+            mp = Math.max(mp + weatherMod, 0);
             if (getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_WIND)
                     && (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WI_TORNADO_F13)) {
-                wmp += 1;
+                mp += 1;
             }
         }
-        // gravity
-        if (gravity) {
-            wmp = applyGravityEffectsOnMP(wmp);
-        }
 
-        // For sanity sake...
-        wmp = Math.max(0, wmp);
-
-        return wmp;
-    }
-
-    /**
-     * Returns this mech's running/flank mp modified for leg loss and stuff.
-     */
-    @Override
-    public int getRunMP(boolean gravity, boolean ignoreheat,
-                        boolean ignoremodulararmor) {
-        if (countBadLegs() == 0) {
-            return super.getRunMP(gravity, ignoreheat, ignoremodulararmor);
+        if (!mpCalculationSetting.ignoreGravity) {
+            mp = applyGravityEffectsOnMP(mp);
         }
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor);
-    }
 
-    /**
-     * Returns run MP without considering MASC modified for leg loss and stuff.
-     */
+        return Math.max(0, mp);
+    }
 
     @Override
-    public int getRunMPwithoutMASC(boolean gravity, boolean ignoreheat,
-                                   boolean ignoremodulararmor) {
+    public int getRunMP(MPCalculationSetting mpCalculationSetting) {
         if (countBadLegs() == 0) {
-            return super.getRunMPwithoutMASC(gravity, ignoreheat,
-                                             ignoremodulararmor);
+            return super.getRunMP(mpCalculationSetting);
+        } else {
+            return getWalkMP(mpCalculationSetting);
         }
-        return getWalkMP(gravity, ignoreheat, ignoremodulararmor);
     }
 
     /**
diff --git a/megamek/src/megamek/common/VTOL.java b/megamek/src/megamek/common/VTOL.java
index 8b8bc15e0ba..105c8fe4a7c 100644
--- a/megamek/src/megamek/common/VTOL.java
+++ b/megamek/src/megamek/common/VTOL.java
@@ -570,26 +570,26 @@ public void newRound(int roundNumber) {
     }
 
     @Override
-    public int getWalkMP(boolean gravity, boolean ignoreheat,
-            boolean ignoremodulararmor) {
-        int j = getOriginalWalkMP();
-        if (engineHit) {
+    public int getWalkMP(MPCalculationSetting mpCalculationSetting) {
+        int mp = getOriginalWalkMP();
+
+        if (engineHit || isLocationBad(LOC_ROTOR)) {
             return 0;
         }
-        if (isLocationBad(LOC_ROTOR)) {
-            return 0;
+
+        mp = Math.max(0, mp - motiveDamage);
+
+        if (!mpCalculationSetting.ignoreCargo) {
+            mp = Math.max(0, mp - getCargoMpReduction(this));
         }
-        j = Math.max(0, j - motiveDamage);
-        j = Math.max(0, j - getCargoMpReduction(this));
-        if (null != game) {
+
+        if (!mpCalculationSetting.ignoreWeather && (null != game)) {
             int weatherMod = game.getPlanetaryConditions().getMovementMods(this);
-            if (weatherMod != 0) {
-                j = Math.max(j + weatherMod, 0);
-            }
+            mp = Math.max(mp + weatherMod, 0);
 
             if (getCrew().getOptions().stringOption(OptionsConstants.MISC_ENV_SPECIALIST).equals(Crew.ENVSPC_SNOW)) {
                 if (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_ICE_STORM) {
-                    j += 2;
+                    mp += 2;
                 }
 
                 if ((game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_SLEET)
@@ -597,26 +597,28 @@ public int getWalkMP(boolean gravity, boolean ignoreheat,
                         || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_MOD_SNOW)
                         || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_HEAVY_SNOW)
                         || (game.getPlanetaryConditions().getWeather() == PlanetaryConditions.WE_SNOW_FLURRIES)) {
-                    j += 1;
+                    mp += 1;
                 }
             }
         }
 
-        if (!ignoremodulararmor && hasModularArmor()) {
-            j--;
+        if (!mpCalculationSetting.ignoreModularArmor && hasModularArmor()) {
+            mp--;
         }
+
         if (hasWorkingMisc(MiscType.F_DUNE_BUGGY)) {
-            j--;
+            mp--;
         }
 
-        j = reduceMPByBombLoad(j);
-
-        if (gravity) {
-            j = applyGravityEffectsOnMP(j);
+        if (!mpCalculationSetting.ignoreCargo) {
+            mp = reduceMPByBombLoad(mp);
         }
 
-        return j;
+        if (!mpCalculationSetting.ignoreGravity) {
+            mp = applyGravityEffectsOnMP(mp);
+        }
 
+        return mp;
     }
 
     @Override
diff --git a/megamek/src/megamek/common/Warship.java b/megamek/src/megamek/common/Warship.java
index 4107c9b9f4d..837479813b3 100644
--- a/megamek/src/megamek/common/Warship.java
+++ b/megamek/src/megamek/common/Warship.java
@@ -218,65 +218,6 @@ public int getECMRange() {
         return range;
     }
 
-    /**
-     * find the adjacent firing arc on this vessel clockwise
-     */
-    @Override
-    public int getAdjacentArcCW(int arc) {
-        switch (arc) {
-            case Compute.ARC_NOSE:
-                return Compute.ARC_RIGHTSIDE_SPHERE;
-            case Compute.ARC_LEFTSIDE_SPHERE:
-                return Compute.ARC_NOSE;
-            case Compute.ARC_RIGHTSIDE_SPHERE:
-                return Compute.ARC_RIGHT_BROADSIDE;
-            case Compute.ARC_LEFTSIDEA_SPHERE:
-                return Compute.ARC_LEFT_BROADSIDE;
-            case Compute.ARC_RIGHTSIDEA_SPHERE:
-                return Compute.ARC_AFT;
-            case Compute.ARC_LEFT_BROADSIDE:
-                return Compute.ARC_LEFTSIDE_SPHERE;
-            case Compute.ARC_RIGHT_BROADSIDE:
-                return Compute.ARC_RIGHTSIDEA_SPHERE;
-            case Compute.ARC_AFT:
-                return Compute.ARC_LEFTSIDEA_SPHERE;
-            default:
-                return Integer.MIN_VALUE;
-        }
-    }
-
-    /**
-     * find the adjacent firing arc on this vessel counter-clockwise
-     */
-    @Override
-    public int getAdjacentArcCCW(int arc) {
-        switch (arc) {
-            case Compute.ARC_NOSE:
-                return Compute.ARC_LEFTSIDE_SPHERE;
-            case Compute.ARC_RIGHTSIDE_SPHERE:
-                return Compute.ARC_NOSE;
-            case Compute.ARC_LEFTSIDE_SPHERE:
-                return Compute.ARC_LEFT_BROADSIDE;
-            case Compute.ARC_LEFTSIDEA_SPHERE:
-                return Compute.ARC_AFT;
-            case Compute.ARC_RIGHTSIDEA_SPHERE:
-                return Compute.ARC_RIGHT_BROADSIDE;
-            case Compute.ARC_LEFT_BROADSIDE:
-                return Compute.ARC_LEFTSIDEA_SPHERE;
-            case Compute.ARC_RIGHT_BROADSIDE:
-                return Compute.ARC_RIGHTSIDE_SPHERE;
-            case Compute.ARC_AFT:
-                return Compute.ARC_RIGHTSIDEA_SPHERE;
-            default:
-                return Integer.MIN_VALUE;
-        }
-    }
-
-    @Override
-    public double getBVTypeModifier() {
-        return 0.8;
-    }
-
     @Override
     public long getEntityType() {
         return Entity.ETYPE_AERO | Entity.ETYPE_JUMPSHIP | Entity.ETYPE_WARSHIP;
@@ -344,4 +285,4 @@ public void newRound(int roundNumber) {
     public void postProcessFacingChange() {
         mpUsed += 2;
     }
-}
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASMekSpecialAbilityConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASMekSpecialAbilityConverter.java
index e6e60637874..cebbf48ec83 100644
--- a/megamek/src/megamek/common/alphaStrike/conversion/ASMekSpecialAbilityConverter.java
+++ b/megamek/src/megamek/common/alphaStrike/conversion/ASMekSpecialAbilityConverter.java
@@ -89,7 +89,7 @@ protected void processUnitFeatures() {
                 report.addLine("Bimodal Movement", "BIM");
                 element.getSpecialAbilities().replaceSUA(BIM, lamMoves);
             } else {
-                lamMoves.put("g", lam.getAirMechCruiseMP(false, false) * 2);
+                lamMoves.put("g", lam.getAirMechCruiseMP(MPCalculationSetting.AS_CONVERSION) * 2);
                 lamMoves.put("a", lam.getCurrentThrust());
                 report.addLine("LAM Movement", "LAM");
                 element.getSpecialAbilities().replaceSUA(LAM, lamMoves);
diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASMovementConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASMovementConverter.java
index 38ad0960b85..650826dfadb 100644
--- a/megamek/src/megamek/common/alphaStrike/conversion/ASMovementConverter.java
+++ b/megamek/src/megamek/common/alphaStrike/conversion/ASMovementConverter.java
@@ -73,10 +73,7 @@ private static Map<String, Integer> convertMovementForNonInfantry(ASConverter.Co
         double walkMP = entity.getOriginalWalkMP();
         report.addLine("Base Walking MP", "", Integer.toString(entity.getOriginalWalkMP()));
 
-        int jumpMove = entity.getJumpMP(false) * 2;
-        if (entity instanceof Mech) {
-            jumpMove = ((Mech) entity).getJumpMP(false, false) * 2;
-        }
+        int jumpMove = entity.getJumpMP(MPCalculationSetting.AS_CONVERSION) * 2;
 
         if (hasSupercharger(entity) && hasMechMASC(entity)) {
             walkMP *= 1.5;
@@ -135,12 +132,8 @@ private static Map<String, Integer> convertMovementForInfantry(ASConverter.Conve
         CalculationReport report = conversionData.conversionReport;
 
         var result = new HashMap<String, Integer>();
-        int walkingMP = entity.getWalkMP(false, true, true);
-        int jumpingMP = entity.getJumpMP();
-        if (entity instanceof BattleArmor) {
-            walkingMP = ((BattleArmor)entity).getWalkMP(true, true, true, true, true);
-            jumpingMP = ((BattleArmor)entity).getJumpMP(true, true, true);
-        }
+        int walkingMP = entity.getWalkMP(MPCalculationSetting.AS_CONVERSION);
+        int jumpingMP = entity.getJumpMP(MPCalculationSetting.AS_CONVERSION);
 
         report.addLine("Walking MP:", Integer.toString(walkingMP));
         report.addLine("Jumping MP:", Integer.toString(jumpingMP));
@@ -265,7 +258,7 @@ public static String getMovementCode(ASConverter.ConversionData conversionData)
                 report.addLine(type, "Infantry (motorized)", "m");
                 return "m";
             case INF_JUMP:
-                if (entity.getJumpMP(false) > 0) {
+                if (entity.getJumpMP(MPCalculationSetting.AS_CONVERSION) > 0) {
                     report.addLine(type, "Infantry (jump)", "j");
                     return "j";
                 } else {
diff --git a/megamek/src/megamek/common/battlevalue/AeroBVCalculator.java b/megamek/src/megamek/common/battlevalue/AeroBVCalculator.java
index fc9f5d7865f..d44edaae738 100644
--- a/megamek/src/megamek/common/battlevalue/AeroBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/AeroBVCalculator.java
@@ -18,680 +18,142 @@
  */
 package megamek.common.battlevalue;
 
-import megamek.client.ui.swing.calculationReport.CalculationReport;
 import megamek.common.*;
-import megamek.common.weapons.ppc.PPCWeapon;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Predicate;
 
-public class AeroBVCalculator {
+import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
 
-    public static int calculateBV(Aero aero, boolean ignoreC3, boolean ignoreSkill, CalculationReport bvReport) {
-        bvReport.addHeader("Battle Value Calculations For");
-        bvReport.addHeader(aero.getChassis() + " " + aero.getModel());
+public class AeroBVCalculator extends HeatTrackingBVCalculator {
 
-        bvReport.addSubHeader("Defensive Battle Rating Calculation:");
-        double dbv = 0; // defensive battle value
-        boolean blueShield = aero.hasWorkingMisc(MiscType.F_BLUE_SHIELD);
-        double armorMultiplier;
+    protected final Aero aero;
 
-        // Ignore any hull/fuselage or capital fighter wing locations
-        for (int loc = 0; loc < aero.locations() - ((aero instanceof SmallCraft) ? 1 : 2); loc++) {
-            int modularArmor = 0;
-            for (Mounted mounted : aero.getEquipment()) {
-                if ((mounted.getType() instanceof MiscType)
-                        && mounted.getType().hasFlag(MiscType.F_MODULAR_ARMOR)
-                        && (mounted.getLocation() == loc)) {
-                    modularArmor += mounted.getBaseDamageCapacity() - mounted.getDamageTaken();
-                }
-            }
-
-            // total armor points
-            switch (aero.getArmorType(loc)) {
-                case EquipmentType.T_ARMOR_COMMERCIAL:
-                    armorMultiplier = 0.5;
-                    break;
-                case EquipmentType.T_ARMOR_HARDENED:
-                    armorMultiplier = 2.0;
-                    break;
-                case EquipmentType.T_ARMOR_REACTIVE:
-                case EquipmentType.T_ARMOR_REFLECTIVE:
-                case EquipmentType.T_ARMOR_BALLISTIC_REINFORCED:
-                    armorMultiplier = 1.5;
-                    break;
-                case EquipmentType.T_ARMOR_LC_LAMELLOR_FERRO_CARBIDE:
-                case EquipmentType.T_ARMOR_FERRO_LAMELLOR:
-                case EquipmentType.T_ARMOR_ANTI_PENETRATIVE_ABLATION:
-                    armorMultiplier = 1.2;
-                    break;
-                default:
-                    armorMultiplier = 1.0;
-                    break;
-            }
-            if (aero.hasBARArmor(loc)) {
-                armorMultiplier *= aero.getBARRating(loc) / 10.0;
-            }
+    AeroBVCalculator(Entity entity) {
+        super(entity);
+        aero = (Aero) entity;
+    }
 
-            if (blueShield) {
-                armorMultiplier += 0.2;
-            }
-            int armor = aero.getArmor(loc) + modularArmor;
-            double armorBV = (aero.getArmor(loc) + modularArmor) * armorMultiplier;
-            dbv += armorBV;
-            bvReport.addLine("Total Armor " + aero.getLocationAbbr(loc) + " ("
-                    + armor + ") x " + armorMultiplier, "", armorBV);
+    @Override
+    protected void processStructure() {
+        String calculation = "+ " + aero.getSI() + " x 2";
+        if (hasBlueShield) {
+            calculation += " x 1.2 (Blue Shield)";
         }
-        dbv *= 2.5;
-        bvReport.addLine("Total modified armor BV x 2.5", "= ", dbv);
-        double dbvSI = aero.getSI() * 2.0 * (blueShield ? 1.2 : 1);
-        dbv += dbvSI;
-        bvReport.addLine("Total SI x 2 x SI modifier",
-                aero.getSI() + " x 2 x " + (blueShield ? 1.2 : 1),
-                "= ", dbvSI);
-
-        // add defensive equipment
-        double amsBV = 0;
-        double amsAmmoBV = 0;
-        double screenBV = 0;
-        double screenAmmoBV = 0;
-        double defEqBV = 0;
-        for (Mounted mounted : aero.getEquipment()) {
-            EquipmentType etype = mounted.getType();
+        defensiveValue += aero.getSI() * 2 * (hasBlueShield ? 1.2 : 1);
+        bvReport.addLine("Structural Integrity:", calculation, "= " + formatForReport(defensiveValue));
+    }
 
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-            if (mounted.isWeaponGroup()) {
-                continue;
-            }
-            if ((etype instanceof WeaponType) && etype.hasFlag(WeaponType.F_AMS)) {
-                amsBV += etype.getBV(aero);
-                bvReport.addLine(etype.getName(), "+ " + etype.getBV(aero), "");
-            } else if ((etype instanceof AmmoType) && (((AmmoType) etype).getAmmoType() == AmmoType.T_AMS)) {
-                amsAmmoBV += etype.getBV(aero);
-                bvReport.addLine(etype.getName(), "+ " + etype.getBV(aero), "");
-            } else if ((etype instanceof AmmoType)
-                    && (((AmmoType) etype).getAmmoType() == AmmoType.T_SCREEN_LAUNCHER)) {
-                screenAmmoBV += etype.getBV(aero);
-                bvReport.addLine(etype.getName(), "+ " + etype.getBV(aero), "");
-            } else if ((etype instanceof WeaponType)
-                    && (((WeaponType) etype).getAtClass() == WeaponType.CLASS_SCREEN)) {
-                screenBV += etype.getBV(aero);
-                bvReport.addLine(etype.getName(), "+ " + etype.getBV(aero), "");
-            } else if ((etype instanceof MiscType) && (etype.hasFlag(MiscType.F_ECM) || etype.hasFlag(MiscType.F_BAP)
-                    || etype.hasFlag(MiscType.F_CHAFF_POD))) {
-                defEqBV += etype.getBV(aero);
-                bvReport.addLine(mounted.getName(), "+ " + etype.getBV(aero), "");
-            }
-        }
-        if (amsBV > 0) {
-            dbv += amsBV;
-            bvReport.addLine("Total AMS BV:", "+ ", amsBV);
-        }
-        if (screenBV > 0) {
-            dbv += screenBV;
-            bvReport.addLine("Total Screen BV:", "", screenBV);
-        }
-        if (amsAmmoBV > 0) {
-            dbv += Math.min(amsBV, amsAmmoBV);
-            bvReport.addLine("Total AMS Ammo BV (to a maximum of AMS BV):", "", Math.min(amsBV, amsAmmoBV));
-        }
-        if (screenAmmoBV > 0) {
-            dbv += Math.min(screenBV, screenAmmoBV);
-            bvReport.addLine("Total Screen Ammo BV (to a maximum of Screen BV):", "", Math.min(screenBV, screenAmmoBV));
-        }
-        if (defEqBV > 0) {
-            dbv += defEqBV;
-            bvReport.addLine("Total misc defensive equipment BV:", "", defEqBV);
-        }
-        bvReport.addResultLine("", dbv);
+    @Override
+    protected boolean validArmorLocation(int location) {
+        return location <= 4;
+    }
 
-        // subtract for explosive ammo
-        double explosivePenalty = 0;
-        // FIXME: Consider new AmmoType::equals / BombType::equals
-        Map<AmmoType, Boolean> ammos = new HashMap<>();
+    @Override
+    protected void processExplosiveEquipment() {
+        boolean hasExplosiveEquipment = false;
+        bvReport.startTentativeSection();
+        bvReport.addLine("Explosive Equipment:", "", "");
+        Set<AmmoType> ammos = new HashSet<>();
         for (Mounted mounted : aero.getEquipment()) {
-            int loc = mounted.getLocation();
-            int toSubtract = 1;
-            EquipmentType etype = mounted.getType();
-
-            if (mounted.isWeaponGroup()) {
-                continue;
-            }
-
-            // only count explosive ammo
-            if (!etype.isExplosive(mounted, true)) {
-                continue;
-            }
-            // PPCs with capacitors subtract 1
-            if (etype instanceof PPCWeapon) {
-                if (mounted.getLinkedBy() == null) {
-                    continue;
-                }
-            }
-
-            // PPC capacitor does not count separately, it's already counted for
-            // with the PPC
-            if ((etype instanceof MiscType) && etype.hasFlag(MiscType.F_PPC_CAPACITOR)) {
-                continue;
-            }
-
-            // don't count oneshot ammo
-            if (loc == Entity.LOC_NONE) {
-                continue;
-            }
-
-            // CASE means no subtraction
-            if (aero.hasWorkingMisc(MiscType.F_CASE) || aero.isClan()) {
+            if (!countsAsExplosive(mounted)) {
                 continue;
             }
 
-            // RACs, LACs and ACs don't really count
-            if ((etype instanceof WeaponType) && ((((WeaponType) etype).getAmmoType() == AmmoType.T_AC_ROTARY)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_AC)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_AC_IMP)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_AC_PRIMITIVE)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_PAC)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_LAC))) {
-                toSubtract = 0;
+            if (entity.hasCase() || entity.hasCASEII() || aero.isClan()) {
+                bvReport.discardTentativeSection();
+                bvReport.addLine("Explosive Equipment:", "(CASE)", "--");
+                return;
             }
 
-            // empty ammo shouldn't count
-            if ((etype instanceof AmmoType) && (mounted.getUsableShotsLeft() == 0)) {
-                continue;
-            }
-            if (etype instanceof AmmoType) {
-                ammos.put((AmmoType) etype, true);
-            } else {
-                explosivePenalty += toSubtract;
-            }
-        }
-        explosivePenalty += ammos.size() * 15;
-        dbv = Math.max(1, dbv - explosivePenalty);
-        bvReport.addLine("Explosive Weapons / Equipment Penalty ", "= -", explosivePenalty);
-        bvReport.addResultLine("", dbv);
-
-        String typeModText = "" + aero.getBVTypeModifier();
-        if (aero.hasStealth()) {
-            typeModText += "+ 0.3 for Stealth";
-        }
-        dbv *= (aero.getBVTypeModifier() + (aero.hasStealth() ? 0.3 : 0));
-        bvReport.addLine("Multiply by Unit Type Modifier", typeModText,
-                "x ", aero.getBVTypeModifier() + (aero.hasStealth() ? 0.3 : 0));
-        bvReport.addResultLine("", dbv);
-
-        bvReport.addSubHeader("Offensive Battle Rating Calculation:");
-        // calculate heat efficiency
-        int aeroHeatEfficiency = 6 + aero.getHeatCapacity();
-        bvReport.addLine("Base Heat Efficiency", "", aeroHeatEfficiency);
-        bvReport.addLine("Unmodified Weapon BV:", "", "");
-
-        double weaponBV = 0;
-        boolean hasTargComp = aero.hasTargComp();
-        double targetingSystemBVMod = 1.0;
-
-        if (aero instanceof FixedWingSupport) {
-            if (aero.hasWorkingMisc(MiscType.F_BASIC_FIRECONTROL)) {
-                targetingSystemBVMod = 0.9;
-            } else if (!aero.hasWorkingMisc(MiscType.F_ADVANCED_FIRECONTROL)) {
-                targetingSystemBVMod = 0.8;
-            }
-        }
-
-        // first, add up front-faced and rear-faced unmodified BV,
-        // to know wether front- or rear faced BV should be halved
-        double bvFront = 0, bvRear = 0;
-        List<Mounted> weapons = aero.getTotalWeaponList();
-        for (Mounted weapon : weapons) {
-            WeaponType wtype = (WeaponType) weapon.getType();
-            double dBV = wtype.getBV(aero);
-            // don't count destroyed equipment
-            if (weapon.isDestroyed()) {
-                continue;
-            }
-            // don't count AMS, it's defensive
-            if (wtype.hasFlag(WeaponType.F_AMS)) {
-                continue;
-            }
-            // don't count screen launchers, they are defensive
-            if (wtype.getAtClass() == WeaponType.CLASS_SCREEN) {
-                continue;
-            }
-            // do not count weapon groups
-            if (weapon.isWeaponGroup()) {
-                continue;
-            }
-
-            String name = wtype.getName();
-            // PPC caps bump up the value
-            if (weapon.getLinkedBy() != null) {
-                // check to see if the weapon is a PPC and has a Capacitor
-                // attached to it
-                if (wtype.hasFlag(WeaponType.F_PPC)) {
-                    dBV += ((MiscType) weapon.getLinkedBy().getType()).getBV(aero, weapon);
-                    name = name.concat(" with Capacitor");
+            EquipmentType eType = mounted.getType();
+            if (eType instanceof AmmoType) {
+                if (ammos.add((AmmoType) eType)) {
+                    defensiveValue -= 15;
+                    bvReport.addLine("- " + equipmentDescriptor(mounted), "- 15",
+                            "= " + formatForReport(defensiveValue));
                 }
-            }
-            // calc MG Array here:
-            if (wtype.hasFlag(WeaponType.F_MGA)) {
-                double mgBV = 0;
-                for (int eqNum : weapon.getBayWeapons()) {
-                    Mounted mg = aero.getEquipment(eqNum);
-                    if ((mg != null) && (!mg.isDestroyed())) {
-                        mgBV += mg.getType().getBV(aero);
-                    }
-                }
-                dBV = mgBV * 0.67;
-            }
-            String wName = name;
-            if (weapon.isRearMounted() || (weapon.getLocation() == Aero.LOC_AFT)) {
-                bvRear += dBV;
-                wName += " (R)";
             } else {
-                bvFront += dBV;
+                defensiveValue -= 1;
+                bvReport.addLine("- " + equipmentDescriptor(mounted), "- 1",
+                        "= " + formatForReport(defensiveValue));
             }
-            bvReport.addLine(wName, "", dBV);
-        }
-        boolean halveRear = true;
-        if (bvFront <= bvRear) {
-            halveRear = false;
-            bvReport.addLine("halving front instead of rear weapon BVs", "", "");
+            hasExplosiveEquipment = true;
         }
-        bvReport.addLine("Weapon Heat:", "", "");
-
-        // here we store the modified BV and heat of all heat-using weapons, to later be sorted by BV
-        ArrayList<ArrayList<Object>> heatBVs = new ArrayList<>();
-        // BVs of non-heat-using weapons
-        ArrayList<ArrayList<Object>> nonHeatBVs = new ArrayList<>();
-        // total up maximum heat generated
-        // and add up BVs for ammo-using weapon types for excessive ammo rule
-        Map<String, Double> weaponsForExcessiveAmmo = new HashMap<>();
-        double maximumHeat = 0;
-        for (Mounted mounted : aero.getTotalWeaponList()) {
-            WeaponType wtype = (WeaponType) mounted.getType();
-            double weaponHeat = wtype.getHeat();
-
-            // only count non-damaged equipment
-            if (mounted.isMissing() || mounted.isHit() || mounted.isDestroyed() || mounted.isBreached()) {
-                continue;
-            }
-
-            // do not count weapon groups
-            if (mounted.isWeaponGroup()) {
-                continue;
-            }
-
-            // one shot weapons count 1/4
-            if ((wtype.getAmmoType() == AmmoType.T_ROCKET_LAUNCHER) || wtype.hasFlag(WeaponType.F_ONESHOT)) {
-                weaponHeat *= 0.25;
-            }
-
-            // double heat for ultras
-            if ((wtype.getAmmoType() == AmmoType.T_AC_ULTRA) || (wtype.getAmmoType() == AmmoType.T_AC_ULTRA_THB)) {
-                weaponHeat *= 2;
-            }
-
-            // Six times heat for RAC
-            if (wtype.getAmmoType() == AmmoType.T_AC_ROTARY) {
-                weaponHeat *= 6;
-            }
-
-            // laser insulator reduce heat by 1, to a minimum of 1
-            if (wtype.hasFlag(WeaponType.F_LASER) && (mounted.getLinkedBy() != null)
-                    && !mounted.getLinkedBy().isInoperable()
-                    && mounted.getLinkedBy().getType().hasFlag(MiscType.F_LASER_INSULATOR)) {
-                weaponHeat -= 1;
-                if (weaponHeat == 0) {
-                    weaponHeat++;
-                }
-            }
-
-            // half heat for streaks
-            if ((wtype.getAmmoType() == AmmoType.T_SRM_STREAK) ||
-                    (wtype.getAmmoType() == AmmoType.T_LRM_STREAK)) {
-                weaponHeat *= 0.5;
-            }
-            String name = wtype.getName();
-
-            // check to see if the weapon is a PPC and has a Capacitor attached to it
-            if (wtype.hasFlag(WeaponType.F_PPC) && (mounted.getLinkedBy() != null)) {
-                name = name.concat(" with Capacitor");
-                weaponHeat += 5;
-            }
-
-            bvReport.addLine(name, "", "+ ", weaponHeat);
-
-            double dBV = wtype.getBV(aero);
-            if (aero.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM)) {
-                dBV *= 0.8;
-            }
-
-            String weaponName = mounted.getName() + (mounted.isRearMounted() ? "(R)" : "");
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            // don't count AMS, it's defensive
-            if (wtype.hasFlag(WeaponType.F_AMS)) {
-                continue;
-            }
-            // don't count screen launchers, they are defensive
-            if (wtype.getAtClass() == WeaponType.CLASS_SCREEN) {
-                continue;
-            }
-            // do not count weapon groups
-            if (mounted.isWeaponGroup()) {
-                continue;
-            }
-            // calc MG Array here:
-            if (wtype.hasFlag(WeaponType.F_MGA)) {
-                double mgBV = 0;
-                for (int eqNum : mounted.getBayWeapons()) {
-                    Mounted mg = aero.getEquipment(eqNum);
-                    if ((mg != null) && (!mg.isDestroyed())) {
-                        mgBV += mg.getType().getBV(aero);
-                    }
-                }
-                dBV = mgBV * 0.67;
-            }
-            // artemis bumps up the value, PPC caps do, too
-            if (mounted.getLinkedBy() != null) {
-                // check to see if the weapon is a PPC and has a Capacitor attached to it
-                if (wtype.hasFlag(WeaponType.F_PPC)) {
-                    dBV += ((MiscType) mounted.getLinkedBy().getType()).getBV(aero, mounted);
-                    name = name.concat(" with Capacitor");
-                }
-                Mounted mLinker = mounted.getLinkedBy();
-                if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_ARTEMIS)) {
-                    dBV *= 1.2;
-                    name = name.concat(" with Artemis IV");
-                }
-                if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
-                    dBV *= 1.3;
-                    name = name.concat(" with Artemis V");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_PROTO)) {
-                    dBV *= 1.1;
-                    name = name.concat(" with Artemis IV Prototype");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_APOLLO)) {
-                    dBV *= 1.15;
-                    name = name.concat(" with Apollo");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
-                    dBV *= 1.15;
-                    name = name.concat(" with RISC Laser Pulse Module");
-                }
-            }
-
-            // and we'll add the tcomp here too
-            if (wtype.hasFlag(WeaponType.F_DIRECT_FIRE) && hasTargComp) {
-                dBV *= 1.25;
-            } else if ((aero instanceof FixedWingSupport) && !wtype.hasFlag(WeaponType.F_INFANTRY)) {
-                dBV *= targetingSystemBVMod;
-            }
-
-            // half for being rear mounted (or front mounted, when more rear-
-            // than front-mounted un-modded BV
-            if (((mounted.isRearMounted() || (mounted.getLocation() == Aero.LOC_AFT)) && halveRear)
-                    || (!(mounted.isRearMounted() || (mounted.getLocation() == Aero.LOC_AFT)) && !halveRear)) {
-                dBV /= 2;
-            }
-
-            // ArrayList that stores weapon values
-            // stores a double first (BV), then an Integer (heat),
-            // then a String (weapon name)
-            // for 0 heat weapons, just stores BV and name
-            ArrayList<Object> weaponValues = new ArrayList<>();
-            weaponValues.add(dBV);
-            if (weaponHeat > 0) {
-                // store heat and BV, for sorting a few lines down;
-                weaponValues.add(weaponHeat);
-                weaponValues.add(weaponName);
-                heatBVs.add(weaponValues);
-            } else {
-                weaponValues.add(weaponName);
-                nonHeatBVs.add(weaponValues);
-            }
-
-            maximumHeat += weaponHeat;
-            // add up BV of ammo-using weapons for each type of weapon,
-            // to compare with ammo BV later for excessive ammo BV rule
-            if (!((wtype.hasFlag(WeaponType.F_ENERGY) && !(wtype.getAmmoType() == AmmoType.T_PLASMA))
-                    || wtype.hasFlag(WeaponType.F_ONESHOT) || wtype.hasFlag(WeaponType.F_INFANTRY)
-                    || (wtype.getAmmoType() == AmmoType.T_NA))) {
-                String key = wtype.getAmmoType() + ":" + wtype.getRackSize();
-                if (!weaponsForExcessiveAmmo.containsKey(key)) {
-                    weaponsForExcessiveAmmo.put(key, wtype.getBV(aero));
-                } else {
-                    weaponsForExcessiveAmmo.put(key, wtype.getBV(aero) + weaponsForExcessiveAmmo.get(key));
-                }
-            }
-        }
-
-        bvReport.addResultLine("Total Heat:", "= ", maximumHeat);
-        bvReport.addLine("Weapons with no heat at full BV:", "", "");
-        // count heat-free weapons always at full modified BV
-        for (ArrayList<Object> nonHeatWeapon : nonHeatBVs) {
-            weaponBV += (Double) nonHeatWeapon.get(0);
-            bvReport.addLine((String) nonHeatWeapon.get(1), "", "", (Double) nonHeatWeapon.get(0));
-        }
-
-        bvReport.addLine("Heat Modified Weapons BV: ", "", "");
-        if (maximumHeat > aeroHeatEfficiency) {
-            bvReport.addLine("(Heat Exceeds Aero Heat Efficiency) ", "", "");
-        }
-
-        if (maximumHeat <= aeroHeatEfficiency) {
-            // count all weapons equal, adjusting for rear-firing and excessive ammo
-            for (ArrayList<Object> weaponValues : heatBVs) {
-                weaponBV += (Double) weaponValues.get(0);
-                bvReport.addLine((String) weaponValues.get(2), "", (Double) weaponValues.get(0));
-            }
-        } else {
-            // this will count heat-generating weapons at full modified BV until
-            // heatefficiency is reached or passed with one weapon
-
-            // sort the heat-using weapons by modified BV
-            Collections.sort(heatBVs, (obj1, obj2) -> {
-                Double obj1BV = (Double) obj1.get(0); // BV
-                Double obj2BV = (Double) obj2.get(0); // BV
-
-                // first element in the the ArrayList is BV, second is heat
-                // if same BV, lower heat first
-                if (obj1BV.equals(obj2BV)) {
-                    Double obj1Heat = (Double) obj1.get(1);
-                    Double obj2Heat = (Double) obj2.get(1);
-
-                    return Double.compare(obj1Heat, obj2Heat);
-                }
-
-                // higher BV first
-                return Double.compare(obj2BV, obj1BV);
-            });
+        bvReport.finalizeTentativeSection(hasExplosiveEquipment);
+        super.processExplosiveEquipment();
+    }
 
-            // count heat-generating weapons at full modified BV until
-            // heatefficiency is reached or passed with one weapon
-            double heatAdded = 0;
-            for (ArrayList<Object> weaponValues : heatBVs) {
-                double dBV = (Double) weaponValues.get(0);
-                if (heatAdded >= aeroHeatEfficiency) {
-                    dBV /= 2;
-                }
-                String heatText = "";
-                if (heatAdded >= aeroHeatEfficiency) {
-                    heatText = "Heat efficiency reached, half BV";
-                }
-                heatAdded += (Double) weaponValues.get(1);
-                weaponBV += dBV;
-                bvReport.addLine((String) weaponValues.get(2), heatText, "", dBV);
-                bvReport.addLine("Heat count: " + heatAdded, "", "");
-            }
+    @Override
+    protected void processTypeModifier() {
+        double typeModifier = 1.2;
+        if (entity.isSupportVehicle() || (entity instanceof SmallCraft)) {
+            typeModifier = 1;
+        } else if (entity instanceof ConvFighter) {
+            typeModifier = 1.1;
         }
-        bvReport.addResultLine("Total Weapons BV Adjusted For Heat:", "", weaponBV);
-        bvReport.addLine("Misc Offensive Equipment:", "", "");
-
-        // add offensive misc. equipment BV
-        double oEquipmentBV = 0;
-        for (Mounted mounted : aero.getMisc()) {
-            MiscType mtype = (MiscType) mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            if (mtype.hasFlag(MiscType.F_TARGCOMP) || mtype.hasFlag(MiscType.F_ECM) || mtype.hasFlag(MiscType.F_BAP)
-                    || mtype.hasFlag(MiscType.F_CHAFF_POD)) {
-                continue;
-            }
-            double bv = mtype.getBV(aero);
-            if (bv > 0) {
-                bvReport.addLine(mounted.getName(), "", bv);
-            }
-            oEquipmentBV += bv;
+        String calculation = formatForReport(typeModifier);
+        if (aero.hasStealth()) {
+            calculation = "(" + calculation + " + 0.3 (Stealth))";
+            typeModifier += 0.3;
         }
-        bvReport.addLine("Total Misc Offensive Equipment BV: ", "", oEquipmentBV);
-        weaponBV += oEquipmentBV;
+        calculation = formatForReport(defensiveValue) + " x " + calculation;
 
-        // add ammo bv
-        double ammoBV = 0;
-        // extra BV for when we have semiguided LRMs and someone else has TAG on
-        // our team
-        double tagBV = 0;
-        Map<String, Double> ammo = new HashMap<>();
-        ArrayList<String> keys = new ArrayList<>();
-        for (Mounted mounted : aero.getAmmo()) {
-            AmmoType atype = (AmmoType) mounted.getType();
+        bvReport.addLine("Type Modifier:", calculation,
+                "= " + formatForReport(defensiveValue * typeModifier));
+        defensiveValue *= typeModifier;
+    }
 
-            // don't count depleted ammo
-            if (mounted.getUsableShotsLeft() == 0) {
-                continue;
-            }
+    @Override
+    protected void processDefensiveFactor() { }
 
-            // don't count AMS, it's defensive
-            if (atype.getAmmoType() == AmmoType.T_AMS) {
-                continue;
-            }
-            // don't count screen launchers, they are defensive
-            if (atype.getAmmoType() == AmmoType.T_SCREEN_LAUNCHER) {
-                continue;
-            }
-
-            // don't count oneshot ammo, it's considered part of the launcher.
-            if (mounted.getLocation() == Entity.LOC_NONE) {
-                // assumption: ammo without a location is for a oneshot weapon
-                continue;
-            }
-            // semiguided or homing ammo might count double
-            if ((atype.getMunitionType() == AmmoType.M_SEMIGUIDED) || (atype.getMunitionType() == AmmoType.M_HOMING)) {
-                Player tmpP = aero.getOwner();
-
-                if (tmpP != null) {
-                    // Okay, actually check for friendly TAG.
-                    if (tmpP.hasTAG()) {
-                        tagBV += atype.getBV(aero);
-                    } else if ((tmpP.getTeam() != Player.TEAM_NONE) && (aero.getGame() != null)) {
-                        for (Team m : aero.getGame().getTeams()) {
-                            if (m.getId() == tmpP.getTeam()) {
-                                if (m.hasTAG()) {
-                                    tagBV += atype.getBV(aero);
-                                }
-                                // A player can't be on two teams.
-                                // If we check his team and don't give the penalty, that's it.
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            String key = atype.getAmmoType() + ":" + atype.getRackSize();
-            if (!keys.contains(key)) {
-                keys.add(key);
-            }
-            if (!ammo.containsKey(key)) {
-                ammo.put(key, atype.getBV(aero));
-            } else {
-                ammo.put(key, atype.getBV(aero) + ammo.get(key));
-            }
-        }
+    @Override
+    protected int heatEfficiency() {
+        bvReport.addLine("Heat Efficiency:", " = " + (6 + aero.getHeatCapacity()), "");
+        return 6 + aero.getHeatCapacity();
+    }
 
-        // Excessive ammo rule:
-        // Only count BV for ammo for a weapontype until the BV of all weapons
-        // of that type on the mech is reached.
-        for (String key : keys) {
-            if (weaponsForExcessiveAmmo.get(key) != null) {
-                if (ammo.get(key) > weaponsForExcessiveAmmo.get(key)) {
-                    ammoBV += weaponsForExcessiveAmmo.get(key);
-                } else {
-                    ammoBV += ammo.get(key);
-                }
-            }
-        }
-        weaponBV += ammoBV;
-        bvReport.addLine("Total Ammo BV: ", "", ammoBV);
+    @Override
+    protected boolean isNominalRear(Mounted weapon) {
+        return switchRearAndFront ^ rearWeaponFilter().test(weapon);
+    }
 
-        // adjust further for speed factor
-        double speedFactor = Math.pow(1 + (((double) aero.getRunMP() - 5) / 10), 1.2);
-        speedFactor = Math.round(speedFactor * 100) / 100.0;
-        bvReport.addLine("Final Speed Factor: ", "", speedFactor);
+    @Override
+    protected Predicate<Mounted> frontWeaponFilter() {
+        return weapon -> !weapon.isRearMounted() && !(weapon.getLocation() == Aero.LOC_AFT);
+    }
 
-        double obv; // offensive bv
-        obv = weaponBV * speedFactor;
-        bvReport.addLine("Weapons BV * Speed Factor ",
-                weaponBV + " x " + speedFactor, "= ", obv);
+    @Override
+    protected Predicate<Mounted> rearWeaponFilter() {
+        return weapon -> weapon.isRearMounted() || (weapon.getLocation() == Aero.LOC_AFT);
+    }
 
-        double finalBV = dbv + obv;
-        bvReport.addLine("Offensive BV + Defensive BV", obv + " + " + dbv, "= ", finalBV);
-        double totalBV = finalBV;
+    @Override
+    protected void processSummarize() {
+        super.processSummarize();
 
         double cockpitMod = 1;
-        if (aero.getCockpitType() == Aero.COCKPIT_SMALL) {
+        String modifier = "";
+        if ((aero.getCockpitType() == Aero.COCKPIT_SMALL)
+                || (aero.getCockpitType() == Aero.COCKPIT_COMMAND_CONSOLE)) {
             cockpitMod = 0.95;
-            finalBV *= cockpitMod;
-        } else if (aero.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM)) {
-            finalBV *= 0.95;
-        }
-        finalBV = Math.round(finalBV);
-        bvReport.addLine("Total BV * Cockpit Modifier",
-                totalBV + " x " + cockpitMod, "= ", finalBV);
-        bvReport.addResultLine("Final BV", "", finalBV);
-
-        // We need to consider external stores. Per TechManual Pg314,
-        // TM BV Errata Pg23, the external stores BV is added to the units base BV
-        boolean hasBombs = false;
-        double bombBV = 0;
-        for (int bombType = 0; bombType < BombType.B_NUM; bombType++) {
-            BombType bomb = BombType.createBombByType(bombType);
-            bombBV += bomb.getBV(aero) * aero.getBombChoices()[bombType];
-            if (aero.getBombChoices()[bombType] > 0) {
-                hasBombs = true;
-            }
+            modifier = " (" + aero.getCockpitTypeString() + ")";
+        } else if (entity.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM)) {
+            cockpitMod = 0.95;
+            modifier = " (Drone Op. Sys.)";
         }
-        finalBV += bombBV;
-        if (hasBombs) {
-            bvReport.addLine("External Stores BV", "", bombBV);
-            bvReport.addResultLine("Final BV", "", finalBV);
+        if (cockpitMod != 1) {
+            baseBV *= cockpitMod;
+            bvReport.addLine("Cockpit Modifier:",
+                    formatForReport(baseBV) + " x " + formatForReport(cockpitMod) + modifier,
+                    "= " + baseBV);
+            bvReport.addResultLine("Base BV:", "", formatForReport(baseBV));
         }
+    }
 
-        // we get extra bv from some stuff
-        double xbv = 0.0;
-        // extra BV for semi-guided lrm when TAG in our team
-        xbv += tagBV;
-        // extra from c3 networks. a valid network requires at least 2 members
-        // some hackery and magic numbers here. could be better
-        // also, each 'has' loops through all equipment. inefficient to do it 3 times
-        if (!ignoreC3 && (aero.getGame() != null)) {
-            xbv += aero.getExtraC3BV((int) Math.round(finalBV));
-        }
-        finalBV += xbv;
-
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(aero);
-        return (int) Math.round(finalBV * pilotFactor);
+    @Override
+    protected int offensiveSpeedFactorMP() {
+        return aero.getRunMP(MPCalculationSetting.BV_CALCULATION);
     }
-}
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/BVCalculator.java b/megamek/src/megamek/common/battlevalue/BVCalculator.java
new file mode 100644
index 00000000000..026932d483b
--- /dev/null
+++ b/megamek/src/megamek/common/battlevalue/BVCalculator.java
@@ -0,0 +1,1380 @@
+/*
+ * Copyright (c) 2022-2023 - The MegaMek Team. All Rights Reserved.
+ *
+ * This file is part of MegaMek.
+ *
+ * MegaMek is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MegaMek is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
+ */
+package megamek.common.battlevalue;
+
+import megamek.client.ui.swing.calculationReport.CalculationReport;
+import megamek.client.ui.swing.calculationReport.DummyCalculationReport;
+import megamek.codeUtilities.MathUtility;
+import megamek.common.*;
+import megamek.common.options.OptionsConstants;
+import megamek.common.weapons.bayweapons.BayWeapon;
+
+import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
+import static megamek.common.AmmoType.*;
+
+import java.util.*;
+import java.util.function.Predicate;
+
+/**
+ * Base class for battle value calculators for all units. The subclasses implement overrides
+ * as necessary for the bv calculation process that all unit types follow. To obtain the correct
+ * BVCalculator, use {@link #getBVCalculator(Entity)}.
+ */
+public abstract class BVCalculator {
+
+    protected final static String REAR = " (R)";
+    protected final static String TURRET = " (T)";
+    protected final static int NO_HEAT = Integer.MAX_VALUE;
+
+    protected final Entity entity;
+    protected double defensiveValue;
+    protected double offensiveValue;
+    protected CalculationReport bvReport;
+    protected boolean ignoreC3;
+    protected boolean ignoreSkill;
+    protected Map<String, Double> ammoMap = new HashMap<>();
+    protected List<String> keys = new ArrayList<>();
+    protected Map<String, String> names = new HashMap<>();
+    protected Map<String, Double> weaponsForExcessiveAmmo = new HashMap<>();
+    protected int runMP;
+    protected int jumpMP;
+    protected int umuMP;
+    protected boolean hasBlueShield;
+    protected boolean hasTC;
+    protected boolean isDrone;
+    protected boolean frontAndRearDecided = false;
+    protected boolean switchRearAndFront = false;
+    protected boolean heatEfficiencyExceeded = false;
+    protected double heatSum;
+    private final Map<Mounted, Integer> collectedDefensiveEquipment = new HashMap<>();
+
+    /** The unit's BV without any force adjustments */
+    protected double baseBV = -1;
+
+    /** The unit's BV with the TAG force bonus */
+    protected double tagBV = -1;
+
+    /** The unit's BV with the C3 force bonus and pilot skill adjustment */
+    protected double adjustedBV = -1;
+
+    BVCalculator(Entity entity) {
+        this.entity = entity;
+    }
+
+    public static BVCalculator getBVCalculator(Entity entity) {
+        if (entity instanceof Mech) {
+            return new MekBVCalculator(entity);
+        } else if (entity instanceof Protomech) {
+            return new ProtoMekBVCalculator(entity);
+        } else if (entity instanceof BattleArmor) {
+            return new BattleArmorBVCalculator(entity);
+        } else if (entity instanceof Infantry) {
+            return new InfantryBVCalculator(entity);
+        } else if (entity instanceof Warship) {
+            return new WarShipBVCalculator(entity);
+        } else if (entity instanceof Jumpship) {
+            return new JumpShipBVCalculator(entity);
+        } else if (entity instanceof Dropship) {
+            return new DropShipBVCalculator(entity);
+        } else if (entity instanceof Aero) {
+            return new AeroBVCalculator(entity);
+        } else if (entity instanceof GunEmplacement) {
+            return new GunEmplacementBVCalculator(entity);
+        } else { // Tank
+            return new CombatVehicleBVCalculator(entity);
+        }
+    }
+
+    /**
+     * Calculate and return the current battle value of the entity of this calculator. Depending
+     * on the parameters C3 bonuses and/or pilot skill may be removed from the calculation.
+     *
+     * @param ignoreC3 When true, the force bonus for C3 connections is not added.
+     * @param ignoreSkill When true, the pilot skill (including MD) is not factored in.
+     * @return The newly calculated battle value.
+     */
+    public int calculateBV(boolean ignoreC3, boolean ignoreSkill) {
+        return calculateBV(ignoreC3, ignoreSkill, new DummyCalculationReport());
+    }
+
+    /**
+     * Calculate and return the current battle value of the entity of this calculator. Depending
+     * on the parameters C3 bonuses and/or pilot skill may be removed from the calculation. The
+     * given report is filled in.
+     *
+     * @param ignoreC3 When true, the force bonus for C3 connections is not added.
+     * @param ignoreSkill When true, the pilot skill (including MD) is not factored in.
+     * @param bvReport The report to fill in with the calculation.
+     * @return The newly calculated battle value.
+     */
+    public int calculateBV(boolean ignoreC3, boolean ignoreSkill, CalculationReport bvReport) {
+        this.ignoreC3 = ignoreC3;
+        this.ignoreSkill = ignoreSkill;
+        calculateBaseBV(bvReport);
+        adjustBV();
+        return (int) Math.round(adjustedBV);
+    }
+
+    /**
+     * Calculate and return the base battle value of the entity of this calculator. The base BV
+     * does not include any force bonuses, i.e. external stores, C3, pilot skill and TAG bonuses.
+     *
+     * @return The newly calculated base unit battle value.
+     */
+    public int calculateBaseBV() {
+        return calculateBaseBV(new DummyCalculationReport());
+    }
+
+    /**
+     * Calculate and return the base battle value of the entity of this calculator. The base BV
+     * does not include any force bonuses, i.e. external stores, C3, pilot skill and TAG bonuses.
+     * The given report is filled in with the calculation.
+     *
+     * @param bvReport The report to fill in with the calculation.
+     * @return The newly calculated base unit battle value.
+     */
+    public int calculateBaseBV(CalculationReport bvReport) {
+        this.bvReport = bvReport;
+        processBaseBV();
+        return (int) Math.round(baseBV);
+    }
+
+    /**
+     * Retrieves a previously calculated base battle value of the unit without re-calculating
+     * it; see {@link #calculateBaseBV()}! This should only be used when it is certain
+     * that the value is still correct. The base BV does not include any force bonuses.
+     *
+     * @return The stored base unit battle value.
+     */
+    public int retrieveBaseBV() {
+        return (int) Math.round(baseBV);
+    }
+
+    /**
+     * Retrieves a previously calculated battle value of the unit without re-calculating
+     * it. This BV includes the Tag force bonus but no other force bonuses! it can be
+     * used as a basis for calculating the C3 bonus without recalculating all units repeatedly.
+     * This should only be used when it is certain that the value is still correct.
+     *
+     * @return The stored unit battle value including Tag bonus.
+     */
+    public int retrieveBVWithTag() {
+        return (int) Math.round(tagBV);
+    }
+
+    /**
+     * Retrieves a previously calculated full battle value of the unit without re-calculating
+     * it; see {@link #calculateBV(boolean, boolean)}! This should only be used when it is certain
+     * that the value is still correct. The full BV includes all force bonuses.
+     *
+     * @return The stored full unit battle value.
+     */
+    public int retrieveBV() {
+        return (int) Math.round(adjustedBV);
+    }
+
+    /** Calculates the base unit BV (without force and pilot modifiers). */
+    protected void processBaseBV() {
+        processPreparation();
+
+        if (entity.isCarcass()) {
+            bvReport.addLine("Unit is destroyed.");
+            baseBV = 0;
+            return;
+        }
+
+        processCalculations();
+    }
+
+    protected void processPreparation() {
+        reset();
+        assembleAmmo();
+        assembleMovementPoints();
+
+        String header = "Battle Value Calculation for ";
+        String fullName = entity.getChassis() + " " + entity.getModel();
+        if (fullName.length() < 20) {
+            bvReport.addHeader(header + fullName);
+        } else if (fullName.length() < 50) {
+            bvReport.addHeader(header);
+            bvReport.addHeader(fullName);
+        } else {
+            bvReport.addHeader(header);
+            bvReport.addHeader(entity.getChassis());
+            bvReport.addHeader(entity.getModel());
+        }
+        bvReport.addEmptyLine();
+    }
+
+    protected void processCalculations() {
+        bvReport.addLine("Effective MP:", "R: " + runMP + ", J: " + jumpMP + ", U: " + umuMP, "");
+        bvReport.addEmptyLine();
+        bvReport.addSubHeader("Defensive Battle Rating:");
+        processDefensiveValue();
+        bvReport.addEmptyLine();
+        bvReport.addSubHeader("Offensive Battle Rating:");
+        processOffensiveValue();
+        processSummarize();
+    }
+
+    protected void processDefensiveValue() {
+        processArmor();
+        processStructure();
+        processDefensiveEquipment();
+        processExplosiveEquipment();
+        processTypeModifier();
+        processDefensiveFactor();
+    }
+
+    protected void processOffensiveValue() {
+        determineFront();
+        processWeapons();
+        processAmmo();
+        processOffensiveEquipment();
+        processWeight();
+        processSpeedFactor();
+        processOffensiveTypeModifier();
+    }
+
+    protected void reset() {
+        hasBlueShield = entity.hasWorkingMisc(MiscType.F_BLUE_SHIELD);
+        hasTC = entity.hasTargComp();
+        isDrone = entity.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM);
+        frontAndRearDecided = false;
+        switchRearAndFront = false;
+        defensiveValue = 0;
+        offensiveValue = 0;
+        baseBV = 0;
+        adjustedBV = 0;
+        ammoMap.clear();
+        keys.clear();
+        names.clear();
+        weaponsForExcessiveAmmo.clear();
+        heatEfficiencyExceeded = false;
+        heatSum = 0;
+        collectedDefensiveEquipment.clear();
+    }
+
+    protected void assembleMovementPoints() {
+        setRunMP();
+        setJumpMP();
+        setUmuMP();
+    }
+
+    /**
+     * Sets the running MP as used for battle value calculations. This value should not factor
+     * in gravity or weather (as these aren't well visible in the calculation, may change over
+     * the course of a battle and aren't available in MHQ).
+     * It also should not factor in player-controlled transients such as
+     * cargo, trailers, bombs, heat, movement mode changes (LAM, WiGE, QuadVees), grounded/landed
+     * status (Aero) as these would also change BV in battle in strange ways. Also, it should
+     * ignore advanced rules such as TO Infantry Fast Movement to prevent base BV values
+     * different from those on the MUL.
+     *
+     * It should factor in intransient modifiers such as TSM, modular or hardened armor as well as
+     * damage to the unit (engine hits, motive damage, immobile status).
+     */
+    protected void setRunMP() {
+        runMP = entity.getRunMP(MPCalculationSetting.BV_CALCULATION);
+    }
+
+    /**
+     * Sets the jumping MP as used for battle value calculations. Here the same rules apply as with
+     * {@link #setRunMP()}.
+     */
+    protected void setJumpMP() {
+        jumpMP = entity.getJumpMP(MPCalculationSetting.BV_CALCULATION);
+    }
+
+    /**
+     * Sets the UMU MP as used for battle value calculations. Here the same rules apply as with
+     * {@link #setRunMP()}.
+     */
+    protected void setUmuMP() {
+        umuMP = entity.getActiveUMUCount();
+    }
+
+    protected void processTypeModifier() { }
+
+    /**
+     * Returns true when the given location is valid for armor BV calculations. Returns
+     * true by default. Override to exclude locations, e.g. hull on Aeros.
+     *
+     * @param location The location to check
+     * @return True when the given location must be considered for Armor BV
+     */
+    protected boolean validArmorLocation(int location) {
+        return true;
+    }
+
+    protected void processArmor() {
+        double totalArmorBV = 0;
+        // Units with patchwork armor or Harjel II/III calculate and list every location separately
+        if (entity.hasPatchworkArmor() || entity.hasWorkingMisc(MiscType.F_HARJEL_II)
+                || entity.hasWorkingMisc(MiscType.F_HARJEL_III)) {
+            bvReport.addLine("Armor:", "", "");
+            for (int loc = 0; loc < entity.locations(); loc++) {
+                if (!validArmorLocation(loc)) {
+                    continue;
+                }
+                double armorMultiplier = armorMultiplier(loc);
+                double torsoMountedCockpit = addTorsoMountedCockpit();
+
+                // Rear Armor
+                int rearArmor = entity.hasRearArmor(loc) ? entity.getArmor(loc, true) : 0;
+                int armor = entity.getArmor(loc) + (entity.hasRearArmor(loc) ? entity.getArmor(loc, true) : 0);
+                String calculation = entity.getArmor(loc) + "";
+                calculation += entity.hasRearArmor(loc) ? " + " + rearArmor + " (R)" : "";
+
+                // Modular Armor
+                int modularArmor = 0;
+                for (Mounted mounted : entity.getMisc()) {
+                    if (mounted.getType().hasFlag(MiscType.F_MODULAR_ARMOR) && (mounted.getLocation() == loc)) {
+                        modularArmor += mounted.getBaseDamageCapacity() - mounted.getDamageTaken();
+                    }
+                }
+                if (modularArmor > 0) {
+                    calculation += " + " + modularArmor + " (Mod.)";
+                }
+
+                // BAR Rating
+                double barRating = entity.getBARRating(loc) / 10.0;
+
+                if (((barRating != 1) || (armorMultiplier != 1)) && ((rearArmor != 0) || (modularArmor != 0))) {
+                    calculation = "[" + calculation + "] ";
+                }
+
+                if (armorMultiplier != 1) {
+                    calculation += " x " + formatForReport(armorMultiplier) + armorMultiplierText(loc);
+                }
+
+                double armorBV = (armor + modularArmor + torsoMountedCockpit) * armorMultiplier * barRating;
+                totalArmorBV += armorBV;
+                String type = "- " + EquipmentType.getArmorTypeName(entity.getArmorType(loc))
+                        + " (" + entity.getLocationAbbr(loc) + ")";
+                bvReport.addLine(type, "+ " + calculation + " = " + formatForReport(totalArmorBV), "");
+            }
+            defensiveValue += totalArmorBV * armorFactor();
+            bvReport.addLine("Armor BV:",
+                    formatForReport(totalArmorBV) + " x " + formatForReport(armorFactor()),
+                    "= " + formatForReport(defensiveValue));
+        } else {
+            // Units without Patchwork armor can use the (simpler) total armor value
+            int modularArmor = entity.getMisc().stream()
+                    .filter(m -> m.getType().hasFlag(MiscType.F_MODULAR_ARMOR))
+                    .mapToInt(m -> m.getBaseDamageCapacity() - m.getDamageTaken())
+                    .sum();
+            double armorMultiplier = armorMultiplier(0);
+            double barRating = entity.getBARRating(0) / 10.0;
+            double torsoMountedCockpit = addTorsoMountedCockpit();
+
+            double totalArmor = entity.getTotalArmor() + modularArmor + torsoMountedCockpit;
+            totalArmorBV = totalArmor * armorMultiplier * barRating;
+            String calculation = entity.getTotalArmor() + "";
+            calculation += (modularArmor > 0) ? " + " + modularArmor + " (Mod.)" : "";
+            calculation += (torsoMountedCockpit > 0) ? " + " + formatForReport(torsoMountedCockpit) + " (Torso-m. Cockpit)" : "";
+            if (totalArmor > entity.getTotalArmor()) {
+                calculation = "(" + calculation + ")";
+            }
+
+            calculation += " x " + formatForReport(armorFactor());
+            calculation += (armorMultiplier != 1) ?
+                    " x " + formatForReport(armorMultiplier) + " ("
+                            + EquipmentType.armorNames[entity.getArmorType(0)] + ")" : "";
+            calculation += (barRating != 1) ?
+                    " x " + formatForReport(barRating) + " (BAR)" : "";
+            defensiveValue += totalArmorBV * armorFactor();
+            bvReport.addLine("Armor:", calculation, "= " + formatForReport(defensiveValue));
+        }
+    }
+
+    /** @return The base factor to multiply armor by, i.e. 25 for capital aerosapce and 2.5 for all others. */
+    protected double armorFactor() {
+        return 2.5;
+    }
+
+    protected String equipmentDescriptor(Mounted mounted) {
+        if (mounted.getType() instanceof WeaponType) {
+            String descriptor = mounted.getType().getShortName() + " (" + entity.getLocationAbbr(mounted.getLocation()) + ")";
+            if (mounted.isMechTurretMounted()) {
+                descriptor += TURRET;
+            }
+            if (mounted.isRearMounted() || isRearFacingVGL(mounted)) {
+                descriptor += REAR;
+            }
+            return descriptor;
+        } else if ((mounted.getType() instanceof MiscType)
+                && ((MiscType) mounted.getType()).isVibroblade()) {
+            return mounted.getType().getShortName() + " (" + entity.getLocationAbbr(mounted.getLocation()) + ")";
+        } else if (mounted.getType() instanceof AmmoType) {
+            String shortName = mounted.getType().getShortName();
+            return shortName + (shortName.contains("Ammo") ? "" : " Ammo");
+        } else {
+            return mounted.getType().getShortName();
+        }
+    }
+
+    protected double addTorsoMountedCockpit() {
+        return 0;
+    }
+
+    protected void processStructure() {
+        String calculation = "+ " + entity.getTotalInternal() + " x 1.5";
+        String typeModifier = "";
+        double typeMultiplier = 1.0;
+        if ((entity.getStructureType() == EquipmentType.T_STRUCTURE_INDUSTRIAL)
+                || (entity.getStructureType() == EquipmentType.T_STRUCTURE_COMPOSITE)) {
+            typeMultiplier = 0.5;
+            typeModifier = (entity.getStructureType() == EquipmentType.T_STRUCTURE_COMPOSITE) ? " (Comp." : " (Ind.";
+        } else if (entity.getStructureType() == EquipmentType.T_STRUCTURE_REINFORCED) {
+            typeMultiplier = 2.0;
+            typeModifier = "(Reinf.";
+        }
+        if (hasBlueShield) {
+            typeMultiplier += 0.2;
+            typeModifier += typeModifier.isBlank() ? " (Blue Shield)" : ", Blue Shield)";
+        }
+        if (typeMultiplier != 1) {
+            calculation += " x " + formatForReport(typeMultiplier) + typeModifier;
+        }
+
+        defensiveValue += entity.getTotalInternal() * 1.5 * typeMultiplier;
+        bvReport.addLine("Internal Structure:", calculation, "= " + formatForReport(defensiveValue));
+    }
+
+    protected boolean countsAsDefensiveEquipment(Mounted equipment) {
+        if (equipment.isDestroyed() || equipment.isWeaponGroup()
+                || (equipment.getType() instanceof BayWeapon)) {
+            return false;
+        }
+
+        EquipmentType eType = equipment.getType();
+        if (eType instanceof WeaponType) {
+            return eType.hasFlag(WeaponType.F_AMS)
+                    || eType.hasFlag(WeaponType.F_M_POD)
+                    || eType.hasFlag(WeaponType.F_B_POD)
+                    || (((WeaponType) eType).getAtClass() == WeaponType.CLASS_SCREEN);
+        } else if (eType instanceof MiscType) {
+            return eType.hasFlag(MiscType.F_ECM)
+                    || eType.hasFlag(MiscType.F_BAP)
+                    || eType.hasFlag(MiscType.F_VIRAL_JAMMER_DECOY)
+                    || eType.hasFlag(MiscType.F_VIRAL_JAMMER_HOMING)
+                    || eType.hasFlag(MiscType.F_AP_POD)
+                    || eType.hasFlag(MiscType.F_MASS)
+                    || eType.hasFlag(MiscType.F_HEAVY_BRIDGE_LAYER)
+                    || eType.hasFlag(MiscType.F_MEDIUM_BRIDGE_LAYER)
+                    || eType.hasFlag(MiscType.F_LIGHT_BRIDGE_LAYER)
+                    || eType.hasFlag(MiscType.F_BULLDOZER)
+                    || eType.hasFlag(MiscType.F_CHAFF_POD)
+                    || eType.hasFlag(MiscType.F_HARJEL_II)
+                    || eType.hasFlag(MiscType.F_HARJEL_III)
+                    || eType.hasFlag(MiscType.F_SPIKES)
+                    || eType.hasFlag(MiscType.F_MINESWEEPER)
+                    || ((MiscType) eType).isShield();
+        } else {
+            return false;
+        }
+    }
+
+    protected void processDefensiveEquipment() {
+        bvReport.startTentativeSection();
+        bvReport.addLine("Defensive Equipment:", "", "");
+        double amsBV = 0;
+        double amsAmmoBV = 0;
+        double screenBV = 0;
+        double screenAmmoBV = 0;
+        boolean hasDefensiveEquipment = false;
+        for (Mounted ammo : entity.getAmmo()) {
+            if (ammo.getUsableShotsLeft() == 0) {
+                continue;
+            }
+            // Ammo may be loaded in multi-ton increments on large aerospace
+            AmmoType ammoType = (AmmoType) ammo.getType();
+            int ratio = 1;
+            if (ammoType.getShots() > 0) {
+                ratio = Math.max(1, ammo.getUsableShotsLeft() / ammoType.getShots());
+            }
+
+            if ((ammoType.getAmmoType() == T_AMS) || (ammoType.getAmmoType() == T_APDS)) {
+                amsAmmoBV += ammoType.getBV(entity) * ratio;
+            } else if (ammoType.getAmmoType() == AmmoType.T_SCREEN_LAUNCHER) {
+                screenAmmoBV += ammoType.getBV(entity) * ratio;
+            }
+        }
+
+        for (Mounted equipment : entity.getEquipment()) {
+            if (countsAsDefensiveEquipment(equipment)) {
+                Mounted key = collectedDefensiveEquipment.keySet().stream()
+                        .filter(p -> equipment.getType() == p.getType()).findFirst().orElse(equipment);
+                collectedDefensiveEquipment.merge(key, 1, Integer::sum);
+            }
+        }
+
+        for (Map.Entry<Mounted, Integer> equipmentEntry : collectedDefensiveEquipment.entrySet()) {
+            Mounted equipment = equipmentEntry.getKey();
+            EquipmentType eType = equipment.getType();
+            double equipmentBV = eType.getBV(entity);
+            if (eType instanceof MiscType) {
+                equipmentBV = ((MiscType) eType).getBV(entity, equipment.getLocation());
+            }
+            String multiplier = (equipmentEntry.getValue() > 1) ? equipmentEntry.getValue() + " x " : "";
+            defensiveValue += equipmentBV * equipmentEntry.getValue();
+            String calculation = ((equipmentBV > 0) ? "+ " : "- ");
+            calculation += multiplier + formatForReport(Math.abs(equipmentBV));
+            bvReport.addLine("- " + multiplier + equipmentDescriptor(equipment), calculation,
+                    "= " + formatForReport(defensiveValue));
+            hasDefensiveEquipment = true;
+
+            if (eType instanceof WeaponType) {
+                WeaponType wtype = (WeaponType) eType;
+                if (wtype.hasFlag(WeaponType.F_AMS)
+                        && ((wtype.getAmmoType() == T_AMS) || (wtype.getAmmoType() == T_APDS))) {
+                    amsBV += eType.getBV(entity) * equipmentEntry.getValue();
+                }
+            }
+            if ((eType instanceof WeaponType)
+                    && (((WeaponType) eType).getAtClass() == WeaponType.CLASS_SCREEN)) {
+                screenBV += eType.getBV(entity) * equipmentEntry.getValue();
+            }
+        }
+
+        if (amsAmmoBV > 0) {
+            double nonExcessiveBV = Math.min(amsBV, amsAmmoBV);
+            String calculation = "+ " + formatForReport(nonExcessiveBV) + ((amsAmmoBV > amsBV) ? " (Excessive)" : "");
+            defensiveValue += nonExcessiveBV;
+            bvReport.addLine("- AMS Ammo", calculation, "= " + formatForReport(defensiveValue));
+            hasDefensiveEquipment = true;
+        }
+        if (screenAmmoBV > 0) {
+            double nonExcessiveBV = Math.min(screenBV, screenAmmoBV);
+            String calculation = "+ " + formatForReport(nonExcessiveBV) + ((screenAmmoBV > screenBV) ? " (Excessive)" : "");
+            defensiveValue += nonExcessiveBV;
+            bvReport.addLine("- Screen Launcher Ammo", calculation, "= " + formatForReport(defensiveValue));
+            hasDefensiveEquipment = true;
+        }
+        bvReport.finalizeTentativeSection(hasDefensiveEquipment);
+    }
+
+    protected void processExplosiveEquipment() { }
+
+    protected void processDefensiveFactor() {
+        int tmmRunning = getRunningTMM();
+        int tmmJumping = getJumpingTMM();
+        int tmmUmu = getUmuTMM();
+        bvReport.addLine("TMMs:", tmmRunning + " (R), " + tmmJumping + " (J), " + tmmUmu + " (U)", "");
+        double tmmFactor = tmmFactor(tmmRunning, tmmJumping, tmmUmu);
+        bvReport.addLine("Defensive Factor:",
+                formatForReport(defensiveValue) + " x " + formatForReport(tmmFactor),
+                "= " + formatForReport(tmmFactor * defensiveValue));
+        defensiveValue *= tmmFactor;
+    }
+
+    protected int getRunningTMM() {
+        if (runMP == 0) {
+            return 0;
+        } else {
+            return Compute.getTargetMovementModifier(runMP, false, false, entity.getGame()).getValue();
+        }
+    }
+
+    protected int getJumpingTMM() {
+        if (jumpMP == 0) {
+            return 0;
+        } else {
+            return Compute.getTargetMovementModifier(jumpMP, true, false, entity.getGame()).getValue();
+        }
+    }
+
+    protected int getUmuTMM() {
+        if (umuMP == 0) {
+            return 0;
+        } else {
+            return Compute.getTargetMovementModifier(umuMP, false, false, entity.getGame()).getValue();
+        }
+    }
+
+    protected double tmmFactor(int tmmRunning, int tmmJumping, int tmmUmu) {
+        return 1 + (Math.max(tmmRunning, Math.max(tmmJumping, tmmUmu)) / 10.0);
+    }
+
+    protected void determineFront() {
+        Predicate<Mounted> frontFilter = frontWeaponFilter();
+        Predicate<Mounted> rearFilter = rearWeaponFilter();
+        double weaponsBVFront = processWeaponSection(false, frontFilter, false);
+        double weaponsBVRear = processWeaponSection(false, rearFilter, false);
+        switchRearAndFront = weaponsBVFront < weaponsBVRear;
+        if (switchRearAndFront) {
+            bvReport.addLine("Front BV < Rear BV", "Switching Front and Rear", "");
+        }
+        frontAndRearDecided = true;
+    }
+
+    protected void processWeapons() {
+        bvReport.addLine("Weapons:", "", "");
+        double weaponBV = processWeaponSection(true, this::countAsOffensiveWeapon, true);
+        if (weaponBV == 0) {
+            bvReport.addLine("- None.", "", "0");
+        }
+    }
+
+    protected boolean isRearFacingVGL(Mounted weapon) {
+        // vehicular grenade launchers facing to the rear sides count for rear BV, too
+        return weapon.getType().hasFlag(WeaponType.F_VGL) &&
+             (weapon.getFacing() >= 2) && (weapon.getFacing() <= 4);
+    }
+
+    protected boolean isFrontFacingVGL(Mounted weapon) {
+        // vehicular grenade launchers facing to the rear sides count for rear BV, too
+        return weapon.getType().hasFlag(WeaponType.F_VGL) &&
+                ((weapon.getFacing() == 1) || (weapon.getFacing() >= 5));
+    }
+
+    protected double processWeaponSection(boolean showInReport, Predicate<Mounted> weaponFilter,
+                                          boolean addToOffensiveValue) {
+        return entity.getEquipment().stream()
+                .filter(this::countAsOffensiveWeapon)
+                .filter(weaponFilter)
+                .mapToDouble(weapon -> processWeapon(weapon, showInReport, addToOffensiveValue))
+                .sum();
+    }
+
+    /**
+     * Returns true when a weapon is to be counted and calculated as a rear weapon.
+     * For units that deal with rear weapons this is usually true when the weapon is actually
+     * rear-facing but may be false when weapon facing is reversed (when the front weapons BV
+     * is smaller than the rear weapon BV).
+     * This method should rely on the switchRearAndFront field to decide the return value.
+     * switchRearAndFront is set before weapons are processed by the call to
+     * {@link #determineFront()}.
+     * By default, this returns false which is correct for units that do not deal with rear
+     * weapons such as ProtoMeks.
+     * This is overridden as necessary for units that deal with rear weapons (Mek, Aero, Tanks,
+     * but not large aerospace that use arcs).
+     *
+     * @param weapon The Mounted equipment to check
+     * @return True when the weapon is to be counted as if it was rear-facing
+     */
+    protected boolean isNominalRear(Mounted weapon) {
+        return switchRearAndFront ^ rearWeaponFilter().test(weapon);
+    }
+
+    /**
+     * Returns true when a weapon is to be counted and calculated as a "rear" arc weapon in
+     * large aerospace units. The nominal rear arcs are those that are valued at 25% only.
+     * By default, this returns false. This is overridden for large aerospace units.
+     *
+     * @param weapon The Mounted equipment to check
+     * @return True when the weapon is to be counted as in a "rear" arc
+     */
+    protected boolean isNominalRearArc(Mounted weapon) {
+        return false;
+    }
+
+    /**
+     * @return True when rear and front weapon switching has been decided and
+     * the given weapon is to be counted as rear-facing.
+     */
+    private boolean isDecidedAsNominalRear(Mounted weapon) {
+        return frontAndRearDecided && isNominalRear(weapon);
+    }
+
+    /**
+     * @return When true, will show individual weapon heat sums. Used in Meks, AF, CF, and SC.
+     */
+    protected boolean usesWeaponHeat() {
+        return false;
+    }
+
+    /**
+     * @return The multiplier for the arc that the given equipment is in (1, 0.5, or 0.25).
+     * Overridden for large aerospace units. When not 1, the factor is shown in the report
+     * and multiplied into the resulting BV.
+     */
+    protected double arcFactor(Mounted equipment) {
+        return 1;
+    }
+
+    /**
+     * Forwards to {@link #processWeapon(Mounted, boolean, boolean, int)} with a weaponCount
+     * parameter of 1 (single weapon).
+     */
+    protected double processWeapon(Mounted weapon, boolean showInReport,
+                                   boolean addToOffensiveValue) {
+        return processWeapon(weapon, showInReport, addToOffensiveValue, 1);
+    }
+
+    /**
+     * Determines the BV for one or more weapons of a single type which may include
+     * a WeaponType, MiscType or AmmoType.
+     * When showInReport is false, nothing is written to the report. Otherwise, a line
+     * with the weapon's name and (if it has a WeaponType) location as well as the calculation
+     * and modifiers is shown.
+     *
+     * @param weapon The Mounted to process - may include a WeaponType, MiscType or AmmoType
+     * @param showInReport When true, will write a line for this weapon to the report.
+     * @param weaponCount The number of this particular type of weapon (multiplies the BV)
+     * @param addToOffensiveValue When true, will add the result to offensiveValue and show the result
+     * @return The BV for this weapon
+     */
+    protected double processWeapon(Mounted weapon, boolean showInReport,
+                                   boolean addToOffensiveValue, int weaponCount) {
+        double weaponBV = weapon.getType().getBV(entity);
+        String multiplierText = (weaponCount > 1) ? weaponCount + " x " : "";
+        String squadSupportDivisorText = "";
+        double squadSupportDivisor = 1;
+        if (entity instanceof BattleArmor && weapon.isSquadSupportWeapon()) {
+            squadSupportDivisorText = " / " + ((BattleArmor) entity).getShootingStrength();
+            squadSupportDivisor = ((BattleArmor) entity).getShootingStrength();
+        }
+        String calculation = "+ " + multiplierText + formatForReport(weaponBV) + squadSupportDivisorText;
+        weaponBV *= weaponCount;
+        weaponBV /= squadSupportDivisor;
+
+        if (entity.hasFunctionalArmAES(weapon.getLocation())) {
+            weaponBV *= 1.25;
+            calculation += " x 1.25 (AES)";
+        }
+
+        if (isDecidedAsNominalRear(weapon)) {
+            weaponBV /= 2;
+            calculation += " x 0.5 (R)";
+        }
+
+        double arcFactor = arcFactor(weapon);
+        if (arcFactor != 1) {
+            weaponBV *= arcFactor;
+            calculation += " x " + formatForReport(arcFactor) + " (Arc)";
+        }
+
+        if (isDrone) {
+            weaponBV *= 0.8;
+            calculation += " x 0.8 (Drone)";
+        }
+
+        // The weapon can be a Vibroblade (MiscType)
+        if (weapon.getType() instanceof WeaponType) {
+            WeaponType weaponType = (WeaponType) weapon.getType();
+
+            // PPC with Capacitor
+            if ((weapon.getLinkedBy() != null) && (weaponType.hasFlag(WeaponType.F_PPC))) {
+                double capBV = ((MiscType) weapon.getLinkedBy().getType()).getBV(entity, weapon);
+                weaponBV += capBV;
+                calculation += " + " + formatForReport(capBV) + " (Cap)";
+            }
+
+            // MG Array
+            if (weaponType.hasFlag(WeaponType.F_MGA)) {
+                double mgBV = 0;
+                for (int eqNum : weapon.getBayWeapons()) {
+                    Mounted mg = entity.getEquipment(eqNum);
+                    if ((mg != null) && (!mg.isDestroyed())) {
+                        mgBV += mg.getType().getBV(entity);
+                    }
+                }
+                weaponBV = mgBV * 0.67;
+            }
+
+            // artemis bumps up the value
+            if ((weapon.getLinkedBy() != null) && (weapon.getLinkedBy().getType() instanceof MiscType)) {
+                Mounted linkedBy = weapon.getLinkedBy();
+                if (linkedBy.getType().hasFlag(MiscType.F_ARTEMIS)) {
+                    weaponBV *= 1.2;
+                    calculation += " x 1.2 (Art-IV)";
+                } else if (linkedBy.getType().hasFlag(MiscType.F_ARTEMIS_PROTO)) {
+                    weaponBV *= 1.1;
+                    calculation += " x 1.1 (P-Art)";
+                } else if (linkedBy.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
+                    weaponBV *= 1.3;
+                    calculation += " x 1.3 (Art-V)";
+                } else if (linkedBy.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)
+                        || linkedBy.getType().hasFlag(MiscType.F_APOLLO)) {
+                    weaponBV *= 1.15;
+                    calculation += " x 1.15 (" + (linkedBy.getType().hasFlag(MiscType.F_APOLLO) ? "Apollo)" : "RISC LPM)");
+                }
+            }
+
+            if (weaponType.hasFlag(WeaponType.F_DIRECT_FIRE) && hasTC) {
+                weaponBV *= 1.25;
+                calculation += " x 1.25 (TC)";
+            } else if ((fireControlModifier() != 1) && !weaponType.hasFlag(WeaponType.F_INFANTRY)) {
+                weaponBV *= fireControlModifier();
+                calculation += " x " + fireControlModifier() + " (Fire Control)";
+            }
+        }
+
+        if (usesWeaponHeat()) {
+            if (heatEfficiencyExceeded) {
+                weaponBV /= 2;
+                calculation += " x 0.5 (Overheat)";
+            } else {
+                calculation += " (Heat: " + formatForReport(heatSum) + ")";
+            }
+        }
+
+        String result = "";
+        if (addToOffensiveValue) {
+            offensiveValue += weaponBV;
+            result = "= " + formatForReport(offensiveValue);
+        }
+
+        if (showInReport) {
+            bvReport.addLine("- " + multiplierText + equipmentDescriptor(weapon), calculation, result);
+        }
+        return weaponBV;
+    }
+
+    /**
+     * Returns a Predicate that determines if a weapon is counted as a front or nose arc weapon -ONLY-
+     * for the purpose of determining if the weapon BV of front weapons exceeds that of
+     * rear weapons on unit types that care about rear weapons.
+     * By default, returns true so that all weapons count safely as front weapons. Should be
+     * overridden for all unit types that account for rear-facing weapons. Does not need to
+     * be overridden for unit types that don't (such as ProtoMeks).
+     *
+     * @return A Predicate identifying if a weapon counts as a front weapon (read above!)
+     */
+    protected Predicate<Mounted> frontWeaponFilter() {
+        return weapon -> true;
+    }
+
+    /**
+     * Returns a Predicate that determines if a weapon is counted as a rear or aft arc weapon -ONLY-
+     * for the purpose of determining if the weapon BV of front weapons exceeds that of
+     * rear weapons on unit types that care about rear weapons.
+     * By default, returns false so that all weapons count safely as front weapons. Should be
+     * overridden for all unit types that account for rear-facing weapons. Does not need to
+     * be overridden for unit types that don't (such as ProtoMeks).
+     *
+     * @return A Predicate identifying if a weapon counts as a front weapon (read above!)
+     */
+    protected Predicate<Mounted> rearWeaponFilter() {
+        return weapon -> false;
+    }
+
+    protected boolean countAsOffensiveWeapon(Mounted equipment) {
+        if (equipment.getType() instanceof AmmoType) {
+            return false;
+        } else if (equipment.getType() instanceof MiscType) {
+            return countMiscAsOffensiveWeapon(equipment);
+        } else {
+            WeaponType weaponType = (WeaponType) equipment.getType();
+            return !weaponType.hasFlag(WeaponType.F_AMS) && !weaponType.hasFlag(WeaponType.F_B_POD)
+                    && !weaponType.hasFlag(WeaponType.F_M_POD)
+                    && ((weaponType.getBV(entity) > 0) || weaponType.hasFlag(WeaponType.F_MGA))
+                    && !equipment.isInoperable() && !equipment.isHit()
+                    && !equipment.isWeaponGroup() && !(weaponType.getAtClass() == WeaponType.CLASS_SCREEN)
+                    && !(weaponType instanceof BayWeapon);
+        }
+    }
+
+    protected boolean countMiscAsOffensiveWeapon(Mounted misc) {
+        MiscType miscType = (MiscType) misc.getType();
+        return (miscType.getBV(entity) > 0)
+                && !misc.isHit() && !misc.isInoperable()
+                && !misc.isWeaponGroup()
+                && (miscType.isVibroblade() || miscType.hasFlag(MiscType.F_VIBROCLAW)
+                || miscType.hasFlag(MiscType.F_MAGNET_CLAW));
+    }
+
+    /** @return The BV modifier for AFC or BFC. Override as necessary. */
+    protected double fireControlModifier() {
+        if (entity.isSupportVehicle()) {
+            if (entity.hasWorkingMisc(MiscType.F_BASIC_FIRECONTROL)) {
+                return 0.9;
+            } else if (!entity.hasWorkingMisc(MiscType.F_ADVANCED_FIRECONTROL)) {
+                return 0.8;
+            }
+        }
+        return 1;
+    }
+
+    protected void processOffensiveEquipment() {
+        bvReport.startTentativeSection();
+        bvReport.addLine("Offensive Equipment:", "", "");
+        boolean hasOffensiveEquipment = false;
+        for (Mounted misc : entity.getMisc()) {
+            MiscType mtype = (MiscType) misc.getType();
+
+            // don't count destroyed equipment
+            if (misc.isDestroyed()) {
+                continue;
+            }
+
+            // Vibroblades are treated with weapons
+            if ((misc.getType() instanceof MiscType)
+                    && misc.getType().hasFlag(MiscType.F_CLUB)
+                    && ((MiscType) misc.getType()).isVibroblade()) {
+                continue;
+            }
+
+            if ((mtype.hasFlag(MiscType.F_ECM) && !mtype.hasFlag(MiscType.F_WATCHDOG))
+                    || mtype.hasFlag(MiscType.F_AP_POD)
+                    || mtype.hasFlag(MiscType.F_VIRAL_JAMMER_DECOY)
+                    || mtype.hasFlag(MiscType.F_VIRAL_JAMMER_HOMING)
+                    || mtype.hasFlag(MiscType.F_LIGHT_BRIDGE_LAYER)
+                    || mtype.hasFlag(MiscType.F_MEDIUM_BRIDGE_LAYER)
+                    || mtype.hasFlag(MiscType.F_HEAVY_BRIDGE_LAYER)
+                    || mtype.hasFlag(MiscType.F_CHAFF_POD)
+                    || mtype.hasFlag(MiscType.F_BULLDOZER)
+                    || mtype.hasFlag(MiscType.F_BAP)
+                    || mtype.hasFlag(MiscType.F_TARGCOMP)
+                    || mtype.hasFlag(MiscType.F_SPIKES)
+                    || mtype.hasFlag(MiscType.F_MINESWEEPER)
+                    || mtype.hasFlag(MiscType.F_HARJEL_II)
+                    || mtype.hasFlag(MiscType.F_HARJEL_III)
+                    || mtype.hasFlag(MiscType.F_MASS)
+                    || mtype.hasFlag(MiscType.F_MINE)
+                    || mtype.isShield()
+                    || offensiveEquipmentBV(mtype, misc.getLocation()) == 0) {
+                continue;
+            }
+            double bv = offensiveEquipmentBV(mtype, misc.getLocation());
+            if ((mtype.hasFlag(MiscType.F_CLUB) || mtype.hasFlag(MiscType.F_HAND_WEAPON))
+                    && entity.hasFunctionalArmAES(misc.getLocation())) {
+                bv *= 1.25;
+            } else if (mtype.hasFlag(MiscType.F_WATCHDOG)) {
+                bv = 7;
+            }
+            offensiveValue += bv;
+            bvReport.addLine("- " + equipmentDescriptor(misc), "+ " + formatForReport(bv),
+                    "= " + formatForReport(offensiveValue));
+            hasOffensiveEquipment = true;
+        }
+        bvReport.finalizeTentativeSection(hasOffensiveEquipment);
+    }
+
+    protected double offensiveEquipmentBV(MiscType misc, int location) {
+        return misc.getBV(entity, location);
+    }
+
+    protected void processAmmo() {
+        bvReport.startTentativeSection();
+        bvReport.addLine("Ammo:", "", "");
+        boolean hasAmmo = false;
+        for (String key : keys) {
+            if (!weaponsForExcessiveAmmo.containsKey(key)) {
+                // Coolant Pods have no matching weapon
+                if (key.equals(Integer.valueOf(AmmoType.T_COOLANT_POD).toString() + "1")) {
+                    offensiveValue += ammoMap.get(key);
+                }
+                continue;
+            }
+            if (!ammoMap.containsKey(key)) {
+                continue;
+            }
+            String calculation = "+ ";
+
+            if (ammoMap.get(key) > weaponsForExcessiveAmmo.get(key)) {
+                offensiveValue += weaponsForExcessiveAmmo.get(key) * fireControlModifier();
+                calculation += formatForReport(weaponsForExcessiveAmmo.get(key)) + " (Excessive)";
+            } else {
+                offensiveValue += ammoMap.get(key) * fireControlModifier();
+                calculation += formatForReport(ammoMap.get(key));
+            }
+            calculation += (fireControlModifier() != 1) ? " x " + formatForReport(fireControlModifier()) : "";
+            bvReport.addLine("- " + names.get(key), calculation, "= " + formatForReport(offensiveValue));
+            hasAmmo = true;
+        }
+        if (hasAmmo) {
+            bvReport.endTentativeSection();
+        } else {
+            bvReport.discardTentativeSection();
+        }
+    }
+
+    /** @return The unit's head dissipation for BV purposes. Override as necessary. */
+    protected int heatEfficiency() {
+        return NO_HEAT;
+    }
+
+    protected void processWeight() { }
+
+    protected void processSpeedFactor() {
+        double speedFactor = offensiveSpeedFactor(offensiveSpeedFactorMP());
+        bvReport.addLine("Speed Factor:",
+                formatForReport(offensiveValue) + " x " + speedFactor,
+                "= " + formatForReport(offensiveValue * speedFactor));
+        offensiveValue *= speedFactor;
+    }
+
+    /**
+     * Returns the Speed Factor (TM p.316) for the given MP parameter
+     * @param mp The MP value for the unit (base value: Walk + 1/2 Jump/UMU)
+     * @return The Speed Factor as a two-digit-rounded double such as 1.76
+     */
+    protected double offensiveSpeedFactor(int mp) {
+        return Math.round(Math.pow(1 + ((mp - 5) / 10.0), 1.2) * 100.0) / 100.0;
+    }
+
+    /** @return the MP value to use for the Offensive Speed Factor (TM p.316) for this unit. */
+    protected int offensiveSpeedFactorMP() {
+        return runMP + (int) (Math.round(Math.max(jumpMP, umuMP) / 2.0));
+    }
+
+    /** Processes unit type modifiers of TM, p.316. */
+    protected void processOffensiveTypeModifier() { }
+
+    /** @return true when the given ammo (must be AmmoType) counts towards offensive ammo BV calculation. */
+    protected boolean ammoCounts(Mounted ammo) {
+        AmmoType ammoType = (AmmoType) ammo.getType();
+        return (ammo.getUsableShotsLeft() > 0)
+                && (ammoType.getAmmoType() != AmmoType.T_AMS)
+                && (ammoType.getAmmoType() != AmmoType.T_APDS)
+                && (ammoType.getAmmoType() != AmmoType.T_SCREEN_LAUNCHER)
+                && !ammo.isOneShotAmmo();
+    }
+
+    /** Processes the sum of offensive and defensive battle rating and modifiers that affect this sum. */
+    protected void processSummarize() {
+        double cockpitMod = 1;
+        String modifier = "";
+        if (isDrone) {
+            cockpitMod = 0.95;
+            modifier = " (Drone Op. Sys.)";
+        }
+        baseBV = defensiveValue + offensiveValue;
+        bvReport.addEmptyLine();
+        bvReport.addSubHeader("Battle Value:");
+        if (cockpitMod != 1) {
+            bvReport.addLine("Defensive BR + Offensive BR:",
+                    formatForReport(defensiveValue) + " + " + formatForReport(offensiveValue),
+                    "= " + formatForReport(baseBV));
+            bvReport.addLine("Cockpit Modifier:",
+                    formatForReport(baseBV) + " x " + formatForReport(cockpitMod) + modifier,
+                    "= " + formatForReport(baseBV * cockpitMod));
+            baseBV *= cockpitMod;
+            bvReport.addLine("--- Base Unit BV:", "" + (int) Math.round(baseBV));
+        } else {
+            bvReport.addLine("--- Base Unit BV:",
+                    formatForReport(defensiveValue) + " + " + formatForReport(offensiveValue) + ", rn",
+                    "= " + (int) Math.round(baseBV));
+        }
+    }
+
+    protected void assembleAmmo() {
+        for (Mounted ammo : entity.getAmmo()) {
+            AmmoType ammoType = (AmmoType) ammo.getType();
+
+            // don't count depleted ammo, AMS and oneshot ammo
+            if (ammoCounts(ammo)) {
+                String key = ammoType.getAmmoType() + ":" + ammoType.getRackSize();
+                if (!keys.contains(key)) {
+                    keys.add(key);
+                    names.put(key, equipmentDescriptor(ammo));
+                }
+                if (!ammoMap.containsKey(key)) {
+                    ammoMap.put(key, getAmmoBV(ammo));
+                } else {
+                    ammoMap.put(key, getAmmoBV(ammo) + ammoMap.get(key));
+                }
+            }
+        }
+
+        for (Mounted weapon : entity.getTotalWeaponList()) {
+            WeaponType wtype = (WeaponType) weapon.getType();
+
+            if (weapon.isDestroyed() //|| wtype.hasFlag(WeaponType.F_AMS)
+                    || wtype.hasFlag(WeaponType.F_B_POD) || wtype.hasFlag(WeaponType.F_M_POD)
+                    || wtype instanceof BayWeapon || weapon.isWeaponGroup()) {
+                continue;
+            }
+
+            // add up BV of ammo-using weapons for each type of weapon,
+            // to compare with ammo BV later for excessive ammo BV rule
+            if (!((wtype.hasFlag(WeaponType.F_ENERGY) && !((wtype.getAmmoType() == AmmoType.T_PLASMA)
+                    || (wtype.getAmmoType() == AmmoType.T_VEHICLE_FLAMER)
+                    || (wtype.getAmmoType() == AmmoType.T_HEAVY_FLAMER)
+                    || (wtype.getAmmoType() == AmmoType.T_CHEMICAL_LASER)))
+                    || wtype.hasFlag(WeaponType.F_ONESHOT)
+                    || wtype.hasFlag(WeaponType.F_INFANTRY)
+                    || (wtype.getAmmoType() == AmmoType.T_NA))) {
+                String key = wtype.getAmmoType() + ":" + wtype.getRackSize();
+                if (!weaponsForExcessiveAmmo.containsKey(key)) {
+                    weaponsForExcessiveAmmo.put(key, wtype.getBV(entity));
+                } else {
+                    weaponsForExcessiveAmmo.put(key, wtype.getBV(entity) + weaponsForExcessiveAmmo.get(key));
+                }
+            }
+        }
+    }
+
+    protected double getAmmoBV(Mounted ammo) {
+        return ammo.getType().getBV(entity);
+    }
+
+    /**
+     * Adjust the BV with force bonuses (TAG, C3) and pilot skill.
+     */
+    protected void adjustBV() {
+        adjustedBV = (int) Math.round(baseBV);
+        double c3Bonus = ignoreC3 ? 0 : entity.getExtraC3BV((int) Math.round(adjustedBV));
+        double pilotFactor = ignoreSkill ? 1 : BVCalculator.bvMultiplier(entity);
+
+        processTagBonus();
+
+        if (c3Bonus > 0) {
+            adjustedBV += c3Bonus;
+            bvReport.addLine("Force Bonus (C3):",
+                    "+ " + formatForReport(c3Bonus), "= " + formatForReport(adjustedBV));
+        }
+
+        processExternalStores();
+
+        if (pilotFactor != 1) {
+            bvReport.addLine("Pilot Modifier:",
+                    formatForReport(adjustedBV) + " x " + formatForReport(pilotFactor),
+                    "= " + formatForReport(adjustedBV * pilotFactor));
+            adjustedBV *= pilotFactor;
+        }
+
+        if (adjustedBV != (int) Math.round(baseBV)) {
+            bvReport.addLine("--- Adjusted BV:", formatForReport(adjustedBV) + ", rn",
+                    "= " + (int) Math.round(adjustedBV));
+        }
+    }
+
+    private static final double[][] bvMultipliers = new double[][] {
+            {2.42, 2.31, 2.21, 2.10, 1.93, 1.75, 1.68, 1.59, 1.50},
+            {2.21, 2.11, 2.02, 1.92, 1.76, 1.60, 1.54, 1.46, 1.38},
+            {1.93, 1.85, 1.76, 1.68, 1.54, 1.40, 1.35, 1.28, 1.21},
+            {1.66, 1.58, 1.51, 1.44, 1.32, 1.20, 1.16, 1.10, 1.04},
+            {1.38, 1.32, 1.26, 1.20, 1.10, 1.00, 0.95, 0.90, 0.85},
+            {1.31, 1.19, 1.13, 1.08, 0.99, 0.90, 0.86, 0.81, 0.77},
+            {1.24, 1.12, 1.07, 1.02, 0.94, 0.85, 0.81, 0.77, 0.72},
+            {1.17, 1.06, 1.01, 0.96, 0.88, 0.80, 0.76, 0.72, 0.68},
+            {1.10, 0.99, 0.95, 0.90, 0.83, 0.75, 0.71, 0.68, 0.64},
+    };
+
+    /**
+     * Returns the BV multiplier for the gunnery/piloting of the given entity's pilot (TM p.315) as well as MD
+     * implants of the pilot.
+     * Returns 1 if the given entity's crew is null. Special treatment is given to infantry units where
+     * units unable to make anti-mek attacks use 5 as their anti-mek (piloting) value as well as LAM pilots that
+     * use the average of their aero and mek values.
+     *
+     * @param entity The entity to get the skill modifier for
+     * @return The BV multiplier for the given entity's pilot
+     */
+    public static double bvMultiplier(Entity entity) {
+        if (entity.getCrew() == null) {
+            return 1;
+        }
+        int gunnery = entity.getCrew().getGunnery();
+        int piloting = entity.getCrew().getPiloting();
+
+        if (((entity instanceof Infantry) && (!((Infantry) entity).canMakeAntiMekAttacks()))
+                || (entity instanceof Protomech)) {
+            piloting = 5;
+        } else if (entity.getCrew() instanceof LAMPilot) {
+            LAMPilot lamPilot = (LAMPilot) entity.getCrew();
+            gunnery = (lamPilot.getGunneryMech() + lamPilot.getGunneryAero()) / 2;
+            piloting = (lamPilot.getPilotingMech() + lamPilot.getPilotingAero()) / 2;
+        }
+        return bvImplantMultiplier(entity) * bvSkillMultiplier(gunnery, piloting);
+    }
+
+    /**
+     * Returns the BV multiplier for the given gunnery and piloting values. Returns 1 for the neutral
+     * values 4/5.
+     *
+     * @param gunnery  the gunnery skill of a pilot
+     * @param piloting the piloting skill of a pilot
+     * @return a multiplier to the BV of whatever unit the pilot is piloting.
+     */
+    public static double bvSkillMultiplier(int gunnery, int piloting) {
+        return bvMultipliers[MathUtility.clamp(gunnery, 0, 8)][MathUtility.clamp(piloting, 0, 8)];
+    }
+
+    /**
+     * Returns the BV multiplier for any MD implants that the crew of the given entity has. When the crew
+     * doesn't have any relevant MD implants, returns 1.
+     *
+     * @param entity The entity to get the skill modifier for
+     * @return a multiplier to the BV of the given entity
+     */
+    public static double bvImplantMultiplier(Entity entity) {
+        int level = 1;
+        if (entity.getCrew().getOptions().booleanOption(OptionsConstants.MD_PAIN_SHUNT)) {
+            level = 2;
+        }
+        if (entity.getCrew().getOptions().booleanOption(OptionsConstants.MD_VDNI)) {
+            level = 3;
+        }
+        if (entity.getCrew().getOptions().booleanOption(OptionsConstants.MD_BVDNI)) {
+            level = 5;
+        }
+        return level / 4.0 + 0.75;
+    }
+
+    /**
+     * Processes the BV bonus that a unit with TAG, LTAG or C3M gets for friendly units that have semi-guided
+     * or Arrow IV homing ammunition
+     * (TO:AUE p.198, https://bg.battletech.com/forums/tactical-operations/tagguided-munitions-and-bv/)
+     */
+    public void processTagBonus() {
+        long tagCount = workingTAGCount(entity);
+        if ((tagCount == 0) || (entity.getGame() == null)) {
+            return;
+        }
+
+        bvReport.startTentativeSection();
+        bvReport.addLine("TAG Bonus (" + tagCount + " Tag" + (tagCount == 1 ? "" : "s") + "):", "", "");
+        // In the lobby, bombs are represented as a bombChoices array, only later is it real Mounteds.
+        boolean hasGuided = false;
+
+        for (Entity otherEntity : entity.getGame().getEntitiesVector()) {
+            if ((otherEntity == entity) || otherEntity.getOwner().isEnemyOf(entity.getOwner())) {
+                continue;
+            }
+            for (Mounted mounted : otherEntity.getAmmo()) {
+                AmmoType atype = (AmmoType) mounted.getType();
+                long munitionType = atype.getMunitionType();
+                if ((mounted.getUsableShotsLeft() > 0)
+                        && ((munitionType == M_SEMIGUIDED) || (munitionType == M_HOMING))) {
+                    adjustedBV += mounted.getType().getBV(entity) * tagCount;
+                    bvReport.addLine("- " + equipmentDescriptor(mounted),
+                            "+ " + tagCount + " x " + formatForReport(mounted.getType().getBV(entity))
+                                    + " (" + otherEntity.getShortName() + ")",
+                            "= " + formatForReport(adjustedBV));
+                    hasGuided = true;
+                }
+            }
+            if (otherEntity instanceof IBomber) {
+                IBomber asBomber = (IBomber) otherEntity;
+                BombType bomb = BombType.createBombByType(BombType.B_HOMING);
+                int homingCount = asBomber.getBombChoices()[BombType.B_HOMING];
+                if (homingCount > 0) {
+                    adjustedBV += bomb.getBV(otherEntity) * asBomber.getBombChoices()[BombType.B_HOMING] * tagCount;
+                    bvReport.addLine("- " + bomb.getName(),
+                            "+ " + tagCount + " x " + formatForReport(bomb.getBV(otherEntity))
+                                    + " (" + otherEntity.getShortName() + ")",
+                            "= " + formatForReport(adjustedBV));
+                    hasGuided = true;
+                }
+            }
+        }
+        bvReport.finalizeTentativeSection(hasGuided);
+    }
+
+    protected long workingTAGCount(Entity entity) {
+        long tagCount = entity.getWeaponList().stream()
+                .filter(m -> !m.isMissing() && !m.isDestroyed())
+                .map(Mounted::getType)
+                .filter(Objects::nonNull)
+                .filter(t -> t.hasFlag(WeaponType.F_TAG))
+                .count();
+        if (entity instanceof IBomber) {
+            IBomber asBomber = (IBomber) entity;
+            tagCount += asBomber.getBombChoices()[BombType.B_TAG];
+        }
+        return tagCount;
+    }
+
+    protected void processExternalStores() {
+        bvReport.startTentativeSection();
+        bvReport.addLine("External Stores:", "", "");
+        // In the lobby, bombs are represented as a bombChoices array, only later is it real Mounteds.
+        boolean hasBombs = false;
+        if (entity instanceof IBomber) {
+            IBomber asBomber = (IBomber) entity;
+            for (BombType bombType : BombType.allBombTypes()) {
+                int bombCount = asBomber.getBombChoices()[BombType.getBombTypeFromInternalName(bombType.getInternalName())];
+                double bombTypeBV = bombType.getBV(entity);
+                if ((bombCount > 0) && (bombTypeBV > 0)) {
+                    double bombBV = bombType.getBV(entity) * bombCount;
+                    adjustedBV += bombBV;
+                    bvReport.addLine("- " + bombType.getName(),
+                            "+ " + bombCount + " x " + formatForReport(bombType.getBV(entity)),
+                            "= " + formatForReport(adjustedBV));
+                    hasBombs = true;
+                }
+            }
+            for (Mounted bomb : entity.getBombs()) {
+                double bombBV = processWeapon(bomb, true, false);
+                if (bombBV > 0) {
+                    adjustedBV += bombBV;
+                    hasBombs = true;
+                }
+
+            }
+        }
+        bvReport.finalizeTentativeSection(hasBombs);
+    }
+
+    private double armorMultiplier(int location) {
+        double armorMultiplier;
+        switch (entity.getArmorType(location)) {
+            case EquipmentType.T_ARMOR_HARDENED:
+                armorMultiplier = 2.0;
+                break;
+            case EquipmentType.T_ARMOR_REACTIVE:
+            case EquipmentType.T_ARMOR_REFLECTIVE:
+            case EquipmentType.T_ARMOR_BALLISTIC_REINFORCED:
+                armorMultiplier = 1.5;
+                break;
+            case EquipmentType.T_ARMOR_FERRO_LAMELLOR:
+            case EquipmentType.T_ARMOR_ANTI_PENETRATIVE_ABLATION:
+                armorMultiplier = 1.2;
+                break;
+            case EquipmentType.T_ARMOR_HEAT_DISSIPATING:
+                armorMultiplier = 1.1;
+                break;
+            default:
+                armorMultiplier = 1.0;
+                break;
+        }
+
+        if (hasBlueShield) {
+            armorMultiplier += 0.2;
+        }
+        if (entity.countWorkingMisc(MiscType.F_HARJEL_II, location) > 0) {
+            armorMultiplier *= 1.1;
+        }
+        if (entity.countWorkingMisc(MiscType.F_HARJEL_III, location) > 0) {
+            armorMultiplier *= 1.2;
+        }
+        return armorMultiplier;
+    }
+
+    private String armorMultiplierText(int location) {
+        List<String> modifiers = new ArrayList<>();
+        switch (entity.getArmorType(location)) {
+            case EquipmentType.T_ARMOR_COMMERCIAL:
+            case EquipmentType.T_ARMOR_HARDENED:
+            case EquipmentType.T_ARMOR_REACTIVE:
+            case EquipmentType.T_ARMOR_REFLECTIVE:
+            case EquipmentType.T_ARMOR_BALLISTIC_REINFORCED:
+            case EquipmentType.T_ARMOR_FERRO_LAMELLOR:
+            case EquipmentType.T_ARMOR_ANTI_PENETRATIVE_ABLATION:
+            case EquipmentType.T_ARMOR_HEAT_DISSIPATING:
+                modifiers.add(EquipmentType.getArmorTypeName(entity.getArmorType(location)));
+        }
+
+        if (hasBlueShield) {
+            modifiers.add("Blue Shield");
+        }
+        if (entity.countWorkingMisc(MiscType.F_HARJEL_II, location) > 0) {
+            modifiers.add("HarJel II");
+        }
+        if (entity.countWorkingMisc(MiscType.F_HARJEL_III, location) > 0) {
+            modifiers.add("HarJel III");
+        }
+        return modifiers.isEmpty() ? "" : " (" + String.join(", ", modifiers) + ")";
+    }
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/BattleArmorBVCalculator.java b/megamek/src/megamek/common/battlevalue/BattleArmorBVCalculator.java
index c883471df8e..37954290a6f 100644
--- a/megamek/src/megamek/common/battlevalue/BattleArmorBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/BattleArmorBVCalculator.java
@@ -19,274 +19,278 @@
 package megamek.common.battlevalue;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
+import megamek.client.ui.swing.calculationReport.DummyCalculationReport;
 import megamek.common.*;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
 
 import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
 
-public class BattleArmorBVCalculator {
+public class BattleArmorBVCalculator extends BVCalculator {
 
-    public static int calculateBV(BattleArmor battleArmor, boolean ignoreC3,
-                                  boolean ignoreSkill, CalculationReport bvReport) {
-        return calculateBV(battleArmor, ignoreC3, ignoreSkill, bvReport, false);
+    private final BattleArmor battleArmor;
+    private int currentTrooper;
+
+    BattleArmorBVCalculator(Entity entity) {
+        super(entity);
+        battleArmor = (BattleArmor) entity;
     }
 
-    public static int calculateBV(BattleArmor battleArmor, boolean ignoreC3, boolean ignoreSkill,
-                                  CalculationReport bvReport, boolean singleTrooper) {
-        bvReport.addHeader("Battle Value Calculations For");
-        bvReport.addHeader(battleArmor.getChassis() + " " + battleArmor.getModel());
-
-        double squadBV = 0;
-        for (int i = 1; i < battleArmor.locations(); i++) {
-            bvReport.addSubHeader("Trooper " + i + ":");
-            if (battleArmor.getInternal(i) <= 0) {
-                bvReport.addLine("N/A", "", "");
-                bvReport.addEmptyLine();
-                continue;
-            }
+    /**
+     * Calculates the Battle Value of a single trooper of this BattleArmor. This value is not influenced
+     * by the pilot skill or any force bonuses.
+     *
+     * @implNote Used in MML
+     *
+     * @return The BV of a single trooper of this BattleArmor
+     */
+    @SuppressWarnings("unused")
+    public int singleTrooperBattleValue() {
+        reset();
+        bvReport = new DummyCalculationReport();
+        currentTrooper = 1;
+        processTrooper();
+        return (int) Math.round(baseBV);
+    }
 
-            // --- Defensive Value
-            bvReport.addLine("--- Defensive Battle Rating:", "");
-            List<String> modifierList = new ArrayList<>();
-            double armorBV = 2.5;
-            if (battleArmor.isFireResistant() || battleArmor.isReflective() || battleArmor.isReactive()) {
-                armorBV = 3.5;
-                modifierList.add("Fire-Res./Refl./React.");
-            }
-            double dBV = battleArmor.getArmor(i) * armorBV + 1;
-            String modifiers = modifierList.isEmpty() ? "" : " (" + String.join(", ", modifierList) + ")";
-            String calculation = battleArmor.getArmor(i) + " x " + formatForReport(armorBV) + " + 1" + modifiers;
-            bvReport.addLine("Armor:", calculation, formatForReport(dBV));
-            modifierList.clear();
-
-            int bonus = 0;
-            if (battleArmor.hasImprovedSensors()) {
-                bonus += 1;
-                modifierList.add("Imp. Sens.");
-            }
-            if (battleArmor.hasActiveProbe()) {
-                bonus += 1;
-                modifierList.add("AP");
-            }
-            for (Mounted mounted : battleArmor.getMisc()) {
-                if (mounted.getType().hasFlag(MiscType.F_ECM)) {
-                    if (mounted.getType().hasFlag(MiscType.F_ANGEL_ECM)) {
-                        bonus += 2;
-                        modifierList.add("Angel ECM");
-                    } else {
-                        bonus += 1;
-                        modifierList.add("ECM");
-                    }
-                    break;
-                }
-            }
-            if (bonus > 0) {
-                dBV += bonus;
-                calculation = "+ " + bonus + " (" + String.join(", ", modifierList) + ")";
-                bvReport.addLine("Systems:", calculation, "= " + formatForReport(dBV));
-            }
-            modifierList.clear();
-
-            double amsBonus = 0;
-            for (Mounted weapon : battleArmor.getWeaponList()) {
-                if (weapon.getType().hasFlag(WeaponType.F_AMS)) {
-                    if (weapon.getLocation() == BattleArmor.LOC_SQUAD) {
-                        amsBonus += weapon.getType().getBV(battleArmor);
-                    } else {
-                        // squad support, count at 1/troopercount
-                        amsBonus += weapon.getType().getBV(battleArmor) / battleArmor.getTotalOInternal();
-                    }
-                }
-            }
-            if (amsBonus > 0) {
-                dBV += amsBonus;
-                bvReport.addLine("AMS:", "+ " + formatForReport(amsBonus), "= " + formatForReport(dBV));
-            }
+    @Override
+    protected double tmmFactor(int tmmRunning, int tmmJumping, int tmmUmu) {
+        List<String> modifierList = new ArrayList<>();
+        double tmmFactor = 1 + (Math.max(tmmRunning, Math.max(tmmJumping, tmmUmu)) / 10.0);
+        double tmmBonus = 0.1;
+        modifierList.add("BA");
+        if (battleArmor.hasCamoSystem()) {
+            tmmBonus += 0.2;
+            modifierList.add("Camo");
+        }
+        if ((battleArmor.getStealthName() != null)
+                && battleArmor.getStealthName().equals(BattleArmor.IMPROVED_STEALTH_ARMOR)) {
+            tmmBonus += 0.3;
+            modifierList.add("Imp. Stealth");
+        } else if (battleArmor.isStealthy()) {
+            tmmBonus += 0.2;
+            modifierList.add("Stealth");
+        }
+        if (battleArmor.isMimetic()) {
+            tmmBonus += 0.3;
+            modifierList.add("Mimetic");
+        }
+        String calculation = formatForReport(tmmFactor);
+        if (tmmBonus > 0) {
+            String modifiers = " (" + String.join(", ", modifierList) + ")";
+            calculation += " + " + formatForReport(tmmBonus) + modifiers;
+            tmmFactor += tmmBonus;
+        }
+        bvReport.addLine("TMM Factor:", calculation, "");
+        return tmmFactor;
+    }
 
-            int runMP = battleArmor.getWalkMP(false, false, true, true, false);
-            int umuMP = battleArmor.getActiveUMUCount();
-            int tmmRan = Compute.getTargetMovementModifier(Math.max(runMP, umuMP), false, false, battleArmor.getGame()).getValue();
-            // get jump MP, ignoring burden
-            int rawJump = battleArmor.getJumpMP(false, true, true);
-            int tmmJumped = (rawJump > 0) ?
-                    Compute.getTargetMovementModifier(rawJump, true, false, battleArmor.getGame()).getValue()
-                    : 0;
-            double targetMovementModifier = Math.max(tmmRan, tmmJumped);
-            double tmmFactor = 1 + (targetMovementModifier / 10) + 0.1;
-            double tmmBonus = 0;
-            if (battleArmor.hasCamoSystem()) {
-                tmmBonus += 0.2;
-                modifierList.add("Camo");
-            }
-            if ((battleArmor.getStealthName() != null)
-                    && battleArmor.getStealthName().equals(BattleArmor.IMPROVED_STEALTH_ARMOR)) {
-                tmmBonus += 0.3;
-                modifierList.add("Imp. Stealth");
-            } else if (battleArmor.isStealthy()) {
-                tmmBonus += 0.2;
-                modifierList.add("Stealth");
-            }
-            if (battleArmor.isMimetic()) {
-                tmmBonus += 0.3;
-                modifierList.add("Mimetic");
-            }
-            calculation = formatForReport(tmmFactor);
-            if (tmmBonus > 0) {
-                modifiers = " (" + String.join(", ", modifierList) + ")";
-                calculation += " + " + tmmBonus + modifiers;
-                tmmFactor += tmmBonus;
-            }
-            bvReport.addLine("TMM Factor:", calculation, "");
+    @Override
+    protected boolean countAsOffensiveWeapon(Mounted equipment) {
+        // see https://bg.battletech.com/forums/ground-combat/battle-armor-bv/
+        return super.countAsOffensiveWeapon(equipment) && !equipment.getType().isAnyOf(EquipmentTypeLookup.INFANTRY_ASSAULT_RIFLE);
+    }
 
-            bvReport.addLine("Defensive Battle Rating:",
-                    formatForReport(dBV) + " x " + formatForReport(tmmFactor),
-                    "= " + formatForReport(dBV * tmmFactor));
-            dBV *= tmmFactor;
+    protected void reportPossibleWeaponSection(String name, Predicate<Mounted> weaponFilter) {
+        bvReport.startTentativeSection();
+        bvReport.addLine(name, "", "");
+        double resultingBV = processWeaponSection(true, weaponFilter, true);
+        bvReport.finalizeTentativeSection(resultingBV > 0);
+    }
 
-            // --- Offensive Value
-            bvReport.addEmptyLine();
-            bvReport.addLine("--- Offensive Battle Rating:", "");
-            double oBV = 0;
-            double antiMek = 0;
-            for (Mounted weapon : battleArmor.getWeaponList()) {
-                // infantry weapons don't count at all
-                if (weapon.getType().hasFlag(WeaponType.F_INFANTRY) || weapon.getType().hasFlag(WeaponType.F_AMS)
-                        || (weapon.getType().getBV(battleArmor) == 0)) {
-                    continue;
-                }
+    private boolean isAnyBattleClaw(Mounted mounted) {
+        EquipmentType type = mounted.getType();
+        return (type instanceof MiscType)
+                && (type.hasFlag(MiscType.F_VIBROCLAW) || type.hasFlag(MiscType.F_MAGNET_CLAW));
+    }
 
-                double weaponBV = weapon.getType().getBV(battleArmor);
-                String name = weapon.getType().getName();
-                modifierList.clear();
-                if ((weapon.getLocation() != BattleArmor.LOC_SQUAD) || (weapon.isSquadSupportWeapon())) {
-                    weaponBV /= battleArmor.getTotalOInternal();
-                    modifierList.add("Support");
-                    name += " (Support)";
-                }
-                if (battleArmor.canMakeAntiMekAttacks() && !weapon.getType().hasFlag(WeaponType.F_MISSILE)
-                        && !weapon.isBodyMounted()) {
-                    antiMek += weaponBV;
-                    modifierList.add("count for AM");
-                }
-                oBV += weaponBV;
-                modifiers = modifierList.isEmpty() ? "" : " (" + String.join(", ", modifierList) + ")";
-                bvReport.addLine(name, "+ " + formatForReport(weaponBV) + modifiers,
-                        "= " + formatForReport(oBV));
-            }
+    Predicate<Mounted> weaponFilter = m -> (m.getLocation() == BattleArmor.LOC_SQUAD)
+            && !m.isSquadSupportWeapon() && !isAnyBattleClaw(m);
 
-            for (Mounted misc : battleArmor.getMisc()) {
-                if ((misc.getLocation() == BattleArmor.LOC_SQUAD) || (misc.getLocation() == i)) {
-                    if (misc.getType().hasFlag(MiscType.F_MAGNET_CLAW) || misc.getType().hasFlag(MiscType.F_VIBROCLAW)) {
-                        antiMek += misc.getType().getBV(battleArmor);
-                        bvReport.addLine(misc.getType().getName(),
-                                "+ " + formatForReport(misc.getType().getBV(battleArmor)) + " (only AM)", "");
-                    }
-                }
-            }
+    Predicate<Mounted> supportFilter = m -> !m.getType().hasFlag(WeaponType.F_INFANTRY)
+            && ((m.getLocation() == currentTrooper) || m.isSquadSupportWeapon());
 
-            oBV += antiMek;
-            if (battleArmor.canMakeAntiMekAttacks()) {
-                bvReport.addLine("Anti-Mek", "+ " + formatForReport(antiMek), "= " + oBV);
-            }
+    Predicate<Mounted> antiMekClawFilter = m -> (m.getType() instanceof MiscType)
+            && ((m.getLocation() == BattleArmor.LOC_SQUAD) || (m.getLocation() == currentTrooper))
+            && (isAnyBattleClaw(m));
 
-            for (Mounted misc : battleArmor.getMisc()) {
-                if (!misc.getType().hasFlag(MiscType.F_MINE) && !misc.getType().hasFlag(MiscType.F_MAGNETIC_CLAMP)) {
-                    continue;
-                }
+    Predicate<Mounted> antiMekWeaponFilter = m -> (m.getType() instanceof WeaponType)
+            && !m.getType().hasFlag(WeaponType.F_INFANTRY) && !m.getType().hasFlag(WeaponType.F_MISSILE)
+            && !m.isBodyMounted()
+            && ((m.getLocation() == BattleArmor.LOC_SQUAD) || (m.getLocation() == currentTrooper));
 
-                double miscBV = misc.getType().getBV(battleArmor);
-                String name = misc.getType().getName();
-                if (misc.getLocation() != BattleArmor.LOC_SQUAD) {
-                    miscBV /= battleArmor.getTotalOInternal();
-                    name += " (Support)";
-                }
-                oBV += miscBV;
-                bvReport.addLine(name, "+ " + formatForReport(miscBV), "= " + formatForReport(oBV));
-            }
+    Predicate<Mounted> antiMekFilter = m -> antiMekClawFilter.test(m) || antiMekWeaponFilter.test(m);
 
-            for (Mounted ammo : battleArmor.getAmmo()) {
-                int loc = ammo.getLocation();
-                // don't count oneshot ammo
-                if (loc == Entity.LOC_NONE) {
-                    continue;
-                }
-                if ((loc == BattleArmor.LOC_SQUAD) || (loc == i)) {
-                    double ammoBV = ((AmmoType) ammo.getType()).getBABV();
-                    oBV += ammoBV;
-                    bvReport.addLine(ammo.getType().getName(), "+ " + formatForReport(ammoBV),
-                            "= " + formatForReport(oBV));
-                }
-            }
+    @Override
+    protected void processWeapons() {
+        reportPossibleWeaponSection("Weapons:", weaponFilter);
+        reportPossibleWeaponSection("Squad Support:", supportFilter);
+        if (battleArmor.canMakeAntiMekAttacks()) {
+            reportPossibleWeaponSection("Anti-Mek:", antiMekFilter);
+        }
+    }
 
-            // getJumpMP won't return UMU MP, so weed need to count that extra
-            int movement = Math.max(battleArmor.getWalkMP(false, false, true, true, false),
-                    Math.max(battleArmor.getJumpMP(false, true, true), battleArmor.getActiveUMUCount()));
-            double speedFactor = Math.pow(1 + ((double) (movement - 5) / 10), 1.2);
-            speedFactor = Math.round(speedFactor * 100) / 100.0;
-            bvReport.addLine("Speed Factor", formatForReport(speedFactor), "");
-            bvReport.addLine("Offensive Battle Rating:",
-                    formatForReport(oBV) + " x " + formatForReport(speedFactor),
-                    "= " + formatForReport(oBV * speedFactor));
-            oBV *= speedFactor;
-
-            double soldierBV = oBV + dBV;
-            bvReport.addEmptyLine();
-            bvReport.addResultLine("Trooper BV", formatForReport(oBV) + " + " + formatForReport(dBV),
-                    "= " + formatForReport(soldierBV));
-            squadBV += soldierBV;
-            bvReport.addEmptyLine();
+    @Override
+    protected void processCalculations() {
+        // Test if all troopers are exactly the same without writing to the real report
+        CalculationReport saveReport = bvReport;
+        bvReport = new DummyCalculationReport();
+        Set<Double> trooperBVs = new HashSet<>();
+        for (currentTrooper = 1; currentTrooper < battleArmor.locations(); currentTrooper++) {
+            processTrooper();
+            trooperBVs.add(baseBV);
+        }
+        bvReport = saveReport;
+
+        // Write a single trooper in the report if they're all the same
+        if (trooperBVs.size() == 1) {
+            currentTrooper = 1;
+            processTrooper();
+            baseBV *= battleArmor.getShootingStrength();
+        } else {
+            double bvSum = 0;
+            for (currentTrooper = 1; currentTrooper < battleArmor.locations(); currentTrooper++) {
+                bvReport.addSubHeader("Trooper " + currentTrooper + ":");
+                processTrooper();
+                bvSum += baseBV;
+            }
+            baseBV = bvSum;
         }
 
-        bvReport.addSubHeader("Squad Result:");
-        bvReport.addLine("Total Squad BV", "", formatForReport(squadBV));
+        bvReport.addEmptyLine();
+        bvReport.addSubHeader("Squad Battle Value:");
+        bvReport.addLine("Total Squad BV:", "", formatForReport(baseBV));
         // we have now added all troopers, divide by current strength, then multiply by the unit size modifier
-        squadBV /= battleArmor.getShootingStrength();
+        baseBV /= battleArmor.getShootingStrength();
         bvReport.addLine("Average BV per Trooper", "/ " + battleArmor.getShootingStrength(),
-                "= " + formatForReport(squadBV));
+                "= " + formatForReport(baseBV));
 
-        if (singleTrooper) {
-            return (int) Math.round(squadBV);
+        double squadFactor = (0.9 + 0.1 * battleArmor.getShootingStrength()) * battleArmor.getShootingStrength();
+        bvReport.addLine("Squad Size",
+                "x " + squadFactor, "= " + formatForReport(baseBV * squadFactor));
+        baseBV *= squadFactor;
+        bvReport.addLine("--- Base Unit BV:",
+                formatForReport(baseBV) + ", rn",
+                "= " + (int) Math.round(baseBV));
+    }
+
+    private void processTrooper() {
+        offensiveValue = 0;
+        defensiveValue = 0;
+        baseBV = 0;
+
+        if (battleArmor.getInternal(currentTrooper) <= 0) {
+            bvReport.addLine("N/A", "", "");
+            bvReport.addEmptyLine();
+        } else {
+            super.processCalculations();
         }
+    }
 
-        double squadFactor = 1;
-        switch (battleArmor.getShootingStrength()) {
-            case 1:
-                break;
-            case 2:
-                squadFactor = 2.2;
-                break;
-            case 3:
-                squadFactor = 3.6;
-                break;
-            case 4:
-                squadFactor = 5.2;
-                break;
-            case 5:
-                squadFactor = 7;
-                break;
-            case 6:
-                squadFactor = 9;
+    @Override
+    protected double offensiveEquipmentBV(MiscType misc, int location) {
+        return location == currentTrooper ? super.offensiveEquipmentBV(misc, location) : 0;
+    }
+
+    @Override
+    protected void processSummarize() {
+        baseBV = defensiveValue + offensiveValue;
+        bvReport.addEmptyLine();
+        bvReport.addSubHeader("Trooper Battle Value:");
+        bvReport.addLine("",
+                formatForReport(defensiveValue) + " + " + formatForReport(offensiveValue) + ", rn",
+                "= " + formatForReport(baseBV));
+    }
+
+    @Override
+    protected boolean ammoCounts(Mounted ammo) {
+        return super.ammoCounts(ammo)
+                && ((ammo.getLocation() == BattleArmor.LOC_SQUAD) || (ammo.getLocation() == currentTrooper));
+    }
+
+    @Override
+    protected void processArmor() {
+        String modifier = "";
+        double armorBV = 2.5;
+        if (battleArmor.isFireResistant() || battleArmor.isReflective() || battleArmor.isReactive()) {
+            armorBV = 3.5;
+            final String armorName = EquipmentType.getArmorTypeName(battleArmor.getArmorType(BattleArmor.LOC_TROOPER_1),
+                    TechConstants.isClan(battleArmor.getArmorTechLevel(BattleArmor.LOC_TROOPER_1)));
+            final EquipmentType armor = EquipmentType.get(armorName);
+            modifier = " (" + armor.getName().replaceAll("^BA\\s+", "") + ")";
+        }
+        defensiveValue += battleArmor.getArmor(currentTrooper) * armorBV + 1;
+        String calculation = "1 + " + battleArmor.getArmor(currentTrooper) + " x " + formatForReport(armorBV) + modifier;
+        bvReport.addLine("Armor:", calculation, formatForReport(defensiveValue));
+    }
+
+    @Override
+    protected void processStructure() { }
+
+    @Override
+    protected void processDefensiveEquipment() {
+        List<String> modifierList = new ArrayList<>();
+        int bonus = 0;
+        if (battleArmor.hasImprovedSensors()) {
+            bonus += 1;
+            modifierList.add("Imp. Sens.");
+        }
+        if (battleArmor.hasActiveProbe()) {
+            bonus += 1;
+            modifierList.add("AP");
+        }
+        for (Mounted mounted : battleArmor.getMisc()) {
+            if (mounted.getType().hasFlag(MiscType.F_ECM)) {
+                if (mounted.getType().hasFlag(MiscType.F_ANGEL_ECM)) {
+                    bonus += 2;
+                    modifierList.add("Angel ECM");
+                } else {
+                    bonus += 1;
+                    modifierList.add("ECM");
+                }
                 break;
+            }
         }
-        bvReport.addLine("Squad Size",
-                "x " + squadFactor, "= " + formatForReport(squadBV * squadFactor));
-        squadBV *= squadFactor;
-
-        if (!ignoreC3) {
-            double c3Bonus = battleArmor.getExtraC3BV((int) Math.round(squadBV));
-            squadBV += c3Bonus;
-            if (c3Bonus > 0) {
-                bvReport.addLine("C3 Bonus", "+ " + formatForReport(c3Bonus),
-                        "= " + formatForReport(squadBV));
+        if (bonus > 0) {
+            defensiveValue += bonus;
+            String calculation = "+ " + bonus + " (" + String.join(", ", modifierList) + ")";
+            bvReport.addLine("Systems:", calculation, "= " + formatForReport(defensiveValue));
+        }
+        double amsBonus = 0;
+        for (Mounted weapon : battleArmor.getWeaponList()) {
+            if (weapon.getType().hasFlag(WeaponType.F_AMS)) {
+                if (weapon.getLocation() == BattleArmor.LOC_SQUAD) {
+                    amsBonus += weapon.getType().getBV(battleArmor);
+                } else {
+                    // squad support, count at 1/troopercount
+                    amsBonus += weapon.getType().getBV(battleArmor) / battleArmor.getTotalOInternal();
+                }
             }
         }
+        if (amsBonus > 0) {
+            defensiveValue += amsBonus;
+            bvReport.addLine("AMS:", "+ " + formatForReport(amsBonus),
+                    "= " + formatForReport(defensiveValue));
+        }
+    }
+
+    @Override
+    protected double getAmmoBV(Mounted ammo) {
+        return ((AmmoType) ammo.getType()).getKgPerShotBV(ammo.getUsableShotsLeft());
+    }
+
+    @Override
+    protected int offensiveSpeedFactorMP() {
+        return Math.max(battleArmor.getWalkMP(MPCalculationSetting.BV_CALCULATION),
+                Math.max(battleArmor.getJumpMP(MPCalculationSetting.BV_CALCULATION), battleArmor.getActiveUMUCount()));
+    }
 
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(battleArmor);
-        String pilotCalculation = ignoreSkill ? "" : "x " + formatForReport(pilotFactor) + " (Skill/Implants), ";
-        bvReport.addResultLine("Final BV:",
-                pilotCalculation + "round normal", "= " + Math.round(squadBV * pilotFactor));
-        return (int) Math.round(squadBV * pilotFactor);
+    @Override
+    protected String equipmentDescriptor(Mounted mounted) {
+        return mounted.getType().getShortName();
     }
-}
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/BvMultiplier.java b/megamek/src/megamek/common/battlevalue/BvMultiplier.java
deleted file mode 100644
index 3d41c7f915d..00000000000
--- a/megamek/src/megamek/common/battlevalue/BvMultiplier.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2022 - The MegaMek Team. All Rights Reserved.
- *
- * This file is part of MegaMek.
- *
- * MegaMek is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MegaMek is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
- */
-package megamek.common.battlevalue;
-
-import megamek.codeUtilities.MathUtility;
-import megamek.common.Entity;
-import megamek.common.Infantry;
-import megamek.common.LAMPilot;
-import megamek.common.options.OptionsConstants;
-
-/**
- * Utility class for obtaining BV Skill Multipliers (TM p.315).
- */
-public class BvMultiplier {
-
-    private static final double[][] bvMultipliers = new double[][] {
-            {2.42, 2.31, 2.21, 2.10, 1.93, 1.75, 1.68, 1.59, 1.50},
-            {2.21, 2.11, 2.02, 1.92, 1.76, 1.60, 1.54, 1.46, 1.38},
-            {1.93, 1.85, 1.76, 1.68, 1.54, 1.40, 1.35, 1.28, 1.21},
-            {1.66, 1.58, 1.51, 1.44, 1.32, 1.20, 1.16, 1.10, 1.04},
-            {1.38, 1.32, 1.26, 1.20, 1.10, 1.00, 0.95, 0.90, 0.85},
-            {1.31, 1.19, 1.13, 1.08, 0.99, 0.90, 0.86, 0.81, 0.77},
-            {1.24, 1.12, 1.07, 1.02, 0.94, 0.85, 0.81, 0.77, 0.72},
-            {1.17, 1.06, 1.01, 0.96, 0.88, 0.80, 0.76, 0.72, 0.68},
-            {1.10, 0.99, 0.95, 0.90, 0.83, 0.75, 0.71, 0.68, 0.64},
-    };
-
-    /**
-     * Returns the BV multiplier for the gunnery/piloting of the given entity's pilot (TM p.315) as well as MD
-     * implants of the pilot.
-     * Returns 1 if the given entity's crew is null. Special treatment is given to infantry units where
-     * units unable to make anti-mek attacks use 5 as their anti-mek (piloting) value as well as LAM pilots that
-     * use the average of their aero and mek values.
-     *
-     * @param entity The entity to get the skill modifier for
-     * @return The BV multiplier for the given entity's pilot
-     */
-    public static double bvMultiplier(Entity entity) {
-        if (entity.getCrew() == null) {
-            return 1;
-        }
-        int gunnery = entity.getCrew().getGunnery();
-        int piloting = entity.getCrew().getPiloting();
-
-        if ((entity instanceof Infantry) && (!((Infantry) entity).canMakeAntiMekAttacks())) {
-            piloting = 5;
-        } else if (entity.getCrew() instanceof LAMPilot) {
-            LAMPilot lamPilot = (LAMPilot) entity.getCrew();
-            gunnery = (lamPilot.getGunneryMech() + lamPilot.getGunneryAero()) / 2;
-            piloting = (lamPilot.getPilotingMech() + lamPilot.getPilotingAero()) / 2;
-        }
-        return bvImplantMultiplier(entity) * bvSkillMultiplier(gunnery, piloting);
-    }
-
-    /**
-     * Returns the BV multiplier for the given gunnery and piloting values. Returns 1 for the neutral
-     * values 4/5.
-     *
-     * @param gunnery the gunnery skill of a pilot
-     * @param piloting the piloting skill of a pilot
-     * @return a multiplier to the BV of whatever unit the pilot is piloting.
-     */
-    public static double bvSkillMultiplier(int gunnery, int piloting) {
-        return bvMultipliers[MathUtility.clamp(gunnery, 0, 8)][MathUtility.clamp(piloting, 0, 8)];
-    }
-
-    /**
-     * Returns the BV multiplier for any MD implants that the crew of the given entity has. When the crew
-     * doesn't have any relevant MD implants, returns 1.
-     *
-     * @param entity The entity to get the skill modifier for
-     * @return a multiplier to the BV of the given entity
-     */
-    public static double bvImplantMultiplier(Entity entity) {
-        int level = 1;
-        if (entity.getCrew().getOptions().booleanOption(OptionsConstants.MD_PAIN_SHUNT)) {
-            level = 2;
-        }
-        if (entity.getCrew().getOptions().booleanOption(OptionsConstants.MD_VDNI)) {
-            level = 3;
-        }
-        if (entity.getCrew().getOptions().booleanOption(OptionsConstants.MD_BVDNI)) {
-            level = 5;
-        }
-        return level / 4.0 + 0.75;
-    }
-
-    private BvMultiplier() { }
-}
diff --git a/megamek/src/megamek/common/battlevalue/CombatVehicleBVCalculator.java b/megamek/src/megamek/common/battlevalue/CombatVehicleBVCalculator.java
index 7f257225525..08c224864bf 100644
--- a/megamek/src/megamek/common/battlevalue/CombatVehicleBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/CombatVehicleBVCalculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 - The MegaMek Team. All Rights Reserved.
+ * Copyright (c) 2022-2023 - The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
@@ -18,129 +18,50 @@
  */
 package megamek.common.battlevalue;
 
-import megamek.client.ui.swing.calculationReport.CalculationReport;
 import megamek.common.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.function.Predicate;
 
-public class CombatVehicleBVCalculator {
+import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
 
-    public static int calculateBV(Tank combatVee, boolean ignoreC3, boolean ignoreSkill, CalculationReport bvReport) {
-        if (combatVee.isCarcass() && !ignoreSkill) { // TODO : why is this only done for Tanks? Necessary at all?
-            return 0;
-        }
-        bvReport.addHeader("Battle Value Calculations For");
-        bvReport.addHeader(combatVee.getChassis() + " " + combatVee.getModel());
-
-        bvReport.addSubHeader("Defensive Battle Rating Calculation:");
-        double dbv = 0; // defensive battle value
-        boolean blueShield = combatVee.hasWorkingMisc(MiscType.F_BLUE_SHIELD);
-        double armorMultiplier;
-
-        for (int loc = 1; loc < combatVee.locations(); loc++) {
-            int modularArmor = 0;
-            for (Mounted mounted : combatVee.getEquipment()) {
-                if ((mounted.getType() instanceof MiscType)
-                        && mounted.getType().hasFlag(MiscType.F_MODULAR_ARMOR)
-                        && (mounted.getLocation() == loc)) {
-                    modularArmor += mounted.getBaseDamageCapacity() - mounted.getDamageTaken();
-                }
-            }
+public class CombatVehicleBVCalculator extends BVCalculator {
 
-            // total armor points
-            switch (combatVee.getArmorType(loc)) {
-                case EquipmentType.T_ARMOR_COMMERCIAL:
-                    armorMultiplier = 0.5;
-                    break;
-                case EquipmentType.T_ARMOR_HARDENED:
-                    armorMultiplier = 2.0;
-                    break;
-                case EquipmentType.T_ARMOR_REACTIVE:
-                case EquipmentType.T_ARMOR_REFLECTIVE:
-                case EquipmentType.T_ARMOR_BALLISTIC_REINFORCED:
-                    armorMultiplier = 1.5;
-                    break;
-                case EquipmentType.T_ARMOR_FERRO_LAMELLOR:
-                case EquipmentType.T_ARMOR_ANTI_PENETRATIVE_ABLATION:
-                    armorMultiplier = 1.2;
-                    break;
-                default:
-                    armorMultiplier = 1.0;
-                    break;
-            }
+    CombatVehicleBVCalculator(Entity entity) {
+        super(entity);
+    }
 
-            if (blueShield) {
-                armorMultiplier += 0.2;
-            }
-            int armor = combatVee.getArmor(loc) + modularArmor;
-            double armorBV = (combatVee.getArmor(loc) + modularArmor) * armorMultiplier * (combatVee.getBARRating(loc) / 10.0);
-            dbv += armorBV;
-            bvReport.addLine("Total Armor " + combatVee.getLocationAbbr(loc) + " ("
-                    + armor + ") x " + armorMultiplier + " x " + combatVee.getBARRating(loc) + "/10", "", armorBV);
-        }
-        dbv *= 2.5;
-        bvReport.addLine("Total modified armor BV x 2.5", "= ", dbv);
-        bvReport.addLine("Total I.S. Points x 1.5 x Blue Shield Multipler",
-                combatVee.getTotalInternal() + " x 1.5 x " + (blueShield ? 1.2 : 1),
-                "= ", combatVee.getTotalInternal() * 1.5 * (blueShield ? 1.2 : 1));
-        // total internal structure
-        dbv += combatVee.getTotalInternal() * 1.5 * (blueShield ? 1.2 : 1);
-        bvReport.addResultLine("Defensive Equipment", "", "");
+    @Override
+    protected int getUmuTMM() {
+        return 0;
+    }
 
-        double amsAmmoBV = 0;
-        for (Mounted mounted : combatVee.getAmmo()) {
-            AmmoType atype = (AmmoType) mounted.getType();
-            if ((atype.getAmmoType() == AmmoType.T_AMS) || (atype.getAmmoType() == AmmoType.T_APDS)) {
-                amsAmmoBV += atype.getBV(combatVee);
-            }
+    @Override
+    protected int getRunningTMM() {
+        if (runMP == 0) {
+            return 0;
         }
-        double amsBV = 0;
-        // add defensive equipment
-        double dEquipmentBV = 0;
-        for (Mounted mounted : combatVee.getEquipment()) {
-            EquipmentType etype = mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
+        int tmmRan = Compute.getTargetMovementModifier(runMP, entity instanceof VTOL,
+                entity instanceof VTOL, entity.getGame()).getValue();
+        tmmRan += (entity.hasStealth()) ? 2 : 0;
+        tmmRan += (entity.getMovementMode() == EntityMovementMode.WIGE) ? 1 : 0;
+        return tmmRan;
+    }
 
-            if (((etype instanceof WeaponType) && (etype.hasFlag(WeaponType.F_AMS) ||
-                    etype.hasFlag(WeaponType.F_B_POD) || etype.hasFlag(WeaponType.F_M_POD)))) {
-                bvReport.addLine(etype.getName(), "", etype.getBV(combatVee));
-                dEquipmentBV += etype.getBV(combatVee);
-                WeaponType wtype = (WeaponType) etype;
-                if ((wtype.hasFlag(WeaponType.F_AMS)
-                        && (wtype.getAmmoType() == AmmoType.T_AMS)) || (wtype.getAmmoType() == AmmoType.T_APDS)) {
-                    amsBV += etype.getBV(combatVee);
-                }
-            } else if ((etype instanceof MiscType) &&
-                    (etype.hasFlag(MiscType.F_ECM)
-                            || etype.hasFlag(MiscType.F_AP_POD)
-                            || etype.hasFlag(MiscType.F_HEAVY_BRIDGE_LAYER)
-                            || etype.hasFlag(MiscType.F_MEDIUM_BRIDGE_LAYER)
-                            || etype.hasFlag(MiscType.F_HEAVY_BRIDGE_LAYER)
-                            || etype.hasFlag(MiscType.F_BULLDOZER)
-                            || etype.hasFlag(MiscType.F_CHAFF_POD)
-                            || etype.hasFlag(MiscType.F_BAP)
-                            || etype.hasFlag(MiscType.F_MINESWEEPER))) {
-                MiscType mtype = (MiscType) etype;
-                double bv = mtype.getBV(combatVee, mounted.getLocation());
-                dEquipmentBV += bv;
-                bvReport.addLine(mounted.getName(), "", bv);
-            }
-        }
-        if (amsAmmoBV > 0) {
-            bvReport.addLine("AMS Ammo (to a maximum of AMS BV)", "+ ", Math.min(amsBV, amsAmmoBV));
-            dEquipmentBV += Math.min(amsBV, amsAmmoBV);
+    @Override
+    protected int getJumpingTMM() {
+        if (jumpMP == 0) {
+            return 0;
         }
-        bvReport.addLine("", "= ", dEquipmentBV);
-        dbv += dEquipmentBV;
+        int tmmJumped = Compute.getTargetMovementModifier(jumpMP, true, false, entity.getGame()).getValue();
+        tmmJumped += (entity.hasStealth()) ? 2 : 0;
+        tmmJumped += (entity.getMovementMode() == EntityMovementMode.WIGE) ? 1 : 0;
+        return tmmJumped;
+    }
 
+    @Override
+    protected void processTypeModifier() {
         double typeModifier;
-        switch (combatVee.getMovementMode()) {
+        switch (entity.getMovementMode()) {
             case TRACKED:
                 typeModifier = 0.9;
                 break;
@@ -156,8 +77,8 @@ public static int calculateBV(Tank combatVee, boolean ignoreC3, boolean ignoreSk
                 typeModifier = 0.6;
         }
 
-        if (!combatVee.isSupportVehicle()) {
-            for (Mounted m : combatVee.getMisc()) {
+        if (!entity.isSupportVehicle()) {
+            for (Mounted m : entity.getMisc()) {
                 if (m.getType().hasFlag(MiscType.F_FULLY_AMPHIBIOUS)) {
                     typeModifier += 0.2;
                 } else if (m.getType().hasFlag(MiscType.F_LIMITED_AMPHIBIOUS)
@@ -169,338 +90,57 @@ public static int calculateBV(Tank combatVee, boolean ignoreC3, boolean ignoreSk
                 }
             }
         }
-        typeModifier = Math.round(typeModifier * 10.0) / 10.0;
-        bvReport.addLine("x Body Type Modifier", "x " + typeModifier, "");
-        dbv *= typeModifier;
-
-        // adjust for target movement modifier
-        double tmmRan = Compute.getTargetMovementModifier(
-                combatVee.getRunMP(false, true, true), combatVee instanceof VTOL,
-                combatVee instanceof VTOL, combatVee.getGame()).getValue();
-        // for the future, when we implement jumping tanks
-        double tmmJumped = (combatVee.getJumpMP() > 0) ? Compute.
-                getTargetMovementModifier(combatVee.getJumpMP(), true, false, combatVee.getGame()).
-                getValue() : 0;
-        if (combatVee.hasStealth()) {
-            tmmRan += 2;
-            tmmJumped += 2;
-        }
-        if (combatVee.getMovementMode() == EntityMovementMode.WIGE) {
-            tmmRan += 1;
-            tmmJumped += 1;
-        }
-        double tmmFactor = 1 + (Math.max(tmmRan, tmmJumped) / 10);
-        dbv *= tmmFactor;
-        // Deal with floating point errors
-        dbv = Math.round(dbv * 100000.0) / 100000.0;
-        bvReport.addLine("x Target Movement modifier", "x " + tmmFactor, "");
-        bvReport.addResultLine("", dbv);
-
-        // figure out base weapon bv
-        double weaponBV = 0;
-        double weaponsBVFront = 0;
-        double weaponsBVRear = 0;
-        boolean hasTargComp = combatVee.hasTargComp();
-        double targetingSystemBVMod = 1.0;
-
-        if (combatVee.isSupportVehicle()) {
-            if (combatVee.hasWorkingMisc(MiscType.F_BASIC_FIRECONTROL)) {
-                targetingSystemBVMod = 0.9;
-            } else if (!combatVee.hasWorkingMisc(MiscType.F_ADVANCED_FIRECONTROL)) {
-                targetingSystemBVMod = 0.8;
-            }
-        }
-        bvReport.addLine("Weapons", "", "");
-
-        // and add up BVs for ammo-using weapon types for excessive ammo rule
-        Map<String, Double> weaponsForExcessiveAmmo = new HashMap<>();
-        for (Mounted mounted : combatVee.getWeaponList()) {
-            WeaponType wtype = (WeaponType) mounted.getType();
-            double dBV = wtype.getBV(combatVee);
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            // don't count AMS, it's defensive
-            if (wtype.hasFlag(WeaponType.F_AMS)) {
-                continue;
-            }
-            if (wtype.hasFlag(WeaponType.F_B_POD)) {
-                continue;
-            }
-            if (wtype.hasFlag(WeaponType.F_M_POD)) {
-                continue;
-            }
-            String weaponName = wtype.getName();
-            if (mounted.getLinkedBy() != null) {
-                // check to see if the weapon is a PPC and has a Capacitor attached to it
-                if (wtype.hasFlag(WeaponType.F_PPC)) {
-                    dBV += ((MiscType) mounted.getLinkedBy().getType()).getBV(
-                            combatVee, mounted);
-                    weaponName = weaponName.concat(" with Capacitor");
-                }
-            }
+        bvReport.addLine("Type Modifier:",
+                formatForReport(defensiveValue) + " x " + formatForReport(typeModifier),
+                "= " + formatForReport(defensiveValue * typeModifier));
+        defensiveValue *= typeModifier;
+    }
 
-            // calc MG Array here:
-            if (wtype.hasFlag(WeaponType.F_MGA)) {
-                double mgBV = 0;
-                for (int eqNum : mounted.getBayWeapons()) {
-                    Mounted mg = combatVee.getEquipment(eqNum);
-                    if ((mg != null) && (!mg.isDestroyed())) {
-                        mgBV += mg.getType().getBV(combatVee);
-                    }
-                }
-                dBV = mgBV * 0.67;
-            }
+    @Override
+    protected Predicate<Mounted> rearWeaponFilter() {
+        return weapon -> weapon.getLocation() == rearLocation();
+    }
 
-            String calculationText = "" + dBV;
-            // artemis bumps up the value
-            if (mounted.getLinkedBy() != null) {
-                Mounted mLinker = mounted.getLinkedBy();
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS)) {
-                    dBV *= 1.2;
-                    calculationText += " x 1.2 Artemis IV";
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_PROTO)) {
-                    dBV *= 1.1;
-                    calculationText += " x 1.1 Artemis IV Prototype";
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
-                    dBV *= 1.3;
-                    calculationText += " x 1.3 Artemis V";
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_APOLLO)) {
-                    dBV *= 1.15;
-                    calculationText += " x 1.15 Apollo";
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
-                    dBV *= 1.15;
-                    calculationText += " x 1.15 RISC Laser Pulse Module";
-                }
-            }
-            if (combatVee.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM)) {
-                dBV *= 0.8;
-                calculationText += " x 0.8 Drone OS";
-            }
+    @Override
+    protected Predicate<Mounted> frontWeaponFilter() {
+        return weapon -> weapon.getLocation() == Tank.LOC_FRONT;
+    }
 
-            // and we'll add the tcomp here too
-            if (wtype.hasFlag(WeaponType.F_DIRECT_FIRE) && hasTargComp) {
-                dBV *= 1.25;
-                calculationText += " x 1.25 Direct Fire and TC";
-            } else if (combatVee.isSupportVehicle() && !wtype.hasFlag(WeaponType.F_INFANTRY)) {
-                dBV *= targetingSystemBVMod;
-                calculationText += " x " + targetingSystemBVMod + " Targeting System";
-            }
-            if (mounted.getLocation() == (combatVee instanceof SuperHeavyTank ? SuperHeavyTank.LOC_REAR
-                    : combatVee instanceof LargeSupportTank ? LargeSupportTank.LOC_REAR
-                    : Tank.LOC_REAR)) {
-                weaponsBVRear += dBV;
-                calculationText += " Rear";
-            } else if (mounted.getLocation() == Tank.LOC_FRONT) {
-                weaponsBVFront += dBV;
-                calculationText += " Front";
-            } else {
-                weaponBV += dBV;
-                calculationText += " Side/Turret";
-            }
-            // add up BV of ammo-using weapons for each type of weapon,
-            // to compare with ammo BV later for excessive ammo BV rule
-            if (!((wtype.hasFlag(WeaponType.F_ENERGY) && !((wtype.getAmmoType() == AmmoType.T_PLASMA)
-                    || (wtype.getAmmoType() == AmmoType.T_VEHICLE_FLAMER)
-                    || (wtype.getAmmoType() == AmmoType.T_HEAVY_FLAMER)
-                    || (wtype.getAmmoType() == AmmoType.T_CHEMICAL_LASER)))
-                    || wtype.hasFlag(WeaponType.F_ONESHOT)
-                    || wtype.hasFlag(WeaponType.F_INFANTRY)
-                    || (wtype.getAmmoType() == AmmoType.T_NA))) {
-                String key = wtype.getAmmoType() + ":" + wtype.getRackSize();
-                if (!weaponsForExcessiveAmmo.containsKey(key)) {
-                    weaponsForExcessiveAmmo.put(key, wtype.getBV(combatVee));
-                } else {
-                    weaponsForExcessiveAmmo.put(key, wtype.getBV(combatVee) + weaponsForExcessiveAmmo.get(key));
-                }
-            }
-            bvReport.addLine(weaponName, calculationText, "", dBV);
-        }
+    @Override
+    protected boolean isNominalRear(Mounted weapon) {
+        return (switchRearAndFront ^ rearWeaponFilter().test(weapon)) && !(weapon.getLocation() == Tank.LOC_TURRET)
+                && !(weapon.getLocation() == Tank.LOC_TURRET_2);
+    }
 
-        if (weaponsBVFront > weaponsBVRear) {
-            weaponBV += weaponsBVFront;
-            weaponBV += weaponsBVRear * 0.5;
+    private int rearLocation() {
+        if (entity instanceof SuperHeavyTank) {
+            return SuperHeavyTank.LOC_REAR;
+        } else if (entity instanceof LargeSupportTank) {
+            return LargeSupportTank.LOC_REAR;
         } else {
-            weaponBV += weaponsBVRear;
-            weaponBV += weaponsBVFront * 0.5;
+            return Tank.LOC_REAR;
         }
+    }
 
-        bvReport.addLine("", "", "= ", weaponBV);
-        bvReport.addLine("Ammo BV", "", "");
-
-        // add ammo bv
-        double ammoBV = 0;
-        // extra BV for when we have semiguided LRMs and someone else has TAG on our team
-        double tagBV = 0;
-        String tagText = "";
-        Map<String, Double> ammo = new HashMap<>();
-        ArrayList<String> keys = new ArrayList<>();
-        for (Mounted mounted : combatVee.getAmmo()) {
-            AmmoType atype = (AmmoType) mounted.getType();
-
-            // don't count depleted ammo
-            if (mounted.getUsableShotsLeft() == 0) {
-                continue;
-            }
-
-            // don't count AMS, it's defensive
-            if ((atype.getAmmoType() == AmmoType.T_AMS) || (atype.getAmmoType() == AmmoType.T_APDS)) {
-                continue;
-            }
-
-            // don't count oneshot ammo, it's considered part of the launcher.
-            if (mounted.getLocation() == Entity.LOC_NONE) {
-                // assumption: ammo without a location is for a oneshot weapon
-                continue;
-            }
-
-            // semiguided or homing ammo might count double
-            if ((atype.getMunitionType() == AmmoType.M_SEMIGUIDED)
-                    || (atype.getMunitionType() == AmmoType.M_HOMING)) {
-                Player tmpP = combatVee.getOwner();
-                // Okay, actually check for friendly TAG.
-                if (tmpP != null) {
-                    if (tmpP.hasTAG()) {
-                        tagBV += atype.getBV(combatVee);
-                    } else if ((tmpP.getTeam() != Player.TEAM_NONE) && (combatVee.getGame() != null)) {
-                        for (Team m : combatVee.getGame().getTeams()) {
-                            if (m.getId() == tmpP.getTeam()) {
-                                if (m.hasTAG()) {
-                                    tagBV += atype.getBV(combatVee);
-                                    tagText = "Tag: ";
-                                }
-                                // A player can't be on two teams.
-                                // If we check his team and don't give the penalty, that's it.
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            String key = atype.getAmmoType() + ":" + atype.getRackSize();
-            if (!keys.contains(key)) {
-                keys.add(key);
-            }
-            if (!ammo.containsKey(key)) {
-                ammo.put(key, atype.getBV(combatVee));
-            } else {
-                ammo.put(key, atype.getBV(combatVee) + ammo.get(key));
-            }
-            bvReport.addLine(atype.getName(), tagText, "BV: ", atype.getBV(combatVee));
-        }
-        // excessive ammo rule:
-        // only count BV for ammo for a weapontype until the BV of all weapons of that
-        // type on the mech is reached
-        for (String key : keys) {
-            // They dont exist in either hash then dont bother adding nulls.
-            if (!ammo.containsKey(key) || !weaponsForExcessiveAmmo.containsKey(key)) {
-                continue;
-            }
-            if (ammo.get(key) > weaponsForExcessiveAmmo.get(key)) {
-                ammoBV += weaponsForExcessiveAmmo.get(key);
-            } else {
-                ammoBV += ammo.get(key);
-            }
-        }
-        ammoBV *= targetingSystemBVMod;
-        bvReport.addLine("", "", "= ", ammoBV);
-        weaponBV += ammoBV;
-        // add offensive misc. equipment BV (everything except AMS, A-Pod, ECM - BMR p152)
-        bvReport.addLine("Offensive Equipment", "", "");
-
-        double oEquipmentBV = 0;
-        for (Mounted mounted : combatVee.getMisc()) {
-            MiscType mtype = (MiscType) mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            if ((mtype.hasFlag(MiscType.F_ECM) && !mtype
-                    .hasFlag(MiscType.F_WATCHDOG))
-                    || mtype.hasFlag(MiscType.F_AP_POD)
-                    || mtype.hasFlag(MiscType.F_LIGHT_BRIDGE_LAYER)
-                    || mtype.hasFlag(MiscType.F_MEDIUM_BRIDGE_LAYER)
-                    || mtype.hasFlag(MiscType.F_HEAVY_BRIDGE_LAYER)
-                    || mtype.hasFlag(MiscType.F_CHAFF_POD)
-                    || mtype.hasFlag(MiscType.F_BAP)
-                    || mtype.hasFlag(MiscType.F_BULLDOZER)
-                    || mtype.hasFlag(MiscType.F_TARGCOMP)
-                    || mtype.hasFlag(MiscType.F_MINESWEEPER)) {
-                continue;
-            }
-            double bv = mtype.getBV(combatVee, mounted.getLocation());
-            // we need to special case watchdog, because it has both offensive
-            // and defensive BV
-            if (mtype.hasFlag(MiscType.F_WATCHDOG)) {
-                bv = 7;
-            }
-            oEquipmentBV += bv;
-            bvReport.addLine(mounted.getName(), "" + bv, "");
-        }
-
-        bvReport.addLine("", "", "= ", oEquipmentBV);
-        weaponBV += oEquipmentBV;
-        bvReport.addResultLine("+ weight / 2",
-                combatVee.getWeight() + " / 2 ",
-                "= ", combatVee.getWeight() / 2);
-        weaponBV += combatVee.getWeight() / 2;
-
-        // adjust further for speed factor
-        double runMP = combatVee.getRunMP(false, true, true);
+    @Override
+    protected void processWeight() {
+        offensiveValue += entity.getWeight() / 2;
+        bvReport.addLine("Weight:",
+                "+ " + formatForReport(entity.getWeight()) + " x 0.5 ",
+                "= " + formatForReport(offensiveValue));
+    }
 
-        // Trains use cruise instead of flank MP for speed factor
-        if (combatVee.getMovementMode().isTrain()) {
-            runMP = combatVee.getWalkMP(false, true, true);
+    @Override
+    protected int offensiveSpeedFactorMP() {
+        int runMP = entity.getRunMP(MPCalculationSetting.BV_CALCULATION);
+        int jumpMP = entity.getJumpMP(MPCalculationSetting.BV_CALCULATION);
+        if (entity.getMovementMode().isTrain()) {
+            runMP = entity.getWalkMP(MPCalculationSetting.BV_CALCULATION);
         }
         // trailers have original run MP of 0, but should count at 1 for speed factor calculation
-        if (combatVee.getOriginalRunMP() == 0) {
+        if (entity.getOriginalRunMP() == 0) {
             runMP = 1;
         }
-        double speedFactor = Math.pow(1 + (((runMP + (Math.round(combatVee.getJumpMP(false) / 2.0))) - 5) / 10), 1.2);
-        speedFactor = Math.round(speedFactor * 100) / 100.0;
-
-        double obv; // offensive bv
-        obv = weaponBV * speedFactor;
-        bvReport.addLine("+ weapons bv * speed factor", weaponBV + " * " + speedFactor, "= ", obv);
-
-        double finalBV;
-        finalBV = dbv + obv;
-        double totalBV = finalBV;
-
-        if (combatVee.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM)) {
-            finalBV *= 0.95;
-            finalBV = Math.round(finalBV);
-            bvReport.addLine("Total BV * Drone Operating System Modifier", totalBV + " x 0.95", "= ", finalBV);
-        }
-        bvReport.addResultLine("Final BV", "", finalBV);
-
-        // we get extra bv from some stuff
-        double xbv = 0.0;
-        // extra BV for semi-guided lrm when TAG in our team
-        xbv += tagBV;
-        if (!ignoreC3) {
-            xbv += combatVee.getExtraC3BV((int) Math.round(finalBV));
-        }
-
-        finalBV = Math.round(finalBV + xbv);
-
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(combatVee);
-        int finalAdjustedBV = (int) Math.round(finalBV * pilotFactor);
-        bvReport.addResultLine("Final Adjusted BV", "= ", finalAdjustedBV);
-        return finalAdjustedBV;
+        return runMP + (int) Math.round(jumpMP / 2.0);
     }
-}
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/DropShipBVCalculator.java b/megamek/src/megamek/common/battlevalue/DropShipBVCalculator.java
index efcef21ba7e..2dc569f1a6d 100644
--- a/megamek/src/megamek/common/battlevalue/DropShipBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/DropShipBVCalculator.java
@@ -18,479 +18,81 @@
  */
 package megamek.common.battlevalue;
 
-import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.*;
-import megamek.common.weapons.bayweapons.BayWeapon;
+import megamek.common.Dropship;
+import megamek.common.Entity;
+import megamek.common.Mounted;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.function.Predicate;
 
-public class DropShipBVCalculator {
+public class DropShipBVCalculator extends LargeAeroBVCalculator {
 
-    public static int calculateBV(Dropship dropShip, boolean ignoreC3, boolean ignoreSkill, CalculationReport bvReport) {
-        bvReport.addHeader("Battle Value Calculations For");
-        bvReport.addHeader(dropShip.getChassis() + " " + dropShip.getModel());
-
-        bvReport.addSubHeader("Defensive Battle Rating Calculation:");
-        double dbv = 0; // defensive battle value
-        int modularArmor = 0;
-        for (Mounted mounted : dropShip.getEquipment()) {
-            if ((mounted.getType() instanceof MiscType) && mounted.getType().hasFlag(MiscType.F_MODULAR_ARMOR)) {
-                modularArmor += mounted.getBaseDamageCapacity() - mounted.getDamageTaken();
-            }
-        }
-
-        dbv += dropShip.getTotalArmor() + modularArmor;
-        dbv *= 2.5;
-        bvReport.addLine("Total Armor Factor x 2.5 ",
-                (dropShip.getTotalArmor() + modularArmor) + " x 2.5", "= ", dbv);
-        double dbvSI = dropShip.getSI() * 2.0;
-        dbv += dbvSI;
-        bvReport.addLine("Total SI x 2", dropShip.getSI() + " x 2", "= ", dbvSI);
-
-        // add defensive equipment
-        double amsBV = 0;
-        double amsAmmoBV = 0;
-        double screenBV = 0;
-        double screenAmmoBV = 0;
-        double defEqBV = 0;
-        for (Mounted mounted : dropShip.getEquipment()) {
-            EquipmentType etype = mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-            if (etype instanceof BayWeapon) {
-                continue;
-            }
-            if (((etype instanceof WeaponType) && (etype.hasFlag(WeaponType.F_AMS)))) {
-                amsBV += etype.getBV(dropShip);
-                bvReport.addLine(etype.getName(), "+ " + etype.getBV(dropShip), "");
-            } else if ((etype instanceof AmmoType) && (((AmmoType) etype).getAmmoType() == AmmoType.T_AMS)) {
-                // we need to deal with cases where ammo is loaded in multi-ton increments
-                // (on dropships and jumpships) - lets take the ratio of shots to shots left
-                double ratio = mounted.getUsableShotsLeft() / ((AmmoType) etype).getShots();
-
-                // if the ratio is less than one, we will treat as a full ton
-                // since we don't make that adjustment elsewhere
-                if (ratio < 1.0) {
-                    ratio = 1.0;
-                }
-                amsAmmoBV += ratio * etype.getBV(dropShip);
-                bvReport.addLine(etype.getName(), "+ " + (ratio * etype.getBV(dropShip)), "");
-            } else if ((etype instanceof AmmoType)
-                    && (((AmmoType) etype).getAmmoType() == AmmoType.T_SCREEN_LAUNCHER)) {
-                // we need to deal with cases where ammo is loaded in multi-ton increments
-                // (on dropships and jumpships) - lets take the ratio of shots to shots left
-                double ratio = mounted.getUsableShotsLeft() / ((AmmoType) etype).getShots();
-
-                // if the ratio is less than one, we will treat as a full ton
-                // since we don't make that adjustment elsewhere
-                if (ratio < 1.0) {
-                    ratio = 1.0;
-                }
-                screenAmmoBV += ratio * etype.getBV(dropShip);
-                bvReport.addLine(etype.getName(), "+ " + (ratio * etype.getBV(dropShip)), "");
-            } else if ((etype instanceof WeaponType)
-                    && (((WeaponType) etype).getAtClass() == WeaponType.CLASS_SCREEN)) {
-                screenBV += etype.getBV(dropShip);
-                bvReport.addLine(etype.getName(), "+ " + etype.getBV(dropShip), "");
-            } else if ((etype instanceof MiscType)
-                    && (etype.hasFlag(MiscType.F_ECM) || etype.hasFlag(MiscType.F_BAP))) {
-                defEqBV += etype.getBV(dropShip);
-                bvReport.addLine(mounted.getName(), "+ " + etype.getBV(dropShip), "");
-            }
-        }
-        if (amsBV > 0) {
-            dbv += amsBV;
-            bvReport.addLine("Total AMS BV:", "", amsBV);
-        }
-        if (screenBV > 0) {
-            dbv += screenBV;
-            bvReport.addLine("Total Screen BV:", "", screenBV);
-        }
-        if (amsAmmoBV > 0) {
-            dbv += Math.min(amsBV, amsAmmoBV);
-            bvReport.addLine("Total AMS Ammo BV (to a maximum of AMS BV):", "", Math.min(amsBV, amsAmmoBV));
-        }
-        if (screenAmmoBV > 0) {
-            dbv += Math.min(screenBV, screenAmmoBV);
-            bvReport.addLine("Total Screen Ammo BV (to a maximum of Screen BV):", "", Math.min(screenBV, screenAmmoBV));
-        }
-        if (defEqBV > 0) {
-            dbv += defEqBV;
-            bvReport.addLine("Total misc defensive equipment BV:", "", defEqBV);
-        }
-        bvReport.addResultLine("", dbv);
-        dbv *= dropShip.getBVTypeModifier();
-        bvReport.addLine("Multiply by Unit type Modifier", "" + dropShip.getBVTypeModifier(),
-                "x ", dropShip.getBVTypeModifier());
-        bvReport.addResultLine("", dbv);
-
-        bvReport.addSubHeader("Offensive Battle Rating Calculation:");
-        // calculate heat efficiency
-        int aeroHeatEfficiency = dropShip.getHeatCapacity();
-        bvReport.addLine("Base Heat Efficiency ", "", aeroHeatEfficiency);
-
-        // get arc BV and heat
-        double[] arcBVs = new double[dropShip.locations() + 2];
-        double[] arcHeats = new double[dropShip.locations() + 2];
-        double[] ammoBVs = new double[dropShip.locations() + 2];
-        bvReport.addLine("Arc BV and Heat", "", "");
-
-        // cycle through locations
-        for (int loc = 0; loc < (dropShip.locations() + 2); loc++) {
-            int l = loc;
-            boolean isRear = (loc >= dropShip.locations());
-            String rear = "";
-            if (isRear) {
-                l = l - 3;
-                rear = " (R)";
-            }
-            dropShip.getLocationName(l);
-            bvReport.addLine(dropShip.getLocationName(l) + rear, "BV", "Heat");
-            double arcBV = 0.0;
-            double arcHeat = 0.0;
-            double arcAmmoBV = 0.0;
-            TreeMap<String, Double> weaponsForExcessiveAmmo = new TreeMap<>();
-            for (Mounted mounted : dropShip.getTotalWeaponList()) {
-                if (mounted.getLocation() != l) {
-                    continue;
-                }
-                if (mounted.isRearMounted() != isRear) {
-                    continue;
-                }
-                // only count non-damaged equipment
-                if (mounted.isMissing() || mounted.isHit() || mounted.isDestroyed() || mounted.isBreached()) {
-                    continue;
-                }
-                WeaponType wtype = (WeaponType) mounted.getType();
-                double weaponHeat = wtype.getHeat();
-                double dBV = wtype.getBV(dropShip);
-                // skip bays
-                if (wtype instanceof BayWeapon) {
-                    continue;
-                }
-                // don't count defensive weapons
-                if (wtype.hasFlag(WeaponType.F_AMS)) {
-                    continue;
-                }
-                // don't count screen launchers, they are defensive
-                if (wtype.getAtClass() == WeaponType.CLASS_SCREEN) {
-                    continue;
-                }
-                // double heat for ultras
-                if ((wtype.getAmmoType() == AmmoType.T_AC_ULTRA) || (wtype.getAmmoType() == AmmoType.T_AC_ULTRA_THB)) {
-                    weaponHeat *= 2;
-                }
-                // Six times heat for RAC
-                if (wtype.getAmmoType() == AmmoType.T_AC_ROTARY) {
-                    weaponHeat *= 6;
-                }
-                // calc MG Array here:
-                if (wtype.hasFlag(WeaponType.F_MGA)) {
-                    double mgBV = 0;
-                    for (int eqNum : mounted.getBayWeapons()) {
-                        Mounted mg = dropShip.getEquipment(eqNum);
-                        if ((mg != null) && (!mg.isDestroyed())) {
-                            mgBV += mg.getType().getBV(dropShip);
-                        }
-                    }
-                    dBV = mgBV * 0.67;
-                }
-                // and we'll add the tcomp here too
-                if (wtype.hasFlag(WeaponType.F_DIRECT_FIRE)) {
-                    if (dropShip.hasTargComp()) {
-                        dBV *= 1.25;
-                    }
-                }
-                // artemis bumps up the value
-                if (mounted.getLinkedBy() != null) {
-                    Mounted mLinker = mounted.getLinkedBy();
-                    if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_ARTEMIS)) {
-                        dBV *= 1.2;
-                    }
-                    if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_PROTO)) {
-                        dBV *= 1.1;
-                    }
-
-                    if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
-                        dBV *= 1.3;
-                    }
-                    if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_APOLLO)) {
-                        dBV *= 1.15;
-                    }
-                    if ((mLinker.getType() instanceof MiscType)
-                            && mLinker.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
-                        dBV *= 1.15;
-                    }
-                }
-                // add up BV of ammo-using weapons for each type of weapon,
-                // to compare with ammo BV later for excessive ammo BV rule
-                if (!((wtype.hasFlag(WeaponType.F_ENERGY) && !(wtype.getAmmoType() == AmmoType.T_PLASMA))
-                        || wtype.hasFlag(WeaponType.F_ONESHOT) || wtype.hasFlag(WeaponType.F_INFANTRY)
-                        || (wtype.getAmmoType() == AmmoType.T_NA))) {
-                    String key = wtype.getAmmoType() + ":" + wtype.getRackSize();
-                    if (!weaponsForExcessiveAmmo.containsKey(key)) {
-                        weaponsForExcessiveAmmo.put(key, wtype.getBV(dropShip));
-                    } else {
-                        weaponsForExcessiveAmmo.put(key, wtype.getBV(dropShip) + weaponsForExcessiveAmmo.get(key));
-                    }
-                }
-                bvReport.addLine(wtype.getName(), "+ " + dBV, "+ ", weaponHeat);
-                arcBV += dBV;
-                arcHeat += weaponHeat;
-            }
-            // now ammo
-            Map<String, Double> ammo = new HashMap<>();
-            ArrayList<String> keys = new ArrayList<>();
-            for (Mounted mounted : dropShip.getAmmo()) {
-                if (mounted.getLocation() != l) {
-                    continue;
-                }
-                if (mounted.isRearMounted() != isRear) {
-                    continue;
-                }
-                AmmoType atype = (AmmoType) mounted.getType();
-                // we need to deal with cases where ammo is loaded in multi-ton increments
-                // (on dropships and jumpships) - lets take the ratio of shots to shots left
-                double ratio = mounted.getUsableShotsLeft() / atype.getShots();
-
-                // if the ratio is less than one, we will treat as a full ton
-                // since we don't make that adjustment elsewhere
-                if (ratio < 1.0) {
-                    ratio = 1.0;
-                }
-
-                // don't count depleted ammo
-                if (mounted.getUsableShotsLeft() == 0) {
-                    continue;
-                }
-
-                // don't count AMS, it's defensive
-                if (atype.getAmmoType() == AmmoType.T_AMS) {
-                    continue;
-                }
-                // don't count screen launchers, they are defensive
-                if (atype.getAmmoType() == AmmoType.T_SCREEN_LAUNCHER) {
-                    continue;
-                }
-
-                // don't count oneshot ammo, it's considered part of the launcher.
-                if (mounted.getLocation() == Entity.LOC_NONE) {
-                    // assumption: ammo without a location is for a oneshot weapon
-                    continue;
-                }
-                double abv = ratio * atype.getBV(dropShip);
-                String key = atype.getAmmoType() + ":" + atype.getRackSize();
-                String key2 = atype.getName() + ";" + key;
-                // MML needs special casing so they don't count double
-                if (atype.getAmmoType() == AmmoType.T_MML) {
-                    key2 = "MML " + atype.getRackSize() + " Ammo;" + key;
-                }
-                // same for the different AR10 ammos
-                if (atype.getAmmoType() == AmmoType.T_AR10) {
-                    key2 = "AR10 Ammo;" + key;
-                }
-                if (!keys.contains(key2)) {
-                    keys.add(key2);
-                }
-                if (!ammo.containsKey(key)) {
-                    ammo.put(key, abv);
-                } else {
-                    ammo.put(key, abv + ammo.get(key));
-                }
-            }
-            // now cycle through ammo hash and deal with excessive ammo issues
-            for (String fullkey : keys) {
-                String[] k = fullkey.split(";");
-                String key = k[1];
-                if (weaponsForExcessiveAmmo.get(key) != null) {
-                    if (ammo.get(key) > weaponsForExcessiveAmmo.get(key)) {
-                        bvReport.addLine(k[0], "+ " + weaponsForExcessiveAmmo.get(key) + "*", "");
-                        arcAmmoBV += weaponsForExcessiveAmmo.get(key);
-                    } else {
-                        bvReport.addLine(k[0], "+ " + ammo.get(key), "");
-                        arcAmmoBV += ammo.get(key);
-                    }
-                }
-            }
-            bvReport.addLine(dropShip.getLocationName(l) + rear + " Weapon Totals", "" + arcBV, "", arcHeat);
-            bvReport.addLine(dropShip.getLocationName(l) + rear + " Ammo Totals", "" + arcAmmoBV, "");
-            bvReport.addLine(dropShip.getLocationName(l) + rear + " Totals", "" + (arcBV + arcAmmoBV), "");
-            arcBVs[loc] = arcBV;
-            arcHeats[loc] = arcHeat;
-            ammoBVs[loc] = arcAmmoBV;
-        }
-
-        double weaponBV = 0.0;
-        // ok, now lets loop through the arcs and find the highest value BV arc
-        int highArc = Integer.MIN_VALUE;
-        int adjArcH = Integer.MIN_VALUE;
-        int adjArcL = Integer.MIN_VALUE;
-        double adjArcHMult = 1.0;
-        double adjArcLMult = 0.5;
-        double highBV = 0.0;
-        double heatUsed = 0.0;
-        for (int loc = 0; loc < arcBVs.length; loc++) {
-            if (arcBVs[loc] > highBV) {
-                highArc = loc;
-                highBV = arcBVs[loc];
-            }
-        }
-        // now lets identify the adjacent arcs
-        if (highArc > Integer.MIN_VALUE) {
-            heatUsed += arcHeats[highArc];
-            // now get the BV and heat for the two adjacent arcs
-            int adjArcCW = dropShip.getAdjacentLocCW(highArc);
-            int adjArcCCW = dropShip.getAdjacentLocCCW(highArc);
-            double adjArcCWBV = 0.0;
-            double adjArcCWHeat = 0.0;
-            if (adjArcCW > Integer.MIN_VALUE) {
-                adjArcCWBV = arcBVs[adjArcCW];
-                adjArcCWHeat = arcHeats[adjArcCW];
-            }
-            double adjArcCCWBV = 0.0;
-            double adjArcCCWHeat = 0.0;
-            if (adjArcCCW > Integer.MIN_VALUE) {
-                adjArcCCWBV = arcBVs[adjArcCCW];
-                adjArcCCWHeat = arcHeats[adjArcCCW];
-            }
-            if (adjArcCWBV > adjArcCCWBV) {
-                adjArcH = adjArcCW;
-                if ((heatUsed + adjArcCWHeat) > aeroHeatEfficiency) {
-                    adjArcHMult = 0.5;
-                }
-                heatUsed += adjArcCWHeat;
-                adjArcL = adjArcCCW;
-                if ((heatUsed + adjArcCCWHeat) > aeroHeatEfficiency) {
-                    adjArcLMult = 0.25;
-                }
-                heatUsed += adjArcCCWHeat;
-            } else {
-                adjArcH = adjArcCCW;
-                if ((heatUsed + adjArcCCWHeat) > aeroHeatEfficiency) {
-                    adjArcHMult = 0.5;
-                }
-                heatUsed += adjArcCCWHeat;
-                adjArcL = adjArcCW;
-                if ((heatUsed + adjArcCWHeat) > aeroHeatEfficiency) {
-                    adjArcLMult = 0.25;
-                }
-                heatUsed += adjArcCWHeat;
-            }
-        }
-
-        // ok now add in ammo to arc bvs
-        for (int i = 0; i < arcBVs.length; i++) {
-            arcBVs[i] = arcBVs[i] + ammoBVs[i];
-        }
-
-        // ok now lets go in and add the arcs
-        double totalHeat;
-        if (highArc > Integer.MIN_VALUE) {
-            // ok now add the BV from this arc and reset to zero
-            totalHeat = arcHeats[highArc];
-            bvReport.addLine("Highest BV Arc (" + getArcName(dropShip, highArc) + ")" + arcBVs[highArc] + "*1.0",
-                    "+ " + arcBVs[highArc], "Total Heat: " + totalHeat);
-            weaponBV += arcBVs[highArc];
-            arcBVs[highArc] = 0.0;
-
-            if (adjArcH > Integer.MIN_VALUE) {
-                totalHeat += arcHeats[adjArcH];
-                String over = "";
-                if (totalHeat > aeroHeatEfficiency) {
-                    over = " (Greater than heat efficiency)";
-                }
-                bvReport.addLine("Adjacent High BV Arc (" + getArcName(dropShip, adjArcH) + ") " + arcBVs[adjArcH] + "*" + adjArcHMult,
-                        "+ " + (arcBVs[adjArcH] * adjArcHMult),
-                        "Total Heat: " + totalHeat + over);
-                weaponBV += adjArcHMult * arcBVs[adjArcH];
-                arcBVs[adjArcH] = 0.0;
-            }
+    DropShipBVCalculator(Entity entity) {
+        super(entity);
+    }
 
-            if (adjArcL > Integer.MIN_VALUE) {
-                totalHeat += arcHeats[adjArcL];
-                String over = "";
-                if (totalHeat > aeroHeatEfficiency) {
-                    over = " (Greater than heat efficiency)";
-                }
-                bvReport.addLine("Adjacent Low BV Arc (" + getArcName(dropShip, adjArcL) + ") " + arcBVs[adjArcL] + "*" + adjArcLMult,
-                        "+ " + (adjArcLMult * arcBVs[adjArcL]),
-                        "Total Heat: " + totalHeat + over);
-                weaponBV += adjArcLMult * arcBVs[adjArcL];
-                arcBVs[adjArcL] = 0.0;
-            }
-            // ok now we can cycle through the rest and add 25%
-            bvReport.addLine("Remaining Arcs", "", "");
-            for (int loc = 0; loc < arcBVs.length; loc++) {
-                if (arcBVs[loc] <= 0) {
-                    continue;
-                }
-                bvReport.addLine(getArcName(dropShip, loc) + " " + arcBVs[loc] + "*0.25",
-                        "+" + (0.25 * arcBVs[loc]), "");
-                weaponBV += (0.25 * arcBVs[loc]);
-            }
-        }
-        bvReport.addLine("Total Weapons BV Adjusted For Heat:", "", weaponBV);
-        // add offensive misc. equipment BV
-        double oEquipmentBV = 0;
-        for (Mounted mounted : dropShip.getMisc()) {
-            MiscType mtype = (MiscType) mounted.getType();
+    @Override
+    protected Predicate<Mounted> frontWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Dropship.LOC_NOSE);
+    }
 
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
+    @Override
+    protected Predicate<Mounted> rearWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Dropship.LOC_AFT);
+    }
 
-            if (mtype.hasFlag(MiscType.F_TARGCOMP)) {
-                continue;
-            }
-            double bv = mtype.getBV(dropShip);
-            if (bv > 0) {
-                bvReport.addLine(mounted.getName(), "", bv);
-            }
-            oEquipmentBV += bv;
-        }
-        bvReport.addLine("Total Misc Offensive Equipment BV: ", "", oEquipmentBV);
-        weaponBV += oEquipmentBV;
+    @Override
+    protected Predicate<Mounted> leftWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Dropship.LOC_LWING) && !weapon.isRearMounted();
+    }
 
-        // adjust further for speed factor
-        double speedFactor = Math.pow(1 + (((double) dropShip.getRunMP() - 5) / 10), 1.2);
-        speedFactor = Math.round(speedFactor * 100) / 100.0;
-        bvReport.addLine("Final Speed Factor: ", "", speedFactor);
-        double obv; // offensive bv
-        obv = weaponBV * speedFactor;
-        bvReport.addLine("Weapons BV * Speed Factor ",
-                weaponBV + " x " + speedFactor, "= ", obv);
+    @Override
+    protected Predicate<Mounted> leftAftWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Dropship.LOC_LWING) && weapon.isRearMounted();
+    }
 
-        double finalBV = dbv + obv;
-        bvReport.addLine("Offensive BV + Defensive BV", obv + " + " + dbv, "= ", finalBV);
-        finalBV = Math.round(finalBV);
-        bvReport.addResultLine("Final BV", "", finalBV);
+    @Override
+    protected Predicate<Mounted> rightWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Dropship.LOC_RWING) && !weapon.isRearMounted();
+    }
 
-        // we get extra bv from some stuff
-        double xbv = 0.0;
+    @Override
+    protected Predicate<Mounted> rightAftWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Dropship.LOC_RWING) && weapon.isRearMounted();
+    }
 
-        // extra from c3 networks. a valid network requires at least 2 members
-        // some hackery and magic numbers here. could be better
-        // also, each 'has' loops through all equipment. inefficient to do it 3 times
-        if (!ignoreC3 && (dropShip.getGame() != null)) {
-            xbv += dropShip.getExtraC3BV((int) Math.round(finalBV));
+    @Override
+    protected int bvLocation(Mounted equipment) {
+        if (equipment.getLocation() == Dropship.LOC_NOSE) {
+            return BVLOC_NOSE;
+        } else if ((equipment.getLocation() == Dropship.LOC_LWING) && !equipment.isRearMounted()) {
+            return BVLOC_LEFT;
+        } else if ((equipment.getLocation() == Dropship.LOC_LWING) && equipment.isRearMounted()) {
+            return BVLOC_LEFT_AFT;
+        } else if (equipment.getLocation() == Dropship.LOC_AFT) {
+            return BVLOC_AFT;
+        } else if ((equipment.getLocation() == Dropship.LOC_RWING) && equipment.isRearMounted()) {
+            return BVLOC_RIGHT_AFT;
+        } else {
+            return BVLOC_RIGHT;
         }
-        finalBV += xbv;
-
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(dropShip);
-        return (int) Math.round(finalBV * pilotFactor);
     }
 
-    private static String getArcName(Dropship dropShip, int loc) {
-        if (loc < dropShip.locations()) {
-            return dropShip.getLocationName(loc);
+    @Override
+    protected String arcName(int bvLocation) {
+        switch (bvLocation) {
+            case BVLOC_NOSE:
+                return entity.getLocationName(Dropship.LOC_NOSE);
+            case BVLOC_LEFT:
+                return entity.getLocationName(Dropship.LOC_LWING);
+            case BVLOC_LEFT_AFT:
+                return entity.getLocationName(Dropship.LOC_LWING) + " (R)";
+            case BVLOC_AFT:
+                return entity.getLocationName(Dropship.LOC_AFT);
+            case BVLOC_RIGHT_AFT:
+                return entity.getLocationName(Dropship.LOC_RWING) + " (R)";
+            case BVLOC_RIGHT:
+                return entity.getLocationName(Dropship.LOC_RWING);
         }
-        return dropShip.getLocationName(loc - 3) + " (R)";
+        return "Error: Unexpected location value.";
     }
 }
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/GunEmplacementBVCalculator.java b/megamek/src/megamek/common/battlevalue/GunEmplacementBVCalculator.java
index 718a8012bd3..723ba7cdd1b 100644
--- a/megamek/src/megamek/common/battlevalue/GunEmplacementBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/GunEmplacementBVCalculator.java
@@ -18,126 +18,30 @@
  */
 package megamek.common.battlevalue;
 
-import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.*;
+import megamek.common.Entity;
+import megamek.common.Mounted;
 
-public class GunEmplacementBVCalculator {
+public class GunEmplacementBVCalculator extends BVCalculator {
 
-    public static int calculateBV(GunEmplacement gunEmplacement, boolean ignoreC3, boolean ignoreSkill, CalculationReport bvReport) {
-        bvReport.addHeader("Battle Value Calculations For");
-        bvReport.addHeader(gunEmplacement.getChassis() + " " + gunEmplacement.getModel());
-        bvReport.addLine("There is currently no report available for Gun Emplacements.");
-
-        // using structures BV rules from MaxTech
-        double dbv = 0; // defensive battle value
-        double obv = 0; // offensive bv
-
-        // total armor points
-        dbv += gunEmplacement.getTotalArmor();
-
-        // add defensive equipment
-        double dEquipmentBV = 0;
-        for (Mounted mounted : gunEmplacement.getEquipment()) {
-            EquipmentType etype = mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            if (((etype instanceof WeaponType) && etype.hasFlag(WeaponType.F_AMS))
-                    || ((etype instanceof AmmoType) && (((AmmoType) etype).getAmmoType() == AmmoType.T_AMS))
-                    || etype.hasFlag(MiscType.F_ECM)) {
-                dEquipmentBV += etype.getBV(gunEmplacement);
-            }
-        }
-        dbv += dEquipmentBV;
-        dbv *= 0.5; // structure modifier
-        double weaponBV = 0;
-
-        // figure out base weapon bv
-        boolean hasTargComp = gunEmplacement.hasTargComp();
-        for (Mounted mounted : gunEmplacement.getWeaponList()) {
-            WeaponType wtype = (WeaponType) mounted.getType();
-            double dBV = wtype.getBV(gunEmplacement);
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            // don't count AMS, it's defensive
-            if (wtype.hasFlag(WeaponType.F_AMS)) {
-                continue;
-            }
-
-            // artemis bumps up the value
-            if (mounted.getLinkedBy() != null) {
-                Mounted mLinker = mounted.getLinkedBy();
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS)) {
-                    dBV *= 1.2;
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_PROTO)) {
-                    dBV *= 1.1;
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
-                    dBV *= 1.3;
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
-                    dBV *= 1.15;
-                }
-            }
-
-            if (mounted.getLinkedBy() != null) {
-                Mounted mLinker = mounted.getLinkedBy();
-                if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_APOLLO)) {
-                    dBV *= 1.15;
-                }
-            }
-
-            // and we'll add the tcomp here too
-            if (wtype.hasFlag(WeaponType.F_DIRECT_FIRE) && hasTargComp) {
-                dBV *= 1.2;
-            }
-
-            weaponBV += dBV;
-        }
-        obv += weaponBV;
-
-        // add ammo bv
-        double ammoBV = 0;
-        for (Mounted mounted : gunEmplacement.getAmmo()) {
-            AmmoType atype = (AmmoType) mounted.getType();
-
-            // don't count depleted ammo
-            if (mounted.getUsableShotsLeft() == 0) {
-                continue;
-            }
-
-            // don't count AMS, it's defensive
-            if (atype.getAmmoType() == AmmoType.T_AMS) {
-                continue;
-            }
+    GunEmplacementBVCalculator(Entity entity) {
+        super(entity);
+    }
 
-            ammoBV += atype.getBV(gunEmplacement);
-        }
-        obv += ammoBV;
+    @Override
+    protected double tmmFactor(int tmmRunning, int tmmJumping, int tmmUmu) {
+        return 0.5;
+    }
 
-        // structure modifier
-        obv *= 0.44;
-        double finalBV = obv + dbv;
-        double xbv = 0.0;
-        if (!ignoreC3 && (gunEmplacement.getGame() != null)) {
-            xbv += gunEmplacement.getExtraC3BV((int) Math.round(finalBV));
-        }
+    @Override
+    protected void processStructure() { }
 
-        finalBV += xbv;
+    @Override
+    protected int offensiveSpeedFactorMP() {
+        return 0;
+    }
 
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(gunEmplacement);
-        return (int) Math.round(finalBV * pilotFactor);
+    @Override
+    protected String equipmentDescriptor(Mounted mounted) {
+        return mounted.getType().getShortName();
     }
-}
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/HeatTrackingBVCalculator.java b/megamek/src/megamek/common/battlevalue/HeatTrackingBVCalculator.java
new file mode 100644
index 00000000000..886febc62e3
--- /dev/null
+++ b/megamek/src/megamek/common/battlevalue/HeatTrackingBVCalculator.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2022-2023 - The MegaMek Team. All Rights Reserved.
+ *
+ * This file is part of Megaentity.
+ *
+ * MegaMek is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MegaMek is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Megaentity. If not, see <http://www.gnu.org/licenses/>.
+ */
+package megamek.common.battlevalue;
+
+import megamek.common.*;
+import megamek.common.annotations.Nullable;
+import megamek.common.weapons.ppc.PPCWeapon;
+import megamek.common.weapons.prototypes.*;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+public abstract class HeatTrackingBVCalculator extends BVCalculator {
+
+    HeatTrackingBVCalculator(Entity entity) {
+        super(entity);
+    }
+
+    @Override
+    protected boolean usesWeaponHeat() {
+        return !(entity instanceof ConvFighter);
+    }
+
+    @Override
+    protected void processExplosiveEquipment() {
+        if (defensiveValue < 1) {
+            defensiveValue = 1;
+            bvReport.addLine("Minimum Defensive Value", "", "= 1");
+        }
+    }
+
+    @Override
+    protected void processWeapons() {
+        if (entity instanceof ConvFighter) {
+            super.processWeapons();
+            return;
+        }
+
+        List<WeaponBvHeatRecord> weaponRecords = new ArrayList<>();
+        for (Mounted mounted : entity.getWeaponList()) {
+            if (!countAsOffensiveWeapon(mounted)) {
+                continue;
+            }
+
+            double thisWeaponBV = processWeapon(mounted, false, false);
+            weaponRecords.add(new WeaponBvHeatRecord(mounted, thisWeaponBV, weaponHeat(mounted)));
+        }
+
+        if (entity.hasVibroblades()) {
+            Mounted vibroblade = getVibroblade(Mech.LOC_LARM);
+            if (vibroblade != null) {
+                double weaponHeat = entity.getActiveVibrobladeHeat(Mech.LOC_LARM, true);
+                double thisWeaponBV = processWeapon(vibroblade, false, false);
+                weaponRecords.add(new WeaponBvHeatRecord(vibroblade, thisWeaponBV, weaponHeat));
+            }
+
+            vibroblade = getVibroblade(Mech.LOC_RARM);
+            if (vibroblade != null) {
+                double weaponHeat = entity.getActiveVibrobladeHeat(Mech.LOC_LARM, true);
+                double thisWeaponBV = processWeapon(vibroblade, false, false);
+                weaponRecords.add(new WeaponBvHeatRecord(vibroblade, thisWeaponBV, weaponHeat));
+            }
+        }
+
+        bvReport.addLine("Weapons:", "", "");
+        if (weaponRecords.isEmpty()) {
+            bvReport.addLine("- None", "", "");
+            return;
+        }
+
+        weaponRecords.sort(heatSorter);
+        boolean exceededEfficiency = false;
+        int heatEfficiency = heatEfficiency();
+
+        for (WeaponBvHeatRecord weaponRecord : weaponRecords) {
+            heatSum += weaponRecord.heat;
+            processWeapon(weaponRecord.weapon, true, true);
+            if ((!exceededEfficiency) && (heatSum >= heatEfficiency)) {
+                exceededEfficiency = true;
+                heatEfficiencyExceeded = true;
+            }
+        }
+        heatEfficiencyExceeded = false;
+    }
+
+    /** The weapon sorter. Will place weapons without heat first, then in descending order of BV > heat. */
+    Comparator<WeaponBvHeatRecord> heatSorter = (obj1, obj2) -> {
+        if ((obj1.heat == 0) && (obj2.heat > 0)) {
+            return -1;
+        } else if ((obj1.heat > 0) && (obj2.heat == 0)) {
+            return 1;
+        } else if ((obj1.heat == 0) && (obj2.heat == 0)) {
+            return 0;
+        }
+
+        if (obj1.bv == obj2.bv) {
+            return Double.compare(obj1.heat, obj2.heat);
+        }
+        return Double.compare(obj2.bv, obj1.bv);
+    };
+
+    static class WeaponBvHeatRecord {
+        Mounted weapon;
+        double bv;
+        double heat;
+
+        WeaponBvHeatRecord(Mounted weapon, double bv, double heat) {
+            this.weapon = weapon;
+            this.bv = bv;
+            this.heat = heat;
+        }
+    }
+
+    private @Nullable Mounted getVibroblade(int location) {
+        for (int slot = 0; slot < entity.locations(); slot++) {
+            CriticalSlot cs = entity.getCritical(location, slot);
+
+            if ((cs != null) && (cs.getType() == CriticalSlot.TYPE_EQUIPMENT)) {
+                Mounted mounted = cs.getMount();
+                if ((mounted.getType() instanceof MiscType)
+                        && ((MiscType) mounted.getType()).isVibroblade()) {
+                    return mounted;
+                }
+            }
+        }
+        return null;
+    }
+
+    protected double weaponHeat(Mounted weapon) {
+        WeaponType wType = (WeaponType) weapon.getType();
+        double weaponHeat = wType.getHeat();
+
+        if (weapon.isOneShotWeapon()) {
+            weaponHeat /= 4;
+        }
+
+        if ((wType.getAmmoType() == AmmoType.T_AC_ULTRA) || (wType.getAmmoType() == AmmoType.T_AC_ULTRA_THB)) {
+            weaponHeat *= 2;
+        } else if (wType.getAmmoType() == AmmoType.T_AC_ROTARY) {
+            weaponHeat *= 6;
+        }
+
+        // 1d6 extra heat; add half for heat calculations (1d3/+2 for small pulse)
+        if ((wType instanceof ISERLaserLargePrototype)
+                || (wType instanceof ISPulseLaserLargePrototype)
+                || (wType instanceof ISPulseLaserMediumPrototype)
+                || (wType instanceof ISPulseLaserMediumRecovered)) {
+            weaponHeat += 3;
+        } else if (wType instanceof ISPulseLaserSmallPrototype) {
+            weaponHeat += 2;
+        }
+
+        // RISC laser pulse module adds 2 heat
+        if ((wType.hasFlag(WeaponType.F_LASER)) && (weapon.getLinkedBy() != null)
+                && (weapon.getLinkedBy().getType() instanceof MiscType)
+                && (weapon.getLinkedBy().getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE))) {
+            weaponHeat += 2;
+        }
+
+        // laser insulator reduce heat by 1, to a minimum of 1
+        if (wType.hasFlag(WeaponType.F_LASER)
+                && (weapon.getLinkedBy() != null)
+                && !weapon.getLinkedBy().isInoperable()
+                && (weapon.getLinkedBy().getType() instanceof MiscType)
+                && weapon.getLinkedBy().getType().hasFlag(MiscType.F_LASER_INSULATOR)) {
+            weaponHeat = Math.max(1, weaponHeat - 1);
+        }
+
+        // half heat for streaks
+        if ((wType.getAmmoType() == AmmoType.T_SRM_STREAK)
+                || (wType.getAmmoType() == AmmoType.T_LRM_STREAK)
+                || (wType.getAmmoType() == AmmoType.T_IATM)) {
+            weaponHeat *= 0.5;
+        }
+
+        // PPC with Capacitor
+        if (wType.hasFlag(WeaponType.F_PPC) && (weapon.getLinkedBy() != null)) {
+            weaponHeat += 5;
+        }
+        return weaponHeat;
+    }
+
+    protected double totalWeaponHeat() {
+        return entity.getWeaponList().stream()
+                .filter(this::countAsOffensiveWeapon)
+                .mapToDouble(this::weaponHeat)
+                .sum();
+    }
+
+    /** @return True when the given mounted may count as explosive for BV purposes. */
+    protected boolean countsAsExplosive(Mounted mounted) {
+        EquipmentType eType = mounted.getType();
+        if (mounted.isWeaponGroup() || (mounted.getLocation() == Entity.LOC_NONE)
+                || !eType.isExplosive(mounted, true)) {
+            return false;
+        } else if ((eType instanceof AmmoType) && (mounted.getUsableShotsLeft() == 0)) {
+            return false;
+        } else if ((eType instanceof PPCWeapon) && (mounted.getLinkedBy() == null)) {
+            return false;
+        } else if ((eType instanceof WeaponType) && ((((WeaponType) eType).getAmmoType() == AmmoType.T_AC_ROTARY)
+                || (((WeaponType) eType).getAmmoType() == AmmoType.T_AC)
+                || (((WeaponType) eType).getAmmoType() == AmmoType.T_AC_IMP)
+                || (((WeaponType) eType).getAmmoType() == AmmoType.T_AC_PRIMITIVE)
+                || (((WeaponType) eType).getAmmoType() == AmmoType.T_PAC)
+                || (((WeaponType) eType).getAmmoType() == AmmoType.T_LAC))) {
+            return false;
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/InfantryBVCalculator.java b/megamek/src/megamek/common/battlevalue/InfantryBVCalculator.java
index 9f4b176cef4..703fd4f5694 100644
--- a/megamek/src/megamek/common/battlevalue/InfantryBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/InfantryBVCalculator.java
@@ -18,46 +18,41 @@
  */
 package megamek.common.battlevalue;
 
-import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.Compute;
+import megamek.common.Entity;
 import megamek.common.Infantry;
 import megamek.common.Mounted;
 import megamek.common.weapons.infantry.InfantryWeapon;
 
-import java.text.NumberFormat;
-import java.util.Locale;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
 
-public class InfantryBVCalculator {
+import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
 
-    public static int calculateBV(Infantry infantry, boolean ignoreSkill, CalculationReport bvReport) {
-        NumberFormat df = NumberFormat.getNumberInstance(Locale.US);
-        df.setMaximumFractionDigits(2);
-        df.setMinimumFractionDigits(0);
+public class InfantryBVCalculator extends BVCalculator {
 
-        bvReport.addHeader("Battle Value Calculations For");
-        bvReport.addHeader(infantry.getChassis() + " " + infantry.getModel());
-        bvReport.addSubHeader("Defensive Battle Rating Calculation:");
-        double dbr; // defensive battle rating
-        int men = Math.max(0, infantry.getInternal(Infantry.LOC_INFANTRY));
-        dbr = men * 1.5 * infantry.calcDamageDivisor();
-        int tmmRan = Compute.getTargetMovementModifier(
-                infantry.getRunMP(false, true, true),
-                false, false, infantry.getGame()).getValue();
+    Infantry infantry = (Infantry) entity;
 
-        final int jumpMP = infantry.getJumpMP(false);
-        final int tmmJumped = (jumpMP > 0) ?
-                Compute.getTargetMovementModifier(jumpMP, true, false, infantry.getGame()).getValue()
-                : 0;
+    InfantryBVCalculator(Entity entity) {
+        super(entity);
+    }
 
-        final int umuMP = infantry.getActiveUMUCount();
-        final int tmmUMU = (umuMP > 0) ?
-                Compute.getTargetMovementModifier(umuMP, false, false, infantry.getGame()).getValue()
-                : 0;
+    @Override
+    protected void processStructure() {
+        int men = Math.max(0, entity.getInternal(Infantry.LOC_INFANTRY));
+        double dmgDivisor = infantry.calcDamageDivisor();
+        defensiveValue = men * 1.5 * dmgDivisor;
+        String calculation = men + " x 1.5";
+        calculation += dmgDivisor != 1 ? " x " + formatForReport(dmgDivisor) : "";
+        bvReport.addLine("Troopers:", calculation, "= " + formatForReport(defensiveValue));
+    }
 
-        double targetMovementModifier = Math.max(tmmRan, Math.max(tmmJumped, tmmUMU));
-        double tmmFactor = 1 + (targetMovementModifier / 10);
-        bvReport.addLine("Base Target Movement Modifier:", "", tmmFactor);
+    @Override
+    protected void processArmor() { }
 
+    @Override
+    protected double tmmFactor(int tmmRunning, int tmmJumping, int tmmUmu) {
+        double tmmFactor = super.tmmFactor(tmmRunning, tmmJumping, tmmUmu);
         if (infantry.hasDEST()) {
             tmmFactor += 0.2;
             bvReport.addLine("DEST:", "+0.2");
@@ -77,142 +72,136 @@ public static int calculateBV(Infantry infantry, boolean ignoreSkill, Calculatio
             tmmFactor += 0.1;
             bvReport.addLine("Camo (ECM):", "+0.1");
         }
-        dbr *= tmmFactor;
-
-        bvReport.addResultLine("Target Movement Modifier:", "", df.format(tmmFactor));
-        bvReport.addLine("Damage Divisor:", "", df.format(infantry.calcDamageDivisor()));
-        bvReport.addLine("Defensive Battle Rating:",
-                men + " x 1.5 x " + tmmFactor + " x " + infantry.calcDamageDivisor(),
-                "= " + df.format(dbr));
-
-        double obr; // offensive battle rating
+        return tmmFactor;
+    }
 
-        int speedFactorTableLookup = Math.max(infantry.getRunMP(false, true, true), Math.max(jumpMP, umuMP));
-        double speedFactor = Math.pow(1 + ((speedFactorTableLookup - 5) / 10.0), 1.2);
-        speedFactor = Math.round(speedFactor * 100) / 100.0;
-        double wbv = 0;
-        InfantryWeapon primaryW = infantry.getPrimaryWeapon();
-        InfantryWeapon secondW = infantry.getSecondaryWeapon();
-        int squadsize = infantry.getSquadSize();
-        int secondn = infantry.getSecondaryWeaponsPerSquad();
-        int squadn = infantry.getSquadCount();
+    @Override
+    protected void processWeapons() {
+        bvReport.addLine("Weapons:", "", "");
+        final InfantryWeapon primaryWeapon = infantry.getPrimaryWeapon();
+        final InfantryWeapon secondaryWeapon = infantry.getSecondaryWeapon();
+        int originalTroopers = Math.max(0, infantry.getOInternal(Infantry.LOC_INFANTRY));
+        int secondaryShooterCount = infantry.getSecondaryWeaponsPerSquad() * infantry.getSquadCount();
+        int primaryShooterCount = originalTroopers - secondaryShooterCount;
 
-        if (null != primaryW) {
-            wbv += primaryW.getBV(infantry) * (squadsize - secondn);
+        // Damage dealt by the troopers is averaged over primary and secondary weapons; therefore calculate
+        // weapon damage at full strength and then multiply by the surviving trooper ratio
+        if (primaryWeapon != null) {
+            Mounted primaryWeaponMounted = new Mounted(infantry, primaryWeapon);
+            processWeapon(primaryWeaponMounted, true, true, primaryShooterCount);
         }
-        if (null != secondW) {
-            wbv += secondW.getBV(infantry) * secondn;
+        if (secondaryWeapon != null) {
+            Mounted secondaryWeaponMounted = new Mounted(infantry, secondaryWeapon);
+            processWeapon(secondaryWeaponMounted, true, true, secondaryShooterCount);
         }
-        wbv = wbv * (men / squadsize);
 
-        double ambv = 0;
         if (infantry.canMakeAntiMekAttacks()) {
-            if (primaryW != null && !primaryW.hasFlag(InfantryWeapon.F_INF_ARCHAIC)) {
-                ambv += primaryW.getBV(infantry) * (squadsize - secondn);
+            bvReport.addLine("Anti-Mek:", "", "");
+            if (primaryWeapon != null && !primaryWeapon.hasFlag(InfantryWeapon.F_INF_ARCHAIC)) {
+                Mounted primaryWeaponMounted = new Mounted(infantry, primaryWeapon);
+                processWeapon(primaryWeaponMounted, true, true, primaryShooterCount);
             }
-            if (secondW != null && !secondW.hasFlag(InfantryWeapon.F_INF_ARCHAIC)) {
-                ambv += secondW.getBV(infantry) * (secondn);
+            if (secondaryWeapon != null && !secondaryWeapon.hasFlag(InfantryWeapon.F_INF_ARCHAIC)) {
+                Mounted secondaryWeaponMounted = new Mounted(infantry, secondaryWeapon);
+                processWeapon(secondaryWeaponMounted, true, true, secondaryShooterCount);
             }
-            ambv *= men / squadsize;
         }
 
-        bvReport.addEmptyLine();
-        bvReport.addSubHeader("Offensive Battle Rating Calculation:");
-        if (primaryW != null) {
-            bvReport.addLine(primaryW.getName(),
-                    (squadsize - secondn) * squadn + " x " + df.format(primaryW.getBV(infantry)),
-                    "= " + df.format(primaryW.getBV(infantry) * (squadsize - secondn) * squadn));
+        int troopers = Math.max(0, infantry.getInternal(Infantry.LOC_INFANTRY));
+        if (troopers < originalTroopers) {
+            bvReport.addLine("Surviving troopers:",
+                    formatForReport(offensiveValue) + " x " + troopers + " / " + originalTroopers,
+                    "= " + formatForReport(offensiveValue * troopers / originalTroopers));
+            offensiveValue *= (double) troopers / originalTroopers;
         }
 
-        if (secondW != null) {
-            bvReport.addLine(secondW.getName(),
-                    secondn * squadn + " x " + df.format(secondW.getBV(infantry)),
-                    "= " + df.format(secondW.getBV(infantry) * secondn * squadn));
-        }
+        bvReport.startTentativeSection();
+        bvReport.addLine("Field Guns:", "", "");
+        Predicate<Mounted> weaponFilter = m -> countAsOffensiveWeapon(m) && m.getLocation() == Infantry.LOC_FIELD_GUNS;
+        double fieldGunBV = processWeaponSection(true, weaponFilter, true);
+        bvReport.finalizeTentativeSection(fieldGunBV > 0);
 
-        // add in field gun BV
-        for (Mounted mounted : infantry.getEquipment()) {
-            if (mounted.getLocation() == Infantry.LOC_FIELD_GUNS) {
-                wbv += mounted.getType().getBV(infantry);
-                bvReport.addLine(mounted.getType().getName(), "", mounted.getType().getBV(infantry));
-            }
+        if (offensiveValue == 0) {
+            bvReport.addLine("- None.", "", "0");
         }
-        obr = (wbv + ambv) * speedFactor;
-        bvReport.addResultLine("Weapon BV:", "", df.format(wbv));
-        bvReport.addLine("Anti-Mek BV:", "", df.format(ambv));
-        bvReport.addLine("Speed Factor:", "", df.format(speedFactor));
-        bvReport.addLine("Offensive Battle Rating:",
-                df.format(wbv + ambv) + " x " + df.format(speedFactor),
-                "= " + df.format(obr));
-        bvReport.addEmptyLine();
+    }
 
-        double bv = obr + dbr;
+    @Override
+    protected void processSummarize() {
+        baseBV = defensiveValue + offensiveValue;
+        bvReport.addEmptyLine();
+        bvReport.addSubHeader("Battle Value:");
         bvReport.addLine("Defensive BR + Offensive BR:",
-                df.format(dbr) + " + " + df.format(obr),
-                "= " + df.format(bv));
+                formatForReport(defensiveValue) + " + " + formatForReport(offensiveValue),
+                "= " + formatForReport(baseBV));
 
-        double utm; // unit type modifier
+        List<String> modifierList = new ArrayList<>();
+        double typeModifier = 1;
         switch (infantry.getMovementMode()) {
             case INF_MOTORIZED:
             case WHEELED:
-                utm = 0.8;
+                typeModifier = 0.8;
                 break;
             case TRACKED:
-                utm = 0.9;
+                typeModifier = 0.9;
                 break;
             case HOVER:
             case VTOL:
-                utm = 0.7;
+                typeModifier = 0.7;
                 break;
             case SUBMARINE:
-                utm = 0.6;
-                break;
-            default:
-                utm = 1.0;
+                typeModifier = 0.6;
                 break;
         }
 
-        bvReport.addLine("Base Unit Type Modifier:", "", df.format(utm));
-
         if (infantry.hasSpecialization(Infantry.COMBAT_ENGINEERS)) {
-            utm += 0.1;
-            bvReport.addLine("Combat Engineers:", "0.1");
+            typeModifier += 0.1;
+            modifierList.add("Combat Eng.");
         }
 
         if (infantry.hasSpecialization(Infantry.MARINES)) {
-            utm += 0.3;
-            bvReport.addLine("Marines:", "0.3");
+            typeModifier += 0.3;
+            modifierList.add("Marines");
         }
 
         if (infantry.hasSpecialization(Infantry.MOUNTAIN_TROOPS)) {
-            utm += 0.2;
-            bvReport.addLine("Mountain Troops:", "0.2");
+            typeModifier += 0.2;
+            modifierList.add("Mtn. Troops");
         }
 
         if (infantry.hasSpecialization(Infantry.PARATROOPS)) {
-            utm += 0.1;
-            bvReport.addLine("Paratroops:", "0.1");
+            typeModifier += 0.1;
+            modifierList.add("Paratroops");
         }
 
         if (infantry.hasSpecialization(Infantry.SCUBA)) {
-            utm += 0.1;
-            bvReport.addLine("SCUBA:", "0.1");
+            typeModifier += 0.1;
+            modifierList.add("SCUBA");
         }
 
         if (infantry.hasSpecialization(Infantry.XCT)) {
-            utm += 0.1;
-            bvReport.addLine("XCT:", "0.1");
+            typeModifier += 0.1;
+            modifierList.add("XCT");
         }
 
-        bvReport.addResultLine("Total Unit Type Modifier", "", df.format(utm));
+        String calculation = formatForReport(baseBV) + " x " + formatForReport(typeModifier);
+        if (!modifierList.isEmpty()) {
+            calculation += " (" + String.join(", ", modifierList) + ")";
+        }
 
-        bvReport.addEmptyLine();
-        bvReport.addLine("Final BV:",
-                df.format(bv) + " x " + df.format(utm),
-                "" + (int) Math.round(bv * utm));
-        bv *= utm;
+        bvReport.addLine("Type Modifier:", calculation,
+                "= " + formatForReport(baseBV * typeModifier));
+        baseBV *= typeModifier;
+        bvReport.addLine("--- Base Unit BV:", "" + (int) Math.round(baseBV));
+    }
+
+    @Override
+    protected int offensiveSpeedFactorMP() {
+        return Math.max(runMP, Math.max(jumpMP, umuMP));
+    }
 
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(infantry);
-        return (int) Math.round(bv * pilotFactor);
+    @Override
+    protected String equipmentDescriptor(Mounted mounted) {
+        return mounted.getType().getShortName();
     }
 }
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/JumpShipBVCalculator.java b/megamek/src/megamek/common/battlevalue/JumpShipBVCalculator.java
index d827bdb260d..f6ec08f1d68 100644
--- a/megamek/src/megamek/common/battlevalue/JumpShipBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/JumpShipBVCalculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 - The MegaMek Team. All Rights Reserved.
+ * Copyright (c) 2022-2023 - The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
@@ -18,467 +18,114 @@
  */
 package megamek.common.battlevalue;
 
-import megamek.client.ui.swing.calculationReport.CalculationReport;
-import megamek.common.*;
-import megamek.common.weapons.bayweapons.BayWeapon;
+import megamek.common.Entity;
+import megamek.common.Jumpship;
+import megamek.common.Mounted;
+import megamek.common.SpaceStation;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.function.Predicate;
 
-public class JumpShipBVCalculator {
+import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
 
-    public static int calculateBV(Jumpship jumpShip, boolean ignoreC3, boolean ignoreSkill, CalculationReport bvReport) {
-        bvReport.addHeader("Battle Value Calculations For");
-        bvReport.addHeader(jumpShip.getChassis() + " " + jumpShip.getModel());
-        bvReport.addSubHeader("Defensive Battle Rating Calculation:");
+public class JumpShipBVCalculator extends LargeAeroBVCalculator {
 
-        double dbv = jumpShip.getTotalArmor(); // defensive battle value
-        bvReport.addLine("Total Armor Factor x 25", dbv + " x 25", "= ", dbv * 25);
-        dbv *= 25.0;
-        double dbvSI = jumpShip.getSI() * 20.0;
-        bvReport.addLine("Total SI x 20", jumpShip.getSI() + " x 20", "= ", dbvSI);
-        dbv += dbvSI;
-
-        // add defensive equipment
-        double amsBV = 0;
-        double amsAmmoBV = 0;
-        double screenBV = 0;
-        double screenAmmoBV = 0;
-        double defEqBV = 0;
-        for (Mounted mounted : jumpShip.getEquipment()) {
-            EquipmentType etype = mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-            if (((etype instanceof WeaponType) && (etype.hasFlag(WeaponType.F_AMS)))) {
-                amsBV += etype.getBV(jumpShip);
-                bvReport.addLine(etype.getName(), "+ " + etype.getBV(jumpShip));
-            } else if ((etype instanceof AmmoType) && (((AmmoType) etype).getAmmoType() == AmmoType.T_AMS)) {
-                // we need to deal with cases where ammo is loaded in multi-ton increments
-                // (on dropships and jumpships) - lets take the ratio of shots to shots left
-                double ratio = mounted.getUsableShotsLeft() / ((AmmoType) etype).getShots();
-
-                // if the ratio is less than one, we will treat as a full ton since
-                // we don't make that adjustment elsewhere
-                if (ratio < 1.0) {
-                    ratio = 1.0;
-                }
-                amsAmmoBV += ratio * etype.getBV(jumpShip);
-                bvReport.addLine(etype.getName(), "+ " + ratio * etype.getBV(jumpShip));
-            } else if ((etype instanceof AmmoType)
-                    && (((AmmoType) etype).getAmmoType() == AmmoType.T_SCREEN_LAUNCHER)) {
-                // we need to deal with cases where ammo is loaded in multi-ton increments
-                // (on dropships and jumpships) - lets take the ratio of shots to shots left
-                double ratio = mounted.getUsableShotsLeft() / ((AmmoType) etype).getShots();
-
-                // if the ratio is less than one, we will treat as a full ton since
-                // we don't make that adjustment elsewhere
-                if (ratio < 1.0) {
-                    ratio = 1.0;
-                }
-                screenAmmoBV += ratio * etype.getBV(jumpShip);
-                bvReport.addLine(etype.getName(), "+ " + ratio * etype.getBV(jumpShip));
-            } else if ((etype instanceof WeaponType)
-                    && (((WeaponType) etype).getAtClass() == WeaponType.CLASS_SCREEN)) {
-                screenBV += etype.getBV(jumpShip);
-                bvReport.addLine(etype.getName(), "+ " + etype.getBV(jumpShip));
-            } else if ((etype instanceof MiscType)
-                    && (etype.hasFlag(MiscType.F_ECM) || etype.hasFlag(MiscType.F_BAP))) {
-                defEqBV += etype.getBV(jumpShip);
-                bvReport.addLine(mounted.getName(), "+ " + etype.getBV(jumpShip));
-            }
-        }
-        if (amsBV > 0) {
-            bvReport.addLine("Total AMS BV:", "", amsBV);
-            dbv += amsBV;
-        }
-        if (screenBV > 0) {
-            bvReport.addLine("Total Screen BV:", "", screenBV);
-            dbv += screenBV;
-        }
-        if (amsAmmoBV > 0) {
-            bvReport.addLine("Total AMS Ammo BV (to a maximum of AMS BV):", "", Math.min(amsBV, amsAmmoBV));
-            dbv += Math.min(amsBV, amsAmmoBV);
-        }
-        if (screenAmmoBV > 0) {
-            bvReport.addLine("Total Screen Ammo BV (to a maximum of Screen BV):", "", Math.min(screenBV, screenAmmoBV));
-            dbv += Math.min(screenBV, screenAmmoBV);
-        }
-        if (defEqBV > 0) {
-            bvReport.addLine("Total misc defensive equipment BV:", "", defEqBV);
-            dbv += defEqBV;
-        }
-        bvReport.addResultLine("", dbv);
-
-        // unit type multiplier
-        bvReport.addLine("Multiply by Unit type Modifier",
-                "" + jumpShip.getBVTypeModifier(), "x ", jumpShip.getBVTypeModifier());
-        dbv *= jumpShip.getBVTypeModifier();
-        bvReport.addResultLine("", dbv);
-
-        bvReport.addSubHeader("Defensive Battle Rating Calculation:");
-
-        // calculate heat efficiency
-        int aeroHeatEfficiency = jumpShip.getHeatCapacity();
-        bvReport.addLine("Base Heat Efficiency", "", aeroHeatEfficiency);
-
-        // get arc BV and heat
-        // and add up BVs for ammo-using weapon types for excessive ammo rule
-        TreeMap<String, Double> weaponsForExcessiveAmmo = new TreeMap<>();
-        TreeMap<Integer, Double> arcBVs = new TreeMap<>();
-        TreeMap<Integer, Double> arcHeat = new TreeMap<>();
-        bvReport.addLine("Arc BV and Heat", "", "");
+    JumpShipBVCalculator(Entity entity) {
+        super(entity);
+    }
 
-        Map<Integer, String> arcNameLookup = new HashMap<>();
-        // cycle through locations
-        for (int loc = 0; loc < jumpShip.locations(); loc++) {
-            int l = loc;
-            boolean isRear = (loc >= jumpShip.locations());
-            String rear = "";
-            if (isRear) {
-                l = l - 3;
-                rear = " (R)";
-            }
-            jumpShip.getLocationName(l);
-            bvReport.addLine(jumpShip.getLocationName(l) + rear, "BV", "Heat");
+    @Override
+    protected void processStructure() {
+        String calculation = "+ " + aero.getSI() + " x 20";
+        defensiveValue += aero.getSI() * 20;
+        bvReport.addLine("Structural Integrity:", calculation, "= " + formatForReport(defensiveValue));
+    }
 
-            for (Mounted mounted : jumpShip.getTotalWeaponList()) {
-                if (mounted.getLocation() != loc) {
-                    continue;
-                }
-                WeaponType wtype = (WeaponType) mounted.getType();
-                double weaponHeat = wtype.getHeat();
-                int arc = jumpShip.getWeaponArc(jumpShip.getEquipmentNum(mounted));
-                arcNameLookup.put(arc, jumpShip.getLocationName(loc));
-                double dBV = wtype.getBV(jumpShip);
-                // skip bays
-                if (wtype instanceof BayWeapon) {
-                    continue;
-                }
-                // don't count defensive weapons
-                if (wtype.hasFlag(WeaponType.F_AMS)) {
-                    continue;
-                }
-                // don't count screen launchers, they are defensive
-                if (wtype.getAtClass() == WeaponType.CLASS_SCREEN) {
-                    continue;
-                }
-                // only count non-damaged equipment
-                if (mounted.isMissing() || mounted.isHit() || mounted.isDestroyed() || mounted.isBreached()) {
-                    continue;
-                }
+    @Override
+    protected double armorFactor() {
+        return 25;
+    }
 
-                // double heat for ultras
-                if ((wtype.getAmmoType() == AmmoType.T_AC_ULTRA) || (wtype.getAmmoType() == AmmoType.T_AC_ULTRA_THB)) {
-                    weaponHeat *= 2;
-                }
-                // Six times heat for RAC
-                if (wtype.getAmmoType() == AmmoType.T_AC_ROTARY) {
-                    weaponHeat *= 6;
-                }
-                // add up BV of ammo-using weapons for each type of weapon,
-                // to compare with ammo BV later for excessive ammo BV rule
-                if (!((wtype.hasFlag(WeaponType.F_ENERGY) && !(wtype.getAmmoType() == AmmoType.T_PLASMA))
-                        || wtype.hasFlag(WeaponType.F_ONESHOT) || wtype.hasFlag(WeaponType.F_INFANTRY)
-                        || (wtype.getAmmoType() == AmmoType.T_NA))) {
-                    String key = wtype.getAmmoType() + ":" + wtype.getRackSize() + ";" + arc;
-                    if (!weaponsForExcessiveAmmo.containsKey(key)) {
-                        weaponsForExcessiveAmmo.put(key, wtype.getBV(jumpShip));
-                    } else {
-                        weaponsForExcessiveAmmo.put(key, wtype.getBV(jumpShip) + weaponsForExcessiveAmmo.get(key));
-                    }
-                }
-                // calc MG Array here:
-                if (wtype.hasFlag(WeaponType.F_MGA)) {
-                    double mgaBV = 0;
-                    for (Mounted possibleMG : jumpShip.getTotalWeaponList()) {
-                        if (possibleMG.getType().hasFlag(WeaponType.F_MG)
-                                && (possibleMG.getLocation() == mounted.getLocation())) {
-                            mgaBV += possibleMG.getType().getBV(jumpShip);
-                        }
-                    }
-                    dBV = mgaBV * 0.67;
-                }
-                // and we'll add the tcomp here too
-                if (wtype.hasFlag(WeaponType.F_DIRECT_FIRE)) {
-                    if (jumpShip.hasTargComp()) {
-                        dBV *= 1.25;
-                    }
-                }
-                // artemis bumps up the value
-                if (mounted.getLinkedBy() != null) {
-                    Mounted mLinker = mounted.getLinkedBy();
-                    if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_ARTEMIS)) {
-                        dBV *= 1.2;
-                    }
-                    if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_PROTO)) {
-                        dBV *= 1.1;
-                    }
-                    if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
-                        dBV *= 1.3;
-                    }
-                    if ((mLinker.getType() instanceof MiscType) && mLinker.getType().hasFlag(MiscType.F_APOLLO)) {
-                        dBV *= 1.15;
-                    }
-                    if ((mLinker.getType() instanceof MiscType)
-                            && mLinker.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
-                        dBV *= 1.15;
-                    }
-                }
-                bvReport.addLine(wtype.getName(), "+ " + dBV, "+ " + weaponHeat);
+    @Override
+    protected Predicate<Mounted> frontWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Jumpship.LOC_NOSE);
+    }
 
-                double currentArcBV = 0.0;
-                double currentArcHeat = 0.0;
-                if (null != arcBVs.get(arc)) {
-                    currentArcBV = arcBVs.get(arc);
-                }
-                if (null != arcHeat.get(arc)) {
-                    currentArcHeat = arcHeat.get(arc);
-                }
-                arcBVs.put(arc, currentArcBV + dBV);
-                arcHeat.put(arc, currentArcHeat + weaponHeat);
-            }
-        }
-        double weaponBV = 0.0;
-        // lets traverse the hash and find the highest value BV arc
-        int highArc = Integer.MIN_VALUE;
-        int adjArc = Integer.MIN_VALUE;
-        int oppArc = Integer.MIN_VALUE;
-        double adjArcMult = 1.0;
-        double oppArcMult = 0.5;
-        double highBV = 0.0;
-        double heatUsed = 0.0;
-        for (int key : arcBVs.keySet()) {
-            // Warships only look at nose, aft, and broadsides for primary arc. Jumpships and space stations
-            // look at all six arcs.
-            if (jumpShip.hasETypeFlag(Entity.ETYPE_WARSHIP)
-                    && (key != Compute.ARC_NOSE)
-                    && (key != Compute.ARC_LEFT_BROADSIDE)
-                    && (key != Compute.ARC_RIGHT_BROADSIDE)
-                    && (key != Compute.ARC_AFT)) {
-                continue;
-            }
-            if (arcBVs.get(key) > highBV) {
-                highArc = key;
-                highBV = arcBVs.get(key);
-            }
-        }
-        // now lets identify the adjacent and opposite arcs
-        if (highArc > Integer.MIN_VALUE) {
-            heatUsed += arcHeat.getOrDefault(highArc, 0.0);
-            // now get the BV and heat for the two adjacent arcs
-            int adjArcCW = jumpShip.getAdjacentArcCW(highArc);
-            int adjArcCCW = jumpShip.getAdjacentArcCCW(highArc);
-            double adjArcCWBV = 0.0;
-            double adjArcCWHeat = 0.0;
-            if ((adjArcCW > Integer.MIN_VALUE) && (null != arcBVs.get(adjArcCW))) {
-                adjArcCWBV = arcBVs.get(adjArcCW);
-                adjArcCWHeat = arcHeat.getOrDefault(adjArcCW, 0.0);
-            }
-            double adjArcCCWBV = 0.0;
-            double adjArcCCWHeat = 0.0;
-            if ((adjArcCCW > Integer.MIN_VALUE) && (null != arcBVs.get(adjArcCCW))) {
-                adjArcCCWBV = arcBVs.get(adjArcCCW);
-                adjArcCCWHeat = arcHeat.getOrDefault(adjArcCCW, 0.0);
-            }
-            if (adjArcCWBV > adjArcCCWBV) {
-                adjArc = adjArcCW;
-                if ((heatUsed + adjArcCWHeat) > aeroHeatEfficiency) {
-                    adjArcMult = 0.5;
-                }
-                heatUsed += adjArcCWHeat;
-            } else {
-                adjArc = adjArcCCW;
-                if ((heatUsed + adjArcCCWHeat) > aeroHeatEfficiency) {
-                    adjArcMult = 0.5;
-                }
-                heatUsed += adjArcCCWHeat;
-            }
-            oppArc = jumpShip.getOppositeArc(highArc);
-            if ((heatUsed + arcHeat.getOrDefault(oppArc, 0.0)) > aeroHeatEfficiency) {
-                oppArcMult = 0.25;
-            }
-        }
-        // According to an email with Welshman, ammo should be now added into each arc BV
-        // for the final calculation of BV, including the excessive ammo rule
-        Map<String, Double> ammo = new HashMap<>();
-        ArrayList<String> keys = new ArrayList<>();
-        for (Mounted mounted : jumpShip.getAmmo()) {
-            int arc = jumpShip.getWeaponArc(jumpShip.getEquipmentNum(mounted));
-            AmmoType atype = (AmmoType) mounted.getType();
+    @Override
+    protected Predicate<Mounted> rearWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Jumpship.LOC_AFT);
+    }
 
-            // don't count depleted ammo
-            if (mounted.getUsableShotsLeft() == 0) {
-                continue;
-            }
-            // don't count AMS, it's defensive
-            if (atype.getAmmoType() == AmmoType.T_AMS) {
-                continue;
-            }
-            // don't count screen launchers, they are defensive
-            if (atype.getAmmoType() == AmmoType.T_SCREEN_LAUNCHER) {
-                continue;
-            }
-            // don't count oneshot ammo, it's considered part of the launcher.
-            if (mounted.getLocation() == Entity.LOC_NONE) {
-                // assumption: ammo without a location is for a oneshot weapon
-                continue;
-            }
-            String key = atype.getAmmoType() + ":" + atype.getRackSize() + ";" + arc;
-            String key2 = atype.getName() + ";" + key;
-            // MML needs special casing so they don't count double
-            if (atype.getAmmoType() == AmmoType.T_MML) {
-                key2 = "MML " + atype.getRackSize() + " Ammo;" + key;
-            }
-            // same for the different AR10 ammos
-            if (atype.getAmmoType() == AmmoType.T_AR10) {
-                key2 = "AR10 Ammo;" + key;
-            }
-            double ammoWeight = mounted.getTonnage();
-            if (atype.isCapital()) {
-                ammoWeight = mounted.getUsableShotsLeft() * atype.getAmmoRatio();
-            }
-            // new errata: round partial tons of ammo up to the full ton
-            ammoWeight = Math.ceil(jumpShip.getWeight()); // TODO : This looks very wrong but has been in here since 2009
-            if (atype.hasFlag(AmmoType.F_CAP_MISSILE)) {
-                ammoWeight = mounted.getUsableShotsLeft();
-            }
-            if (!keys.contains(key2)) {
-                keys.add(key2);
-            }
-            if (!ammo.containsKey(key)) {
-                ammo.put(key, ammoWeight * atype.getBV(jumpShip));
-            } else {
-                ammo.put(key, (ammoWeight * atype.getBV(jumpShip)) + ammo.get(key));
-            }
-        }
+    @Override
+    protected Predicate<Mounted> leftWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Jumpship.LOC_FLS);
+    }
 
-        // Excessive ammo rule:
-        // Only count BV for ammo for a weapontype until the BV of all weapons
-        // in that arc is reached
-        for (String fullkey : keys) {
-            double ammoBV = 0.0;
-            String[] k = fullkey.split(";");
-            String key = k[1] + ";" + k[2];
-            int arc = Integer.parseInt(k[2]);
-            // get the arc
-            if (weaponsForExcessiveAmmo.get(key) != null) {
-                if (ammo.get(key) > weaponsForExcessiveAmmo.get(key)) {
-                    bvReport.addLine(k[0], "+" + weaponsForExcessiveAmmo.get(key) + "*", "");
-                    ammoBV += weaponsForExcessiveAmmo.get(key);
-                } else {
-                    bvReport.addLine(k[0], "+" + ammo.get(key), "");
-                    ammoBV += ammo.get(key);
-                }
-            }
-            double currentArcBV = 0.0;
-            if (null != arcBVs.get(arc)) {
-                currentArcBV = arcBVs.get(arc);
-            }
-            arcBVs.put(arc, currentArcBV + ammoBV);
-        }
+    @Override
+    protected Predicate<Mounted> leftAftWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Jumpship.LOC_ALS);
+    }
 
-        // ok now lets go in and add the arcs
-        if (highArc > Integer.MIN_VALUE) {
-            // ok now add the BV from this arc and reset to zero
-            double totalHeat = arcHeat.getOrDefault(highArc, 0.0);
-            bvReport.addLine("Highest BV Arc (" + arcNameLookup.get(highArc) + ")" + arcBVs.get(highArc) + "*1.0",
-                    "+ " + arcBVs.get(highArc),
-                    "Total Heat: " + totalHeat);
-            weaponBV += arcBVs.get(highArc);
-            arcBVs.put(highArc, 0.0);
-            if ((adjArc > Integer.MIN_VALUE) && (null != arcBVs.get(adjArc))) {
-                totalHeat += arcHeat.getOrDefault(adjArc, 0.0);
-                String over = "";
-                if (totalHeat > aeroHeatEfficiency) {
-                    over = " (Greater than heat efficiency)";
-                }
-                bvReport.addLine("Adjacent High BV Arc (" + arcNameLookup.get(adjArc) + ") " + arcBVs.get(adjArc) + "*" + adjArcMult,
-                        "+ " + (arcBVs.get(adjArc) * adjArcMult),
-                        "Total Heat: " + totalHeat + over);
-                weaponBV += adjArcMult * arcBVs.get(adjArc);
-                arcBVs.put(adjArc, 0.0);
-            }
-            if ((oppArc > Integer.MIN_VALUE) && (null != arcBVs.get(oppArc))) {
-                totalHeat += arcHeat.getOrDefault(oppArc, 0.0);
-                String over = "";
-                if (totalHeat > aeroHeatEfficiency) {
-                    over = " (Greater than heat efficiency)";
-                }
-                bvReport.addLine("Adjacent Low BV Arc (" + arcNameLookup.get(oppArc) + ") " + arcBVs.get(oppArc) + "*" + oppArcMult,
-                        "+ " + (oppArc * arcBVs.get(oppArc)),
-                        "Total Heat: " + totalHeat + over);
-                weaponBV += oppArcMult * arcBVs.get(oppArc);
-                arcBVs.put(oppArc, 0.0);
-            }
-            // ok now we can cycle through the rest and add 25%
-            bvReport.addLine("Remaining Arcs", "", "");
-            for (int loc : arcBVs.keySet()) {
-                if (arcBVs.get(loc) > 0) {
-                    bvReport.addLine(arcNameLookup.get(loc) + " " + arcBVs.get(loc) + "*0.25",
-                            "+" + (0.25 * arcBVs.get(loc)), "");
-                    weaponBV += (0.25 * arcBVs.get(loc));
-                }
-            }
-        }
-        bvReport.addLine("Total Weapons BV Adjusted For Heat:", "", weaponBV);
-        // add offensive misc. equipment BV (everything except AMS, A-Pod, ECM - BMR p152)
-        double oEquipmentBV = 0;
-        for (Mounted mounted : jumpShip.getMisc()) {
-            MiscType mtype = (MiscType) mounted.getType();
+    @Override
+    protected Predicate<Mounted> rightWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Jumpship.LOC_FRS);
+    }
 
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
+    @Override
+    protected Predicate<Mounted> rightAftWeaponFilter() {
+        return weapon -> (weapon.getLocation() == Jumpship.LOC_ARS);
+    }
 
-            if (mtype.hasFlag(MiscType.F_TARGCOMP)) {
-                continue;
-            }
-            double bv = mtype.getBV(jumpShip);
-            if (bv > 0) {
-                bvReport.addLine(mounted.getName(), "", bv);
-                oEquipmentBV += bv;
-            }
+    @Override
+    protected int bvLocation(Mounted equipment) {
+        if (equipment.getLocation() == Jumpship.LOC_NOSE) {
+            return BVLOC_NOSE;
+        } else if (equipment.getLocation() == Jumpship.LOC_FLS) {
+            return BVLOC_LEFT;
+        } else if (equipment.getLocation() == Jumpship.LOC_ALS) {
+            return BVLOC_LEFT_AFT;
+        } else if (equipment.getLocation() == Jumpship.LOC_AFT) {
+            return BVLOC_AFT;
+        } else if (equipment.getLocation() == Jumpship.LOC_ARS) {
+            return BVLOC_RIGHT_AFT;
+        } else {
+            return BVLOC_RIGHT;
         }
-        bvReport.addLine("Total Misc Offensive Equipment BV:", "", oEquipmentBV);
-        weaponBV += oEquipmentBV;
+    }
 
-        // adjust further for speed factor
-        int runMp = 1;
-        if (jumpShip.hasETypeFlag(Entity.ETYPE_WARSHIP)) {
-            runMp = jumpShip.getRunMP();
-        } else if (jumpShip.hasETypeFlag(Entity.ETYPE_SPACE_STATION)) {
-            runMp = 0;
+    @Override
+    protected String arcName(int bvLocation) {
+        switch (bvLocation) {
+            case BVLOC_NOSE:
+                return entity.getLocationName(Jumpship.LOC_NOSE);
+            case BVLOC_LEFT:
+                return entity.getLocationName(Jumpship.LOC_FLS);
+            case BVLOC_LEFT_AFT:
+                return entity.getLocationName(Jumpship.LOC_ALS);
+            case BVLOC_AFT:
+                return entity.getLocationName(Jumpship.LOC_AFT);
+            case BVLOC_RIGHT_AFT:
+                return entity.getLocationName(Jumpship.LOC_ARS);
+            case BVLOC_RIGHT:
+                return entity.getLocationName(Jumpship.LOC_FRS);
         }
-        double speedFactor = Math.pow(1 + (((double) runMp - 5) / 10), 1.2);
-        speedFactor = Math.round(speedFactor * 100) / 100.0;
-        bvReport.addLine("Final Speed Factor:", "", speedFactor);
-
-        double obv; // offensive bv
-        obv = weaponBV * speedFactor;
-        bvReport.addLine("Weapons BV * Speed Factor ", weaponBV + " * " + speedFactor, "", obv);
-
-        double finalBV = dbv + obv;
-        bvReport.addLine("Offensive BV + Defensive BV", obv + " + " + dbv, "");
-        bvReport.addResultLine("Final BV", "", finalBV);
+        return "Error: Unexpected location value.";
+    }
 
-        // we get extra bv from some stuff
-        double xbv = 0.0;
-        // extra from c3 networks. a valid network requires at least 2 members
-        // some hackery and magic numbers here. could be better
-        // also, each 'has' loops through all equipment. inefficient to do it 3 times
-        if (!ignoreC3 && (jumpShip.getGame() != null)) {
-            xbv += jumpShip.getExtraC3BV((int) Math.round(finalBV));
+    @Override
+    protected int offensiveSpeedFactorMP() {
+        if (entity instanceof SpaceStation) {
+            return 0;
+        } else {
+            return 1;
         }
+    }
 
-        finalBV = Math.round(finalBV + xbv);
-
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(jumpShip);
-        return (int) Math.round(finalBV * pilotFactor);
+    @Override
+    protected void processTypeModifier() {
+        double typeModifier = (entity instanceof SpaceStation) ? 0.7 : 0.75;
+        bvReport.addLine("Type Modifier:",
+                formatForReport(defensiveValue) + " x " + formatForReport(typeModifier),
+                "= " + formatForReport(defensiveValue * typeModifier));
+        defensiveValue *= typeModifier;
     }
-}
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/LargeAeroBVCalculator.java b/megamek/src/megamek/common/battlevalue/LargeAeroBVCalculator.java
new file mode 100644
index 00000000000..3511af07ff7
--- /dev/null
+++ b/megamek/src/megamek/common/battlevalue/LargeAeroBVCalculator.java
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 2022-2023 - The MegaMek Team. All Rights Reserved.
+ *
+ * This file is part of MegaMek.
+ *
+ * MegaMek is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MegaMek is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
+ */
+package megamek.common.battlevalue;
+
+import megamek.common.*;
+import megamek.common.weapons.bayweapons.BayWeapon;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+
+import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
+
+public abstract class LargeAeroBVCalculator extends AeroBVCalculator {
+
+    protected static final int BVLOC_NOSE = 0;
+    protected static final int BVLOC_LEFT = 1;
+    protected static final int BVLOC_LEFT_AFT = 2;
+    protected static final int BVLOC_AFT = 3;
+    protected static final int BVLOC_RIGHT_AFT = 4;
+    protected static final int BVLOC_RIGHT = 5;
+
+    protected int nominalNoseLocation;
+    protected int nominalLeftLocation;
+    protected int nominalRightLocation;
+    protected final Map<Mounted, Integer> collectedWeapons = new HashMap<>();
+
+    LargeAeroBVCalculator(Entity entity) {
+        super(entity);
+    }
+
+    @Override
+    protected void reset() {
+        super.reset();
+        collectedWeapons.clear();
+    }
+
+    @Override
+    protected boolean usesWeaponHeat() {
+        return false;
+    }
+
+    @Override
+    protected void assembleAmmo() {
+        for (Mounted ammo : entity.getAmmo()) {
+            AmmoType ammoType = (AmmoType) ammo.getType();
+
+            // don't count depleted ammo, AMS and oneshot ammo
+            if (ammoCounts(ammo)) {
+                // Ammo may be loaded in multi-ton increments
+                int ratio = Math.max(1, ammo.getUsableShotsLeft() / ammoType.getShots());
+
+                // Ammo must be handled per arc, therefore include the arc in the key
+                String key = bvLocation(ammo) + ":" + ammoType.getAmmoType() + ":" + ammoType.getRackSize();
+                if (!keys.contains(key)) {
+                    keys.add(key);
+                    names.put(key, equipmentDescriptor(ammo));
+                }
+                if (!ammoMap.containsKey(key)) {
+                    ammoMap.put(key, getAmmoBV(ammo) * ratio);
+                } else {
+                    ammoMap.put(key, getAmmoBV(ammo) * ratio + ammoMap.get(key));
+                }
+            }
+        }
+
+        for (Mounted weapon : entity.getTotalWeaponList()) {
+            WeaponType wtype = (WeaponType) weapon.getType();
+
+            if (weapon.isDestroyed() || wtype.hasFlag(WeaponType.F_AMS)
+                    || wtype.hasFlag(WeaponType.F_B_POD) || wtype.hasFlag(WeaponType.F_M_POD)
+                    || wtype instanceof BayWeapon || weapon.isWeaponGroup()) {
+                continue;
+            }
+
+            // add up BV of ammo-using weapons for each type of weapon,
+            // to compare with ammo BV later for excessive ammo BV rule
+            if (!((wtype.hasFlag(WeaponType.F_ENERGY) && !((wtype.getAmmoType() == AmmoType.T_PLASMA)
+                    || (wtype.getAmmoType() == AmmoType.T_VEHICLE_FLAMER)
+                    || (wtype.getAmmoType() == AmmoType.T_HEAVY_FLAMER)
+                    || (wtype.getAmmoType() == AmmoType.T_CHEMICAL_LASER)))
+                    || wtype.hasFlag(WeaponType.F_ONESHOT)
+                    || wtype.hasFlag(WeaponType.F_INFANTRY)
+                    || (wtype.getAmmoType() == AmmoType.T_NA))) {
+                String key = bvLocation(weapon) + ":" + wtype.getAmmoType() + ":" + wtype.getRackSize();
+                if (!weaponsForExcessiveAmmo.containsKey(key)) {
+                    weaponsForExcessiveAmmo.put(key, wtype.getBV(entity));
+                } else {
+                    weaponsForExcessiveAmmo.put(key, wtype.getBV(entity) + weaponsForExcessiveAmmo.get(key));
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void processExplosiveEquipment() { }
+
+    @Override
+    protected int heatEfficiency() {
+        bvReport.addLine("Heat Efficiency:", " = " + entity.getHeatCapacity(), "");
+        return entity.getHeatCapacity();
+    }
+
+    protected abstract Predicate<Mounted> leftWeaponFilter();
+
+    protected abstract Predicate<Mounted> leftAftWeaponFilter();
+
+    protected abstract Predicate<Mounted> rightWeaponFilter();
+
+    protected abstract Predicate<Mounted> rightAftWeaponFilter();
+
+    @Override
+    protected double arcFactor(Mounted equipment) {
+        return arcFactor(bvLocation(equipment));
+    }
+
+    protected double arcFactor(int bvLocation) {
+        if (!frontAndRearDecided) {
+            return 1;
+        } else if (bvLocation == nominalNoseLocation) {
+            return 1;
+        } else if (bvLocation == nominalLeftLocation) {
+            return heatEfficiencyExceeded ? 0.5 : 1;
+        } else if (bvLocation == nominalRightLocation) {
+            return heatEfficiencyExceeded ? 0.25 : 0.5;
+        } else {
+            return 0.25;
+        }
+    }
+
+    @Override
+    protected boolean isNominalRear(Mounted weapon) {
+        return false;
+    }
+
+    @Override
+    protected boolean isNominalRearArc(Mounted weapon) {
+        return super.isNominalRearArc(weapon);
+    }
+
+    protected boolean isNominalArc(int nominalBvLocation, Mounted equipment) {
+        return bvLocation(equipment) == nominalBvLocation;
+    }
+
+    protected abstract int bvLocation(Mounted equipment);
+
+    @Override
+    protected void determineFront() {
+        Predicate<Mounted> frontFilter = frontWeaponFilter();
+        Predicate<Mounted> rearFilter = rearWeaponFilter();
+        Predicate<Mounted> leftFilter = leftWeaponFilter();
+        Predicate<Mounted> rightFilter = rightWeaponFilter();
+        Predicate<Mounted> leftAftFilter = leftAftWeaponFilter();
+        Predicate<Mounted> rightAftFilter = rightAftWeaponFilter();
+        Map<Integer, Double> bvPerArc = new HashMap<>();
+        double weaponsBVFront = processWeaponSection(false, frontFilter, false);
+        double weaponsBVRear = processWeaponSection(false, rearFilter, false);
+        double weaponsBVLeft = processWeaponSection(false, leftFilter, false);
+        double weaponsBVRight = processWeaponSection(false, rightFilter, false);
+        double weaponsBVAftLeft = processWeaponSection(false, leftAftFilter, false);
+        double weaponsBVAftRight = processWeaponSection(false, rightAftFilter, false);
+        bvPerArc.put(BVLOC_NOSE, weaponsBVFront);
+        bvPerArc.put(BVLOC_LEFT, weaponsBVLeft);
+        bvPerArc.put(BVLOC_RIGHT, weaponsBVRight);
+        bvPerArc.put(BVLOC_AFT, weaponsBVRear);
+        bvPerArc.put(BVLOC_LEFT_AFT, weaponsBVAftLeft);
+        bvPerArc.put(BVLOC_RIGHT_AFT, weaponsBVAftRight);
+        final double maxBV = bvPerArc.values().stream().mapToDouble(bv -> bv).max().orElse(0);
+        for (Map.Entry<Integer, Double> entry : bvPerArc.entrySet()) {
+            if (entry.getValue() == maxBV) {
+                nominalNoseLocation = entry.getKey();
+                break;
+            }
+        }
+        int firstAdjacentArc = getAdjacentLocationCCW(nominalNoseLocation);
+        int secondAdjacentArc = getAdjacentLocationCW(nominalNoseLocation);
+        if (bvPerArc.get(firstAdjacentArc) > bvPerArc.get(secondAdjacentArc)) {
+            nominalLeftLocation = firstAdjacentArc;
+            nominalRightLocation = secondAdjacentArc;
+        } else {
+            nominalLeftLocation = secondAdjacentArc;
+            nominalRightLocation = firstAdjacentArc;
+        }
+
+        bvReport.addLine("Nominal Nose Location",
+                arcName(nominalNoseLocation) + ", Weapon BV: " + formatForReport(bvPerArc.get(nominalNoseLocation)),
+                "");
+        bvReport.addLine("Nominal Left Location",
+                arcName(nominalLeftLocation) + ", Weapon BV: " + formatForReport(bvPerArc.get(nominalLeftLocation)),
+                "");
+        bvReport.addLine("Nominal Right Location",
+                arcName(nominalRightLocation) + ", Weapon BV: " + formatForReport(bvPerArc.get(nominalRightLocation)),
+                "");
+        frontAndRearDecided = true;
+    }
+
+    /** @return True when the two weapons are equal for conversion purposes (same type, location and links). */
+    protected boolean canBeSummed(Mounted weapon1, Mounted weapon2) {
+        return weapon1.getType().equals(weapon2.getType())
+                && weapon1.getLocation() == weapon2.getLocation()
+                && weapon1.isRearMounted() == weapon2.isRearMounted()
+                && ((weapon1.getLinkedBy() == null && weapon2.getLinkedBy() == null)
+                || (weapon1.getLinkedBy() != null
+                && weapon1.getLinkedBy().getType().equals(weapon2.getLinkedBy().getType())));
+    }
+
+    @Override
+    protected void processWeapons() {
+        for (Mounted weapon : entity.getTotalWeaponList()) {
+            if (countAsOffensiveWeapon(weapon)) {
+                Mounted key = collectedWeapons.keySet().stream()
+                        .filter(wp -> canBeSummed(weapon, wp)).findFirst().orElse(weapon);
+                collectedWeapons.merge(key, 1, Integer::sum);
+            }
+        }
+        int heatEfficiency = heatEfficiency();
+
+        double totalHeatSum = processArc(nominalNoseLocation);
+        bvReport.addLine("Total Heat:", formatForReport(totalHeatSum), "");
+        heatEfficiencyExceeded = totalHeatSum > heatEfficiency;
+        if (heatEfficiencyExceeded) {
+            bvReport.addLine("Heat Efficiency Exceeded", "", "");
+        }
+
+        totalHeatSum += processArc(nominalLeftLocation);
+        bvReport.addLine("Total Heat:", formatForReport(totalHeatSum), "");
+        heatEfficiencyExceeded = totalHeatSum > heatEfficiency;
+        if (heatEfficiencyExceeded) {
+            bvReport.addLine("Heat Efficiency Exceeded", "", "");
+        }
+
+        processArc(nominalRightLocation);
+        processArc(getOppositeLocation(nominalNoseLocation));
+        processArc(getOppositeLocation(nominalLeftLocation));
+        processArc(getOppositeLocation(nominalRightLocation));
+        bvReport.addEmptyLine();
+    }
+
+    protected double processArc(final int bvNominalLocation) {
+        double arcHeat = 0;
+        bvReport.addEmptyLine();
+        bvReport.addLine(arcName(bvNominalLocation) + ":", "", "");
+        boolean arcEmpty = true;
+        for (Map.Entry<Mounted, Integer> weaponEntry : collectedWeapons.entrySet()) {
+            Mounted weapon = weaponEntry.getKey();
+            if (isNominalArc(bvNominalLocation, weapon) && countAsOffensiveWeapon(weapon)) {
+                arcHeat += weaponHeat(weapon) * weaponEntry.getValue();
+                processWeapon(weapon, true, true, weaponEntry.getValue());
+                arcEmpty = false;
+            }
+        }
+        if (arcEmpty) {
+            bvReport.addLine("- None.", "", "");
+        }
+
+        processAmmo(bvNominalLocation);
+        return arcHeat;
+    }
+
+    protected void processAmmo(int bvLocation) {
+        bvReport.startTentativeSection();
+        boolean hasAmmo = false;
+        for (String key : keys) {
+            if (!key.startsWith(bvLocation + ":")) {
+                continue;
+            }
+            if (!weaponsForExcessiveAmmo.containsKey(key)) {
+                // Coolant Pods have no matching weapon
+                if (key.equals(Integer.valueOf(AmmoType.T_COOLANT_POD).toString() + "1")) {
+                    offensiveValue += ammoMap.get(key);
+                }
+                continue;
+            }
+            if (!ammoMap.containsKey(key)) {
+                continue;
+            }
+            String calculation = "+ ";
+            double arcFactor = arcFactor(bvLocation);
+
+            if (ammoMap.get(key) > weaponsForExcessiveAmmo.get(key)) {
+                offensiveValue += weaponsForExcessiveAmmo.get(key) * arcFactor;
+                calculation += formatForReport(weaponsForExcessiveAmmo.get(key)) + " (Excessive)";
+            } else {
+                offensiveValue += ammoMap.get(key) * arcFactor;
+                calculation += formatForReport(ammoMap.get(key));
+            }
+            if (arcFactor != 1) {
+                calculation += " x " + formatForReport(arcFactor) + " (Arc)";
+            }
+            bvReport.addLine("- " + names.get(key), calculation, "= " + formatForReport(offensiveValue));
+            hasAmmo = true;
+        }
+        if (hasAmmo) {
+            bvReport.endTentativeSection();
+        } else {
+            bvReport.discardTentativeSection();
+        }
+    }
+
+    @Override
+    protected void processAmmo() { }
+
+    protected abstract String arcName(int bvLocation);
+
+    /** @return The adjacent firing arc location, counter-clockwise */
+    protected int getAdjacentLocationCCW(int bvLocation) {
+        return (bvLocation + 1) % 6;
+    }
+
+    /** @return The adjacent firing arc location, clockwise */
+    protected int getAdjacentLocationCW(int bvLocation) {
+        return (bvLocation + 5) % 6;
+    }
+
+    /** @return The opposite firing arc location, counter-clockwise */
+    protected int getOppositeLocation(int bvLocation) {
+        return (bvLocation + 3) % 6;
+    }
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/MekBVCalculator.java b/megamek/src/megamek/common/battlevalue/MekBVCalculator.java
index 1bb548a161c..d166e35a16e 100644
--- a/megamek/src/megamek/common/battlevalue/MekBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/MekBVCalculator.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2022 - The MegaMek Team. All Rights Reserved.
  *
- * This file is part of MegaMek.
+ * This file is part of Megaentity.
  *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,14 +14,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
+ * along with Megaentity. If not, see <http://www.gnu.org/licenses/>.
  */
 package megamek.common.battlevalue;
 
-import megamek.client.ui.swing.calculationReport.CalculationReport;
 import megamek.common.*;
 import megamek.common.annotations.Nullable;
-import megamek.common.enums.MPBoosters;
 import megamek.common.weapons.autocannons.HVACWeapon;
 import megamek.common.weapons.gaussrifles.GaussWeapon;
 import megamek.common.weapons.lasers.CLImprovedHeavyLaserLarge;
@@ -31,195 +29,146 @@
 import megamek.common.weapons.other.ISMekTaser;
 import megamek.common.weapons.other.TSEMPWeapon;
 import megamek.common.weapons.ppc.PPCWeapon;
-import megamek.common.weapons.prototypes.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
 
-public class MekBVCalculator {
+import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
+import static megamek.common.EquipmentType.*;
 
-    public static int calculateBV(Mech mek, boolean ignoreC3, boolean ignoreSkill, CalculationReport bvReport) {
-        bvReport.addHeader("Battle Value Calculations For " + mek.getChassis() + " " + mek.getModel());
-        bvReport.addSubHeader("Defensive Battle Rating Calculation:");
+public class MekBVCalculator extends HeatTrackingBVCalculator {
 
-        double dbv = 0; // defensive battle value
-        double obv; // offensive bv
+    private final Mech mek;
 
-        double armorMultiplier;
-        for (int loc = 0; loc < mek.locations(); loc++) {
-            // total armor points
-            switch (mek.getArmorType(loc)) {
-                case EquipmentType.T_ARMOR_COMMERCIAL:
-                    armorMultiplier = 0.5;
-                    break;
-                case EquipmentType.T_ARMOR_HARDENED:
-                    armorMultiplier = 2.0;
-                    break;
-                case EquipmentType.T_ARMOR_REACTIVE:
-                case EquipmentType.T_ARMOR_REFLECTIVE:
-                case EquipmentType.T_ARMOR_BALLISTIC_REINFORCED:
-                    armorMultiplier = 1.5;
-                    break;
-                case EquipmentType.T_ARMOR_FERRO_LAMELLOR:
-                case EquipmentType.T_ARMOR_ANTI_PENETRATIVE_ABLATION:
-                    armorMultiplier = 1.2;
-                    break;
-                case EquipmentType.T_ARMOR_HEAT_DISSIPATING:
-                    armorMultiplier = 1.1;
-                    break;
-                default:
-                    armorMultiplier = 1.0;
-                    break;
-            }
-
-            if (mek.hasWorkingMisc(MiscType.F_BLUE_SHIELD)) {
-                armorMultiplier += 0.2;
-            }
-            if (mek.countWorkingMisc(MiscType.F_HARJEL_II, loc) > 0) {
-                armorMultiplier *= 1.1;
-            }
-            if (mek.countWorkingMisc(MiscType.F_HARJEL_III, loc) > 0) {
-                armorMultiplier *= 1.2;
-            }
-
-            // BV for torso mounted cockpit.
-            if ((mek.getCockpitType() == Mech.COCKPIT_TORSO_MOUNTED) && (loc == Mech.LOC_CT)) {
-                double cockpitArmor = mek.getArmor(Mech.LOC_CT) + mek.getArmor(Mech.LOC_CT, true);
-                cockpitArmor *= armorMultiplier;
-                bvReport.addLine("Extra BV for torso mounted cockpit", "" + cockpitArmor);
-                dbv += cockpitArmor;
-            }
-            int modularArmor = 0;
-            for (Mounted mounted : mek.getMisc()) {
-                if (mounted.getType().hasFlag(MiscType.F_MODULAR_ARMOR) && (mounted.getLocation() == loc)) {
-                    modularArmor += mounted.getBaseDamageCapacity() - mounted.getDamageTaken();
-                }
-            }
-            int armor = mek.getArmor(loc) + (mek.hasRearArmor(loc) ? mek.getArmor(loc, true) : 0);
-            double armorBV = (armor + modularArmor) * armorMultiplier;
-            dbv += armorBV;
-            String type = "Total Armor " + mek.getLocationAbbr(loc) + " (" + armor
-                    + (modularArmor > 0 ? " +" + modularArmor + " modular" : "") + ") x " + armorMultiplier;
-            bvReport.addLine(type, "" + armorBV);
-        }
-        dbv *= 2.5;
-        bvReport.addLine("Total modified armor BV x 2.5 ", "= ", dbv);
+    MekBVCalculator(Entity entity) {
+        super(entity);
+        mek = (Mech) entity;
+    }
 
-        // total internal structure
-        double internalMultiplier = 1.0;
-        if ((mek.getStructureType() == EquipmentType.T_STRUCTURE_INDUSTRIAL)
-                || (mek.getStructureType() == EquipmentType.T_STRUCTURE_COMPOSITE)) {
-            internalMultiplier = 0.5;
-        } else if (mek.getStructureType() == EquipmentType.T_STRUCTURE_REINFORCED) {
-            internalMultiplier = 2.0;
-        }
-        if (mek.hasWorkingMisc(MiscType.F_BLUE_SHIELD)) {
-            internalMultiplier += 0.2;
+    @Override
+    protected double addTorsoMountedCockpit() {
+        if (mek.getCockpitType() == Mech.COCKPIT_TORSO_MOUNTED) {
+            return entity.getArmor(Mech.LOC_CT) + entity.getArmor(Mech.LOC_CT, true);
+        } else {
+            return 0;
         }
+    }
 
-        dbv += mek.getTotalInternal() * internalMultiplier * 1.5
-                * (mek.hasEngine() ? mek.getEngine().getBVMultiplier() : 1.0);
-        double structMult = mek.hasEngine() ? mek.getEngine().getBVMultiplier() : 1.0;
-        bvReport.addLine("Total I.S. Points x IS Multipler x 1.5 x Engine Multipler",
-                mek.getTotalInternal() + " x " + internalMultiplier + " x 1.5 x " + structMult,
-                "= " + mek.getTotalInternal() * internalMultiplier * 1.5 * structMult);
-
-        // add gyro
-        dbv += mek.getWeight() * mek.getGyroMultiplier();
-        bvReport.addLine("Weight x Gyro Multipler ", mek.getWeight() + " x " + mek.getGyroMultiplier(),
-                "= " + mek.getWeight() * mek.getGyroMultiplier());
+    @Override
+    protected void processStructure() {
+        String calculation = "+ " + entity.getTotalInternal() + " x 1.5";
+        List<String> modifiers = new ArrayList<>();
+        double typeMultiplier = 1.0;
+        int structureType = entity.getStructureType();
+        if ((structureType == T_STRUCTURE_INDUSTRIAL) || (structureType == T_STRUCTURE_COMPOSITE)) {
+            typeMultiplier = 0.5;
+            modifiers.add((structureType == T_STRUCTURE_COMPOSITE) ? "Comp." : "Ind.");
+        } else if (structureType == T_STRUCTURE_REINFORCED) {
+            typeMultiplier = 2.0;
+            modifiers.add("Reinf.");
+        }
+        if (hasBlueShield) {
+            typeMultiplier += 0.2;
+            modifiers.add("Blue Shield");
+        }
+        if (typeMultiplier != 1) {
+            calculation += " x " + formatForReport(typeMultiplier);
+        }
+
+        double engineMultiplier = entity.hasEngine() ? entity.getEngine().getBVMultiplier() : 1.0;
+        if (engineMultiplier != 1) {
+            calculation += " x " + formatForReport(engineMultiplier);
+            modifiers.add(entity.getEngine().getShortEngineName());
+        }
+        if (!modifiers.isEmpty()) {
+            calculation += " (" + String.join(", ", modifiers) + ")";
+        }
+        defensiveValue += entity.getTotalInternal() * 1.5 * typeMultiplier * engineMultiplier;
+        bvReport.addLine("Internal Structure:", calculation, "= " + formatForReport(defensiveValue));
+
+        defensiveValue += entity.getWeight() * mek.getGyroMultiplier();
+        bvReport.addLine("Gyro:",
+                "+ " + formatForReport(entity.getWeight()) + " x " + formatForReport(mek.getGyroMultiplier()),
+                "= " + formatForReport(defensiveValue));
+    }
 
-        bvReport.addLine("Defensive Equipment:", "", "");
-        double amsAmmoBV = 0;
-        for (Mounted mounted : mek.getAmmo()) {
-            AmmoType atype = (AmmoType) mounted.getType();
-            if ((atype.getAmmoType() == AmmoType.T_AMS) || (atype.getAmmoType() == AmmoType.T_APDS)) {
-                amsAmmoBV += atype.getBV(mek);
-            }
+    @Override
+    protected void processDefensiveEquipment() {
+        super.processDefensiveEquipment();
+        double armoredCompBV = mek.getArmoredComponentBV();
+        if (armoredCompBV > 0) {
+            defensiveValue += armoredCompBV;
+            bvReport.addLine("Armored Components:",
+                    "+ " + formatForReport(armoredCompBV), "= " + formatForReport(defensiveValue));
         }
-        double amsBV = 0;
-        // add defensive equipment
-        double dEquipmentBV = 0;
-        for (Mounted mounted : mek.getEquipment()) {
-            EquipmentType etype = mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
+    }
 
-            if (((etype instanceof WeaponType) && (etype.hasFlag(WeaponType.F_AMS)
-                    || etype.hasFlag(WeaponType.F_M_POD)
-                    || etype.hasFlag(WeaponType.F_B_POD)))
-                    || ((etype instanceof MiscType) && (etype.hasFlag(MiscType.F_ECM)
-                    || etype.hasFlag(MiscType.F_BAP)
-                    || etype.hasFlag(MiscType.F_VIRAL_JAMMER_DECOY)
-                    || etype.hasFlag(MiscType.F_VIRAL_JAMMER_HOMING)
-                    || etype.hasFlag(MiscType.F_AP_POD)
-                    || etype.hasFlag(MiscType.F_MASS)
-                    || etype.hasFlag(MiscType.F_HEAVY_BRIDGE_LAYER)
-                    || etype.hasFlag(MiscType.F_MEDIUM_BRIDGE_LAYER)
-                    || etype.hasFlag(MiscType.F_LIGHT_BRIDGE_LAYER)
-                    || etype.hasFlag(MiscType.F_CHAFF_POD)
-                    || etype.hasFlag(MiscType.F_HARJEL_II)
-                    || etype.hasFlag(MiscType.F_HARJEL_III)
-                    || etype.hasFlag(MiscType.F_SPIKES)
-                    || (etype.hasFlag(MiscType.F_CLUB) && (etype.hasSubType(MiscType.S_SHIELD_LARGE)
-                    || etype.hasSubType(MiscType.S_SHIELD_MEDIUM)
-                    || etype.hasSubType(MiscType.S_SHIELD_SMALL)))))) {
-                double bv = etype.getBV(mek);
-                if (etype instanceof WeaponType) {
-                    WeaponType wtype = (WeaponType) etype;
-                    if (wtype.hasFlag(WeaponType.F_AMS)
-                            && ((wtype.getAmmoType() == AmmoType.T_AMS) || (wtype.getAmmoType() == AmmoType.T_APDS))) {
-                        amsBV += bv;
+    @Override
+    protected void processExplosiveEquipment() {
+        boolean hasExplosiveEquipment = false;
+        bvReport.startTentativeSection();
+        bvReport.addLine("Explosive Equipment:", "", "");
+        if (hasBlueShield) {
+            int unProtectedCrits = 0;
+            for (int loc = Mech.LOC_CT; loc <= Mech.LOC_LLEG; loc++) {
+                if (entity.hasCASEII(loc)) {
+                    continue;
+                }
+                if (entity.isClan()) {
+                    // Clan mechs only count ammo in ct, legs or head (per BMRr).
+                    // Also count ammo in side torsos if mech has xxl engine
+                    // (extrapolated from rule intent - not covered in rules)
+                    if (((loc != Mech.LOC_CT) && (loc != Mech.LOC_RLEG) && (loc != Mech.LOC_LLEG))
+                            && !(((loc == Mech.LOC_RT) || (loc == Mech.LOC_LT)) && entity.hasEngine() &&
+                            (entity.getEngine().getSideTorsoCriticalSlots().length > 2))) {
+                        continue;
+                    }
+                } else {
+                    // inner sphere with XL or XXL counts everywhere
+                    if (entity.hasEngine() && (entity.getEngine().getSideTorsoCriticalSlots().length <= 2)) {
+                        // without XL or XXL, only count torsos if not CASEed,
+                        // and arms if arm & torso not CASEed
+                        if (((loc == Mech.LOC_RT) || (loc == Mech.LOC_LT)) && entity.locationHasCase(loc)) {
+                            continue;
+                        } else if ((loc == Mech.LOC_LARM)
+                                && (entity.locationHasCase(loc) || entity.locationHasCase(Mech.LOC_LT))) {
+                            continue;
+                        } else if ((loc == Mech.LOC_RARM)
+                                && (entity.locationHasCase(loc) || entity.locationHasCase(Mech.LOC_RT))) {
+                            continue;
+                        }
                     }
                 }
-                dEquipmentBV += bv;
-                bvReport.addLine(mounted.getName(), "+" + bv);
+                unProtectedCrits++;
             }
+            defensiveValue -= unProtectedCrits;
+            bvReport.addLine("Blue Shield", "- " + formatForReport(unProtectedCrits),
+                    "= " + formatForReport(defensiveValue));
+            hasExplosiveEquipment = true;
         }
-        if (amsAmmoBV > 0) {
-            bvReport.addLine("AMS Ammo (to a maximum of AMS BV)", "+" + Math.min(amsBV, amsAmmoBV));
-            dEquipmentBV += Math.min(amsBV, amsAmmoBV);
-        }
-
-        dbv += dEquipmentBV;
-
-        double armoredBVCal = mek.getArmoredComponentBV();
-        if (armoredBVCal > 0) {
-            bvReport.addLine("Armored Components BV Modification", "+" + armoredBVCal);
-            dbv += armoredBVCal;
-        }
-
-        bvReport.addLine("Total BV of all Defensive Equipment ", "= " + dEquipmentBV);
-
-        // subtract for explosive ammo
-        double ammoPenalty = 0;
         List<CriticalSlot> slotAlreadyCounted = new ArrayList<>();
-        for (Mounted mounted : mek.getEquipment()) {
-            int loc = mounted.getLocation();
-            // For superheavies, make sure to subtract at most once for each slot
-            CriticalSlot critSlot = getCriticalSlot(mek, mounted);
-            if (slotAlreadyCounted.contains(critSlot)) {
+        for (Mounted mounted : entity.getEquipment()) {
+            if (!countsAsExplosive(mounted)) {
                 continue;
             }
-            int toSubtract = 15;
             EquipmentType etype = mounted.getType();
-
-            // only count explosive ammo
-            if (!etype.isExplosive(mounted, true)) {
+            if ((etype instanceof MiscType) && etype.hasFlag(MiscType.F_BLUE_SHIELD)) {
                 continue;
             }
 
-            // don't count oneshot ammo
-            if (loc == Entity.LOC_NONE) {
+            // For superheavies, make sure to subtract at most once for each slot
+            CriticalSlot critSlot = getCriticalSlot(mounted);
+            if (slotAlreadyCounted.contains(critSlot)) {
                 continue;
             }
 
-            if (!hasExplosiveEquipmentPenalty(mek, loc) && !hasExplosiveEquipmentPenalty(mek, mounted.getSecondLocation())) {
+            int loc = mounted.getLocation();
+            if (!hasExplosiveEquipmentPenalty(loc) && !hasExplosiveEquipmentPenalty(mounted.getSecondLocation())) {
                 continue;
             }
 
+            int toSubtract = 15;
             // Gauss rifles only subtract 1 point per slot, same for HVACs and iHeavy Lasers and mektasers
             if ((etype instanceof GaussWeapon) || (etype instanceof HVACWeapon)
                     || (etype instanceof CLImprovedHeavyLaserLarge)
@@ -235,11 +184,7 @@ public static int calculateBV(Mech mek, boolean ignoreC3, boolean ignoreSkill, C
 
             // PPCs with capacitors subtract 1
             if (etype instanceof PPCWeapon) {
-                if (mounted.getLinkedBy() != null) {
-                    toSubtract = 1;
-                } else {
-                    continue;
-                }
+                toSubtract = 1;
             }
 
             if ((etype instanceof MiscType)
@@ -255,39 +200,15 @@ public static int calculateBV(Mech mek, boolean ignoreC3, boolean ignoreSkill, C
                 toSubtract = 1;
             }
 
-            if ((etype instanceof MiscType)
-                    && etype.hasFlag(MiscType.F_BLUE_SHIELD)) {
-                // blue shield needs to be special cased, because it's one
-                // mounted with lots of locations,
-                // and some of those could be protected by cas
-                toSubtract = 0;
-            }
-
-            // RACs, LACs and ACs don't really count
-            if ((etype instanceof WeaponType) && ((((WeaponType) etype).getAmmoType() == AmmoType.T_AC_ROTARY)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_AC)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_LAC)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_AC_IMP)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_AC_PRIMITIVE)
-                    || (((WeaponType) etype).getAmmoType() == AmmoType.T_PAC))) {
-                toSubtract = 0;
-            }
-
-            // empty ammo shouldn't count
-            if ((etype instanceof AmmoType)
-                    && (mounted.getUsableShotsLeft() == 0)) {
-                continue;
-            }
-
             // For weapons split between locations, subtract per critical slot
             int criticals;
             if (mounted.isSplit()) {
                 criticals = 0;
-                for (int l = 0; l < mek.locations(); l++) {
+                for (int l = 0; l < entity.locations(); l++) {
                     if (((l == mounted.getLocation()) || (l == mounted.getSecondLocation()))
-                            && hasExplosiveEquipmentPenalty(mek, l)) {
-                        for (int i = 0; i < mek.getNumberOfCriticals(l); i++) {
-                            CriticalSlot slot = mek.getCritical(l, i);
+                            && hasExplosiveEquipmentPenalty(l)) {
+                        for (int i = 0; i < entity.getNumberOfCriticals(l); i++) {
+                            CriticalSlot slot = entity.getCritical(l, i);
                             if ((slot != null) && mounted.equals(slot.getMount())) {
                                 criticals++;
                             }
@@ -301,106 +222,21 @@ && hasExplosiveEquipmentPenalty(mek, l)) {
                 criticals = mounted.getCriticals();
             }
             toSubtract *= criticals;
-            ammoPenalty += toSubtract;
+            defensiveValue -= toSubtract;
+            bvReport.addLine("- " + equipmentDescriptor(mounted), "- " + formatForReport(toSubtract),
+                    "= " + formatForReport(defensiveValue));
             slotAlreadyCounted.add(critSlot);
+            hasExplosiveEquipment = true;
         }
+        bvReport.finalizeTentativeSection(hasExplosiveEquipment);
+        super.processExplosiveEquipment();
+    }
 
-        // special case for blueshield, need to check each non-head location
-        // seperately for CASE
-        if (mek.hasWorkingMisc(MiscType.F_BLUE_SHIELD)) {
-            int unProtectedCrits = 0;
-            for (int loc = Mech.LOC_CT; loc <= Mech.LOC_LLEG; loc++) {
-                if (mek.hasCASEII(loc)) {
-                    continue;
-                }
-                if (mek.isClan()) {
-                    // Clan mechs only count ammo in ct, legs or head (per
-                    // BMRr).
-                    // Also count ammo in side torsos if mech has xxl engine
-                    // (extrapolated from rule intent - not covered in rules)
-                    if (((loc != Mech.LOC_CT) && (loc != Mech.LOC_RLEG) && (loc != Mech.LOC_LLEG))
-                            && !(((loc == Mech.LOC_RT) || (loc == Mech.LOC_LT)) && mek.hasEngine() &&
-                            (mek.getEngine().getSideTorsoCriticalSlots().length > 2))) {
-                        continue;
-                    }
-                } else {
-                    // inner sphere with XL or XXL counts everywhere
-                    if (mek.hasEngine() && (mek.getEngine().getSideTorsoCriticalSlots().length <= 2)) {
-                        // without XL or XXL, only count torsos if not CASEed,
-                        // and arms if arm & torso not CASEed
-                        if (((loc == Mech.LOC_RT) || (loc == Mech.LOC_LT))
-                                && mek.locationHasCase(loc)) {
-                            continue;
-                        } else if ((loc == Mech.LOC_LARM)
-                                && (mek.locationHasCase(loc) || mek.locationHasCase(Mech.LOC_LT))) {
-                            continue;
-                        } else if ((loc == Mech.LOC_RARM)
-                                && (mek.locationHasCase(loc) || mek.locationHasCase(Mech.LOC_RT))) {
-                            continue;
-                        }
-                    }
-                }
-                unProtectedCrits++;
-            }
-            ammoPenalty += unProtectedCrits;
-        }
-        dbv = Math.max(1, dbv - ammoPenalty);
-        bvReport.addLine("Explosive Weapons/Equipment Penalty ", "= -" + ammoPenalty);
-        bvReport.addResultLine("", "", "" + dbv);
-
-        // adjust for target movement modifier
-        // we use full possible movement, ignoring gravity, heat and modular
-        // armor, but taking into account hit actuators
-        int bvWalk = mek.getWalkMP(false, true, true);
-        int airmechMP = 0;
-        if (((mek.getEntityType() & Entity.ETYPE_LAND_AIR_MECH) != 0)) {
-            bvWalk = ((LandAirMech) mek).getBVWalkMP();
-            if (((LandAirMech) mek).getLAMType() == LandAirMech.LAM_STANDARD) {
-                airmechMP = ((LandAirMech) mek).getAirMechFlankMP();
-            }
-        } else if (((mek.getEntityType() & Entity.ETYPE_QUADVEE) != 0)
-                && (mek.getMovementMode() == EntityMovementMode.WHEELED)) {
-            // Don't use bonus cruise MP in calculating BV
-            bvWalk = Math.max(0, mek.getOriginalWalkMP());
-        }
-        int runMP;
-        if (mek.hasTSM(false)) {
-            bvWalk++;
-        }
-        MPBoosters mpBooster = mek.getMPBoosters();
-        if (mpBooster.isMASCAndSupercharger()) {
-            runMP = (int) Math.ceil(bvWalk * 2.5);
-        } else if (mpBooster.isMASCXorSupercharger()) {
-            runMP = bvWalk * 2;
-        } else {
-            runMP = (int) Math.ceil(bvWalk * 1.5);
-        }
-        if (mek.hasMPReducingHardenedArmor()) {
-            runMP--;
-        }
-        int tmmRan = Compute.getTargetMovementModifier(runMP, false, false, mek.getGame()).getValue();
-        bvReport.addLine("Run MP", "" + runMP);
-        bvReport.addLine("Target Movement Modifier For Run", "" + tmmRan);
-
-        // Calculate modifiers for jump and UMU movement where applicable.
-        final int jumpMP = Math.max(mek.getJumpMP(false, true), airmechMP);
-        final int tmmJumped = (jumpMP > 0) ?
-                Compute.getTargetMovementModifier(jumpMP, true, false, mek.getGame()).getValue()
-                : 0;
-
-        final int umuMP = mek.getActiveUMUCount();
-        final int tmmUMU = (umuMP > 0) ?
-                Compute.getTargetMovementModifier(umuMP, false, false, mek.getGame()).getValue()
-                : 0;
-
-        String tmmType = "Target Movement Modifier for " + ((airmechMP == 0) ? "Jumping" : "AirMech Flank");
-        bvReport.addLine(tmmType, "" + tmmJumped);
-        bvReport.addLine("Target Movement Modifier For UMUs", "" + tmmUMU);
-        double targetMovementModifier = Math.max(tmmRan, Math.max(tmmJumped, tmmUMU));
-        bvReport.addLine("Target Movement Modifier", "" + targetMovementModifier);
-
+    @Override
+    protected double tmmFactor(int tmmRunning, int tmmJumping, int tmmUmu) {
+        int targetMovementModifier = Math.max(tmmRunning, Math.max(tmmJumping, tmmUmu));
         // Try to find a Mek Stealth or similar system.
-        if (mek.hasStealth() || mek.hasNullSig()) {
+        if (entity.hasStealth() || mek.hasNullSig()) {
             targetMovementModifier += 2;
             bvReport.addLine("Stealth +2", "+2");
         }
@@ -419,605 +255,132 @@ && hasExplosiveEquipmentPenalty(mek, l)) {
             }
             bvReport.addLine("Void Sig", modifier);
         }
-        double tmmFactor = 1 + (targetMovementModifier / 10);
-        dbv *= tmmFactor;
-        bvReport.addLine("Multiply by Defensive Movement Factor of ", "" + tmmFactor, " x " + tmmFactor);
-        bvReport.addResultLine("Defensive Battle Value", "= ", dbv);
-        bvReport.addSubHeader("Offensive Battle Rating Calculation:");
+        return 1 + targetMovementModifier / 10.0;
+    }
 
-        // calculate heat efficiency
-        int mechHeatEfficiency = 6 + mek.getHeatCapacity();
-        if ((mek instanceof LandAirMech) && (((LandAirMech) mek).getLAMType() == LandAirMech.LAM_STANDARD)) {
-            mechHeatEfficiency += 3;
+    @Override
+    protected void setUmuMP() {
+        if (entity.hasShield() && (entity.getNumberOfShields(MiscType.S_SHIELD_LARGE) > 0)) {
+            return;
         }
-
-        bvReport.addLine("Base Heat Efficiency ", "" + (6 + mek.getHeatCapacity()), "");
-
-        double coolantPods = 0;
-        for (Mounted ammo : mek.getAmmo()) {
-            if (((AmmoType) ammo.getType()).getAmmoType() == AmmoType.T_COOLANT_POD) {
-                coolantPods++;
+        umuMP = 0;
+        for (Mounted m : entity.getMisc()) {
+            EquipmentType type = m.getType();
+            if ((type instanceof MiscType) && type.hasFlag(MiscType.F_UMU) && !m.isInoperable()) {
+                umuMP++;
             }
         }
+    }
 
-        // account for coolant pods
+    @Override
+    protected int heatEfficiency() {
+        int heatCapacity = entity.getHeatCapacity();
+        int mechHeatEfficiency = 6 + heatCapacity;
+        String calculation = "6 + " + heatCapacity;
+        if ((mek instanceof LandAirMech) && (((LandAirMech) mek).getLAMType() == LandAirMech.LAM_STANDARD)) {
+            mechHeatEfficiency += 3;
+            calculation += " + 3 (LAM)";
+        }
+
+        long coolantPods = entity.getAmmo().stream().map(a -> ((AmmoType) a.getType()).getAmmoType())
+                .filter(t -> t == AmmoType.T_COOLANT_POD).count();
         if (coolantPods > 0) {
-            mechHeatEfficiency += (int) Math.ceil((mek.getNumberOfSinks() * coolantPods) / 5d);
-            bvReport.addLine(" + Coolant Pods ", " + " + Math.ceil((mek.getNumberOfSinks() * coolantPods) / 5), "");
+            int coolantPodBonus = (int) Math.ceil((mek.getNumberOfSinks() * coolantPods) / 5d);
+            mechHeatEfficiency += coolantPodBonus;
+            calculation += " + " + coolantPodBonus + " (Cool. Pods)";
         }
-        if (mek.hasWorkingMisc(MiscType.F_EMERGENCY_COOLANT_SYSTEM)) {
+
+        if (entity.hasWorkingMisc(MiscType.F_EMERGENCY_COOLANT_SYSTEM)) {
             mechHeatEfficiency += 4;
-            bvReport.addLine(" + RISC Emergency Coolant System", " + 4", "");
+            calculation += " + 4 (ECS)";
         }
 
         int moveHeat;
-        String moveHeatType = " - Run Heat ";
+        String moveHeatType = " (Run)";
         if ((mek instanceof LandAirMech) && (((LandAirMech) mek).getLAMType() == LandAirMech.LAM_STANDARD)) {
-            moveHeat = (int) Math.round(((LandAirMech) mek).getAirMechFlankMP(false, true) / 3d);
-        } else if ((mek.getJumpMP(false, true) > 0)
-                && (mek.getJumpHeat(mek.getJumpMP(false, true)) > mek.getRunHeat())) {
-            moveHeat = mek.getJumpHeat(mek.getJumpMP(false, true));
-            moveHeatType = " - Jump Heat ";
+            moveHeat = (int) Math.round(((LandAirMech) mek).getAirMechFlankMP(MPCalculationSetting.BV_CALCULATION) / 3d);
+        } else if ((mek.getJumpMP(MPCalculationSetting.BV_CALCULATION) > 0)
+                && (entity.getJumpHeat(mek.getJumpMP(MPCalculationSetting.BV_CALCULATION)) > entity.getRunHeat())) {
+            moveHeat = entity.getJumpHeat(mek.getJumpMP(MPCalculationSetting.BV_CALCULATION));
+            moveHeatType = " (Jump)";
         } else {
-            moveHeat = mek.getRunHeat();
             if (mek.hasSCM()) {
                 moveHeat = 0;
+                moveHeatType = " (SCM)";
+            } else {
+                moveHeat = entity.getRunHeat();
             }
         }
-
         mechHeatEfficiency -= moveHeat;
-        if (mek.hasStealth()) {
+        calculation += " - " + moveHeat + moveHeatType;
+
+        if (entity.hasStealth()) {
             mechHeatEfficiency -= 10;
-            bvReport.addLine(" - Stealth Heat ", " - 10", "");
+            calculation += " - 10 (Stealth)";
         }
         if (mek.hasChameleonShield()) {
             mechHeatEfficiency -= 6;
-            bvReport.addLine(" - Chameleon LPS Heat ", " - 6", "");
+            calculation += " - 6 (Chameleon)";
         }
         if (mek.hasNullSig()) {
             mechHeatEfficiency -= 10;
-            bvReport.addLine(" - Null-signature system Heat ", " - 10", "");
+            calculation += " - 10 (Null Sig.)";
         }
         if (mek.hasVoidSig()) {
             mechHeatEfficiency -= 10;
-            bvReport.addLine(" - Void-signature system Heat ", " - 10", "");
+            calculation += " - 10 (Void Sig.)";
         }
-        bvReport.addLine(moveHeatType, " - " + moveHeat, "");
-        bvReport.addLine("= " + mechHeatEfficiency);
-
-        bvReport.addLine("Unmodified Weapon BV:", "", "");
-        double weaponBV = 0;
-        boolean hasTargComp = mek.hasTargComp();
-        // first, add up front-faced and rear-faced unmodified BV,
-        // to know wether front- or rear faced BV should be halved
-        double bvFront = 0, bvRear = 0, nonArmFront = 0, nonArmRear = 0, bvTurret = 0;
-        ArrayList<Mounted> weapons = mek.getWeaponList();
-        for (Mounted weapon : weapons) {
-            WeaponType wtype = (WeaponType) weapon.getType();
-            if (wtype.hasFlag(WeaponType.F_B_POD)
-                    || wtype.hasFlag(WeaponType.F_M_POD)) {
-                continue;
-            }
-            double dBV = wtype.getBV(mek);
-
-            // don't count destroyed equipment
-            if (weapon.isDestroyed()) {
-                continue;
-            }
-            // don't count AMS, it's defensive
-            if (wtype.hasFlag(WeaponType.F_AMS)) {
-                continue;
-            }
-            // calc MG Array here:
-            if (wtype.hasFlag(WeaponType.F_MGA)) {
-                double mgBV = 0;
-                for (int eqNum : weapon.getBayWeapons()) {
-                    Mounted mg = mek.getEquipment(eqNum);
-                    if ((mg != null) && (!mg.isDestroyed())) {
-                        mgBV += mg.getType().getBV(mek);
-                    }
-                }
-                dBV = mgBV * 0.67;
-            }
-            String name = wtype.getName();
-            // artemis bumps up the value, PPC caps do, too
-            if (weapon.getLinkedBy() != null) {
-                // check to see if the weapon is a PPC and has a Capacitor attached to it
-                if (wtype.hasFlag(WeaponType.F_PPC)) {
-                    dBV += ((MiscType) weapon.getLinkedBy().getType()).getBV(mek, weapon);
-                    name = name.concat(" with Capacitor");
-                }
-                Mounted mLinker = weapon.getLinkedBy();
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS)) {
-                    dBV *= 1.2;
-                    name = name.concat(" with Artemis IV");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_PROTO)) {
-                    dBV *= 1.2;
-                    name = name.concat(" with Artemis IV Prototype");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
-                    dBV *= 1.3;
-                    name = name.concat(" with Artemis V");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_APOLLO)) {
-                    dBV *= 1.15;
-                    name = name.concat(" with Apollo");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
-                    dBV *= 1.15;
-                    name = name.concat(" with RISC Laser Pulse Module");
-                }
-            }
-
-            if (mek.hasFunctionalArmAES(weapon.getLocation())) {
-                dBV *= 1.25;
-                name = name.concat(" augmented by AES");
-            }
-
-            String weaponName = name;
-            boolean rearVGL = false;
-            if (weapon.getType().hasFlag(WeaponType.F_VGL)) {
-                // vehicular grenade launchers facing to the rear sides count
-                // for rear BV, too
-                if ((weapon.getFacing() == 2) || (weapon.getFacing() == 4)) {
-                    rearVGL = true;
-                }
-            }
-            if (weapon.isMechTurretMounted()) {
-                bvTurret += dBV;
-                weaponName += " (T)";
-            } else if (weapon.isRearMounted() || rearVGL) {
-                bvRear += dBV;
-                weaponName += " (R)";
-            } else {
-                bvFront += dBV;
-            }
-            if (!mek.isArm(weapon.getLocation()) && !weapon.isMechTurretMounted()) {
-                if (weapon.isRearMounted() || rearVGL) {
-                    nonArmRear += dBV;
-                } else {
-                    nonArmFront += dBV;
-                }
-            }
-
-            bvReport.addLine(weaponName, "" + dBV);
-        }
-
-        bvReport.addLine("Unmodified Front BV:", "" + bvFront);
-        bvReport.addLine("Unmodified Rear BV:", "" + bvRear);
-        bvReport.addLine("Unmodfied Turret BV:", "" + bvTurret);
-        bvReport.addLine("Total Unmodfied BV:", "" + (bvRear + bvFront + bvTurret));
-        bvReport.addLine("Unmodified Front non-arm BV:", "" + nonArmFront);
-        bvReport.addLine("Unmodfied Rear non-arm BV:", "" + nonArmRear);
-
-        boolean halveRear = true;
-        boolean turretFront = true;
-        if (nonArmFront <= nonArmRear) {
-            halveRear = false;
-            turretFront = false;
-            bvReport.addLine("halving front instead of rear weapon BVs", "");
-            bvReport.addLine("turret mounted weapon BVs count as rear firing", "");
-        }
-
-        bvReport.addLine("Weapon Heat:", "");
-
-        // here we store the modified BV and heat of all heat-using weapons, to later be sorted by BV
-        ArrayList<ArrayList<Object>> heatBVs = new ArrayList<>();
-        // BVs of non-heat-using weapons
-        ArrayList<ArrayList<Object>> nonHeatBVs = new ArrayList<>();
-        // total up maximum heat generated and add up BVs for ammo-using weapon types for excessive ammo rule
-        Map<String, Double> weaponsForExcessiveAmmo = new HashMap<>();
-        double maximumHeat = 0;
-        for (Mounted mounted : mek.getWeaponList()) {
-            WeaponType wtype = (WeaponType) mounted.getType();
-            if (wtype.hasFlag(WeaponType.F_B_POD)
-                    || wtype.hasFlag(WeaponType.F_M_POD)) {
-                continue;
-            }
-            double weaponHeat = wtype.getHeat();
-
-            // only count non-damaged equipment
-            if (mounted.isMissing() || mounted.isHit() || mounted.isDestroyed()
-                    || mounted.isBreached()) {
-                continue;
-            }
-
-            // one shot weapons count 1/4
-            if ((wtype.getAmmoType() == AmmoType.T_ROCKET_LAUNCHER)
-                    || wtype.hasFlag(WeaponType.F_ONESHOT)) {
-                weaponHeat *= 0.25;
-            }
-
-            // double heat for ultras
-            if ((wtype.getAmmoType() == AmmoType.T_AC_ULTRA)
-                    || (wtype.getAmmoType() == AmmoType.T_AC_ULTRA_THB)) {
-                weaponHeat *= 2;
-            }
-
-            // Six times heat for RAC
-            if (wtype.getAmmoType() == AmmoType.T_AC_ROTARY) {
-                weaponHeat *= 6;
-            }
-
-            // 1d6 extra heat; add half for heat calculations (1d3/+2 for small pulse)
-            if ((wtype instanceof ISERLaserLargePrototype)
-                    || (wtype instanceof ISPulseLaserLargePrototype)
-                    || (wtype instanceof ISPulseLaserMediumPrototype)
-                    || (wtype instanceof ISPulseLaserMediumRecovered)) {
-                weaponHeat += 3;
-            } else if (wtype instanceof ISPulseLaserSmallPrototype) {
-                weaponHeat += 2;
-            }
-
-            String name = wtype.getName();
-
-            // RISC laser pulse module adds 2 heat
-            if ((wtype.hasFlag(WeaponType.F_LASER)) && (mounted.getLinkedBy() != null)
-                    && (mounted.getLinkedBy().getType() instanceof MiscType)
-                    && (mounted.getLinkedBy().getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE))) {
-                name = name.concat(" with RISC Laser Pulse Module");
-                weaponHeat += 2;
-            }
-
-            // laser insulator reduce heat by 1, to a minimum of 1
-            if (wtype.hasFlag(WeaponType.F_LASER)
-                    && (mounted.getLinkedBy() != null)
-                    && !mounted.getLinkedBy().isInoperable()
-                    && (mounted.getLinkedBy().getType() instanceof MiscType)
-                    && mounted.getLinkedBy().getType().hasFlag(MiscType.F_LASER_INSULATOR)) {
-                weaponHeat -= 1;
-                if (weaponHeat == 0) {
-                    weaponHeat++;
-                }
-            }
-
-            // half heat for streaks
-            if ((wtype.getAmmoType() == AmmoType.T_SRM_STREAK)
-                    || (wtype.getAmmoType() == AmmoType.T_LRM_STREAK)
-                    || (wtype.getAmmoType() == AmmoType.T_IATM)) {
-                weaponHeat *= 0.5;
-            }
-            // check to see if the weapon is a PPC and has a Capacitor attached
-            // to it
-            if (wtype.hasFlag(WeaponType.F_PPC) && (mounted.getLinkedBy() != null)) {
-                name = name.concat(" with Capacitor");
-                weaponHeat += 5;
-            }
-            bvReport.addLine(name, "+ " + weaponHeat);
-
-            double dBV = wtype.getBV(mek);
-            if (mek.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM)) {
-                dBV *= 0.8;
-            }
-            String weaponName = mounted.getName() + (mounted.isRearMounted() ? "(R)" : "");
-
-            // don't count AMS, it's defensive
-            if (wtype.hasFlag(WeaponType.F_AMS)) {
-                continue;
-            }
-            // calc MG Array here:
-            if (wtype.hasFlag(WeaponType.F_MGA)) {
-                double mgBV = 0;
-                for (int eqNum : mounted.getBayWeapons()) {
-                    Mounted mg = mek.getEquipment(eqNum);
-                    if ((mg != null) && (!mg.isDestroyed())) {
-                        mgBV += mg.getType().getBV(mek);
-                    }
-                }
-                dBV = mgBV * 0.67;
-            }
-
-            // artemis bumps up the value,  PPC caps do, too
-            if (mounted.getLinkedBy() != null) {
-                // check to see if the weapon is a PPC and has a Capacitor attached to it
-                if (wtype.hasFlag(WeaponType.F_PPC)) {
-                    dBV += ((MiscType) mounted.getLinkedBy().getType()).getBV(mek, mounted);
-                    weaponName = weaponName.concat(" with Capacitor");
-                }
-                Mounted mLinker = mounted.getLinkedBy();
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS)) {
-                    dBV *= 1.2;
-                    weaponName = weaponName.concat(" with Artemis IV");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
-                    dBV *= 1.3;
-                    weaponName = weaponName.concat(" with Artemis V");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_APOLLO)) {
-                    dBV *= 1.15;
-                    weaponName = weaponName.concat(" with Apollo");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
-                    dBV *= 1.15;
-                    weaponName = weaponName.concat(" with RISC Laser Pulse Module");
-                }
-            }
-            // if linked to AES, multiply by 1.25
-            if (mek.hasFunctionalArmAES(mounted.getLocation())) {
-                dBV *= 1.25;
-            }
-            // and we'll add the tcomp here too
-            if (wtype.hasFlag(WeaponType.F_DIRECT_FIRE) && hasTargComp) {
-                dBV *= 1.25;
-            }
-            // half for being rear mounted (or front mounted, when more rear-
-            // than front-mounted un-modded BV
-            // or for being turret mounted, when more rear-mounted BV than front mounted BV
-            if ((!mek.isArm(mounted.getLocation())
-                    && !mounted.isMechTurretMounted() && (mounted.isRearMounted() == halveRear))
-                    || (mounted.isMechTurretMounted() && (turretFront != halveRear))) {
-                dBV /= 2;
-            }
-
-            // ArrayList that stores weapon values stores a double first (BV), then an Integer (heat),
-            // then a String (weapon name) for 0 heat weapons, just stores BV and name
-            ArrayList<Object> weaponValues = new ArrayList<>();
-            weaponValues.add(dBV);
-            if (weaponHeat > 0) {
-                // store heat and BV, for sorting a few lines down;
-                weaponValues.add(weaponHeat);
-                weaponValues.add(weaponName);
-                heatBVs.add(weaponValues);
-            } else {
-                weaponValues.add(weaponName);
-                nonHeatBVs.add(weaponValues);
-            }
-
-            maximumHeat += weaponHeat;
-            // add up BV of ammo-using weapons for each type of weapon,
-            // to compare with ammo BV later for excessive ammo BV rule
-            if (!((wtype.hasFlag(WeaponType.F_ENERGY) && !((wtype.getAmmoType() == AmmoType.T_PLASMA)
-                    || (wtype.getAmmoType() == AmmoType.T_VEHICLE_FLAMER)
-                    || (wtype.getAmmoType() == AmmoType.T_HEAVY_FLAMER)
-                    || (wtype.getAmmoType() == AmmoType.T_CHEMICAL_LASER)))
-                    || wtype.hasFlag(WeaponType.F_ONESHOT)
-                    || wtype.hasFlag(WeaponType.F_INFANTRY)
-                    || (wtype.getAmmoType() == AmmoType.T_NA))) {
-                String key = wtype.getAmmoType() + ":" + wtype.getRackSize();
-                if (!weaponsForExcessiveAmmo.containsKey(key)) {
-                    weaponsForExcessiveAmmo.put(key, wtype.getBV(mek));
-                } else {
-                    weaponsForExcessiveAmmo.put(key, wtype.getBV(mek)
-                            + weaponsForExcessiveAmmo.get(key));
-                }
-            }
-        }
-
-        if (mek.hasVibroblades()) {
-            for (int location = Mech.LOC_RARM; location <= Mech.LOC_LARM; location++) {
-                for (int slot = 0; slot < mek.locations(); slot++) {
-                    CriticalSlot cs = mek.getCritical(location, slot);
-
-                    if ((cs != null)
-                            && (cs.getType() == CriticalSlot.TYPE_EQUIPMENT)) {
-                        Mounted mount = cs.getMount();
-                        if ((mount.getType() instanceof MiscType)
-                                && mount.getType().hasFlag(MiscType.F_CLUB)
-                                && ((MiscType) mount.getType()).isVibroblade()) {
-                            ArrayList<Object> weaponValues = new ArrayList<>();
-                            double dBV = mount.getType().getBV(mek);
-                            if (mek.hasFunctionalArmAES(mount.getLocation())) {
-                                dBV *= 1.25;
-                            }
-                            weaponValues.add(dBV);
-                            weaponValues.add((double) mek.getActiveVibrobladeHeat(location, true));
-                            weaponValues.add(mount.getName());
-                            heatBVs.add(weaponValues);
-                            bvReport.addLine(mount.getName(), "+ " + mek.getActiveVibrobladeHeat(location, true));
-                            maximumHeat += mek.getActiveVibrobladeHeat(location, true);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        bvReport.addResultLine("Total Heat:", "", "= " + maximumHeat);
-
-        bvReport.addLine("Weapons with no heat at full BV:", "", "");
-        // count heat-free weapons always at full modified BV
-        for (ArrayList<Object> nonHeatWeapon : nonHeatBVs) {
-            weaponBV += (Double) nonHeatWeapon.get(0);
-            bvReport.addLine(nonHeatWeapon.get(1).toString(), nonHeatWeapon.get(0).toString());
-        }
-        bvReport.addLine("Heat Modified Weapons BV: ", "", "");
-
-        if (maximumHeat > mechHeatEfficiency) {
-            bvReport.addLine("(Heat Exceeds Mech Heat Efficiency) ", "", "");
-        }
-
-        if (maximumHeat <= mechHeatEfficiency) {
-            // count all weapons equal
-            for (ArrayList<Object> weaponValues : heatBVs) {
-                weaponBV += (Double) weaponValues.get(0);
-                bvReport.addLine(weaponValues.get(2).toString(), weaponValues.get(0).toString());
-            }
-        } else {
-            // this will count heat-generating weapons at full modified BV until
-            // heat efficiency is reached or passed with one weapon
-            // sort the heat-using weapons by modified BV
-            heatBVs.sort((obj1, obj2) -> {
-                Double obj1BV = (Double) obj1.get(0); // BV
-                Double obj2BV = (Double) obj2.get(0); // BV
-                // first element in the ArrayList is BV, second is heat
-                // if same BV, lower heat first
-                if (obj1BV.equals(obj2BV)) {
-                    Double obj1Heat = (Double) obj1.get(1);
-                    Double obj2Heat = (Double) obj2.get(1);
-
-                    return Double.compare(obj1Heat, obj2Heat);
-                }
-                // higher BV first
-                return Double.compare(obj2BV, obj1BV);
-            });
-            // count heat-generating weapons at full modified BV until
-            // heat efficiency is reached or
-            // passed with one weapon
-            double heatAdded = 0;
-            for (ArrayList<Object> weaponValues : heatBVs) {
-                String heatEffText = "Heat efficiency reached, ";
-                double dBV = (Double) weaponValues.get(0);
-                if (heatAdded >= mechHeatEfficiency) {
-                    dBV /= 2;
-                    heatEffText += "half BV";
-                }
-                heatAdded += (Double) weaponValues.get(1);
-                weaponBV += dBV;
-                bvReport.addLine(weaponValues.get(2).toString(), heatEffText, "" + dBV);
-                bvReport.addLine("Heat count: ", "" + heatAdded, "");
-            }
+        if (mek.hasEngine() && (mek.getEngineHits() > 0)
+                && (mek.getEngine().isFusion() || mek.getEngine().isFission())) {
+            mechHeatEfficiency -= mek.getEngineHits() * 5;
+            calculation += " - " + mek.getEngineHits() * 5 + " (Engine Hits)";
         }
-        bvReport.addResultLine("Total Weapons BV Adjusted For Heat:", "", "" + weaponBV);
-
-        bvReport.addLine("Misc Offensive Equipment: ", "", "");
-        // add offensive misc. equipment BV (everything except AMS, A-Pod, ECM - BMR p152)
-        double oEquipmentBV = 0;
-        for (Mounted mounted : mek.getMisc()) {
-            MiscType mtype = (MiscType) mounted.getType();
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-            // vibroblades have been counted under weapons
-            if ((mounted.getType() instanceof MiscType)
-                    && mounted.getType().hasFlag(MiscType.F_CLUB)
-                    && ((MiscType) mounted.getType()).isVibroblade()) {
-                continue;
-            }
-
-            if (mtype.hasFlag(MiscType.F_ECM)
-                    || mtype.hasFlag(MiscType.F_BAP)
-                    || mtype.hasFlag(MiscType.F_AP_POD)
-                    || mtype.hasFlag(MiscType.F_VIRAL_JAMMER_DECOY)
-                    || mtype.hasFlag(MiscType.F_VIRAL_JAMMER_HOMING)
-                    || mtype.hasFlag(MiscType.F_MASS)
-                    || mtype.hasFlag(MiscType.F_HEAVY_BRIDGE_LAYER)
-                    || mtype.hasFlag(MiscType.F_MEDIUM_BRIDGE_LAYER)
-                    || mtype.hasFlag(MiscType.F_LIGHT_BRIDGE_LAYER)
-                    || mtype.hasFlag(MiscType.F_CHAFF_POD)
-                    || mtype.hasFlag(MiscType.F_TARGCOMP)
-                    || mtype.hasFlag(MiscType.F_SPIKES)
-                    || mtype.hasFlag(MiscType.F_HARJEL_II)
-                    || mtype.hasFlag(MiscType.F_HARJEL_III)
-                    || (mtype.hasFlag(MiscType.F_CLUB) && (mtype.hasSubType(MiscType.S_SHIELD_LARGE)
-                    || mtype.hasSubType(MiscType.S_SHIELD_MEDIUM) || mtype.hasSubType(MiscType.S_SHIELD_SMALL)))) {
-                continue;
-            }
-            double bv = mtype.getBV(mek);
-            // if physical weapon linked to AES, multiply by 1.25
-            if ((mtype.hasFlag(MiscType.F_CLUB) || mtype.hasFlag(MiscType.F_HAND_WEAPON))
-                    && mek.hasFunctionalArmAES(mounted.getLocation())) {
-                bv *= 1.25;
-            }
-
-            if (bv > 0) {
-                bvReport.addLine(mounted.getName(), "" + bv);
-            }
-
-            oEquipmentBV += bv;
-        }
-        bvReport.addLine("Total Misc Offensive Equipment BV: ", "" + oEquipmentBV);
-        weaponBV += oEquipmentBV;
-
-        // add ammo bv
-        double ammoBV = 0;
-        // extra BV for when we have semiguided LRMs and someone else has TAG on
-        // our team
-        double tagBV = 0;
-        Map<String, Double> ammo = new HashMap<>();
-        ArrayList<String> keys = new ArrayList<>();
-        for (Mounted mounted : mek.getAmmo()) {
-            AmmoType atype = (AmmoType) mounted.getType();
-
-            // don't count depleted ammo
-            if (mounted.getUsableShotsLeft() == 0) {
-                continue;
-            }
-
-            // don't count AMS, it's defensive
-            if ((atype.getAmmoType() == AmmoType.T_AMS) || (atype.getAmmoType() == AmmoType.T_APDS)) {
-                continue;
-            }
+        bvReport.addLine("Heat Efficiency:", calculation + " = " + mechHeatEfficiency, "");
+        return mechHeatEfficiency;
+    }
 
-            // don't count oneshot ammo, it's considered part of the launcher.
-            if (mounted.getLocation() == Entity.LOC_NONE) {
-                // assumption: ammo without a location is for a oneshot weapon
-                continue;
-            }
-            // semiguided or homing ammo might count double
-            if ((atype.getMunitionType() == AmmoType.M_SEMIGUIDED)
-                    || (atype.getMunitionType() == AmmoType.M_HOMING)) {
-                Player tmpP = mek.getOwner();
+    @Override
+    protected Predicate<Mounted> frontWeaponFilter() {
+        return weapon -> countAsOffensiveWeapon(weapon)
+                && !mek.isArm(weapon.getLocation()) && !weapon.isMechTurretMounted()
+                && (!weapon.isRearMounted() || isFrontFacingVGL(weapon));
+    }
 
-                if (tmpP != null) {
-                    // Okay, actually check for friendly TAG.
-                    if (tmpP.hasTAG()) {
-                        tagBV += atype.getBV(mek);
-                    } else if ((tmpP.getTeam() != Player.TEAM_NONE) && (mek.getGame() != null)) {
-                        for (Team m : mek.getGame().getTeams()) {
-                            if (m.getId() == tmpP.getTeam()) {
-                                if (m.hasTAG()) {
-                                    tagBV += atype.getBV(mek);
-                                }
-                                // A player can't be on two teams.
-                                // If we check his team and don't give the
-                                // penalty, that's it.
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            String key = atype.getAmmoType() + ":" + atype.getRackSize();
-            if (!keys.contains(key)) {
-                keys.add(key);
-            }
-            if (!ammo.containsKey(key)) {
-                ammo.put(key, atype.getBV(mek));
-            } else {
-                ammo.put(key, atype.getBV(mek) + ammo.get(key));
-            }
-        }
+    @Override
+    protected Predicate<Mounted> rearWeaponFilter() {
+        return weapon -> countAsOffensiveWeapon(weapon)
+                && !mek.isArm(weapon.getLocation()) && !weapon.isMechTurretMounted()
+                && (weapon.isRearMounted() || isRearFacingVGL(weapon));
+    }
 
-        // Excessive ammo rule:
-        // Only count BV for ammo for a weapontype until the BV of all weapons of that
-        // type on the mech is reached.
-        for (String key : keys) {
+    @Override
+    protected boolean isNominalRear(Mounted weapon) {
+        return (switchRearAndFront ^ rearWeaponFilter().test(weapon)) && !mek.isArm(weapon.getLocation())
+                && !weapon.isMechTurretMounted();
+    }
 
-            if (weaponsForExcessiveAmmo.get(key) != null) {
-                if (ammo.get(key) > weaponsForExcessiveAmmo.get(key)) {
-                    ammoBV += weaponsForExcessiveAmmo.get(key);
-                } else {
-                    ammoBV += ammo.get(key);
-                }
-            } else {
-                // Ammo with no matching weapons counts 0, unless it's a coolant pod
-                // because coolant pods have no matching weapon
-                if (key.equals(Integer.valueOf(AmmoType.T_COOLANT_POD).toString() + "1")) {
-                    ammoBV += ammo.get(key);
-                }
-            }
+    @Override
+    protected void processOffensiveTypeModifier() {
+        if ((mek.getCockpitType() == Mech.COCKPIT_INDUSTRIAL)
+                || (mek.getCockpitType() == Mech.COCKPIT_PRIMITIVE_INDUSTRIAL)) {
+            // Industrial Meks without AFC multiplay their offensive rating with 0.9
+            bvReport.addLine("Fire Control Modifier:",
+                    formatForReport(offensiveValue) + " x 0.9",
+                    "= " + formatForReport(offensiveValue * 0.9));
+            offensiveValue *= 0.9;
         }
-        weaponBV += ammoBV;
-        bvReport.addLine("Total Ammo BV: ", "" + ammoBV);
+    }
 
+    @Override
+    protected void processWeight() {
         double aesMultiplier = 1;
-        if (mek.hasFunctionalArmAES(Mech.LOC_LARM)) {
+        if (entity.hasFunctionalArmAES(Mech.LOC_LARM)) {
             aesMultiplier += 0.1;
         }
-        if (mek.hasFunctionalArmAES(Mech.LOC_RARM)) {
+        if (entity.hasFunctionalArmAES(Mech.LOC_RARM)) {
             aesMultiplier += 0.1;
         }
-        if (mek.hasFunctionalLegAES()) {
+        if (entity.hasFunctionalLegAES()) {
             if (mek instanceof BipedMech) {
                 aesMultiplier += 0.2;
             } else if (mek instanceof QuadMech) {
@@ -1025,69 +388,55 @@ && hasExplosiveEquipmentPenalty(mek, l)) {
             }
         }
 
-        double weight = mek.getWeight() * aesMultiplier;
-
-        if (aesMultiplier > 1) {
-            bvReport.addLine("Weight x AES Multiplier ", weight + " x " + aesMultiplier, "= " + weight);
+        double weight = entity.getWeight() * aesMultiplier;
+        String calculation = "+ " + formatForReport(entity.getWeight());
+        if (aesMultiplier != 1) {
+            calculation += " x " + formatForReport(aesMultiplier) + " (AES)";
         }
-        // add tonnage, adjusted for TSM
+
         if (mek.hasTSM(true)) {
-            weaponBV += weight * 1.5;
-            bvReport.addLine("Add weight + TSM Modifier", weight + " * 1.5", "= " + weight * 1.5);
+            offensiveValue += weight * 1.5;
+            calculation += " x 1.5 (TSM)";
         } else if (mek.hasIndustrialTSM()) {
-            weaponBV += weight * 1.15;
-            bvReport.addLine("Add weight + Industrial TSM Modifier", weight + " * 1.15", "= " + weight * 1.15);
+            offensiveValue += weight * 1.15;
+            calculation += " x 1.15 (ITSM)";
         } else {
-            weaponBV += weight;
-            bvReport.addLine("Add weight", "+ " + weight);
+            offensiveValue += weight;
         }
+        bvReport.addLine("Weight:", calculation, "= " + formatForReport(offensiveValue));
+    }
 
-        if ((mek.getCockpitType() == Mech.COCKPIT_INDUSTRIAL)
-                || (mek.getCockpitType() == Mech.COCKPIT_PRIMITIVE_INDUSTRIAL)) {
-            // industrial without advanced firing control get's 0.9 mod to offensive BV
-            weaponBV *= 0.9;
-            bvReport.addLine("Weapon BV * Firing Control Modifier", weaponBV + " x 0.9", "= " + weaponBV);
-        }
-
-        double speedFactor = Math.pow(1 + ((((double) runMP
-                + (Math.round(Math.max(jumpMP, umuMP) / 2.0))) - 5) / 10), 1.2);
-        speedFactor = Math.round(speedFactor * 100) / 100.0;
-
-        bvReport.addLine("Final Speed Factor: ", "" + speedFactor);
-        obv = weaponBV * speedFactor;
-        bvReport.addLine("Weapons BV * Speed Factor ", weaponBV + " x " + speedFactor, "= " + obv);
-
-        double finalBV = dbv + obv;
-        double totalBV = finalBV;
-        bvReport.addLine("Offensive BV + Defensive BV", dbv + " + " + obv, "= " + finalBV);
-
+    @Override
+    protected void processSummarize() {
         double cockpitMod = 1;
+        String modifier = "";
         if ((mek.getCockpitType() == Mech.COCKPIT_SMALL)
                 || (mek.getCockpitType() == Mech.COCKPIT_TORSO_MOUNTED)
                 || (mek.getCockpitType() == Mech.COCKPIT_SMALL_COMMAND_CONSOLE)) {
             cockpitMod = 0.95;
-            finalBV *= cockpitMod;
-        } else if (mek.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM)) {
-            finalBV *= 0.95;
+            modifier = " (" + mek.getCockpitTypeString() + ")";
+        } else if (entity.hasWorkingMisc(MiscType.F_DRONE_OPERATING_SYSTEM)) {
+            cockpitMod = 0.95;
+            modifier = " (Drone Op. Sys.)";
         } else if (mek.getCockpitType() == Mech.COCKPIT_INTERFACE) {
             cockpitMod = 1.3;
-            finalBV *= cockpitMod;
-        }
-        finalBV = Math.round(finalBV);
-        bvReport.addLine("Total BV * Cockpit Modifier", totalBV + " x " + cockpitMod, "= " + finalBV);
-        bvReport.addResultLine("Final BV", "", "" + finalBV);
-
-        // we get extra bv from some stuff
-        double xbv = 0.0;
-        // extra BV for semi-guided lrm when TAG in our team
-        xbv += tagBV;
-        if (!ignoreC3) {
-            xbv += mek.getExtraC3BV((int) Math.round(finalBV));
+            modifier = " (" + mek.getCockpitTypeString() + ")";
+        }
+        if (cockpitMod != 1) {
+            baseBV = defensiveValue + offensiveValue;
+            bvReport.addEmptyLine();
+            bvReport.addSubHeader("Battle Value:");
+            bvReport.addLine("Defensive BR + Offensive BR:",
+                    formatForReport(defensiveValue) + " + " + formatForReport(offensiveValue),
+                    "= " + formatForReport(baseBV));
+            bvReport.addLine("Cockpit Modifier:",
+                    formatForReport(baseBV) + " x " + formatForReport(cockpitMod) + modifier,
+                    "= " + formatForReport(baseBV * cockpitMod));
+            baseBV *= cockpitMod;
+            bvReport.addLine("--- Base Unit BV:", "" + (int) Math.round(baseBV));
+        } else {
+            super.processSummarize();
         }
-        finalBV = (int) Math.round(finalBV + xbv);
-
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(mek);
-        return (int) Math.round(finalBV * pilotFactor);
     }
 
     /**
@@ -1099,14 +448,14 @@ && hasExplosiveEquipmentPenalty(mek, l)) {
      * @param loc The location index
      * @return Whether explosive equipment in the location should decrease BV
      */
-    private static boolean hasExplosiveEquipmentPenalty(Mech mek, int loc) {
-        if ((loc == Entity.LOC_NONE) || mek.hasCASEII(loc)) {
+    protected boolean hasExplosiveEquipmentPenalty(int loc) {
+        if ((loc == Entity.LOC_NONE) || entity.hasCASEII(loc)) {
             return false;
         }
-        if (!mek.entityIsQuad() && ((loc == Mech.LOC_RARM) || (loc == Mech.LOC_LARM))) {
-            return !mek.locationHasCase(loc) && hasExplosiveEquipmentPenalty(mek, mek.getTransferLocation(loc));
+        if (!entity.entityIsQuad() && ((loc == Mech.LOC_RARM) || (loc == Mech.LOC_LARM))) {
+            return !entity.locationHasCase(loc) && hasExplosiveEquipmentPenalty(entity.getTransferLocation(loc));
         } else if ((loc == Mech.LOC_RT) || (loc == Mech.LOC_LT)) {
-            return !mek.locationHasCase(loc) || (mek.getEngine().getSideTorsoCriticalSlots().length >= 3);
+            return !entity.locationHasCase(loc) || (entity.getEngine().getSideTorsoCriticalSlots().length >= 3);
         } else {
             return true;
         }
@@ -1116,17 +465,17 @@ private static boolean hasExplosiveEquipmentPenalty(Mech mek, int loc) {
      * Returns the (first) CriticalSlot object for a given mounted equipment in its main location. This is
      * used to find the CriticalSlot for ammo which only uses a single CriticalSlot.
      *
-     * @param mek     the Mek
      * @param mounted the equipment to look for
      * @return a CriticalSlot that holds the mounted or null if none can be found
      */
-    public static @Nullable CriticalSlot getCriticalSlot(Mech mek, Mounted mounted) {
+    public @Nullable
+    CriticalSlot getCriticalSlot(Mounted mounted) {
         int location = mounted.getLocation();
         if (location == Entity.LOC_NONE) {
             return null;
         }
-        for (int slot = 0; slot < mek.getNumberOfCriticals(location); slot++) {
-            CriticalSlot cs = mek.getCritical(location, slot);
+        for (int slot = 0; slot < entity.getNumberOfCriticals(location); slot++) {
+            CriticalSlot cs = entity.getCritical(location, slot);
             if ((cs != null) && (cs.getType() == CriticalSlot.TYPE_EQUIPMENT)) {
                 if (cs.getMount().equals(mounted) ||
                         ((cs.getMount2() != null) && (cs.getMount2().equals(mounted)))) {
@@ -1136,5 +485,32 @@ private static boolean hasExplosiveEquipmentPenalty(Mech mek, int loc) {
         }
         return null;
     }
-    
-}
+
+    @Override
+    protected int getRunningTMM() {
+        int mp = runMP;
+        if ((mek instanceof LandAirMech) && (((LandAirMech) mek).getLAMType() == LandAirMech.LAM_STANDARD)) {
+            mp = ((LandAirMech) mek).getAirMechFlankMP(MPCalculationSetting.BV_CALCULATION);
+            if (mp == 0) {
+                return 0;
+            } else {
+                return 1 + Compute.getTargetMovementModifier(mp, false, false, entity.getGame()).getValue();
+            }
+        } else {
+            if (mp == 0) {
+                return 0;
+            } else {
+                return Compute.getTargetMovementModifier(mp, false, false, entity.getGame()).getValue();
+            }
+        }
+    }
+
+    @Override
+    protected int offensiveSpeedFactorMP() {
+        if ((mek instanceof LandAirMech) && (((LandAirMech) mek).getLAMType() == LandAirMech.LAM_STANDARD)) {
+            return runMP + (int) (Math.round(((LandAirMech) mek).getAirMechFlankMP(MPCalculationSetting.BV_CALCULATION) / 2.0));
+        } else {
+            return runMP + (int) (Math.round(Math.max(jumpMP, umuMP) / 2.0));
+        }
+    }
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/ProtoMekBVCalculator.java b/megamek/src/megamek/common/battlevalue/ProtoMekBVCalculator.java
index 17840c15fd2..60ed3db249f 100644
--- a/megamek/src/megamek/common/battlevalue/ProtoMekBVCalculator.java
+++ b/megamek/src/megamek/common/battlevalue/ProtoMekBVCalculator.java
@@ -18,304 +18,28 @@
  */
 package megamek.common.battlevalue;
 
-import megamek.client.ui.swing.calculationReport.CalculationReport;
 import megamek.common.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+public class ProtoMekBVCalculator extends BVCalculator {
 
-public class ProtoMekBVCalculator {
+    Protomech protoMek = (Protomech) entity;
 
-    public static int calculateBV(Protomech protoMek, boolean ignoreSkill, CalculationReport bvReport) {
-        bvReport.addHeader("Battle Value Calculations For");
-        bvReport.addHeader(protoMek.getChassis() + " " + protoMek.getModel());
-        bvReport.addSubHeader("Defensive Battle Rating Calculation:");
-
-        double dbv = 0; // defensive battle value
-        double obv; // offensive bv
-
-        dbv += protoMek.getTotalArmor() * 2.5;
-        bvReport.addLine("Total Armor (" + protoMek.getTotalArmor() + ") x 2.5", "", protoMek.getTotalArmor() * 2.5);
-        dbv += protoMek.getTotalInternal() * 1.5;
-        bvReport.addLine("Total I.S. Points (" + protoMek.getTotalInternal() +") x 1.5", "", protoMek.getTotalInternal() * 1.5);
-
-        // add defensive equipment
-        double dEquipmentBV = 0;
-        double amsBV = 0;
-        double amsAmmoBV = 0;
-        for (Mounted mounted : protoMek.getAmmo()) {
-            AmmoType atype = (AmmoType) mounted.getType();
-            if (atype.getAmmoType() == AmmoType.T_AMS) {
-                amsAmmoBV += atype.getBV(protoMek);
-            }
-        }
-        for (Mounted mounted : protoMek.getEquipment()) {
-            EquipmentType etype = mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            if (((etype instanceof WeaponType) && etype.hasFlag(WeaponType.F_AMS))
-                    || ((etype instanceof MiscType) && (etype.hasFlag(MiscType.F_ECM)
-                    || etype.hasFlag(MiscType.F_VIRAL_JAMMER_DECOY)
-                    || etype.hasFlag(MiscType.F_VIRAL_JAMMER_HOMING)
-                    || etype.hasFlag(MiscType.F_BAP)))) {
-                dEquipmentBV += etype.getBV(protoMek);
-            }
-            if (etype instanceof WeaponType) {
-                WeaponType wtype = (WeaponType) etype;
-                if (wtype.hasFlag(WeaponType.F_AMS)
-                        && (wtype.getAmmoType() == AmmoType.T_AMS)) {
-                    amsBV += etype.getBV(protoMek);
-                }
-            }
-        }
-        if (amsAmmoBV > 0) {
-            dEquipmentBV += Math.min(amsBV, amsAmmoBV);
-        }
-        dbv += dEquipmentBV;
-        bvReport.addLine("Total Equipment BV", "", dEquipmentBV);
-        bvReport.addResultLine("", dbv);
-
-        // adjust for target movement modifier
-        double tmmRan = Compute.getTargetMovementModifier(protoMek.getRunMP(false, true, true), false, false, protoMek.getGame()).getValue();
-        // Gliders get +1 for being airborne.
-        if (protoMek.isGlider()) {
-            tmmRan++;
-        }
-
-        final int jumpMP = protoMek.getJumpMP(false);
-        final int tmmJumped = (jumpMP > 0) ?
-                Compute.getTargetMovementModifier(jumpMP, true, false, protoMek.getGame()).getValue()
-                : 0;
-
-        final int umuMP = protoMek.getActiveUMUCount();
-        final int tmmUMU = (umuMP > 0) ?
-                Compute.getTargetMovementModifier(umuMP, false, false, protoMek.getGame()).getValue()
-                : 0;
-
-        double tmmFactor = 1 + (Math.max(tmmRan, Math.max(tmmJumped, tmmUMU)) / 10.0) + 0.1;
-        // Round to 4 decimal places, just to cut off some numeric error
-        tmmFactor = Math.round(tmmFactor * 1000) / 1000.0;
-        dbv *= tmmFactor;
-
-        bvReport.addLine("Target Movement Modifer For Run", "", tmmRan);
-        bvReport.addLine("Target Movement Modifer For Jumping", "", tmmJumped);
-        bvReport.addLine("Target Movement Modifer For UMUs", "", tmmUMU);
-        bvReport.addLine("Multiply by Defensive Movement Factor of ", "x ", tmmFactor);
-        bvReport.addResultLine("Defensive Battle Value", "= ", dbv);
-        bvReport.addEmptyLine();
-        bvReport.addSubHeader("Offensive Battle Rating Calculation:");
-
-        double weaponBV = 0;
-
-        // figure out base weapon bv
-        boolean hasTargComp = protoMek.hasTargComp();
-        // and add up BVs for ammo-using weapon types for excessive ammo rule
-        Map<String, Double> weaponsForExcessiveAmmo = new HashMap<>();
-        for (Mounted mounted : protoMek.getWeaponList()) {
-            WeaponType wtype = (WeaponType) mounted.getType();
-            double dBV = wtype.getBV(protoMek);
-
-            String name = mounted.getName();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            // don't count AMS, it's defensive
-            if (wtype.hasFlag(WeaponType.F_AMS)) {
-                continue;
-            }
-
-            // artemis bumps up the value
-            if (mounted.getLinkedBy() != null) {
-                Mounted mLinker = mounted.getLinkedBy();
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS)) {
-                    dBV *= 1.2;
-                    name = name.concat(" with Artemis IV");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_PROTO)) {
-                    dBV *= 1.2;
-                    name = name.concat(" with Artemis IV Prototype");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_ARTEMIS_V)) {
-                    dBV *= 1.3;
-                    name = name.concat(" with Artemis V");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_APOLLO)) {
-                    dBV *= 1.15;
-                    name = name.concat(" with Apollo");
-                }
-                if ((mLinker.getType() instanceof MiscType)
-                        && mLinker.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
-                    dBV *= 1.15;
-                }
-            }
-
-            // and we'll add the tcomp here too
-            if (wtype.hasFlag(WeaponType.F_DIRECT_FIRE) && hasTargComp) {
-                dBV *= 1.25;
-                name = name.concat(" with Targeting Computer");
-            }
-            weaponBV += dBV;
-            bvReport.addLine(name, "", dBV);
-
-            // add up BV of ammo-using weapons for each type of weapon,
-            // to compare with ammo BV later for excessive ammo BV rule
-            if (!(wtype.hasFlag(WeaponType.F_ENERGY)
-                    || wtype.hasFlag(WeaponType.F_ONESHOT)
-                    || wtype.hasFlag(WeaponType.F_INFANTRY)
-                    || (wtype.getAmmoType() == AmmoType.T_NA))) {
-                String key = wtype.getAmmoType() + ":" + wtype.getRackSize();
-                if (!weaponsForExcessiveAmmo.containsKey(key)) {
-                    weaponsForExcessiveAmmo.put(key, wtype.getBV(protoMek));
-                } else {
-                    weaponsForExcessiveAmmo.put(key, wtype.getBV(protoMek)
-                            + weaponsForExcessiveAmmo.get(key));
-                }
-            }
-        }
-
-        bvReport.addResultLine("Total Weapons BV", "", weaponBV);
-
-        double ammoBV = 0;
-        // extra BV for when we have semiguided LRMs and someone else has TAG on our team
-        double tagBV = 0;
-        Map<String, Double> ammo = new HashMap<>();
-        ArrayList<String> keys = new ArrayList<>();
-        for (Mounted mounted : protoMek.getAmmo()) {
-            AmmoType atype = (AmmoType) mounted.getType();
-
-            // don't count depleted ammo
-            if (mounted.getUsableShotsLeft() == 0) {
-                continue;
-            }
-
-            // don't count AMS, it's defensive
-            if (atype.getAmmoType() == AmmoType.T_AMS) {
-                continue;
-            }
-
-            // don't count oneshot ammo, it's considered part of the launcher.
-            if (mounted.getLocation() == Entity.LOC_NONE) {
-                // assumption: ammo without a location is for a oneshot weapon
-                continue;
-            }
-            // semiguided or homing ammo might count double
-            if ((atype.getMunitionType() == AmmoType.M_SEMIGUIDED)
-                    || (atype.getMunitionType() == AmmoType.M_HOMING)) {
-                Player tmpP = protoMek.getOwner();
-                // Okay, actually check for friendly TAG.
-                if (tmpP.hasTAG()) {
-                    tagBV += atype.getBV(protoMek);
-                } else if ((tmpP.getTeam() != Player.TEAM_NONE) && (protoMek.getGame() != null)) {
-                    for (Team m : protoMek.getGame().getTeams()) {
-                        if (m.getId() == tmpP.getTeam()) {
-                            if (m.hasTAG()) {
-                                tagBV += atype.getBV(protoMek);
-                            }
-                            // A player can't be on two teams.
-                            // If we check his team and don't give the penalty,
-                            // that's it.
-                            break;
-                        }
-                    }
-                }
-            }
-            String key = atype.getAmmoType() + ":" + atype.getRackSize();
-            if (!keys.contains(key)) {
-                keys.add(key);
-            }
-            if (!ammo.containsKey(key)) {
-                ammo.put(key, atype.getProtoBV(mounted.getUsableShotsLeft()));
-            } else {
-                ammo.put(key, atype.getProtoBV(mounted.getUsableShotsLeft()) + ammo.get(key));
-            }
-        }
-        // excessive ammo rule:
-        // only count BV for ammo for a weapontype until the BV of all weapons of that
-        // type on the mech is reached
-        for (String key : keys) {
-            if (weaponsForExcessiveAmmo.containsKey(key)
-                    && (ammo.get(key) > weaponsForExcessiveAmmo.get(key))) {
-                ammoBV += weaponsForExcessiveAmmo.get(key);
-            } else {
-                ammoBV += ammo.get(key);
-            }
-        }
-        weaponBV += ammoBV;
-        bvReport.addLine("Total Ammo BV", String.format("%.1f", ammoBV));
-
-        // add offensive misc. equipment BV (everything except AMS, A-Pod, ECM - BMR p152)
-        double oEquipmentBV = 0;
-        for (Mounted mounted : protoMek.getMisc()) {
-            MiscType mtype = (MiscType) mounted.getType();
-
-            // don't count destroyed equipment
-            if (mounted.isDestroyed()) {
-                continue;
-            }
-
-            if (mtype.hasFlag(MiscType.F_ECM)
-                    || mtype.hasFlag(MiscType.F_AP_POD)
-                    || mtype.hasFlag(MiscType.F_VIRAL_JAMMER_DECOY)
-                    || mtype.hasFlag(MiscType.F_VIRAL_JAMMER_HOMING)
-                    || mtype.hasFlag(MiscType.F_BAP)
-                    || mtype.hasFlag(MiscType.F_TARGCOMP)) {
-                continue;
-            }
-            oEquipmentBV += mtype.getBV(protoMek);
-            bvReport.addLine(mounted.getName(), "", mtype.getBV(protoMek));
-        }
-
-        weaponBV += oEquipmentBV;
-        bvReport.addResultLine("Total Equipment BV", "", oEquipmentBV);
-
-        // adjust further for speed factor
-        int mp = protoMek.getRunMPwithoutMyomerBooster(false, true, true)
-                + (int) Math.round(Math.max(jumpMP, umuMP) / 2.0);
-        // Unlike MASC and superchargers, which use walk x 2 for speed factor, myomer booster adds
-        // one to run + 1/2 jump MP
-        if (protoMek.hasMyomerBooster()) {
-            mp++;
-        }
-        double speedFactor = Math.round(Math.pow(1 + ((mp - 5) / 10.0), 1.2) * 100.0) / 100.0;
-
-        obv = weaponBV * speedFactor;
-        bvReport.addResultLine("", weaponBV);
-        bvReport.addLine("Multiply by Speed Factor of ", "" + speedFactor, "x ", speedFactor);
-        bvReport.addResultLine("Offensive Battle Value", "= ", obv);
-        bvReport.addEmptyLine();
-        bvReport.addSubHeader("Extra Battle Rating Calculation:");
+    ProtoMekBVCalculator(Entity entity) {
+        super(entity);
+    }
 
-        // we get extra bv from some stuff
-        double xbv = 0.0;
-        // extra BV for semi-guided lrm when TAG in our team
-        xbv += tagBV;
-        bvReport.addLine("Tag BV", "", tagBV);
-        bvReport.addResultLine("Extra Battle Value", "= ", xbv);
-        bvReport.addEmptyLine();
-        bvReport.addSubHeader("Final BV Calculation:");
-        bvReport.addLine("Defensive BV", "", dbv);
-        bvReport.addLine("Offensive BV", "", obv);
-        bvReport.addLine("Extra BV", "", xbv);
+    @Override
+    protected double getAmmoBV(Mounted ammo) {
+        return ((AmmoType) ammo.getType()).getKgPerShotBV(ammo.getUsableShotsLeft());
+    }
 
-        int finalBV = (int) Math.round(dbv + obv + xbv);
-        bvReport.addResultLine("Sum", "= ", finalBV);
+    @Override
+    protected int getRunningTMM() {
+        return super.getRunningTMM() + (protoMek.isGlider() ? 1 : 0);
+    }
 
-        double pilotFactor = ignoreSkill ? 1 : BvMultiplier.bvMultiplier(protoMek);
-        bvReport.addLine("Multiply by Pilot Factor of ", "" + pilotFactor, "x ", pilotFactor);
-        int retVal = (int) Math.round(finalBV * pilotFactor);
-        bvReport.addResultLine("Final Battle Value", "= ", retVal);
-        return retVal;
+    @Override
+    protected double tmmFactor(int tmmRunning, int tmmJumping, int tmmUmu) {
+        return super.tmmFactor(tmmRunning, tmmJumping, tmmUmu) + 0.1;
     }
-}
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/battlevalue/WarShipBVCalculator.java b/megamek/src/megamek/common/battlevalue/WarShipBVCalculator.java
new file mode 100644
index 00000000000..99e9c3f1aeb
--- /dev/null
+++ b/megamek/src/megamek/common/battlevalue/WarShipBVCalculator.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2022 - The MegaMek Team. All Rights Reserved.
+ *
+ * This file is part of MegaMek.
+ *
+ * MegaMek is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MegaMek is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
+ */
+package megamek.common.battlevalue;
+
+import megamek.common.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+
+import static megamek.client.ui.swing.calculationReport.CalculationReport.formatForReport;
+
+public class WarShipBVCalculator extends JumpShipBVCalculator {
+
+    protected static final int BVLOC_LEFT_BROADSIDE = 6;
+    protected static final int BVLOC_RIGHT_BROADSIDE = 7;
+
+    protected static final int[] nextLocationCW = { 5, 0, 6, 2, 3, 7, 1, 4 };
+    protected static final int[] nextLocationCCW = { 1, 6, 3, 4, 7, 0, 2, 5 };
+    protected static final int[] oppositeLocation = { 3, 4, 5, 0, 1, 2, 7, 6 };
+
+    protected int weakerAdjacentArc;
+
+    WarShipBVCalculator(Entity entity) {
+        super(entity);
+    }
+
+    @Override
+    protected boolean validArmorLocation(int location) {
+        return (location <= 5) || (location == 7) || (location == 8);
+    }
+
+    @Override
+    protected int bvLocation(Mounted equipment) {
+        if (equipment.getLocation() == Jumpship.LOC_NOSE) {
+            return BVLOC_NOSE;
+        } else if (equipment.getLocation() == Jumpship.LOC_FLS) {
+            return BVLOC_LEFT;
+        } else if (equipment.getLocation() == Jumpship.LOC_ALS) {
+            return BVLOC_LEFT_AFT;
+        } else if (equipment.getLocation() == Jumpship.LOC_AFT) {
+            return BVLOC_AFT;
+        } else if (equipment.getLocation() == Jumpship.LOC_ARS) {
+            return BVLOC_RIGHT_AFT;
+        } else if (equipment.getLocation() == Jumpship.LOC_FRS) {
+            return BVLOC_RIGHT;
+        } else if (equipment.getLocation() == Warship.LOC_LBS) {
+            return BVLOC_LEFT_BROADSIDE;
+        } else {
+            return BVLOC_RIGHT_BROADSIDE;
+        }
+    }
+
+    @Override
+    protected void determineFront() {
+        Predicate<Mounted> frontFilter = frontWeaponFilter();
+        Predicate<Mounted> rearFilter = rearWeaponFilter();
+        Predicate<Mounted> leftFilter = leftWeaponFilter();
+        Predicate<Mounted> rightFilter = rightWeaponFilter();
+        Predicate<Mounted> leftAftFilter = leftAftWeaponFilter();
+        Predicate<Mounted> rightAftFilter = rightAftWeaponFilter();
+        Predicate<Mounted> leftBroadsideFilter = weapon -> (weapon.getLocation() == Warship.LOC_LBS);
+        Predicate<Mounted> rightBroadsideFilter = weapon -> (weapon.getLocation() == Warship.LOC_RBS);
+        Map<Integer, Double> bvPerArc = new HashMap<>();
+        double weaponsBVFront = processWeaponSection(false, frontFilter, false);
+        double weaponsBVRear = processWeaponSection(false, rearFilter, false);
+        double weaponsBVLeft = processWeaponSection(false, leftFilter, false);
+        double weaponsBVRight = processWeaponSection(false, rightFilter, false);
+        double weaponsBVAftLeft = processWeaponSection(false, leftAftFilter, false);
+        double weaponsBVAftRight = processWeaponSection(false, rightAftFilter, false);
+        double weaponsBVRightBroadside = processWeaponSection(false, rightBroadsideFilter, false);
+        double weaponsBVLeftBroadside = processWeaponSection(false, leftBroadsideFilter, false);
+        bvPerArc.put(BVLOC_NOSE, weaponsBVFront);
+        bvPerArc.put(BVLOC_AFT, weaponsBVRear);
+        bvPerArc.put(BVLOC_LEFT_BROADSIDE, weaponsBVLeftBroadside);
+        bvPerArc.put(BVLOC_RIGHT_BROADSIDE, weaponsBVRightBroadside);
+        final double maxBV = bvPerArc.values().stream().mapToDouble(bv -> bv).max().orElse(0);
+        for (Map.Entry<Integer, Double> entry : bvPerArc.entrySet()) {
+            if (entry.getValue() == maxBV) {
+                nominalNoseLocation = entry.getKey();
+                break;
+            }
+        }
+        bvPerArc.put(BVLOC_LEFT, weaponsBVLeft);
+        bvPerArc.put(BVLOC_RIGHT, weaponsBVRight);
+        bvPerArc.put(BVLOC_LEFT_AFT, weaponsBVAftLeft);
+        bvPerArc.put(BVLOC_RIGHT_AFT, weaponsBVAftRight);
+        int firstAdjacentArc = getAdjacentLocationCCW(nominalNoseLocation);
+        int secondAdjacentArc = getAdjacentLocationCW(nominalNoseLocation);
+        if (bvPerArc.get(firstAdjacentArc) > bvPerArc.get(secondAdjacentArc)) {
+            nominalLeftLocation = firstAdjacentArc;
+            nominalRightLocation = secondAdjacentArc;
+        } else {
+            nominalLeftLocation = secondAdjacentArc;
+            nominalRightLocation = firstAdjacentArc;
+        }
+
+        weakerAdjacentArc = nominalRightLocation;
+        nominalRightLocation = oppositeLocation[nominalNoseLocation];
+
+        bvReport.addLine("Nominal Nose Location",
+                arcName(nominalNoseLocation) + ", Weapon BV: " + formatForReport(bvPerArc.get(nominalNoseLocation)),
+                "");
+        bvReport.addLine("Nominal Left Location",
+                arcName(nominalLeftLocation) + ", Weapon BV: " + formatForReport(bvPerArc.get(nominalLeftLocation)),
+                "");
+        bvReport.addLine("Nominal Right Location",
+                arcName(nominalRightLocation) + ", Weapon BV: " + formatForReport(bvPerArc.get(nominalRightLocation)),
+                "");
+        frontAndRearDecided = true;
+    }
+
+    @Override
+    protected void processWeapons() {
+        for (Mounted weapon : entity.getTotalWeaponList()) {
+            if (countAsOffensiveWeapon(weapon)) {
+                Mounted key = collectedWeapons.keySet().stream()
+                        .filter(wp -> canBeSummed(weapon, wp)).findFirst().orElse(weapon);
+                collectedWeapons.merge(key, 1, Integer::sum);
+            }
+        }
+        int heatEfficiency = heatEfficiency();
+
+        double totalHeatSum = processArc(nominalNoseLocation);
+        bvReport.addLine("Total Heat:", formatForReport(totalHeatSum), "");
+        heatEfficiencyExceeded = totalHeatSum > heatEfficiency;
+        if (heatEfficiencyExceeded) {
+            bvReport.addLine("Heat Efficiency Exceeded", "", "");
+        }
+
+        totalHeatSum += processArc(nominalLeftLocation);
+        bvReport.addLine("Total Heat:", formatForReport(totalHeatSum), "");
+        heatEfficiencyExceeded = totalHeatSum > heatEfficiency;
+        if (heatEfficiencyExceeded) {
+            bvReport.addLine("Heat Efficiency Exceeded", "", "");
+        }
+
+        processArc(nominalRightLocation);
+        processArc(getAdjacentLocationCCW(nominalRightLocation));
+        processArc(getAdjacentLocationCW(nominalRightLocation));
+        processArc(getAdjacentLocationCCW(getAdjacentLocationCCW(nominalRightLocation)));
+        processArc(getAdjacentLocationCW(getAdjacentLocationCW(nominalRightLocation)));
+        processArc(weakerAdjacentArc);
+        bvReport.addEmptyLine();
+    }
+
+    @Override
+    protected String arcName(int bvLocation) {
+        switch (bvLocation) {
+            case BVLOC_NOSE:
+                return entity.getLocationName(Jumpship.LOC_NOSE);
+            case BVLOC_LEFT:
+                return entity.getLocationName(Jumpship.LOC_FLS);
+            case BVLOC_LEFT_AFT:
+                return entity.getLocationName(Jumpship.LOC_ALS);
+            case BVLOC_AFT:
+                return entity.getLocationName(Jumpship.LOC_AFT);
+            case BVLOC_RIGHT_AFT:
+                return entity.getLocationName(Jumpship.LOC_ARS);
+            case BVLOC_RIGHT:
+                return entity.getLocationName(Jumpship.LOC_FRS);
+            case BVLOC_LEFT_BROADSIDE:
+                return entity.getLocationName(Warship.LOC_LBS);
+            case BVLOC_RIGHT_BROADSIDE:
+                return entity.getLocationName(Warship.LOC_RBS);
+        }
+        return "Error: Unexpected location value.";
+    }
+
+    @Override
+    protected int getAdjacentLocationCCW(int bvLocation) {
+        return nextLocationCCW[bvLocation];
+    }
+
+    @Override
+    protected int getAdjacentLocationCW(int bvLocation) {
+        return nextLocationCW[bvLocation];
+    }
+
+    @Override
+    protected int getOppositeLocation(int bvLocation) {
+        return oppositeLocation[bvLocation];
+    }
+
+    @Override
+    protected int offensiveSpeedFactorMP() {
+        return aero.getRunMP(MPCalculationSetting.BV_CALCULATION);
+    }
+
+    @Override
+    protected void processTypeModifier() {
+        double typeModifier = 0.8;
+        bvReport.addLine("Type Modifier:",
+                formatForReport(defensiveValue) + " x " + formatForReport(typeModifier),
+                "= " + formatForReport(defensiveValue * typeModifier));
+        defensiveValue *= typeModifier;
+    }
+}
\ No newline at end of file
diff --git a/megamek/src/megamek/common/pathfinder/CachedEntityState.java b/megamek/src/megamek/common/pathfinder/CachedEntityState.java
index 1254552e3e8..47ebf89da45 100644
--- a/megamek/src/megamek/common/pathfinder/CachedEntityState.java
+++ b/megamek/src/megamek/common/pathfinder/CachedEntityState.java
@@ -4,11 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import megamek.common.Entity;
-import megamek.common.Mech;
-import megamek.common.MiscType;
-import megamek.common.QuadMech;
-import megamek.common.TripodMech;
+import megamek.common.*;
 
 /**
  * A transient class used to lazy-load "calculated" information from an entity
@@ -63,7 +59,7 @@ public int getRunMPwithoutMASC() {
 
     public int getRunMPwithOneMASC() {
         if (runMPWithOneMasc == null) {
-            runMPWithOneMasc = backingEntity.getRunMPwithOneMASC();
+            runMPWithOneMasc = backingEntity.getRunMP(MPCalculationSetting.ONE_MASC);
         }
 
         return runMPWithOneMasc;
@@ -131,7 +127,7 @@ public int getTorsoJumpJets() {
     
     public int getJumpMPNoGravity() {
         if (jumpMPNoGravity == null) {
-            jumpMPNoGravity = backingEntity.getJumpMP(false);
+            jumpMPNoGravity = backingEntity.getJumpMP(MPCalculationSetting.NO_GRAVITY);
         }
         
         return jumpMPNoGravity;
diff --git a/megamek/src/megamek/common/pathfinder/DestructionAwareDestinationPathfinder.java b/megamek/src/megamek/common/pathfinder/DestructionAwareDestinationPathfinder.java
index b76ddb3f9cd..e4b6dd56d31 100644
--- a/megamek/src/megamek/common/pathfinder/DestructionAwareDestinationPathfinder.java
+++ b/megamek/src/megamek/common/pathfinder/DestructionAwareDestinationPathfinder.java
@@ -269,7 +269,8 @@ private boolean friendlyFireCheck(Entity shooter, Game game, Coords position, bo
         // - is friendly
         // - if we care only about mobile units, has no MP 
         for (Entity entity : game.getEntitiesVector(position, true)) {
-            if (!entity.isEnemyOf(shooter) && (includeMobileUnits || (entity.getWalkMP(true, false) == 0))) {
+            if (!entity.isEnemyOf(shooter)
+                    && (includeMobileUnits || (entity.getWalkMP(MPCalculationSetting.STANDARD) == 0))) {
                 friendlyFireCheckResults.put(position, true);
                 return true;
             }
diff --git a/megamek/src/megamek/common/verifier/TestMech.java b/megamek/src/megamek/common/verifier/TestMech.java
index 200d733e2d9..5b8c4203830 100755
--- a/megamek/src/megamek/common/verifier/TestMech.java
+++ b/megamek/src/megamek/common/verifier/TestMech.java
@@ -706,20 +706,20 @@ public boolean correctArmor(StringBuffer buff) {
     public boolean correctMovement(StringBuffer buff) {
         // Mechanical Jump Boosts can be greater then Running as long as
         // the unit can handle the weight.
-        if ((mech.getJumpMP(false) > mech.getOriginalRunMP())
+        if ((mech.getJumpMP(MPCalculationSetting.NO_GRAVITY) > mech.getOriginalRunMP())
                 && !mech.hasJumpBoosters()
                 && !mech.hasWorkingMisc(MiscType.F_PARTIAL_WING)) {
             buff.append("Jump MP exceeds run MP\n");
             return false;
         }
-        if ((mech.getJumpMP(false) > mech.getOriginalWalkMP())
+        if ((mech.getJumpMP(MPCalculationSetting.NO_GRAVITY) > mech.getOriginalWalkMP())
                 && (((mech.getJumpType() != Mech.JUMP_IMPROVED) && (mech.getJumpType() != Mech.JUMP_PROTOTYPE_IMPROVED))
                         && !mech.hasWorkingMisc(MiscType.F_PARTIAL_WING) && !mech
                             .hasJumpBoosters())) {
             buff.append("Jump MP exceeds walk MP without IJJs\n");
             return false;
         }
-        if ((mech instanceof LandAirMech) && mech.getJumpMP(false) < 3) {
+        if ((mech instanceof LandAirMech) && mech.getJumpMP(MPCalculationSetting.NO_GRAVITY) < 3) {
             buff.append("LAMs must have at least 3 jumping MP.\n");
             return false;
         }
diff --git a/megamek/src/megamek/common/verifier/TestSupportVehicle.java b/megamek/src/megamek/common/verifier/TestSupportVehicle.java
index 2c32dc6f9e2..0bd6fd63b84 100644
--- a/megamek/src/megamek/common/verifier/TestSupportVehicle.java
+++ b/megamek/src/megamek/common/verifier/TestSupportVehicle.java
@@ -1320,7 +1320,7 @@ public StringBuffer printSlotCalculation() {
         // different engines take different amounts of slots
 
         // JJs take just 1 slot
-        if (supportVee.getJumpMP(false) > 0) {
+        if (supportVee.getJumpMP(MPCalculationSetting.NO_GRAVITY) > 0) {
             buff.append(StringUtil.makeLength("Jump Jets", 30)).append("1\n");
         }
 
diff --git a/megamek/src/megamek/common/verifier/TestTank.java b/megamek/src/megamek/common/verifier/TestTank.java
index 0f4c2d098d4..d8c00d7d8a9 100755
--- a/megamek/src/megamek/common/verifier/TestTank.java
+++ b/megamek/src/megamek/common/verifier/TestTank.java
@@ -635,7 +635,7 @@ public StringBuffer printSlotCalculation() {
         }
 
         // JJs take just 1 slot
-        if (tank.getJumpMP(false) > 0) {
+        if (tank.getJumpMP(MPCalculationSetting.NO_GRAVITY) > 0) {
             buff.append(StringUtil.makeLength("Jump Jets", 30)).append("1\n");
         }
 
diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
index e66bde4e997..89a4286da74 100644
--- a/megamek/src/megamek/server/GameManager.java
+++ b/megamek/src/megamek/server/GameManager.java
@@ -6935,7 +6935,7 @@ private void processMovement(Entity entity, MovePath md, Map<EntityTargetPair,
 
             if (cachedGravityLimit < 0) {
                 cachedGravityLimit = EntityMovementType.MOVE_JUMP == moveType
-                        ? entity.getJumpMP(false)
+                        ? entity.getJumpMP(MPCalculationSetting.NO_GRAVITY)
                         : entity.getRunningGravityLimit();
             }
             // check for charge
@@ -8352,8 +8352,7 @@ else if ((step.getElevation() + entity.height()) == 0) {
         // if we used ProtoMech myomer booster, roll 2d6
         // pilot damage on a 2
         if ((entity instanceof Protomech) && ((Protomech) entity).hasMyomerBooster()
-                && (md.getMpUsed() > ((Protomech) entity)
-                .getRunMPwithoutMyomerBooster(true, false, false))) {
+                && (md.getMpUsed() > entity.getRunMP(MPCalculationSetting.NO_MYOMERBOOSTER))) {
             r = new Report(2373);
             r.addDesc(entity);
             r.subject = entity.getId();
@@ -20156,7 +20155,7 @@ private Vector<Report> resolvePilotingRolls(Entity entity, boolean moving,
                         if (!entity.gotPavementBonus) {
                             int j = entity.mpUsed;
                             int damage = 0;
-                            while (j > (entity.getRunMP(false, false, false) + k)) {
+                            while (j > (entity.getRunMP(MPCalculationSetting.NO_GRAVITY) + k)) {
                                 j--;
                                 damage++;
                             }
@@ -20173,7 +20172,7 @@ private Vector<Report> resolvePilotingRolls(Entity entity, boolean moving,
                     if (game.getPlanetaryConditions().getGravity() < 1) {
                         int j = entity.mpUsed;
                         int damage = 0;
-                        while (j > entity.getJumpMP(false)) {
+                        while (j > entity.getJumpMP(MPCalculationSetting.NO_GRAVITY)) {
                             j--;
                             damage++;
                         }
@@ -20183,7 +20182,7 @@ private Vector<Report> resolvePilotingRolls(Entity entity, boolean moving,
                     }
                     // high g, 1 damage for each MP we have less than normally
                     else if (game.getPlanetaryConditions().getGravity() > 1) {
-                        int damage = entity.getWalkMP(false, false)
+                        int damage = entity.getWalkMP(MPCalculationSetting.NO_GRAVITY)
                                 - entity.getWalkMP();
                         // Wee, direct internal damage
                         vPhaseReport.addAll(doExtremeGravityDamage(entity,
@@ -32228,7 +32227,7 @@ private void checkExtremeGravityMovement(Entity entity, MoveStep step,
                 } else if (moveType == EntityMovementType.MOVE_JUMP) {
                     LogManager.getLogger().debug("Gravity move check jump: "
                             + step.getMpUsed() + "/" + cachedMaxMPExpenditure);
-                    int origWalkMP = entity.getWalkMP(false, false);
+                    int origWalkMP = entity.getWalkMP(MPCalculationSetting.NO_GRAVITY);
                     int gravWalkMP = entity.getWalkMP();
                     if (step.getMpUsed() > cachedMaxMPExpenditure) {
                         // Jumped too far, make PSR to see if we get damaged
diff --git a/megamek/src/megamek/utilities/MechCacheCSVTool.java b/megamek/src/megamek/utilities/MechCacheCSVTool.java
index b96f3e2def2..2fe5534d7e1 100644
--- a/megamek/src/megamek/utilities/MechCacheCSVTool.java
+++ b/megamek/src/megamek/utilities/MechCacheCSVTool.java
@@ -43,7 +43,7 @@ public static void main(String... args) {
 
             StringBuilder csvLine = new StringBuilder();
 
-            csvLine.append("Chassis,Model,MUL ID,Combined,Clan,Source,Weight,Intro Date,Experimental year,Advanced year," +
+            csvLine.append("Chassis,Model,MUL ID,Combined,Clan,Source,File Location,Weight,Intro Date,Experimental year,Advanced year," +
                     "Standard year,Extinct Year,Unit Type,Role,BV,Cost,Rules,Engine Name,Internal Structure,Myomer," +
                     "Cockpit Type,Gyro Type,Armor Types,Equipment (multiple entries)\n");
             bw.write(csvLine.toString());
@@ -59,6 +59,7 @@ public static void main(String... args) {
                 csvLine.append(unit.getMulId()).append(",");
                 csvLine.append(unit.getChassis()).append(" ").append(unit.getModel()).append(",");
                 csvLine.append(unit.isClan()).append(",");
+                csvLine.append(unit.getSource()).append(",");
                 csvLine.append(unit.getSourceFile()).append(",");
                 csvLine.append(unit.getTons()).append(",");
                 csvLine.append(unit.getYear()).append(",");
diff --git a/megamek/unittests/megamek/client/bot/princess/BasicPathRankerTest.java b/megamek/unittests/megamek/client/bot/princess/BasicPathRankerTest.java
index 9d4dc23f9ff..5c55fa8fe6b 100644
--- a/megamek/unittests/megamek/client/bot/princess/BasicPathRankerTest.java
+++ b/megamek/unittests/megamek/client/bot/princess/BasicPathRankerTest.java
@@ -882,7 +882,7 @@ public void testFindClosestEnemy() {
         when(unmovedMech.isSelectableThisTurn()).thenReturn(true);
         when(unmovedMech.isImmobile()).thenReturn(false);
         // Movement should cause it to be further away.
-        when(unmovedMech.getWalkMP(anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(6);
+        when(unmovedMech.getWalkMP()).thenReturn(6);
         enemyList.add(unmovedMech);
         assertEquals(enemyMech, testRanker.findClosestEnemy(me, position, mockGame));
 
diff --git a/megamek/unittests/megamek/client/bot/princess/PrincessTest.java b/megamek/unittests/megamek/client/bot/princess/PrincessTest.java
index 25f33e2d777..e5379faeb55 100644
--- a/megamek/unittests/megamek/client/bot/princess/PrincessTest.java
+++ b/megamek/unittests/megamek/client/bot/princess/PrincessTest.java
@@ -95,8 +95,8 @@ public void testCalculateMoveIndex() {
 
         // Test a 6/9/6 regular mech.
         Entity mockMech = mock(BipedMech.class);
-        when(mockMech.getRunMP(anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(9);
-        when(mockMech.getJumpMP(anyBoolean())).thenReturn(6);
+        when(mockMech.getRunMP(MPCalculationSetting.STANDARD)).thenReturn(9);
+        when(mockMech.getJumpMP(MPCalculationSetting.STANDARD)).thenReturn(6);
         when(mockMech.isProne()).thenReturn(false);
         when(mockMech.isCommander()).thenReturn(false);
         when(mockMech.isMilitary()).thenReturn(true);
@@ -150,8 +150,8 @@ public void testCalculateMoveIndex() {
 
         // Test a BA unit.
         Entity mockBA = mock(BattleArmor.class);
-        when(mockBA.getRunMP(anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(1);
-        when(mockBA.getJumpMP(anyBoolean())).thenReturn(3);
+        when(mockBA.getRunMP()).thenReturn(1);
+        when(mockBA.getJumpMP()).thenReturn(3);
         when(mockBA.isProne()).thenReturn(false);
         when(mockBA.isCommander()).thenReturn(false);
         when(mockBA.isMilitary()).thenReturn(true);
@@ -164,8 +164,8 @@ public void testCalculateMoveIndex() {
 
         // Test an Inf unit.
         Entity mockInf = mock(Infantry.class);
-        when(mockInf.getRunMP(anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(1);
-        when(mockInf.getJumpMP(anyBoolean())).thenReturn(0);
+        when(mockInf.getRunMP(MPCalculationSetting.STANDARD)).thenReturn(1);
+        when(mockInf.getJumpMP(MPCalculationSetting.STANDARD)).thenReturn(0);
         when(mockInf.isProne()).thenReturn(false);
         when(mockInf.isCommander()).thenReturn(false);
         when(mockInf.isMilitary()).thenReturn(true);
@@ -178,8 +178,8 @@ public void testCalculateMoveIndex() {
 
         // Test a Tank.
         Entity mockTank = mock(Tank.class);
-        when(mockTank.getRunMP(anyBoolean(), anyBoolean(), anyBoolean())).thenReturn(6);
-        when(mockTank.getJumpMP(anyBoolean())).thenReturn(0);
+        when(mockTank.getRunMP(MPCalculationSetting.STANDARD)).thenReturn(6);
+        when(mockTank.getJumpMP(MPCalculationSetting.STANDARD)).thenReturn(0);
         when(mockTank.isProne()).thenReturn(false);
         when(mockTank.isCommander()).thenReturn(false);
         when(mockTank.isMilitary()).thenReturn(true);
diff --git a/megamek/unittests/megamek/common/CrewTest.java b/megamek/unittests/megamek/common/CrewTest.java
index 21899053927..823cd1256bc 100644
--- a/megamek/unittests/megamek/common/CrewTest.java
+++ b/megamek/unittests/megamek/common/CrewTest.java
@@ -19,7 +19,7 @@
  */
 package megamek.common;
 
-import megamek.common.battlevalue.BvMultiplier;
+import megamek.common.battlevalue.BVCalculator;
 import megamek.common.options.GameOptions;
 import org.junit.jupiter.api.Test;
 
@@ -42,14 +42,14 @@ public void testGetBVSkillMultiplier() {
         // Test the default case.
         Game mockGame = null;
         double expected = 1.0;
-        double actual = BvMultiplier.bvSkillMultiplier(gunnery, piloting);
+        double actual = BVCalculator.bvSkillMultiplier(gunnery, piloting);
         assertEquals(expected, actual, 0.001);
 
         mockGame = mock(Game.class);
         GameOptions mockOptions = mock(GameOptions.class);
         when(mockGame.getOptions()).thenReturn(mockOptions);
         expected = 1.0;
-        actual = BvMultiplier.bvSkillMultiplier(gunnery, piloting);
+        actual = BVCalculator.bvSkillMultiplier(gunnery, piloting);
         assertEquals(expected, actual, 0.001);
 
         // Test a 3/4 pilot.
@@ -57,7 +57,7 @@ public void testGetBVSkillMultiplier() {
         piloting = 4;
         when(mockOptions.booleanOption(eq("alternate_pilot_bv_mod"))).thenReturn(false);
         expected = 1.32;
-        actual = BvMultiplier.bvSkillMultiplier(gunnery, piloting);
+        actual = BVCalculator.bvSkillMultiplier(gunnery, piloting);
         assertEquals(expected, actual, 0.001);
 
         // Test a 5/6 pilot.
@@ -65,7 +65,7 @@ public void testGetBVSkillMultiplier() {
         piloting = 6;
         when(mockOptions.booleanOption(eq("alternate_pilot_bv_mod"))).thenReturn(false);
         expected = 0.86;
-        actual = BvMultiplier.bvSkillMultiplier(gunnery, piloting);
+        actual = BVCalculator.bvSkillMultiplier(gunnery, piloting);
         assertEquals(expected, actual, 0.001);
 
         // Test a 2/6 pilot.
@@ -73,7 +73,7 @@ public void testGetBVSkillMultiplier() {
         piloting = 6;
         when(mockOptions.booleanOption(eq("alternate_pilot_bv_mod"))).thenReturn(false);
         expected = 1.35;
-        actual = BvMultiplier.bvSkillMultiplier(gunnery, piloting);
+        actual = BVCalculator.bvSkillMultiplier(gunnery, piloting);
         assertEquals(expected, actual, 0.001);
 
         // Test a 0/0 pilot.
@@ -81,7 +81,7 @@ public void testGetBVSkillMultiplier() {
         piloting = 0;
         when(mockOptions.booleanOption(eq("alternate_pilot_bv_mod"))).thenReturn(false);
         expected = 2.42;
-        actual = BvMultiplier.bvSkillMultiplier(gunnery, piloting);
+        actual = BVCalculator.bvSkillMultiplier(gunnery, piloting);
         assertEquals(expected, actual, 0.001);
     }
 }
diff --git a/megamek/unittests/megamek/common/EntityTest.java b/megamek/unittests/megamek/common/EntityTest.java
index 3caabc30603..9132c7145fb 100644
--- a/megamek/unittests/megamek/common/EntityTest.java
+++ b/megamek/unittests/megamek/common/EntityTest.java
@@ -20,6 +20,7 @@
 package megamek.common;
 
 import megamek.client.ui.swing.calculationReport.CalculationReport;
+import megamek.common.battlevalue.BVCalculator;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -27,8 +28,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -40,11 +40,13 @@ public class EntityTest {
 
     private Entity setupGunEmplacement() {
         Entity testEntity = mock(GunEmplacement.class);
+        when(testEntity.getBvCalculator()).thenReturn(BVCalculator.getBVCalculator(testEntity));
         when(testEntity.calculateBattleValue()).thenCallRealMethod();
         when(testEntity.calculateBattleValue(anyBoolean(), anyBoolean())).thenCallRealMethod();
         when(testEntity.doBattleValueCalculation(anyBoolean(), anyBoolean(),
                 any(CalculationReport.class))).thenCallRealMethod();
         when(testEntity.getTotalArmor()).thenReturn(100);
+        when(testEntity.getBARRating(anyInt())).thenCallRealMethod();
         ArrayList<Mounted> equipment = new ArrayList<>(2);
         WeaponType ppcType = mock(WeaponType.class);
         when(ppcType.getBV(any(Entity.class))).thenReturn(50.0);
@@ -63,7 +65,7 @@ private Entity setupGunEmplacement() {
     public void testCalculateBattleValue() {
         // Test a gun emplacement.
         Entity testEntity = setupGunEmplacement();
-        int expected = 94;
+        int expected = 169;
         int actual = testEntity.calculateBattleValue(true, true);
         assertEquals(expected, actual);
         when(testEntity.getTotalArmor()).thenReturn(0); // Gun Emplacement with no armor.