diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
index cef57a5..19fd453 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
@@ -59,7 +59,7 @@
 			<li Class="FCP.Core.CompProperties_LabelColored">
 				<rarity>Rare</rarity>
 			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>2</Plasteel>
 					<ComponentIndustrial>0.1</ComponentIndustrial>
@@ -77,7 +77,7 @@
 
 	<ThingDef ParentName="FCP_Apparel_Power_Armor_Frame_Base" Name="FCP_Apparel_Power_Armor_Base" Abstract="true">
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+			<li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
 				<requiredApparels>
 					<li>FCP_Apparel_Power_Armor_Frame</li>
 				</requiredApparels>
@@ -132,7 +132,7 @@
 			</tags>
 		</apparel>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_PowerArmor">
+			<li Class="FCP.Core.PowerArmor.CompProperties_PowerArmor">
 				<workDisables>
 					<li>Growing</li>
 					<li>Smithing</li>
@@ -163,10 +163,10 @@
 				<initialFuelPercent>1</initialFuelPercent>
 				<showAllowAutoRefuelToggle>true</showAllowAutoRefuelToggle>
 			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+			<li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
 				<requiredTrait>FCP_Trait_Power_Armor_Trained</requiredTrait>
 			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelDependency"></li>
+			<li Class="FCP.Core.PowerArmor.CompProperties_ApparelDependency"></li>
 		</comps>
 	</ThingDef>
 
@@ -199,7 +199,7 @@
 			<wornGraphicPath>Things/Apparel/Power_Armors/T45/FCP_T45_Power_Armor</wornGraphicPath>
 		</apparel>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>1.5</Plasteel>
 					<ComponentIndustrial>0.08</ComponentIndustrial>
@@ -238,7 +238,7 @@
 			<wornGraphicPath>Things/Apparel/Power_Armors/T51/FCP_T51_Power_Armor</wornGraphicPath>
 		</apparel>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>2</Plasteel>
 					<ComponentIndustrial>0.1</ComponentIndustrial>
@@ -277,7 +277,7 @@
 			<wornGraphicPath>Things/Apparel/Power_Armors/T60/FCP_T60_Power_Armor</wornGraphicPath>
 		</apparel>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>2.5</Plasteel>
 					<ComponentIndustrial>0.12</ComponentIndustrial>
@@ -319,7 +319,7 @@
 			<wornGraphicPath>Things/Apparel/Power_Armors/X01/FCP_X01_Power_Armor</wornGraphicPath>
 		</apparel>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>3</Plasteel>
 					<ComponentIndustrial>0.15</ComponentIndustrial>
@@ -348,7 +348,7 @@
 			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
 		</equippedStatOffsets>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>2</Plasteel>
 					<ComponentIndustrial>0.1</ComponentIndustrial>
@@ -488,7 +488,7 @@
 			<AimingDelayFactor>-0.04</AimingDelayFactor>
 			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
 		</equippedStatOffsets>		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>2</Plasteel>
 					<ComponentIndustrial>0.1</ComponentIndustrial>
diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
index a6050d8..c93af69 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
@@ -15,7 +15,7 @@
 			</tags>
 		</apparel>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Steel>2.5</Steel>
 					<ComponentIndustrial>0.05</ComponentIndustrial>
@@ -72,7 +72,7 @@
             <li Class="FCP.Core.CompProperties_LabelColored">
                 <rarity>Rare</rarity>
             </li>
-            <li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+            <li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
                 <requiredApparels>
                     <li>FCP_Apparel_Power_Armor_Frame</li>
                 </requiredApparels>
@@ -126,12 +126,12 @@
             <li Class="FCP.Core.CompProperties_LabelColored">
                 <rarity>Rare</rarity>
             </li>
-            <li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+            <li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
                 <requiredApparels>
                     <li>FCP_Apparel_Power_Armor_Frame</li>
                 </requiredApparels>
             </li>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>1</Plasteel>
 					<ComponentIndustrial>0.05</ComponentIndustrial>
@@ -187,12 +187,12 @@
             <li Class="FCP.Core.CompProperties_LabelColored">
                 <rarity>Rare</rarity>
             </li>
-            <li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+            <li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
                 <requiredApparels>
                     <li>FCP_Apparel_Power_Armor_Frame</li>
                 </requiredApparels>
             </li>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>1.25</Plasteel>
 					<ComponentIndustrial>0.06</ComponentIndustrial>
@@ -247,12 +247,12 @@
             <li Class="FCP.Core.CompProperties_LabelColored">
                 <rarity>Rare</rarity>
             </li>
-            <li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+            <li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
                 <requiredApparels>
                     <li>FCP_Apparel_Power_Armor_Frame</li>
                 </requiredApparels>
             </li>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>1.5</Plasteel>
 					<ComponentIndustrial>0.08</ComponentIndustrial>
@@ -301,12 +301,12 @@
 			<li Class="FCP.Core.CompProperties_LabelColored">
 				<rarity>Rare</rarity>
 			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+			<li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
 				<requiredApparels>
 					<li>FCP_Apparel_Power_Armor_Frame</li>
 				</requiredApparels>
 			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>1</Plasteel>
 					<ComponentIndustrial>0.05</ComponentIndustrial>
@@ -454,12 +454,12 @@
 			<li Class="FCP.Core.CompProperties_LabelColored">
 				<rarity>Rare</rarity>
 			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_ApparelRequirement">
+			<li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
 				<requiredApparels>
 					<li>FCP_Apparel_Power_Armor_Frame</li>
 				</requiredApparels>
 			</li>
-			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
 					<Plasteel>1</Plasteel>
 					<ComponentIndustrial>0.05</ComponentIndustrial>
@@ -530,4 +530,4 @@
 		</apparel>
 	</ThingDef>
 
-</Defs>
\ No newline at end of file
+</Defs>
diff --git a/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml b/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
index d5a38aa..56915e3 100644
--- a/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
+++ b/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
@@ -33,7 +33,7 @@
 		</statBases>
 		<inspectorTabs>
 			<li>ITab_Bills</li>
-			<li>RangerRick_PowerArmor.ITab_ContentsPowerArmorStation</li>
+			<li>FCP.Core.PowerArmor.ITab_ContentsPowerArmorStation</li>
 		</inspectorTabs>
 		<surfaceType>Item</surfaceType>
 		<recipes>
@@ -57,7 +57,7 @@
 			<li>Make_FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet</li>
 		</recipes>
 		<comps>
-			<li Class="RangerRick_PowerArmor.CompProperties_PowerArmorStation">
+			<li Class="FCP.Core.PowerArmor.CompProperties_PowerArmorStation">
 				<armorDrawOffset>(0, 0, 1)</armorDrawOffset>
 				<allowedLayers>
 					<li>FCP_Apparel_Layer_Power_Armor_Frame</li>