diff --git a/forge-gui/res/cardsfolder/e/essence_harvest.txt b/forge-gui/res/cardsfolder/e/essence_harvest.txt
index 413b9be2bf0..e511d5357f8 100644
--- a/forge-gui/res/cardsfolder/e/essence_harvest.txt
+++ b/forge-gui/res/cardsfolder/e/essence_harvest.txt
@@ -3,6 +3,6 @@ ManaCost:2 B
 Types:Sorcery
 A:SP$ LoseLife | Cost$ 2 B | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ X | SubAbility$ DBGainLife | References$ X | SpellDescription$ Target player loses X life and you gain X life, where X is the highest power amongst creatures you control.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
-SVar:X:Count$GreatestPowerYouControl
+SVar:X:Count$GreatestPower_Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/essence_harvest.jpg
 Oracle:Target player loses X life and you gain X life, where X is the greatest power among creatures you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/fungal_sprouting.txt b/forge-gui/res/cardsfolder/f/fungal_sprouting.txt
index 97c13da49fb..aa56ca79afd 100644
--- a/forge-gui/res/cardsfolder/f/fungal_sprouting.txt
+++ b/forge-gui/res/cardsfolder/f/fungal_sprouting.txt
@@ -2,6 +2,6 @@ Name:Fungal Sprouting
 ManaCost:3 G
 Types:Sorcery
 A:SP$ Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | References$ X | SpellDescription$ Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the greatest power among creatures you control.
-SVar:X:Count$GreatestPowerYouControl
+SVar:X:Count$GreatestPower_Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fungal_sprouting.jpg
 Oracle:Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the greatest power among creatures you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/garruk_primal_hunter.txt b/forge-gui/res/cardsfolder/g/garruk_primal_hunter.txt
index 164e40ecec9..4b7fa7ab6d6 100644
--- a/forge-gui/res/cardsfolder/g/garruk_primal_hunter.txt
+++ b/forge-gui/res/cardsfolder/g/garruk_primal_hunter.txt
@@ -4,7 +4,7 @@ Types:Planeswalker Garruk
 Loyalty:3
 A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
 A:AB$ Draw | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Defined$ You | NumCards$ X | References$ X | SpellDescription$ Draw cards equal to the greatest power among creatures you control.
-SVar:X:Count$GreatestPowerYouControl
+SVar:X:Count$GreatestPower_Creature.YouCtrl
 A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | TokenAmount$ Y | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ You | TokenColors$ Green | TokenPower$ 6 | TokenToughness$ 6 | SpellDescription$ Put a 6/6 green Wurm creature token onto the battlefield for each land you control.
 SVar:Y:Count$Valid Land.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/garruk_primal_hunter.jpg
diff --git a/forge-gui/res/cardsfolder/m/martyr_of_bones.txt b/forge-gui/res/cardsfolder/m/martyr_of_bones.txt
index fa3e5eb1d29..811287ca8a4 100644
--- a/forge-gui/res/cardsfolder/m/martyr_of_bones.txt
+++ b/forge-gui/res/cardsfolder/m/martyr_of_bones.txt
@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 PT:1/1
 A:AB$ ChangeZone | Cost$ 1 Reveal<X/Card.Black> Sac<1/CARDNAME> | CostDesc$ {1}, Reveal X black cards from your hand, Sacrifice CARDNAME: | Origin$ Graveyard | TargetsFromSingleZone$ True | Destination$ Exile | TargetMin$ 0 | TargetMax$ Y | ValidTgts$ Card | References$ X,Y | SpellDescription$ Exile up to X target cards from a single graveyard.
 SVar:X:TargetedObjects$Amount
-SVar:Y:Count$BlackInYourHand
+SVar:Y:Count$ValidHand Card.Black+YouOwn
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/martyr_of_bones.jpg
 Oracle:{1}, Reveal X black cards from your hand, Sacrifice Martyr of Bones: Exile up to X target cards from a single graveyard.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/miming_slime.txt b/forge-gui/res/cardsfolder/m/miming_slime.txt
index 6a7dd3afbdc..37732a57d1a 100644
--- a/forge-gui/res/cardsfolder/m/miming_slime.txt
+++ b/forge-gui/res/cardsfolder/m/miming_slime.txt
@@ -2,7 +2,7 @@ Name:Miming Slime
 ManaCost:2 G
 Types:Sorcery
 A:SP$ Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | References$ X | TokenTypes$ Creature,Ooze | TokenColors$ Green | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield, where X is the greatest power among creatures you control.
-SVar:X:Count$GreatestPowerYouControl
+SVar:X:Count$GreatestPower_Creature.YouCtrl
 SVar:NeedsToPlay:Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/miming_slime.jpg
 Oracle:Put an X/X green Ooze creature token onto the battlefield, where X is the greatest power among creatures you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/o/overwhelming_stampede.txt b/forge-gui/res/cardsfolder/o/overwhelming_stampede.txt
index 844c690bbeb..e963d377a6b 100644
--- a/forge-gui/res/cardsfolder/o/overwhelming_stampede.txt
+++ b/forge-gui/res/cardsfolder/o/overwhelming_stampede.txt
@@ -2,6 +2,6 @@ Name:Overwhelming Stampede
 ManaCost:3 G G
 Types:Sorcery
 A:SP$ PumpAll | Cost$ 3 G G | ValidCards$ Creature.YouCtrl | NumAtt$ +X | NumDef$ +X | References$ X | KW$ Trample | SpellDescription$ Until end of turn, creatures you control gain trample and get +X/+X, where X is the greatest power among creatures you control.
-SVar:X:Count$GreatestPowerYouControl
+SVar:X:Count$GreatestPower_Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overwhelming_stampede.jpg
 Oracle:Until end of turn, creatures you control gain trample and get +X/+X, where X is the greatest power among creatures you control. (If a creature you control would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/prime_speaker_zegana.txt b/forge-gui/res/cardsfolder/p/prime_speaker_zegana.txt
index e6f0f1a37c3..ee5aa312a37 100644
--- a/forge-gui/res/cardsfolder/p/prime_speaker_zegana.txt
+++ b/forge-gui/res/cardsfolder/p/prime_speaker_zegana.txt
@@ -5,7 +5,7 @@ PT:1/1
 K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the greatest power among other creatures you control.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw cards equal to its power.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ Y | References$ Y
-SVar:X:Count$GreatestPowerYouControl
+SVar:X:Count$GreatestPower_Creature.YouCtrl
 SVar:Y:TriggeredCard$CardPower
 SVar:NeedsToPlayVar:X GE3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/prime_speaker_zegana.jpg
diff --git a/forge-gui/res/cardsfolder/r/regal_force.txt b/forge-gui/res/cardsfolder/r/regal_force.txt
index b36749f74fe..31f558bffa5 100644
--- a/forge-gui/res/cardsfolder/r/regal_force.txt
+++ b/forge-gui/res/cardsfolder/r/regal_force.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G G
 Types:Creature Elemental
 PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card for each green creature you control.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X | References$ X
-SVar:X:Count$GreenTypeYouCtrl.Creature
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ X | References$ X
+SVar:X:Count$Valid Creature.Green+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/regal_force.jpg
 Oracle:When Regal Force enters the battlefield, draw a card for each green creature you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/spell_rupture.txt b/forge-gui/res/cardsfolder/s/spell_rupture.txt
index 5b3db0abd48..1c8b53bf692 100644
--- a/forge-gui/res/cardsfolder/s/spell_rupture.txt
+++ b/forge-gui/res/cardsfolder/s/spell_rupture.txt
@@ -2,6 +2,6 @@ Name:Spell Rupture
 ManaCost:1 U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | ValidTgts$ Card | UnlessCost$ X | UnlessPayer$ TargetedController | References$ X | SpellDescription$ Counter target spell unless its controller pays {X}, where X is the greatest power among creatures you control.
-SVar:X:Count$GreatestPowerYouControl
+SVar:X:Count$GreatestPower_Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_rupture.jpg
 Oracle:Counter target spell unless its controller pays {X}, where X is the greatest power among creatures you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/spell_syphon.txt b/forge-gui/res/cardsfolder/s/spell_syphon.txt
index 6ff1c299ea2..2a40720a3ca 100644
--- a/forge-gui/res/cardsfolder/s/spell_syphon.txt
+++ b/forge-gui/res/cardsfolder/s/spell_syphon.txt
@@ -2,7 +2,7 @@ Name:Spell Syphon
 ManaCost:1 U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | References$ X | SpellDescription$ Counter target spell unless its controller pays {1} for each blue permanent you control.
-SVar:X:Count$BlueYouCtrl
+SVar:X:Count$Valid Permanent.YouCtrl+Blue
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_syphon.jpg
 Oracle:Counter target spell unless its controller pays {1} for each blue permanent you control.
\ No newline at end of file