diff --git a/res/cardsfolder/g/graveyard_shovel.txt b/res/cardsfolder/g/graveyard_shovel.txt
index be0d32fe95a..a889eb7b53f 100644
--- a/res/cardsfolder/g/graveyard_shovel.txt
+++ b/res/cardsfolder/g/graveyard_shovel.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 Text:no text
 A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | Hidden$ True | Chooser$ Targeted | Mandatory$ True | SubAbility$ DBGainLife | ForgetOtherTargets$ True | RememberChanged$ True | SpellDescription$ Target player exiles a card from his or her graveyard. If it's a creature card, you gain 2 life.
-SVar:DBGainLife:DB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 2 | CheckSVar$ X | SVarCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBGainLife:DB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Valid Creature
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt b/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt
index 2fddd71d988..e6d8ad019ba 100644
--- a/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt
+++ b/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt
@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:1/2
 A:AB$Draw | Cost$ 2 U T | Defined$ You | NumCards$ 1 | SubAbility$ DBFlip | SpellDescription$ Draw a card. If you have nine or more cards in hand, flip CARDNAME.
-SVar:DBFlip:DB$ChangeState | Defined$ Self | CheckSVar$ HandSize | SVarCompare$ GE9
+SVar:DBFlip:DB$ChangeState | Defined$ Self | ConditionCheckSVar$ HandSize | ConditionSVarCompare$ GE9
 SVar:HandSize:Count$InYourHand
 SVar:Rarity:Rare
 AlternateMode:Flip
diff --git a/res/cardsfolder/m/mirror_mad_phantasm.txt b/res/cardsfolder/m/mirror_mad_phantasm.txt
index 625fe1c63db..aaeb0bd79cb 100644
--- a/res/cardsfolder/m/mirror_mad_phantasm.txt
+++ b/res/cardsfolder/m/mirror_mad_phantasm.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:5/1
 K:Flying
 A:AB$ ChangeZone | Cost$ 1 U | Defined$ Self | Origin$ Battlefield | Destination $ Library | Shuffle$ True | RememberChanged$ True | SubAbility$ DBDig | SpellDescription$ CARDNAME's owner shuffles it into his or her library. If that player does, he or she reveals cards from the top of that library until a card named CARDNAME is revealed. That player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard.
-SVar:DBDig:DB$ DigUntil | Cost$ G T | CheckSVar$ X | SVarCompare$ GE1 | Valid$ Card.namedMirror-Mad Phantasm | ValidDescription$ Mirror-Mad Phantasm | FoundDestination$ Battlefield | RevealedDestination$ Graveyard | SubAbility$ DBCleanup
+SVar:DBDig:DB$ DigUntil | Cost$ G T | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | Valid$ Card.namedMirror-Mad Phantasm | ValidDescription$ Mirror-Mad Phantasm | FoundDestination$ Battlefield | RevealedDestination$ Graveyard | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:Rarity:Mythic
diff --git a/res/cardsfolder/m/murder_of_crows.txt b/res/cardsfolder/m/murder_of_crows.txt
index 1df834fa86f..79049dafc35 100644
--- a/res/cardsfolder/m/murder_of_crows.txt
+++ b/res/cardsfolder/m/murder_of_crows.txt
@@ -6,7 +6,7 @@ PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature dies, you may draw a card. If you do, discard a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1 | SubAbility$ SVar=DBDiscard | OptionalDecider$ You | RememberDrawn$ True
-SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | CheckSVar$ X | SVarCompare$ GE1 | SubAbility$ SVar=DBCleanup
+SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ SVar=DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt b/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
index 56d27236e53..a3060ca4f30 100644
--- a/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
+++ b/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
@@ -4,7 +4,7 @@ Types:Creature Rat Rogue
 Text:no text
 PT:2/1
 A:AB$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card.YouDontCtrl | SubAbility$ DBFlip | SpellDescription$ Exile target card from an opponent's graveyard. If no cards are in that graveyard, flip CARDNAME.
-SVar:DBFlip:DB$ChangeState | Defined$ Self | CheckSVar$ X | SVarCompare$ EQ0
+SVar:DBFlip:DB$ChangeState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
 SVar:X:Count$InOppYard
 SVar:Rarity:Uncommon
 AlternateMode:Flip
diff --git a/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt b/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
index 56aa980219b..f1a61192fd2 100644
--- a/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
+++ b/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
@@ -3,8 +3,8 @@ ManaCost:1 B
 Types:Creature Rat Rogue
 Text:no text
 PT:1/1
-A:AB$Discard | Cost$ 1 B T | ValidTgts$ Opponent | NumCards$ 1 | Mode$ TgtChoose
-SVar:DBFlip:DB$Flip | Defined$ Self | CheckSVar$ X | SVarCompare$ EQ0
+A:AB$ Discard | Cost$ 1 B T | ValidTgts$ Opponent | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBFlip | SpellDescription$  Target opponent discards a card. Then if that player has no cards in hand, flip Nezumi Shortfang.
+SVar:DBFlip:DB$ChangeState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
 SVar:X:Count$InOppHand
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_shortfang.jpg
diff --git a/res/cardsfolder/s/soul_reap.txt b/res/cardsfolder/s/soul_reap.txt
index 2a46ed35d5e..1809e3dd700 100644
--- a/res/cardsfolder/s/soul_reap.txt
+++ b/res/cardsfolder/s/soul_reap.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Sorcery
 Text:no text
 A:SP$Destroy | Cost$ 1 B | ValidTgts$ Creature.nonGreen | TgtPrompt$ Select target nongreen creature. | SubAbility$ DBLoseLife | SpellDescription$ Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn.
-SVar:DBLoseLife:DB$LoseLife | Defined$ TargetedController | LifeAmount$ 3 | CheckSVar$ X
+SVar:DBLoseLife:DB$LoseLife | Defined$ TargetedController | LifeAmount$ 3 | ConditionCheckSVar$ X
 SVar:X:Count$ThisTurnCast Card.Black+Other+YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_reap.jpg
diff --git a/res/cardsfolder/s/standstill.txt b/res/cardsfolder/s/standstill.txt
index 15318bcb88e..f64a4d37b2b 100644
--- a/res/cardsfolder/s/standstill.txt
+++ b/res/cardsfolder/s/standstill.txt
@@ -7,8 +7,8 @@ T:Mode$ SpellCast | ValidControllingPlayer$ Opponent | TriggerZones$ Battlefield
 #Must use SacrificeAll since regular sacrifice can't remember the sac'd cards atm.
 SVar:TrigSacYou:AB$SacrificeAll | Cost$ 0 | ValidCards$ Card.Self | RememberSacrificed$ True | SubAbility$ DrawOpp
 SVar:TrigSacOpp:AB$SacrificeAll | Cost$ 0 | ValidCards$ Card.Self | RememberSacrificed$ True | SubAbility$ DrawYou
-SVar:DrawOpp:DB$ Draw | NumCards$ 3 | Defined$ Opponent | CheckSVar$ X | SVarCompare$ GE1
-SVar:DrawYou:DB$ Draw | NumCards$ 3 | Defined$ You | CheckSVar$ X | SVarCompare$ GE1
+SVar:DrawOpp:DB$ Draw | NumCards$ 3 | Defined$ Opponent | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1
+SVar:DrawYou:DB$ Draw | NumCards$ 3 | Defined$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1
 SVar:X:Remembered$Amount
 Svar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/t/timely_reinforcements.txt b/res/cardsfolder/t/timely_reinforcements.txt
index c5e015373f3..026189f54be 100644
--- a/res/cardsfolder/t/timely_reinforcements.txt
+++ b/res/cardsfolder/t/timely_reinforcements.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Sorcery
 Text:no text
 A:SP$ GainLife | Cost$ 2 W | LifeAmount$ 6 | ConditionLifeTotal$ You | ConditionLifeAmount$ LTX | SubAbility$ DBToken | SpellDescription$ If you have less life than an opponent, you gain 6 life. If you control fewer creatures than an opponent, put three 1/1 white Soldier creature tokens onto the battlefield.
-SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | CheckSVar$ CreatureYouControl | SVarCompare$ LTCreatureOppControl
+SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | ConditionCheckSVar$ CreatureYouControl | ConditionSVarCompare$ LTCreatureOppControl
 SVar:X:Count$OppLifeTotal
 SVar:CreatureYouControl:Count$Valid Creature.YouCtrl
 SVar:CreatureOppControl:Count$Valid Creature.YouDontCtrl
diff --git a/res/cardsfolder/w/whirlpool_whelm.txt b/res/cardsfolder/w/whirlpool_whelm.txt
index 1b6d858b4cd..c83cbd3e918 100644
--- a/res/cardsfolder/w/whirlpool_whelm.txt
+++ b/res/cardsfolder/w/whirlpool_whelm.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 A:SP$ Clash | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | WinSubAbility$ DBLibrary | OtherwiseSubAbility$ DBHand | RememberTargets$ True | SpellDescription$ Clash with an opponent, then return target creature to its owner's hand. If you win, you may put that creature on top of its owner's library instead.
 SVar:DBLibrary:DB$ ChangeZone | Cost$ 0 | Defined$ TargetedController | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | RememberChanged$ True | ChangeType$ Card.IsRemembered | Hidden$ True | Chooser$ You | SubAbility$ DBDeclined
-SVar:DBDeclined:DB$ ChangeZone | Cost$ 0 | Defined$ Targeted | Origin$ Battlefield | Destination$ Hand | CheckSVar$ X | SVarCompare$ EQ1
+SVar:DBDeclined:DB$ ChangeZone | Cost$ 0 | Defined$ Targeted | Origin$ Battlefield | Destination$ Hand | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
 SVar:DBHand:DB$ ChangeZone | Cost$ 0 | Defined$ Targeted | Origin$ Battlefield | Destination$ Hand
 SVar:X:Remembered$Amount
 SVar:RemAIDeck:True
diff --git a/src/main/java/forge/card/spellability/SpellAbility_Condition.java b/src/main/java/forge/card/spellability/SpellAbility_Condition.java
index 2dc5562d120..92d06dd2158 100644
--- a/src/main/java/forge/card/spellability/SpellAbility_Condition.java
+++ b/src/main/java/forge/card/spellability/SpellAbility_Condition.java
@@ -131,12 +131,12 @@ public class SpellAbility_Condition extends SpellAbility_Variables {
             setManaSpent(params.get("ConditionManaSpent"));
         }
 
-        if (params.containsKey("CheckSVar")) {
-            setSvarToCheck(params.get("CheckSVar"));
+        if (params.containsKey("ConditionCheckSVar")) {
+            setSvarToCheck(params.get("ConditionCheckSVar"));
         }
-        if (params.containsKey("SVarCompare")) {
-            setSvarOperator(params.get("SVarCompare").substring(0, 2));
-            setSvarOperand(params.get("SVarCompare").substring(2));
+        if (params.containsKey("ConditionSVarCompare")) {
+            setSvarOperator(params.get("ConditionSVarCompare").substring(0, 2));
+            setSvarOperand(params.get("ConditionSVarCompare").substring(2));
         }
 
     } // setConditions