diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index bb8b47f1d..754a903a5 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -241,8 +241,8 @@ toughness=2
 [card]
 name=Rayne, Academy Chancellor
 #missing parser for player/controller/opponent
-auto=this(auras >= 1) transforms((,newability[@targeted(*|mybattlefield) from(*|oppzones):draw:2]))
-auto=this(auras < 1) transforms((,newability[@targeted(*|mybattlefield) from(*|oppzones):draw:1]))
+auto=this(auras >= 1) transforms((,newability[@targeted(*|mybattlefield) from(*|opponentzones):draw:2]))
+auto=this(auras < 1) transforms((,newability[@targeted(*|mybattlefield) from(*|opponentzones):draw:1]))
 text=Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card. You may draw an additional card if Rayne, Academy Chancellor is enchanted.
 mana={2}{U}
 type=Legendary Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 7b2fe9a35..a775531f7 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -6562,8 +6562,8 @@ subtype=Aura
 [/card]
 [card]
 name=Aura of Silence
-auto=lord(artifact|oppcastingzone) altercost(colorless, +2)
-auto=lord(enchantment|oppcastingzone) altercost(colorless, +2)
+auto=lord(artifact|opponentcastingzone) altercost(colorless, +2)
+auto=lord(enchantment|opponentcastingzone) altercost(colorless, +2)
 auto={S}:destroy target(artifact,enchantment)
 text=Artifact and enchantment spells your opponents cast cost {2} more to cast. -- Sacrifice Aura of Silence: Destroy target artifact or enchantment.
 mana={1}{W}{W}
@@ -18538,7 +18538,7 @@ type=Instant
 [card]
 name=Chill
 auto=lord(*[red]|mycastingzone) altercost(colorless, +2)
-auto=lord(*[red]|oppcastingzone) altercost(colorless, +2)
+auto=lord(*[red]|opponentcastingzone) altercost(colorless, +2)
 text=Red spells cost {2} more to cast.
 mana={1}{U}
 type=Enchantment
@@ -44936,7 +44936,7 @@ toughness=3
 [card]
 name=Glowrider
 auto=lord(*[-creature]|mycastingzone) altercost(colorless,+1)
-auto=lord(*[-creature]|oppcastingzone) altercost(colorless, +1)
+auto=lord(*[-creature]|opponentcastingzone) altercost(colorless, +1)
 text=Noncreature spells cost {1} more to cast.
 mana={2}{W}
 type=Creature
@@ -46916,7 +46916,7 @@ toughness=2
 name=Grand Arbiter Augustin IV
 auto=lord(*[white]|mycastingzone) altercost(colorless,-1)
 auto=lord(*[blue]|mycastingzone) altercost(colorless,-1)
-auto=lord(*|oppcastingzone) altercost( colorless,+1)
+auto=lord(*|opponentcastingzone) altercost( colorless,+1)
 text=White spells you cast cost {1} less to cast. -- Blue spells you cast cost {1} less to cast. -- Spells your opponents cast cost {1} more to cast.
 mana={2}{W}{U}
 type=Legendary Creature
@@ -113313,7 +113313,7 @@ toughness=2
 name=Thalia, Guardian of Thraben
 abilities=first strike
 auto=lord(*[-creature]|mycastingzone) altercost(colorless,+1)
-auto=lord(*[-creature]|oppcastingzone) altercost(colorless, +1)
+auto=lord(*[-creature]|opponentcastingzone) altercost(colorless, +1)
 text=First Strike -- Noncreature spells cost {1} more to cast.
 mana={1}{W}
 type=Legendary Creature
diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp
index e88d7d7c6..e466a254a 100644
--- a/projects/mtg/src/TargetChooser.cpp
+++ b/projects/mtg/src/TargetChooser.cpp
@@ -209,7 +209,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 zones[nbzones++] = MTGGameZone::MY_HAND;
                 zones[nbzones++] = MTGGameZone::MY_EXILE;
             }
-            else if (zoneName.compare("oppcastingzone") == 0)
+            else if (zoneName.compare("opponentcastingzone") == 0)
             {
                 zones[nbzones++] = MTGGameZone::OPPONENT_GRAVEYARD;
                 zones[nbzones++] = MTGGameZone::OPPONENT_LIBRARY;
@@ -225,7 +225,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 zones[nbzones++] = MTGGameZone::MY_HAND;
                 zones[nbzones++] = MTGGameZone::MY_EXILE;
             }
-            else if (zoneName.compare("oppzones") == 0)
+            else if (zoneName.compare("opponentzones") == 0)
             {
                 zones[nbzones++] = MTGGameZone::OPPONENT_BATTLEFIELD;
                 zones[nbzones++] = MTGGameZone::OPPONENT_STACK;