diff --git a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
index f36ef6122..d32c0c1bb 100644
--- a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
+++ b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
@@ -187,7 +187,7 @@
 		<ignoreArmour>0</ignoreArmour>
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
-		<spreadPattern>BuckshotSpread</spreadPattern>
+		<spreadPattern>Buckshot</spreadPattern>
 		<temperatureModificator>0.0</temperatureModificator>
 		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.0</dirtModificator>
@@ -226,7 +226,7 @@
 		<ignoreArmour>0</ignoreArmour>
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
-		<spreadPattern>FlechetteSpread</spreadPattern>
+		<spreadPattern>Flechette</spreadPattern>
 		<temperatureModificator>0.03</temperatureModificator>
 		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>-0.25</dirtModificator>
@@ -1084,7 +1084,7 @@
 		<ignoreArmour>0</ignoreArmour>
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
-		<spreadPattern>DuplexSpread</spreadPattern>
+		<spreadPattern>Duplex</spreadPattern>
 		<temperatureModificator>0.15</temperatureModificator>
 		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.3</dirtModificator>
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 83993af2e..acddec77c 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -1378,7 +1378,7 @@
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
 		<BR_ROF>22</BR_ROF>
-		<spreadPattern>ChokeImpModSpread</spreadPattern>
+		<spreadPattern>Imp Mod Choke</spreadPattern>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<DamageChance>10</DamageChance>
 		<DirtIncreaseFactor>20.0</DirtIncreaseFactor>
@@ -7349,7 +7349,7 @@
 		<BR_UsedInventory>1</BR_UsedInventory>
 		<RangeBonus>20</RangeBonus>
 		<Duckbill>1</Duckbill>
-		<spreadPattern>DuckbillSpread</spreadPattern>
+		<spreadPattern>Duckbill</spreadPattern>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -9970,7 +9970,7 @@
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
 		<BR_ROF>20</BR_ROF>
-		<spreadPattern>ChokeImpModSpread</spreadPattern>
+		<spreadPattern>Imp Mod Choke</spreadPattern>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<DamageChance>10</DamageChance>
 		<DirtIncreaseFactor>20.0</DirtIncreaseFactor>
@@ -21184,7 +21184,7 @@
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
 		<BR_ROF>24</BR_ROF>
-		<spreadPattern>SawedoffSpread</spreadPattern>
+		<spreadPattern>Sawed off</spreadPattern>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<DamageChance>10</DamageChance>
 		<DirtIncreaseFactor>20.0</DirtIncreaseFactor>
@@ -22010,7 +22010,7 @@
 		<BR_ROF>28</BR_ROF>
 		<BurstToHitBonus>5</BurstToHitBonus>
 		<AutoFireToHitBonus>5</AutoFireToHitBonus>
-		<spreadPattern>SawedoffSpread</spreadPattern>
+		<spreadPattern>Sawed off</spreadPattern>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<DamageChance>10</DamageChance>
 		<DirtIncreaseFactor>20.0</DirtIncreaseFactor>
@@ -40887,7 +40887,7 @@
 		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>2</BR_UsedInventory>
 		<RangeBonus>30</RangeBonus>
-		<spreadPattern>ChokeImpModSpread</spreadPattern>
+		<spreadPattern>Imp Mod Choke</spreadPattern>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -40917,7 +40917,7 @@
 		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>2</BR_UsedInventory>
 		<RangeBonus>40</RangeBonus>
-		<spreadPattern>ChokeFullSpread</spreadPattern>
+		<spreadPattern>Full Choke</spreadPattern>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -40948,7 +40948,7 @@
 		<BR_UsedInventory>2</BR_UsedInventory>
 		<RangeBonus>60</RangeBonus>
 		<ToHitBonus>20</ToHitBonus>
-		<spreadPattern>ChokeRifledSpread</spreadPattern>
+		<spreadPattern>Rifled Choke</spreadPattern>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml
index ef620ab22..1c57675b0 100644
--- a/gamedir/Data-1.13/TableData/MercProfiles.xml
+++ b/gamedir/Data-1.13/TableData/MercProfiles.xml
@@ -4031,7 +4031,7 @@
 		<bExplosive>4</bExplosive>
 		<bLeadership>13</bLeadership>
 		<bMedical>24</bMedical>
-		<bMechanical>0</bMechanical>
+		<bMechanical>2</bMechanical>
 		<bExpLevel>2</bExpLevel>
 		<bEvolution>0</bEvolution>
 		<bOldSkillTrait>6</bOldSkillTrait>
@@ -4506,7 +4506,7 @@
 		<bExplosive>56</bExplosive>
 		<bLeadership>11</bLeadership>
 		<bMedical>9</bMedical>
-		<bMechanical>0</bMechanical>
+		<bMechanical>5</bMechanical>
 		<bExpLevel>1</bExpLevel>
 		<bEvolution>0</bEvolution>
 		<bOldSkillTrait>3</bOldSkillTrait>
@@ -17236,7 +17236,7 @@
 		<bExplosive>69</bExplosive>
 		<bLeadership>1</bLeadership>
 		<bMedical>0</bMedical>
-		<bMechanical>0</bMechanical>
+		<bMechanical>7</bMechanical>
 		<bExpLevel>1</bExpLevel>
 		<bEvolution>0</bEvolution>
 		<bOldSkillTrait>3</bOldSkillTrait>
@@ -24148,7 +24148,7 @@
 		<bExplosive>85</bExplosive>
 		<bLeadership>2</bLeadership>
 		<bMedical>31</bMedical>
-		<bMechanical>0</bMechanical>
+		<bMechanical>11</bMechanical>
 		<bExpLevel>1</bExpLevel>
 		<bEvolution>0</bEvolution>
 		<bOldSkillTrait>3</bOldSkillTrait>
diff --git a/gamedir/Data-1.13/TableData/SpreadPatterns.xml b/gamedir/Data-1.13/TableData/SpreadPatterns.xml
index 7cdd04ea6..c92e695b3 100644
--- a/gamedir/Data-1.13/TableData/SpreadPatterns.xml
+++ b/gamedir/Data-1.13/TableData/SpreadPatterns.xml
@@ -80,7 +80,7 @@ Doing so makes everything a lot easier to read.
 
 -->
 	<SPREADPATTERN>
-		<NAME>DefaultSpread</NAME>
+		<NAME>Default</NAME>
 		<DESC>First pellet straight ahead, then follow the original game's shotgun pattern, then wide random spread.</DESC>
 		<!-- First fires straight  -->
 		<p><x> 0.0000</x><y> 0.0000</y></p>
@@ -100,17 +100,17 @@ Doing so makes everything a lot easier to read.
 	*** Section for AmmoType spread patterns ***
 	-->
 	<SPREADPATTERN>
-		<NAME>BuckshotSpread</NAME>
+		<NAME>Buckshot</NAME>
 		<DESC>Spread range slightly wider than the original game.</DESC>
 		<xspread>0.0150</xspread> <yspread>0.0150</yspread>
 	</SPREADPATTERN>
 	<SPREADPATTERN>
-		<NAME>FlechetteSpread</NAME>
+		<NAME>Flechette</NAME>
 		<DESC>Flechettes spread much wider than shot.</DESC>
 		<xspread>0.0250</xspread> <yspread>0.0250</yspread>
 	</SPREADPATTERN>
 	<SPREADPATTERN>
-		<NAME>DuplexSpread</NAME>
+		<NAME>Duplex</NAME>
 		<DESC>Also for triplex, quadplex, or any other inline multiple projectile.</DESC>
 		<xspread>0.0120</xspread> <yspread>0.0120</yspread>
 		<p><x> 0.0000</x><y> 0.0000</y></p>
@@ -119,7 +119,7 @@ Doing so makes everything a lot easier to read.
 	*** Section for Ammo item specific spread patterns ***
 	-->
 	<SPREADPATTERN>
-		<NAME>12gaTungstenSpread</NAME>
+		<NAME>Tungsten</NAME>
 		<DESC>
 			(not used anywhere right now, just an example)
 			Tungsten shot groups better and hits harder at range.
@@ -132,7 +132,7 @@ Doing so makes everything a lot easier to read.
 	*** Section for Weapon item specific spread patterns ***
 	-->
 	<SPREADPATTERN>
-		<NAME>FlamerSpread</NAME>
+		<NAME>Flamer</NAME>
 		<DESC>Flamethrower more spread out.  Uses static angles, unchanged from original game.</DESC>
 		<p><x> 0.0000</x><y> 0.0000</y></p>
 		<p><x>-0.1200</x><y> 0.0000</y></p>
@@ -145,7 +145,7 @@ Doing so makes everything a lot easier to read.
 		<p><x>+0.0080</x><y>+0.0080</y></p>
 	</SPREADPATTERN>
 	<SPREADPATTERN>
-		<NAME>SawedoffSpread</NAME>
+		<NAME>Sawed off</NAME>
 		<DESC>
 			Very wide spread from a crudely cut-off barrel.
 			Use weapon based spread patterns spareingly, since ammo will likely be tweaked to have a specific
@@ -157,17 +157,17 @@ Doing so makes everything a lot easier to read.
 	*** Section for Attachment item specific spread patterns ***
 	-->
 	<SPREADPATTERN>
-		<NAME>DuckbillSpread</NAME>
+		<NAME>Duckbill</NAME>
 		<DESC>Duckbill flattens the spread and makes it wider horizontally.</DESC>
 		<xspread>0.0350</xspread> <yspread>0.0050</yspread>
 	</SPREADPATTERN>
 	<SPREADPATTERN>
-		<NAME>ChokeImpModSpread</NAME>
+		<NAME>Imp Mod Choke</NAME>
 		<DESC>A improved modified choke for standard 12ga shotguns.</DESC>
 		<xspread>0.0110</xspread> <yspread>0.0100</yspread>
 	</SPREADPATTERN>
 	<SPREADPATTERN>
-		<NAME>ChokeFullSpread</NAME>
+		<NAME>Full Choke</NAME>
 		<DESC>A full choke for standard 12ga shotguns.
 			Not for use with slugs or steel shot!
 			Well, in real life, but it won't hurt you in the game.
@@ -176,7 +176,7 @@ Doing so makes everything a lot easier to read.
 		<xspread>0.0080</xspread> <yspread>0.0080</yspread>
 	</SPREADPATTERN>
 	<SPREADPATTERN>
-		<NAME>ChokeRifledSpread</NAME>
+		<NAME>Rifled Choke</NAME>
 		<DESC>A rifled choke for standard 12ga shotguns.
 			This is a little bit of a hack, and a good example of what can be done when getting creative.
 			Rifled chokes are intended to increase the range and accuracy of slugs.
@@ -193,13 +193,13 @@ Doing so makes everything a lot easier to read.
 	*** Section for other unused, special case, testing, or quicky mod-related spread patterns ***
 	-->
 	<SPREADPATTERN>
-		<NAME>RandomSpread</NAME>
+		<NAME>Random</NAME>
 		<DESC>Random angles, from straight ahead to straight back, up, down, left, right.</DESC>
 		<method>Rectangle</method>
 		<xspread>3.1415</xspread> <yspread>3.1415</yspread>
 	</SPREADPATTERN>
 	<SPREADPATTERN>
-		<NAME>CrazySpread</NAME>
+		<NAME>Crazy</NAME>
 		<DESC>Everything firing with moderate spread, but backwards</DESC>
 		<p><x>+3.1415</x><y> 0.0000</y></p>
 		<p><x>-3.1415</x><y> 0.0000</y></p>
@@ -209,7 +209,7 @@ Doing so makes everything a lot easier to read.
 		<p><x>-3.0000</x><y>-0.0100</y></p>
 	</SPREADPATTERN>
 	<SPREADPATTERN>
-		<NAME>AxisSpread</NAME>
+		<NAME>Axis</NAME>
 		<DESC>In straight lines along every axis</DESC>
 		<p><x> 0.0000</x><y> 0.0000</y></p> <!-- forward -->
 		<p><x>+3.1415</x><y> 0.0000</y></p> <!-- backward -->