diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
index c58ad177741..46e0bc5fa41 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
@@ -54,22 +54,22 @@ public class TriggerCounterRemoved extends Trigger {
         final CounterType addedType = (CounterType) runParams2.get("CounterType");
         final Integer addedNewCounterAmount = (Integer) runParams2.get("NewCounterAmount");
 
-        if (this.mapParams.containsKey("ValidCard")) {
-            if (!addedTo.isValid(this.mapParams.get("ValidCard").split(","), this.getHostCard().getController(),
+        if (hasParam("ValidCard")) {
+            if (!addedTo.isValid(getParam("ValidCard").split(","), this.getHostCard().getController(),
                     this.getHostCard(), null)) {
                 return false;
             }
         }
 
-        if (this.mapParams.containsKey("CounterType")) {
-            final String type = this.mapParams.get("CounterType");
+        if (hasParam("CounterType")) {
+            final String type = getParam("CounterType");
             if (!type.equals(addedType.toString())) {
                 return false;
             }
         }
 
-        if (this.mapParams.containsKey("NewCounterAmount")) {
-            final String amtString = this.mapParams.get("NewCounterAmount");
+        if (hasParam("NewCounterAmount")) {
+            final String amtString = getParam("NewCounterAmount");
             int amt = Integer.parseInt(amtString);
             if(amt != addedNewCounterAmount.intValue()) {
                 return false;
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
index c2b6af3c036..4e02b6d8df4 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
@@ -50,18 +50,18 @@ public class TriggerCounterRemovedOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final boolean performTest(final java.util.Map<String, Object> runParams2) {
-        final Card addedTo = (Card) runParams2.get("Card");
+        final Card removedFrom = (Card) runParams2.get("Card");
         final CounterType removedType = (CounterType) runParams2.get("CounterType");
 
-        if (this.mapParams.containsKey("ValidCard")) {
-            if (!addedTo.isValid(this.mapParams.get("ValidCard").split(","), this.getHostCard().getController(),
+        if (hasParam("ValidCard")) {
+            if (!removedFrom.isValid(getParam("ValidCard").split(","), this.getHostCard().getController(),
                     this.getHostCard(), null)) {
                 return false;
             }
         }
 
-        if (this.mapParams.containsKey("CounterType")) {
-            final String type = this.mapParams.get("CounterType");
+        if (hasParam("CounterType")) {
+            final String type = getParam("CounterType");
             if (!type.equals(removedType.toString())) {
                 return false;
             }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java b/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
index 0f71c4937ad..e784432b422 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
@@ -14,20 +14,20 @@ public class TriggerCrewed extends Trigger {
 
     @Override
     public boolean performTest(Map<String, Object> runParams2) {
-        if (this.mapParams.containsKey("ValidVehicle")) {
-            if (!matchesValid(runParams2.get("Vehicle"), this.mapParams.get("ValidVehicle").split(","),
+        if (hasParam("ValidVehicle")) {
+            if (!matchesValid(runParams2.get("Vehicle"), getParam("ValidVehicle").split(","),
                     this.getHostCard())) {
                 return false;
             }
         }
-        if (this.mapParams.containsKey("ValidCrew")) {
+        if (hasParam("ValidCrew")) {
             if (runParams2.get("Crew") == null) {
                 return false;
             }
 
             boolean passes = false;
             for (Object member : (CardCollection)runParams2.get("Crew")) {
-                passes |= matchesValid(member, this.mapParams.get("ValidCrew").split(","),
+                passes |= matchesValid(member, getParam("ValidCrew").split(","),
                         this.getHostCard());
             }
             if (!passes)