diff --git a/res/cardsfolder/walking_archive.txt b/res/cardsfolder/walking_archive.txt
index 2aef57c8c8a..1ebdbe40ac9 100644
--- a/res/cardsfolder/walking_archive.txt
+++ b/res/cardsfolder/walking_archive.txt
@@ -11,7 +11,7 @@ A:AB$PutCounter | Cost$ 2 W U | CounterType$ P1P1 | CounterNum$ 1 | SpellDescrip
 SVar:TrigYouDraw:AB$Draw | Cost$ 0 | NumCards$ X | Defined$ You
 SVar:TrigOppDraw:AB$Draw | Cost$ 0 | NumCards$ X | Defined$ Opponent
 SVar:X:Count$CardCounters.P1P1
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/walking_archive.jpg
 SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/169.jpg
diff --git a/res/cardsfolder/wall_of_kelp.txt b/res/cardsfolder/wall_of_kelp.txt
index 65092f15b20..7e6b1f0d9bd 100644
--- a/res/cardsfolder/wall_of_kelp.txt
+++ b/res/cardsfolder/wall_of_kelp.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:0/3
 K:Defender
 A:AB$Token | Cost$ U U T | TokenAmount$ 1 | TokenName$ Plant Wall | TokenTypes$ Creature,Plant,Wall | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Defender | SpellDescription$ Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/hm/en-us/card2959.jpg
 SetInfo:HML|Rare|http://magiccards.info/scans/en/hl/50.jpg
diff --git a/res/cardsfolder/wallop.txt b/res/cardsfolder/wallop.txt
index 546e3d9ec94..890c6c9121b 100644
--- a/res/cardsfolder/wallop.txt
+++ b/res/cardsfolder/wallop.txt
@@ -2,8 +2,8 @@ Name:Wallop
 ManaCost:1 G
 Types:Sorcery
 Text:no text
-A:SP$Destroy | Cost$ 1 G | ValidTgts$ Creature.Blue+withFlying,Creature.Black+withFlying | TgtPrompt$ Select target blue or black creature with flying | SpellDescription$ Destroy target creature with flying.
-SVar:RemAIDeck:True
+A:SP$Destroy | Cost$ 1 G | ValidTgts$ Creature.Blue+withFlying,Creature.Black+withFlying | TgtPrompt$ Select target blue or black creature with flying | SpellDescription$ Destroy target blue or black creature with flying.
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wallop.jpg
 SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/223.jpg
diff --git a/res/cardsfolder/wand_of_the_elements.txt b/res/cardsfolder/wand_of_the_elements.txt
index 9b4f4615bb8..ccc416a7147 100644
--- a/res/cardsfolder/wand_of_the_elements.txt
+++ b/res/cardsfolder/wand_of_the_elements.txt
@@ -4,7 +4,7 @@ Types:Artifact
 Text:no text
 A:AB$Token | Cost$ T Sac<1/Island> | TokenImage$ U 2 2 Elemental Flying | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying| SpellDescription$ Put a 2/2 blue Elemental creature token with flying onto the battlefield.
 A:AB$Token | Cost$ T Sac<1/Mountain> | TokenImage$ R 3 3 Elemental | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 red Elemental creature token onto the battlefield.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wand_of_the_elements.jpg
 SetInfo:DST|Rare|http://magiccards.info/scans/en/ds/158.jpg
diff --git a/res/cardsfolder/warmonger.txt b/res/cardsfolder/warmonger.txt
index a7d297df8ae..fe920fe01fb 100755
--- a/res/cardsfolder/warmonger.txt
+++ b/res/cardsfolder/warmonger.txt
@@ -4,7 +4,7 @@ Types:Creature Minotaur Monger
 Text:no text
 PT:3/3
 A:AB$DamageAll | Cost$ 2 | NumDmg$ 1 | ValidCards$ Creature.withoutFlying | ValidPlayers$ Each | AnyPlayer$ True | ValidDescription$ each creature without flying and and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature without flying and each player. Any player may activate this ability.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warmonger.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/225.jpg
diff --git a/res/cardsfolder/warmth.txt b/res/cardsfolder/warmth.txt
index cbc600b0a48..4de49d42469 100644
--- a/res/cardsfolder/warmth.txt
+++ b/res/cardsfolder/warmth.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 Text:no text
 T:Mode$ SpellCast | ValidCard$ Card.Red+YouDontCtrl | TriggerZones$ Battlefield | Execut$ TrigGainLife | TriggerDescription$ Whenever an opponent casts a red spell, you gain 2 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warmth.jpg
 SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/263.jpg
diff --git a/res/cardsfolder/warped_devotion.txt b/res/cardsfolder/warped_devotion.txt
index 4eda2bff200..91396d991a2 100644
--- a/res/cardsfolder/warped_devotion.txt
+++ b/res/cardsfolder/warped_devotion.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 Text:no text
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Hand | ValidCard$ Permanent | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever a permanent is returned to a player's hand, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | NumCards$ 1 | Mode$ TgtChoose | Defined$ TriggeredCardOwner
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warped_devotion.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/172.jpg
diff --git a/res/cardsfolder/waterfront_bouncer.txt b/res/cardsfolder/waterfront_bouncer.txt
index 65e0a4d7fab..729edc008ee 100644
--- a/res/cardsfolder/waterfront_bouncer.txt
+++ b/res/cardsfolder/waterfront_bouncer.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk Spellshaper
 Text:no text
 PT:1/1
 A:AB$ChangeZone | Cost$ U T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waterfront_bouncer.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/114.jpg
diff --git a/res/cardsfolder/waterspout_elemental.txt b/res/cardsfolder/waterspout_elemental.txt
index 616673eac7b..a2dbaa1cd9d 100644
--- a/res/cardsfolder/waterspout_elemental.txt
+++ b/res/cardsfolder/waterspout_elemental.txt
@@ -8,7 +8,7 @@ K:Kicker:U
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, return all other creatures to their owners' hands and you skip your next turn.
 SVar:TrigKicker:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Creature.Other | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=DBSkipTurn
 SVar:DBSkipTurn:DB$AddTurn | NumTurns$ 1 | Defined$ Opponent
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waterspout_elemental.jpg
 SetInfo:PLS|Rare|http://magiccards.info/scans/en/ps/38.jpg
diff --git a/res/cardsfolder/waterspout_weavers.txt b/res/cardsfolder/waterspout_weavers.txt
index 1a4e7675501..07c6962be84 100644
--- a/res/cardsfolder/waterspout_weavers.txt
+++ b/res/cardsfolder/waterspout_weavers.txt
@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Creature Merfolk Wizard
 Text:Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Waterspout Weavers, you may reveal it. If you do, each creature you control gains flying until end of turn.
 PT:3/3
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waterspout_weavers.jpg
 SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/56.jpg