diff --git a/Common/Defs/RaceGeneDefs/RaceGeneDefs_RaceGroups.xml b/Common/Defs/RaceGeneDefs/RaceGeneDefs_RaceGroups.xml
index e83baa7..b225233 100644
--- a/Common/Defs/RaceGeneDefs/RaceGeneDefs_RaceGroups.xml
+++ b/Common/Defs/RaceGeneDefs/RaceGeneDefs_RaceGroups.xml
@@ -56,7 +56,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -119,7 +119,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -181,7 +181,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -229,7 +229,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -295,7 +295,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -324,11 +324,11 @@
 				<chance>0.25</chance>
 			</li>
 			<li>
-				<defName>FastRunner</defName>
+				<defName>MoveSpeed_Quick</defName>
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_small_genitalia</defName>
+				<defName>rjw_genes_small_male_genitalia</defName>
 				<chance>0.6</chance>
 			</li>
 			<li>
@@ -348,7 +348,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -390,7 +390,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -429,7 +429,7 @@
 				<chance>0.3</chance>
 			</li>
 			<li>
-				<defName>AptitudePoor_Learning</defName>
+				<defName>AptitudePoor_Intellectual</defName>
 				<chance>0.4</chance>
 			</li>
 			<li>
@@ -441,7 +441,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>AptitudePoor_Ranged</defName>
+				<defName>AptitudePoor_Shooting</defName>
 				<chance>0.6</chance>
 			</li>
 			<li>
@@ -493,7 +493,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -526,7 +526,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_small_genitalia</defName>
+				<defName>rjw_genes_small_male_genitalia</defName>
 				<chance>0.5</chance>
 			</li>
 			<li>
@@ -546,7 +546,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -577,7 +577,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>AptitudeTerrible_Ranged</defName>
+				<defName>AptitudeTerrible_Shooting</defName>
 				<chance>0.4</chance>
 			</li>
 			<li>
@@ -589,7 +589,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -614,7 +614,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>Hands_pig</defName>
+				<defName>Hand</defName>
 				<chance>0.6</chance>
 			</li>
 			<li>
@@ -638,7 +638,7 @@
 				<chance>0.5</chance>
 			</li>
 			<li>
-				<defName>AptitudeTerrible_Ranged</defName>
+				<defName>AptitudeTerrible_Shooting</defName>
 				<chance>0.4</chance>
 			</li>
 			<li>
@@ -650,7 +650,7 @@
 				<chance>0.3</chance>
 			</li>
 			<li>
-				<defName>AptitudeTerrible_Learning</defName>
+				<defName>AptitudeTerrible_Intellectual</defName>
 				<chance>0.7</chance>
 			</li>
 			<li>
@@ -670,7 +670,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -709,7 +709,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -754,7 +754,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -801,7 +801,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>Hands_pig</defName>
+				<defName>Hands_Pig</defName>
 				<chance>0.6</chance>
 			</li>
 			<li>
@@ -825,7 +825,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -874,7 +874,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -899,7 +899,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -924,7 +924,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -995,7 +995,7 @@
 				<chance>0.3</chance>
 			</li>
 			<li>
-				<defName>AptitudePoor_Ranged</defName>
+				<defName>AptitudePoor_Shooting</defName>
 				<chance>0.4</chance>
 			</li>
 			<li>
@@ -1003,7 +1003,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -1024,7 +1024,7 @@
 				<chance>0.8</chance>
 			</li>
 			<li>
-				<defName>AptitudePoor_Learning</defName>
+				<defName>AptitudePoor_Intellectual</defName>
 				<chance>0.3</chance>
 			</li>
 			<li>
@@ -1032,7 +1032,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>AptitudeTerrible_Ranged</defName>
+				<defName>AptitudeTerrible_Shooting</defName>
 				<chance>0.7</chance>
 			</li>
 			<li>
@@ -1076,7 +1076,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -1105,7 +1105,7 @@
 				<chance>0.2</chance>
 			</li>
 			<li>
-				<defName>AptitudePoor_Learning</defName>
+				<defName>AptitudePoor_Intellectual</defName>
 				<chance>0.3</chance>
 			</li>
 			<li>
@@ -1113,7 +1113,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>AptitudePoor_Ranged</defName>
+				<defName>AptitudePoor_Shooting</defName>
 				<chance>0.6</chance>
 			</li>
 			<li>
@@ -1161,7 +1161,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -1259,7 +1259,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -1332,7 +1332,7 @@
 				<chance>0.4</chance>
 			</li>
 			<li>
-				<defName>AptitudePoor_Ranged</defName>
+				<defName>AptitudePoor_Shooting</defName>
 				<chance>0.3</chance>
 			</li>
 			<li>
@@ -1340,7 +1340,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>
@@ -1375,7 +1375,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>Hands_pig</defName>
+				<defName>Hands_Pig</defName>
 				<chance>0.6</chance>
 			</li>
 			<li>
@@ -1391,7 +1391,7 @@
 				<chance>0.6</chance>
 			</li>
 			<li>
-				<defName>AptitudeTerrible_Ranged</defName>
+				<defName>AptitudeTerrible_Shooting</defName>
 				<chance>0.4</chance>
 			</li>
 			<li>
@@ -1403,7 +1403,7 @@
 				<chance>0.3</chance>
 			</li>
 			<li>
-				<defName>AptitudeTerrible_Learning</defName>
+				<defName>AptitudeTerrible_Intellectual</defName>
 				<chance>0.8</chance>
 			</li>
 			<li>
@@ -1423,7 +1423,7 @@
 				<chance>0.15</chance>
 			</li>
 			<li>
-				<defName>rjw_genes_ability_mating_call</defName>
+				<defName>rjw_genes_mating_call</defName>
 				<chance>0.05</chance>
 			</li>
 			<li>