diff --git a/1.5/Assemblies/FCP_Core.dll b/1.5/Assemblies/FCP_Core.dll
index 8b1eb90..a3d7f77 100644
Binary files a/1.5/Assemblies/FCP_Core.dll and b/1.5/Assemblies/FCP_Core.dll differ
diff --git a/1.5/Defs/JobDefs/JobDefs.xml b/1.5/Defs/JobDefs/JobDefs.xml
index bba91f5..d9dd47b 100644
--- a/1.5/Defs/JobDefs/JobDefs.xml
+++ b/1.5/Defs/JobDefs/JobDefs.xml
@@ -9,7 +9,7 @@
 
   <JobDef>
     <defName>RR_RefuelPowerArmor</defName>
-    <driverClass>RangerRick_PowerArmor.JobDriver_RefuelPowerArmor</driverClass>
+    <driverClass>FCP.Core.JobDriver_RefuelPowerArmor</driverClass>
     <reportString>Refueling TargetA.</reportString>
     <allowOpportunisticPrefix>true</allowOpportunisticPrefix>
   </JobDef>
@@ -18,7 +18,7 @@
 
   <JobDef>
     <defName>RR_TrainTrait</defName>
-    <driverClass>RangerRick_PowerArmor.JobDriver_TrainTrait</driverClass>
+    <driverClass>FCP.Core.JobDriver_TrainTrait</driverClass>
     <reportString>Training at TargetA.</reportString>
     <allowOpportunisticPrefix>true</allowOpportunisticPrefix>
   </JobDef>
diff --git a/1.5/Defs/MiscDefs/ThingDefs_Laser_DamageHediffs.xml b/1.5/Defs/MiscDefs/ThingDefs_Laser_DamageHediffs.xml
index 3461aab..36435b8 100644
--- a/1.5/Defs/MiscDefs/ThingDefs_Laser_DamageHediffs.xml
+++ b/1.5/Defs/MiscDefs/ThingDefs_Laser_DamageHediffs.xml
@@ -7,7 +7,7 @@
 
     <DamageDef Name="BurnLaser">
         <defName>laserburn</defName>
-        <workerClass>FalloutCore.LaserBurn</workerClass>
+        <workerClass>FCP.Core.LaserBurn</workerClass>
         <label>laser burn</label>
         <hasForcefulImpact>false</hasForcefulImpact>
         <makesBlood>false</makesBlood>
diff --git a/1.5/Defs/MiscDefs/ThingDefs_Plasma_DamageHediffs.xml b/1.5/Defs/MiscDefs/ThingDefs_Plasma_DamageHediffs.xml
index d14d035..c1f8f8c 100644
--- a/1.5/Defs/MiscDefs/ThingDefs_Plasma_DamageHediffs.xml
+++ b/1.5/Defs/MiscDefs/ThingDefs_Plasma_DamageHediffs.xml
@@ -7,7 +7,7 @@
 
     <DamageDef Name="BurnPlasma">
         <defName>Plasmaburn</defName>
-        <workerClass>FalloutCore.PlasmaBurn</workerClass>
+        <workerClass>FCP.Core.PlasmaBurn</workerClass>
         <label>plasma burn</label>
         <hasForcefulImpact>false</hasForcefulImpact>
         <makesBlood>false</makesBlood>
diff --git a/1.5/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml b/1.5/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
index 4b5ce94..94795ff 100644
--- a/1.5/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
+++ b/1.5/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
@@ -56,8 +56,8 @@
 			<li>FCP_Power_Armor_Basic</li>
 		</tradeTags>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelDependency"></li>
-			<li Class="RangerRick_PowerArmor.CompProperties_PowerArmor">
+			<li Class="FCP.Core.CompProperties_ApparelDependency"></li>
+			<li Class="FCP.Core.CompProperties_PowerArmor">
 				<requiredTrait>FCP_Power_Armor_Trained</requiredTrait>
 				<hediffOnEmptyFuel>FCP_Power_Armor_Empty_Fusion_Core</hediffOnEmptyFuel>
 			</li>
@@ -78,7 +78,7 @@
 			</li>
 		</comps>
         <modExtensions>
-            <li Class="FalloutCore.ApparelExtension">
+            <li Class="FCP.Core.ApparelExtension">
                 <shouldHideBody>True</shouldHideBody>
                 <displayBodyType>Hulk</displayBodyType>
             </li>
diff --git a/1.5/Defs/ThingDefs_Buildings/Power_Armor_Simulator.xml b/1.5/Defs/ThingDefs_Buildings/Power_Armor_Simulator.xml
index 8b3d662..882a538 100644
--- a/1.5/Defs/ThingDefs_Buildings/Power_Armor_Simulator.xml
+++ b/1.5/Defs/ThingDefs_Buildings/Power_Armor_Simulator.xml
@@ -53,7 +53,7 @@
             </li>
             <li Class="CompProperties_Flickable"/>
             <li Class="CompProperties_Breakdownable"/>
-            <li Class="RangerRick_PowerArmor.CompProperties_Trainer">
+            <li Class="FCP.Core.CompProperties_Trainer">
                 <givesTrait>FCP_Power_Armor_Trained</givesTrait>
                 <trainDuration>5000</trainDuration>
             </li>
diff --git a/Source/FCPTools/FalloutCore/Defs/ApparelExtensionDefModExtension.cs b/Source/FCPTools/FalloutCore/Defs/ApparelExtension.cs
similarity index 88%
rename from Source/FCPTools/FalloutCore/Defs/ApparelExtensionDefModExtension.cs
rename to Source/FCPTools/FalloutCore/Defs/ApparelExtension.cs
index 20149c0..8d510de 100644
--- a/Source/FCPTools/FalloutCore/Defs/ApparelExtensionDefModExtension.cs
+++ b/Source/FCPTools/FalloutCore/Defs/ApparelExtension.cs
@@ -10,7 +10,7 @@ using Verse;
 #nullable disable
 namespace FCP.Core
 {
-    public class ApparelExtensionDefModExtension : DefModExtension
+    public class ApparelExtension : DefModExtension
     {
         public bool shouldHideBody;
         public bool shouldHideHead;
diff --git a/Source/FCPTools/FalloutCore/Harmony/Patches.cs b/Source/FCPTools/FalloutCore/Harmony/Patches.cs
index d473590..67fa1e6 100644
--- a/Source/FCPTools/FalloutCore/Harmony/Patches.cs
+++ b/Source/FCPTools/FalloutCore/Harmony/Patches.cs
@@ -946,7 +946,7 @@ public static class Patches
             return;
         foreach (Thing thing in wearer.apparel.WornApparel)
         {
-            ApparelExtensionDefModExtension modExtension = thing.def.GetModExtension<ApparelExtensionDefModExtension>();
+            ApparelExtension modExtension = thing.def.GetModExtension<ApparelExtension>();
             if (modExtension != null && modExtension.displayBodyType != null)
             {
                 bodyType = modExtension.displayBodyType;
diff --git a/Source/FCPTools/FalloutCore/Utilities/ApparelExtensionProps.cs b/Source/FCPTools/FalloutCore/Utilities/ApparelExtensionProps.cs
index 1175597..b55b8f8 100644
--- a/Source/FCPTools/FalloutCore/Utilities/ApparelExtensionProps.cs
+++ b/Source/FCPTools/FalloutCore/Utilities/ApparelExtensionProps.cs
@@ -14,23 +14,23 @@ namespace FCP.Core
     [StaticConstructorOnStartup]
     public static class ApparelExtensionProps
     {
-        private static Dictionary<ThingDef, ApparelExtensionDefModExtension> cachedExtensions = new Dictionary<ThingDef, ApparelExtensionDefModExtension>();
+        private static Dictionary<ThingDef, ApparelExtension> cachedExtensions = new Dictionary<ThingDef, ApparelExtension>();
 
         //static HarmonyInit() => new Harmony("FalloutCore.ApparelExtension").PatchAll();
 
         public static bool ShouldHideBody(this ThingDef def)
         {
-            ApparelExtensionDefModExtension modExtension;
+            ApparelExtension modExtension;
             if (!cachedExtensions.TryGetValue(def, out modExtension))
-                cachedExtensions[def] = modExtension = def.GetModExtension<ApparelExtensionDefModExtension>();
+                cachedExtensions[def] = modExtension = def.GetModExtension<ApparelExtension>();
             return modExtension != null && modExtension.shouldHideBody;
         }
 
         public static bool ShouldHideHead(this ThingDef def)
         {
-            ApparelExtensionDefModExtension modExtension;
+            ApparelExtension modExtension;
             if (!cachedExtensions.TryGetValue(def, out modExtension))
-                cachedExtensions[def] = modExtension = def.GetModExtension<ApparelExtensionDefModExtension>();
+                cachedExtensions[def] = modExtension = def.GetModExtension<ApparelExtension>();
             return modExtension != null && modExtension.shouldHideHead;
         }
     }