diff --git a/res/cardsfolder/s/saprazzan_bailiff.txt b/res/cardsfolder/s/saprazzan_bailiff.txt
index 11809814e61..1f8abf3ec0f 100644
--- a/res/cardsfolder/s/saprazzan_bailiff.txt
+++ b/res/cardsfolder/s/saprazzan_bailiff.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile all artifact and enchantment cards from all graveyards.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return all artifact and enchantment cards from all graveyards to their owners' hands.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return all artifact and enchantment cards from all graveyards to their owners' hands.
 SVar:TrigExile:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Artifact,Enchantment | Origin$ Graveyard | Destination$ Exile
 SVar:TrigReturn:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Artifact,Enchantment | Origin$ Graveyard | Destination$ Hand
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/s/saproling_burst.txt b/res/cardsfolder/s/saproling_burst.txt
index ff1ab2aca67..06f071b9950 100644
--- a/res/cardsfolder/s/saproling_burst.txt
+++ b/res/cardsfolder/s/saproling_burst.txt
@@ -6,8 +6,8 @@ K:Fading:7
 A:AB$ Token | Cost$ SubCounter<1/FADE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenImage$ G X X Saproling | TokenColors$ Green | TokenPower$ 0 | TokenToughness$ 0 |  RememberTokens$ True | TokenKeywords$ This creature's power and toughness are each equal to the number of fade counters on CARDNAME. | SpellDescription$ Put a green Saproling creature token onto the battlefield. It has "This creature's power and toughness are each equal to the number of fade counters on CARDNAME."
 S:Mode$ Continuous | Affected$ Creature.IsRemembered | SetPower$ X | SetToughness$ X | Description$ HIDDEN It has "This creature's power and toughness are each equal to the number of fade counters on Saproling Burst."
 SVar:X:Count$CardCounters.FADE
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ DestroyRemembered | TriggerDescription$ When CARDNAME leaves the battlefield, destroy all tokens put onto the battlefield with CARDNAME. They can't be regenerated.
-SVar:DestroyRemembered:DB$DestroyAll | Cost$ 0 | ValidCards$ Creature.IsRemembered | NoRegen$ True | SubAbility$ DBCleanUp
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ DestroyRemembered | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, destroy all tokens put onto the battlefield with CARDNAME. They can't be regenerated.
+SVar:DestroyRemembered:DB$DestroyAll | Cost$ 0 | ValidCards$ Card.IsRemembered | NoRegen$ True | SubAbility$ DBCleanUp
 SVar:DBCleanUp:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/s/sengir_autocrat.txt b/res/cardsfolder/s/sengir_autocrat.txt
index 86e955dc66e..bbe5a34eb47 100644
--- a/res/cardsfolder/s/sengir_autocrat.txt
+++ b/res/cardsfolder/s/sengir_autocrat.txt
@@ -5,8 +5,8 @@ Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put three 0/1 black Serf creature tokens onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 3 | TokenName$ Serf | TokenTypes$ Creature,Serf | TokenOwner$ You | TokenColors$ Black | TokenPower$ 0 | TokenToughness$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigExileAllSerfs | TriggerDescription$ When CARDNAME leaves the battlefield, exile all Serf tokens.
-SVar:TrigExileAllSerfs:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Creature.Serf+token | Origin$ Battlefield | Destination$ Exile
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigExileAllSerfs | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, exile all Serf tokens.
+SVar:TrigExileAllSerfs:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Serf.token | Origin$ Battlefield | Destination$ Exile
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/tsb/en-us/card106638.jpg
 SetInfo:HML|Rare|http://magiccards.info/scans/en/hl/19.jpg
diff --git a/res/cardsfolder/s/servant_of_volrath.txt b/res/cardsfolder/s/servant_of_volrath.txt
index ae258718115..430abf4f61d 100644
--- a/res/cardsfolder/s/servant_of_volrath.txt
+++ b/res/cardsfolder/s/servant_of_volrath.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Minion
 Text:no text
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerDescription$ When CARDNAME leaves the battlefield, sacrifice a creature.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, sacrifice a creature.
 SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | SacValid$ Creature
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/servant_of_volrath.jpg
diff --git a/res/cardsfolder/s/slithermuse.txt b/res/cardsfolder/s/slithermuse.txt
index f478189c64d..be0706b27f6 100644
--- a/res/cardsfolder/s/slithermuse.txt
+++ b/res/cardsfolder/s/slithermuse.txt
@@ -4,7 +4,7 @@ Types:Creature Elemental
 Text:no text
 PT:3/3
 K:Evoke:3 U
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigDraw | TriggerDescription$ When CARDNAME leaves the battlefield, choose an opponent. If that player has more cards in hand than you, draw cards equal to the difference.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, choose an opponent. If that player has more cards in hand than you, draw cards equal to the difference.
 SVar:TrigDraw:DB$Draw | Cost$ 0 | NumCards$ X | Defined$ You | IsPresent$ Card.YouDontCtrl | PresentCompare$ GTY | PresentZone$ Hand
 SVar:Y:Count$InYourHand
 SVar:X:Count$InOppHand/Minus.Y
diff --git a/res/cardsfolder/s/slithery_stalker.txt b/res/cardsfolder/s/slithery_stalker.txt
index 3605a26dca5..61c4a5c72a5 100644
--- a/res/cardsfolder/s/slithery_stalker.txt
+++ b/res/cardsfolder/s/slithery_stalker.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:1/1
 K:Swampwalk
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target green or white creature an opponent controls.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled card to the battlefield under its owner's control.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled card to the battlefield under its owner's control.
 SVar:TrigExile:DB$ChangeZone | Cost$ 0 | TargetMin$ 1 | TargetMax$ 1 | IsCurse$ True | ValidTgts$ Creature.Green+YouDontCtrl,Creature.White+YouDontCtrl | TgtPrompt$ Choose target green or white creature your opponent controls. | RememberTargets$ True | ForgetOtherTargets$ True | Origin$ Battlefield | Destination$ Exile
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
 SVar:PlayMain1:TRUE
diff --git a/res/cardsfolder/s/soul_scourge.txt b/res/cardsfolder/s/soul_scourge.txt
index e88b7620159..aa3feba806d 100644
--- a/res/cardsfolder/s/soul_scourge.txt
+++ b/res/cardsfolder/s/soul_scourge.txt
@@ -6,7 +6,7 @@ PT:3/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, target player loses 3 life.
 SVar:TrigLoseLife:DB$LoseLife | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | RememberTargets$ True | ForgetOtherTargets$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME leaves the battlefield, that player gains 3 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, that player gains 3 life.
 SVar:TrigGainLife:DB$GainLife | Defined$ Remembered | LifeAmount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_scourge.jpg
diff --git a/res/cardsfolder/s/spellgorger_barbarian.txt b/res/cardsfolder/s/spellgorger_barbarian.txt
index 00eda1a2a86..2f9f93e0379 100644
--- a/res/cardsfolder/s/spellgorger_barbarian.txt
+++ b/res/cardsfolder/s/spellgorger_barbarian.txt
@@ -4,7 +4,7 @@ Types:Creature Human Nightmare Barbarian
 Text:no text
 PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, discard a card at random.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME leaves the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, draw a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ You | NumCards$ 1 | Mode$ Random
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Common
diff --git a/res/cardsfolder/t/thalakos_seer.txt b/res/cardsfolder/t/thalakos_seer.txt
index 68eb93b4086..b33d5a88194 100644
--- a/res/cardsfolder/t/thalakos_seer.txt
+++ b/res/cardsfolder/t/thalakos_seer.txt
@@ -4,7 +4,7 @@ Types:Creature Thalakos Wizard
 Text:no text
 PT:1/1
 K:Shadow
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$TrigDraw | TriggerDescription$ When CARDNAME leaves the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thalakos_seer.jpg
diff --git a/res/cardsfolder/t/tidehollow_sculler.txt b/res/cardsfolder/t/tidehollow_sculler.txt
index bb5e9e2d8a5..b7107771bc0 100644
--- a/res/cardsfolder/t/tidehollow_sculler.txt
+++ b/res/cardsfolder/t/tidehollow_sculler.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Zombie
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card. When CARDNAME leaves the battlefield, return the exiled card to its owner's hand.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigBounce | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card. When CARDNAME leaves the battlefield, return the exiled card to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigBounce | Secondary$ True | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card. When CARDNAME leaves the battlefield, return the exiled card to its owner's hand.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | TgtPrompt$ Select target player | ChangeType$ Card.nonLand | ChangeNum$ 1 | IsCurse$ True | RememberChanged$ True | ForgetOtherRemembered$ True
 SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Hand | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
diff --git a/res/cardsfolder/t/tombstone_stairwell.txt b/res/cardsfolder/t/tombstone_stairwell.txt
index 384c6f15388..31cd9557bf7 100644
--- a/res/cardsfolder/t/tombstone_stairwell.txt
+++ b/res/cardsfolder/t/tombstone_stairwell.txt
@@ -9,8 +9,8 @@ SVar:TrigTokenOpp:DB$Token | TokenAmount$ Y | TokenName$ Tombspawn | TokenTypes$
 SVar:X:Count$TypeInYourYard.Creature
 SVar:Y:Count$TypeInOppYard.Creature
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ DestroyRemembered | TriggerDescription$ At the beginning of each end step or when CARDNAME leaves the battlefield, destroy all tokens put onto the battlefield with CARDNAME. They can't be regenerated.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ DestroyRemembered | Secondary$ True | TriggerDescription$ At the beginning of each end step or when CARDNAME leaves the battlefield, destroy all tokens put onto the battlefield with CARDNAME. They can't be regenerated.
-SVar:DestroyRemembered:DB$DestroyAll | Cost$ 0 | ValidCards$ Creature.IsRemembered | NoRegen$ True | SubAbility$ DBCleanUp
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ DestroyRemembered | Secondary$ True | TriggerController$ TriggeredCardController | TriggerDescription$ At the beginning of each end step or when CARDNAME leaves the battlefield, destroy all tokens put onto the battlefield with CARDNAME. They can't be regenerated.
+SVar:DestroyRemembered:DB$DestroyAll | Cost$ 0 | ValidCards$ Card.IsRemembered | NoRegen$ True | SubAbility$ DBCleanUp
 SVar:DBCleanUp:DB$Cleanup | ClearRemembered$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tombstone_stairwell.jpg
diff --git a/res/cardsfolder/w/walker_of_the_grove.txt b/res/cardsfolder/w/walker_of_the_grove.txt
index db30a126cd2..b1f546f425c 100644
--- a/res/cardsfolder/w/walker_of_the_grove.txt
+++ b/res/cardsfolder/w/walker_of_the_grove.txt
@@ -3,7 +3,7 @@ ManaCost:6 G G
 Types:Creature Elemental
 Text:no text
 PT:7/7
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME leaves the battlefield, put a 4/4 green Elemental creature token onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, put a 4/4 green Elemental creature token onto the battlefield.
 K:Evoke:4 G
 SVar:TrigToken:DB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+evoked | Execute$ TrigSac | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it by it's evoke cost, sacrifice it.
diff --git a/res/cardsfolder/w/wall_of_nets.txt b/res/cardsfolder/w/wall_of_nets.txt
index 2a73db986ee..065ffd5ee0e 100644
--- a/res/cardsfolder/w/wall_of_nets.txt
+++ b/res/cardsfolder/w/wall_of_nets.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:0/7
 K:Defender
 T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | Static$ True | TriggerDescription$ At end of combat, exile all creatures blocked by CARDNAME.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return all cards exiled with CARDNAME to the battlefield under their owners' control.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return all cards exiled with CARDNAME to the battlefield under their owners' control.
 SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigExile | TriggerDescription$ Exile blocked creature at end of combat.
 SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredAttacker | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
diff --git a/res/cardsfolder/w/war_barge.txt b/res/cardsfolder/w/war_barge.txt
index 9b48080682d..eacb9d52241 100644
--- a/res/cardsfolder/w/war_barge.txt
+++ b/res/cardsfolder/w/war_barge.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact
 Text:no text
 A:AB$ Pump | Cost$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Islandwalk | RememberTargets$ True | SpellDescription$ Target creature gains islandwalk until end of turn.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME leaves the battlefield this turn, destroy that creature. A creature destroyed this way can't be regenerated.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigDestroy | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield this turn, destroy that creature. A creature destroyed this way can't be regenerated.
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Card.IsRemembered | NoRegen$ True
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigClearRemembered | Static$ True | Secondary$ True | TriggerDescription$ Clear Remembered at the end of any turn.
 SVar:TrigClearRemembered:DB$ Cleanup | ClearRemembered$ True
diff --git a/res/cardsfolder/w/worldgorger_dragon.txt b/res/cardsfolder/w/worldgorger_dragon.txt
index fcabb8042db..469168199e9 100644
--- a/res/cardsfolder/w/worldgorger_dragon.txt
+++ b/res/cardsfolder/w/worldgorger_dragon.txt
@@ -7,7 +7,7 @@ K:Flying
 K:Trample
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile all other permanents you control.
 SVar:TrigExile:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Permanent.YouCtrl+Other | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | ForgetOtherTargets$ True
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled cards to the battlefield under their owners' control.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled cards to the battlefield under their owners' control.
 SVar:TrigReturn:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Card | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/w/wormfang_behemoth.txt b/res/cardsfolder/w/wormfang_behemoth.txt
index c8971fdbc83..75c625b3cb2 100644
--- a/res/cardsfolder/w/wormfang_behemoth.txt
+++ b/res/cardsfolder/w/wormfang_behemoth.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:5/5
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile all cards from your hand.
 SVar:TrigExile:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Card.YouCtrl | Origin$ Hand | Destination$ Exile | RememberChanged$ True
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled cards to their owner's hand.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled cards to their owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Hand | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/w/wormfang_manta.txt b/res/cardsfolder/w/wormfang_manta.txt
index 62d7c369e22..a1a154c7cbe 100644
--- a/res/cardsfolder/w/wormfang_manta.txt
+++ b/res/cardsfolder/w/wormfang_manta.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:6/1
 K:Flying
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigSkip | TriggerDescription$ When CARDNAME enters the battlefield, you skip your next turn.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigAdd | TriggerDescription$ When CARDNAME leaves the battlefield, you take an extra turn after this one.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigAdd | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, you take an extra turn after this one.
 SVar:TrigAdd:AB$AddTurn | Cost$ 0 | NumTurns$ 1 | Defined$ You
 SVar:TrigSkip:AB$AddTurn | Cost$ 0 | NumTurns$ 1 | Defined$ Opponent
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/y/yukora_the_prisoner.txt b/res/cardsfolder/y/yukora_the_prisoner.txt
index 3107d77f05d..52c43fb5045 100644
--- a/res/cardsfolder/y/yukora_the_prisoner.txt
+++ b/res/cardsfolder/y/yukora_the_prisoner.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Legendary Creature Demon Spirit
 Text:no text
 PT:5/5
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME leaves the battlefield, sacrifice all non-Ogre creatures you control.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, sacrifice all non-Ogre creatures you control.
 SVar:TrigSac:AB$ SacrificeAll | Cost$ 0 | ValidCards$ Creature.nonOgre+YouCtrl
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yukora_the_prisoner.jpg