diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerType.java b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
index f5119f70fd8..3dc4cbf9052 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerType.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
@@ -85,7 +85,7 @@ public enum TriggerType {
     Transformed(TriggerTransformed.class),
     TurnBegin(TriggerTurnBegin.class),
     TurnFaceUp(TriggerTurnFaceUp.class),
-    Unequip(TriggerUnequip.class),
+    Unattach(TriggerUnattach.class),
     Untaps(TriggerUntaps.class),
     Vote(TriggerVote.class);
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java b/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java
similarity index 61%
rename from forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java
index ba2f52ae518..8b96b06fd3f 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java
@@ -17,18 +17,18 @@
  */
 package forge.game.trigger;
 
+import forge.game.GameEntity;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 
 /**
  * <p>
- * Trigger_Unequip class.
+ * Trigger_Unattach class.
  * </p>
  * 
  * @author Forge
- * @version $Id$
  */
-public class TriggerUnequip extends Trigger {
+public class TriggerUnattach extends Trigger {
 
     /**
      * <p>
@@ -42,26 +42,26 @@ public class TriggerUnequip extends Trigger {
      * @param intrinsic
      *            the intrinsic
      */
-    public TriggerUnequip(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
+    public TriggerUnattach(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
         super(params, host, intrinsic);
     }
 
     /** {@inheritDoc} */
     @Override
     public final boolean performTest(final java.util.Map<String, Object> runParams2) {
-        final Card equipped = (Card) runParams2.get("Card");
-        final Card equipment = (Card) runParams2.get("Equipment");
+        final GameEntity object = (GameEntity) runParams2.get("Object");
+        final Card attach = (Card) runParams2.get("Attach");
 
-        if (this.mapParams.containsKey("ValidCard")) {
-            if (!equipped.isValid(this.mapParams.get("ValidCard").split(","), this.getHostCard().getController(),
-                    this.getHostCard(), null)) {
+        if (hasParam("ValidObject")) {
+            if (!object.isValid(getParam("ValidObject").split(","), getHostCard().getController(),
+                    getHostCard(), null)) {
                 return false;
             }
         }
 
-        if (this.mapParams.containsKey("ValidEquipment")) {
-            if (!equipment.isValid(this.mapParams.get("ValidEquipment").split(","), this.getHostCard()
-                    .getController(), this.getHostCard(), null)) {
+        if (hasParam("ValidAttachment")) {
+            if (!attach.isValid(getParam("ValidAttachment").split(","), getHostCard()
+                    .getController(), getHostCard(), null)) {
                 return false;
             }
         }
@@ -72,15 +72,15 @@ public class TriggerUnequip extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject("Card", this.getRunParams().get("Card"));
-        sa.setTriggeringObject("Equipment", this.getRunParams().get("Equipment"));
+        sa.setTriggeringObject("Object", getRunParams().get("Object"));
+        sa.setTriggeringObject("Attach", getRunParams().get("Attach"));
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Equippee: ").append(sa.getTriggeringObject("Card")).append(", ");
-        sb.append("Equipment: ").append(sa.getTriggeringObject("Equipment"));
+        sb.append("Object: ").append(sa.getTriggeringObject("Object")).append(", ");
+        sb.append("Attachment: ").append(sa.getTriggeringObject("Attach"));
         return sb.toString();
     }