diff --git a/res/cardsfolder/e/eradicate.txt b/res/cardsfolder/e/eradicate.txt
index 439ad4b93f3..baf93c62640 100644
--- a/res/cardsfolder/e/eradicate.txt
+++ b/res/cardsfolder/e/eradicate.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Sorcery
 Text:no text
 A:SP$ ChangeZone | Cost$ 2 B B | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DBSearch | SpellDescription$ Exile target nonblack creature. Search its controller's graveyard, hand, and library for all cards with the same name as that creature and exile them. Then that player shuffles his or her library.
-SVar:DBSearch:DB$ChangeZoneAll | Origin$ Graveyard,Hand,Library | Defined$ TargetedController | Destination$ Exile | ChangeType$ Remembered.sameName | Shuffle$ True | SubAbility$ DBCleanup
+SVar:DBSearch:DB$ChangeZoneAll | Origin$ Graveyard,Hand,Library | DefinedPlayer$ TargetedController | Destination$ Exile | ChangeType$ Remembered.sameName | Shuffle$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eradicate.jpg
diff --git a/res/cardsfolder/g/ghost_quarter.txt b/res/cardsfolder/g/ghost_quarter.txt
index 21d99454f74..0968da7feff 100644
--- a/res/cardsfolder/g/ghost_quarter.txt
+++ b/res/cardsfolder/g/ghost_quarter.txt
@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ SVar=DBChange | SpellDescription$ Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
-SVar:DBChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | OptionalDecider$ You | ChangeType$ Land.Basic | ChangeNum$ 1 | Defined$ TargetedController
+A:AB$ Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBChange | SpellDescription$ Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
+SVar:DBChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_quarter.jpg
diff --git a/res/cardsfolder/p/path_to_exile.txt b/res/cardsfolder/p/path_to_exile.txt
index 9001ea5abee..1c6d986d9b8 100644
--- a/res/cardsfolder/p/path_to_exile.txt
+++ b/res/cardsfolder/p/path_to_exile.txt
@@ -3,7 +3,7 @@ ManaCost:W
 Types:Instant
 Text:no text
 A:SP$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | SubAbility$ SVar=DBChange | SpellDescription$ Exile target creature. Its controller may search his or her library for a basic land card, put that card onto the battlefield tapped, then shuffle his or her library.
-SVar:DBChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | OptionalDecider$ You | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | Defined$ TargetedController
+SVar:DBChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | OptionalDecider$ You | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/path_to_exile.jpg
 SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/25.jpg
diff --git a/res/cardsfolder/s/scour.txt b/res/cardsfolder/s/scour.txt
index 5a755c88b03..f2f7eab6d1c 100644
--- a/res/cardsfolder/s/scour.txt
+++ b/res/cardsfolder/s/scour.txt
@@ -3,7 +3,7 @@ ManaCost:2 W W
 Types:Instant
 Text:no text
 A:SP$ ChangeZone | Cost$ 2 W W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DBChangeZoneAll | SpellDescription$ Exile target enchantment. Search its controller's graveyard, hand, and library for all cards with the same name as that enchantment and exile them. Then that player shuffles his or her library.
-SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Remembered.sameName | Defined$ TargetedController | Origin$ Graveyard,Hand,Library | Destination$ Exile | Shuffle$ True | SubAbility$ DBCleanup
+SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Remembered.sameName | DefinedPlayer$ TargetedController | Origin$ Graveyard,Hand,Library | Destination$ Exile | Shuffle$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scour.jpg
diff --git a/res/cardsfolder/s/sowing_salt.txt b/res/cardsfolder/s/sowing_salt.txt
index acaf7234d86..fc8b8da67d1 100644
--- a/res/cardsfolder/s/sowing_salt.txt
+++ b/res/cardsfolder/s/sowing_salt.txt
@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Sorcery
 Text:no text
 A:SP$ ChangeZone | Cost$ 2 R R | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DBChangeZoneAll | SpellDescription$ Exile target nonbasic land. Search its controller's graveyard, hand, and library for all cards with the same name as that land and exile them. Then that player shuffles his or her library.
-SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Remembered.sameName | Origin$ Graveyard,Hand,Library | Defined$ TargetedController | Destination$ Exile | Shuffle$ True | SubAbility$ DBCleanup
+SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Remembered.sameName | Origin$ Graveyard,Hand,Library | DefinedPlayer$ TargetedController | Destination$ Exile | Shuffle$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sowing_salt.jpg
diff --git a/res/cardsfolder/s/splinter.txt b/res/cardsfolder/s/splinter.txt
index c1db4e5dc84..c8f49e822c3 100644
--- a/res/cardsfolder/s/splinter.txt
+++ b/res/cardsfolder/s/splinter.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Sorcery
 Text:no text
 A:SP$ ChangeZone | Cost$ 2 G G | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DBChangeZoneAll | SpellDescription$ Exile target artifact. Search its controller's graveyard, hand, and library for all cards with the same name as that artifact and exile them. Then that player shuffles his or her library.
-SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Remembered.sameName | Origin$ Graveyard,Hand,Library | Defined$ TargetedController | Destination$ Exile | Shuffle$ True | SubAbility$ DBCleanup
+SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Remembered.sameName | Origin$ Graveyard,Hand,Library | DefinedPlayer$ TargetedController | Destination$ Exile | Shuffle$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/splinter.jpg
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
index 82f02838483..312fa7b88e7 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
@@ -335,7 +335,7 @@ public final class AbilityFactory_ChangeZone {
             }
             pDefined = tgt.getTargetPlayers();
         } else {
-            pDefined = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
+            pDefined = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("DefinedPlayer"), sa);
         }
 
         String type = params.get("ChangeType");
@@ -586,7 +586,7 @@ public final class AbilityFactory_ChangeZone {
 
         ArrayList<Player> fetchers;
 
-        fetchers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
+        fetchers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("DefinedPlayer"), sa);
         
         //handle case when Defined is for a Card
         if (fetchers.isEmpty()) {