diff --git a/forge-gui/res/cardsfolder/r/reborn_hero.txt b/forge-gui/res/cardsfolder/r/reborn_hero.txt
index bbd83b00545..6bd987c7acb 100644
--- a/forge-gui/res/cardsfolder/r/reborn_hero.txt
+++ b/forge-gui/res/cardsfolder/r/reborn_hero.txt
@@ -5,6 +5,6 @@ PT:2/2
 K:Vigilance
 S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TriggerBounce | Condition$ Threshold | Description$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME dies, you may pay {W}{W}. If you do, return Reborn Hero to the battlefield under your control."
 SVar:TriggerBounce:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TriggeredBounce | Secondary$ True | TriggerDescription$ When CARDNAME dies, you may pay {W}{W}. If you do, return Reborn Hero to the battlefield under your control.
-SVar:TriggeredBounce:AB$ ChangeZone | Cost$ W W | ValidCard$ Card.Self | Origin$ Graveyard | Destination$ Battlefield
+SVar:TriggeredBounce:AB$ ChangeZone | Cost$ W W | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reborn_hero.jpg
 Oracle:Vigilance\nThreshold - As long as seven or more cards are in your graveyard, Reborn Hero has "When Reborn Hero dies, you may pay {W}{W}. If you do, return Reborn Hero to the battlefield under your control."
diff --git a/forge-gui/res/cardsfolder/r/ringskipper.txt b/forge-gui/res/cardsfolder/r/ringskipper.txt
index 526c1ab07b4..732f9cd6ef7 100644
--- a/forge-gui/res/cardsfolder/r/ringskipper.txt
+++ b/forge-gui/res/cardsfolder/r/ringskipper.txt
@@ -5,6 +5,6 @@ PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigClash | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, clash with an opponent. If you win, return CARDNAME to its owner's hand.
 SVar:TrigClash:AB$Clash | Cost$ 0 | WinSubAbility$ DBReturn
-SVar:DBReturn:DB$ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:DBReturn:DB$ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ringskipper.jpg
 Oracle:Flying\nWhen Ringskipper dies, clash with an opponent. If you win, return Ringskipper to its owner's hand. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
diff --git a/forge-gui/res/cardsfolder/s/shivan_phoenix.txt b/forge-gui/res/cardsfolder/s/shivan_phoenix.txt
index e02862bb356..310e040b51e 100644
--- a/forge-gui/res/cardsfolder/s/shivan_phoenix.txt
+++ b/forge-gui/res/cardsfolder/s/shivan_phoenix.txt
@@ -4,7 +4,7 @@ Types:Creature Phoenix
 PT:3/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
+SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ TriggeredCard
 SVar:SacMe:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shivan_phoenix.jpg
 Oracle:Flying\nWhen Shivan Phoenix dies, return Shivan Phoenix to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/sylvan_hierophant.txt b/forge-gui/res/cardsfolder/s/sylvan_hierophant.txt
index 90b8d05833e..5760b5d69c6 100644
--- a/forge-gui/res/cardsfolder/s/sylvan_hierophant.txt
+++ b/forge-gui/res/cardsfolder/s/sylvan_hierophant.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Human Cleric
 PT:1/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile CARDNAME, then return another target creature card from your graveyard to your hand.
-SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | SubAbility$ HierophantChange
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredCard | SubAbility$ HierophantChange
 SVar:HierophantChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.Other+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sylvan_hierophant.jpg
 Oracle:When Sylvan Hierophant dies, exile Sylvan Hierophant, then return another target creature card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/t/tenacious_dead.txt b/forge-gui/res/cardsfolder/t/tenacious_dead.txt
index 403caaa07fd..ae74d7b7941 100644
--- a/forge-gui/res/cardsfolder/t/tenacious_dead.txt
+++ b/forge-gui/res/cardsfolder/t/tenacious_dead.txt
@@ -3,6 +3,6 @@ ManaCost:B
 Types:Creature Skeleton Warrior
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerController$ TriggeredCardController | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, you may pay {1}{B}. If you do, return it to the battlefield tapped under its owner's control.
-SVar:TrigReturn:AB$ ChangeZone | Cost$ 1 B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 1 B | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tenacious_dead.jpg
 Oracle:When Tenacious Dead dies, you may pay {1}{B}. If you do, return it to the battlefield tapped under its owner's control.
diff --git a/forge-gui/res/cardsfolder/u/underworld_cerberus.txt b/forge-gui/res/cardsfolder/u/underworld_cerberus.txt
index b02bcaf92a2..5fc0caf9bfd 100644
--- a/forge-gui/res/cardsfolder/u/underworld_cerberus.txt
+++ b/forge-gui/res/cardsfolder/u/underworld_cerberus.txt
@@ -5,7 +5,7 @@ PT:6/6
 K:CantBeBlockedByAmount LT3
 S:Mode$ CantTarget | AffectedZone$ Graveyard | Description$ Cards in graveyards can't be the targets of spells or abilities.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it and each player returns all creature cards from his or her graveyard to his or her hand.
-SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | Defined$ Self | SubAbility$ DBChangeZoneAll
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredCard | SubAbility$ DBChangeZoneAll
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | UseAllOriginZones$ True | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/underworld_cerberus.jpg
 Oracle:Underworld Cerberus can't be blocked except by three or more creatures.\nCards in graveyards can't be the targets of spells or abilities.\nWhen Underworld Cerberus dies, exile it and each player returns all creature cards from his or her graveyard to his or her hand.
diff --git a/forge-gui/res/cardsfolder/w/weatherseed_treefolk.txt b/forge-gui/res/cardsfolder/w/weatherseed_treefolk.txt
index ca8d95c1684..c16b7c88176 100644
--- a/forge-gui/res/cardsfolder/w/weatherseed_treefolk.txt
+++ b/forge-gui/res/cardsfolder/w/weatherseed_treefolk.txt
@@ -4,6 +4,6 @@ Types:Creature Treefolk
 PT:5/3
 K:Trample
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
+SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ TriggeredCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/weatherseed_treefolk.jpg
 Oracle:Trample\nWhen Weatherseed Treefolk dies, return it to its owner's hand.