diff --git a/LoadFolders.xml b/LoadFolders.xml
index 22243a5297..f82fd30aa8 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -609,7 +609,8 @@
 		<li IfModActive="Kompadt.Warhammer.Dryad">ModPatches/Warhammer - Dryad</li>
 		<li IfModActive="flangopink.GF40KMaterials">ModPatches/Warhammer 40.000 - Imperium Materials</li>
 		<li IfModActive="GF40K.IoM.Weaponry">ModPatches/Warhammer 40.000 - Imperium Weaponry</li>
-		<li IfModActive="Phonicmas.BiotechExpansionWarhammer40k">ModPatches/Warhammer 40k - Genes and Psycasts</li>
+		<li IfModActive="Phonicmas.40kGenes">ModPatches/Warhammer 40k Genes</li>
+		<li IfModActive="Phonicmas.40kFactions">ModPatches/Warhammer 40k Factions</li>
 		<li IfModActive="Thek.WTB">ModPatches/Waster Toxic Breather</li>
 		<li IfModActive="Kyrrisayo.WeaponsPlus">ModPatches/Weapons+</li>
 		<li IfModActive="Owlchemist.Windows">ModPatches/Windows</li>
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml
similarity index 93%
rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml
rename to ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml
index ca213fc3c7..8d2a363921 100644
--- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml	
+++ b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml	
@@ -3,7 +3,7 @@
 
 	<!-- Chaos Cultist & Imperial Trader -->
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or defName="BEWH_ImperiumTrader"]</xpath>
+		<xpath>Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or @Name="BEWH_HumanBase"]</xpath>
 		<value>
 			<li Class="CombatExtended.LoadoutPropertiesExtension">
 				<primaryMagazineCount>
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml
similarity index 100%
rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml
rename to ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml
similarity index 100%
rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml
rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml
similarity index 88%
rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml
rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml
index ecc7db998d..78b80b5bf3 100644
--- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml	
+++ b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml	
@@ -71,7 +71,7 @@
 	<!-- Custodes -->
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Blunt</xpath>
+		<xpath>Defs/GeneDef[defName="BEWH_CustodesToughness"]/statOffsets/ArmorRating_Blunt</xpath>
 		<value>
 			<ArmorRating_Blunt>24.5</ArmorRating_Blunt>
 			<NightVisionEfficiency>0.8</NightVisionEfficiency>
@@ -80,14 +80,14 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Sharp</xpath>
+		<xpath>Defs/GeneDef[defName="BEWH_CustodesToughness"]/statOffsets/ArmorRating_Sharp</xpath>
 		<value>
 			<ArmorRating_Sharp>8</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/CarryingCapacity</xpath>
+		<xpath>Defs/GeneDef[defName="BEWH_CustodesStrength"]/statOffsets/CarryingCapacity</xpath>
 		<value>
 			<CarryWeight>200</CarryWeight>
 		</value>
@@ -96,7 +96,7 @@
 	<!-- Primarch -->
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Blunt</xpath>
+		<xpath>Defs/GeneDef[defName="BEWH_PrimarchToughness"]/statOffsets/ArmorRating_Blunt</xpath>
 		<value>
 			<ArmorRating_Blunt>33.75</ArmorRating_Blunt>
 			<NightVisionEfficiency>0.8</NightVisionEfficiency>
@@ -105,14 +105,14 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Sharp</xpath>
+		<xpath>Defs/GeneDef[defName="BEWH_PrimarchToughness"]/statOffsets/ArmorRating_Sharp</xpath>
 		<value>
 			<ArmorRating_Sharp>11</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/CarryingCapacity</xpath>
+		<xpath>Defs/GeneDef[defName="BEWH_PrimarchStrength"]/statOffsets/CarryingCapacity</xpath>
 		<value>
 			<CarryWeight>250</CarryWeight>
 		</value>
diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml
similarity index 100%
rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml
rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 921bdadcbf..0eb593e445 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -588,6 +588,7 @@ WarCasket Barbatos Gundam Addon  |
 Warcaskets: Adeptus Astartes    |
 Warhammer 40.000 - Imperium Weaponry    |
 Warhammer 40.000 - Imperium Materials   |
+Warhammer 40k - Factions  |
 Warhammer 40k - Genes and Psycasts  |
 Warhammer"ish" - Dryad    |
 Wasters Toxic Breather  |