diff --git a/res/cardsfolder/anodet_lurker.txt b/res/cardsfolder/anodet_lurker.txt
index 1a20548754a..6c18d4f8703 100644
--- a/res/cardsfolder/anodet_lurker.txt
+++ b/res/cardsfolder/anodet_lurker.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Construct
 Text:no text
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you gain 3 life.
-SVar:TrigSac:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 3
+SVar:TrigSac:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anodet_lurker.jpg
 SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/101.jpg
diff --git a/res/cardsfolder/penumbra_bobcat.txt b/res/cardsfolder/penumbra_bobcat.txt
index 0ae0ca96938..6bd086ef417 100644
--- a/res/cardsfolder/penumbra_bobcat.txt
+++ b/res/cardsfolder/penumbra_bobcat.txt
@@ -4,7 +4,7 @@ Types:Creature Cat
 Text:no text
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 2/1 black Cat creature token onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Cat | TokenTypes$ Creature,Cat | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 1
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Cat | TokenTypes$ Creature,Cat | TokenOwner$ TriggeredCardController | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 1
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/ap/en-us/card26815.jpg
 SetInfo:APC|Common|http://magiccards.info/scans/en/ap/82.jpg
diff --git a/res/cardsfolder/penumbra_kavu.txt b/res/cardsfolder/penumbra_kavu.txt
index 3973b0781f7..ffaeb7bfe5d 100644
--- a/res/cardsfolder/penumbra_kavu.txt
+++ b/res/cardsfolder/penumbra_kavu.txt
@@ -4,7 +4,7 @@ Types:Creature Kavu
 Text:
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 3/3 black Kavu creature token onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Kavu | TokenTypes$ Creature,Kavu | TokenOwner$ You | TokenColors$ Black | TokenPower$ 3 | TokenToughness$ 3
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Kavu | TokenTypes$ Creature,Kavu | TokenOwner$ TriggeredCardController | TokenColors$ Black | TokenPower$ 3 | TokenToughness$ 3
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/ap/en-us/card25956.jpg
 SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/83.jpg
diff --git a/res/cardsfolder/penumbra_spider.txt b/res/cardsfolder/penumbra_spider.txt
index 7d7a92c5a5a..286d60954f6 100644
--- a/res/cardsfolder/penumbra_spider.txt
+++ b/res/cardsfolder/penumbra_spider.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/4
 K:Reach
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 2/4 black Spider creature token with reach onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Spider | TokenTypes$ Creature,Spider | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 4 | TokenKeywords$ Reach
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Spider | TokenTypes$ Creature,Spider | TokenOwner$ TriggeredCardController | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 4 | TokenKeywords$ Reach
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/penumbra_spider.jpg
 SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/210.jpg
diff --git a/res/cardsfolder/penumbra_wurm.txt b/res/cardsfolder/penumbra_wurm.txt
index f8e34b2d235..b0afc288540 100644
--- a/res/cardsfolder/penumbra_wurm.txt
+++ b/res/cardsfolder/penumbra_wurm.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:6/6
 K:Trample
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 6/6 black Wurm creature token with trample onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ You | TokenColors$ Black | TokenPower$ 6 | TokenToughness$ 6 | TokenKeywords$ Trample
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ TriggeredCardController | TokenColors$ Black | TokenPower$ 6 | TokenToughness$ 6 | TokenKeywords$ Trample
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/penumbra_wurm.jpg
 SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/84.jpg