diff --git a/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Industrial.xml b/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Industrial.xml
index e682ddf..7a6d15a 100644
--- a/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Industrial.xml
+++ b/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Industrial.xml
@@ -477,7 +477,7 @@
           <angle>30</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -596,7 +596,7 @@
           <angle>30</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -733,7 +733,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -851,7 +851,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -978,7 +978,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1111,7 +1111,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1229,7 +1229,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
diff --git a/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Royal.xml b/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Royal.xml
index f82da33..dcfa4a7 100644
--- a/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Royal.xml
+++ b/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Royal.xml
@@ -314,7 +314,7 @@
           <angle>30</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -440,7 +440,7 @@
           <angle>30</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -706,7 +706,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -828,7 +828,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -959,7 +959,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1093,7 +1093,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1244,7 +1244,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1395,7 +1395,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1546,7 +1546,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1697,7 +1697,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="Moyo2_ItemFormChange.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>