diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index e526a907aa..3a8776ab57 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -660,15 +660,15 @@ public class TestPlayer implements Player {
                         }
                     }
                 } else if (action.getAction().startsWith("waitStackResolved")) {
-                    boolean oneTime = action.getAction().equals("waitStackResolved:1");
+                    boolean skipOneStackObjectOnly = action.getAction().equals("waitStackResolved:1");
                     if (game.getStack().isEmpty()) {
                         // all done, can use next command
                         actions.remove(action);
                         continue;
                     } else {
-                        // need to wait (don't remove command, except one time)
+                        // need to wait (don't remove command, except one skip only)
                         tryToPlayPriority(game);
-                        if (oneTime) {
+                        if (skipOneStackObjectOnly) {
                             actions.remove(action);
                         }
                         return true;
diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
index 3dc3eec69d..70676f0f5c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
+++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
@@ -1486,8 +1486,8 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
 
     }
 
-    public void waitStackResolved(int turnNum, PhaseStep step, TestPlayer player, boolean oneTime) {
-        String command = "waitStackResolved" + (oneTime ? ":1" : "");
+    public void waitStackResolved(int turnNum, PhaseStep step, TestPlayer player, boolean skipOneStackObjectOnly) {
+        String command = "waitStackResolved" + (skipOneStackObjectOnly ? ":1" : "");
         player.addAction(turnNum, step, command);
     }
 
@@ -1845,18 +1845,18 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
         waitStackResolved(turnNum, step, false);
     }
 
-    public void waitStackResolved(int turnNum, PhaseStep step, boolean oneTime) {
+    public void waitStackResolved(int turnNum, PhaseStep step, boolean skipOneStackObjectOnly) {
         if (playerA != null) {
-            waitStackResolved(turnNum, step, playerA, oneTime);
+            waitStackResolved(turnNum, step, playerA, skipOneStackObjectOnly);
         }
         if (playerB != null) {
-            waitStackResolved(turnNum, step, playerB, oneTime);
+            waitStackResolved(turnNum, step, playerB, skipOneStackObjectOnly);
         }
         if (playerC != null) {
-            waitStackResolved(turnNum, step, playerC, oneTime);
+            waitStackResolved(turnNum, step, playerC, skipOneStackObjectOnly);
         }
         if (playerD != null) {
-            waitStackResolved(turnNum, step, playerD, oneTime);
+            waitStackResolved(turnNum, step, playerD, skipOneStackObjectOnly);
         }
     }