diff --git a/1.3 Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml b/1.3 Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml
index edc9962..d1c3386 100644
--- a/1.3 Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml	
+++ b/1.3 Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml	
@@ -49,7 +49,7 @@
       <li Class="CompProperties_UseEffectPlaySound">
         <soundOnUsed>PsyAmpInstalled</soundOnUsed>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
       <li Class="CompProperties_Forbiddable"/>
diff --git a/1.3/Defs/ThingDef/ThingDef_Item.xml b/1.3/Defs/ThingDef/ThingDef_Item.xml
index 3c60aa1..64824dd 100644
--- a/1.3/Defs/ThingDef/ThingDef_Item.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Item.xml
@@ -357,7 +357,7 @@
         </thingDefs>
         <blockUnnecessaryUse>false</blockUnnecessaryUse>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
diff --git a/1.3/Defs/ThingDef/ThingDef_Randombox.xml b/1.3/Defs/ThingDef/ThingDef_Randombox.xml
index ea88ff6..e2eba16 100644
--- a/1.3/Defs/ThingDef/ThingDef_Randombox.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Randombox.xml
@@ -77,7 +77,7 @@
         <letterLabel>Paniel in black</letterLabel>
         <letterText>Sensing trouble, a mysterious [PAWN_kind] has arrived.\n\nWill [PAWN_pronoun] be able to set things right in these parts?</letterText>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -126,7 +126,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -171,7 +171,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -216,7 +216,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -270,7 +270,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -311,7 +311,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -352,7 +352,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
diff --git a/1.4 Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml b/1.4 Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml
index edc9962..d1c3386 100644
--- a/1.4 Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml	
+++ b/1.4 Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml	
@@ -49,7 +49,7 @@
       <li Class="CompProperties_UseEffectPlaySound">
         <soundOnUsed>PsyAmpInstalled</soundOnUsed>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
       <li Class="CompProperties_Forbiddable"/>
diff --git a/1.4/Defs/ThingDef/ThingDef_Item.xml b/1.4/Defs/ThingDef/ThingDef_Item.xml
index 3c60aa1..64824dd 100644
--- a/1.4/Defs/ThingDef/ThingDef_Item.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Item.xml
@@ -357,7 +357,7 @@
         </thingDefs>
         <blockUnnecessaryUse>false</blockUnnecessaryUse>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
diff --git a/1.4/Defs/ThingDef/ThingDef_Randombox.xml b/1.4/Defs/ThingDef/ThingDef_Randombox.xml
index ea88ff6..e2eba16 100644
--- a/1.4/Defs/ThingDef/ThingDef_Randombox.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Randombox.xml
@@ -77,7 +77,7 @@
         <letterLabel>Paniel in black</letterLabel>
         <letterText>Sensing trouble, a mysterious [PAWN_kind] has arrived.\n\nWill [PAWN_pronoun] be able to set things right in these parts?</letterText>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -126,7 +126,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -171,7 +171,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -216,7 +216,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -270,7 +270,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -311,7 +311,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
@@ -352,7 +352,7 @@
           </li>
         </samples>
       </li>
-      <li Class="CompProperties_UseEffect">
+      <li Class="CompProperties_UseEffectDestroySelf">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>