diff --git a/res/cardsfolder/aether_adept.txt b/res/cardsfolder/aether_adept.txt
index c3ac64c489d..6d021ae339f 100644
--- a/res/cardsfolder/aether_adept.txt
+++ b/res/cardsfolder/aether_adept.txt
@@ -1,9 +1,10 @@
 Name:AEther Adept
 ManaCost:1 U U
 Types:Creature Human Wizard
-Text:When AEther Adept enters the battlefield, return target creature to its owner's hand.
+Text:no text
 PT:2/2
-K:etbBounceTgt:Creature:Hand
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
+SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_adept.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/41.jpg
diff --git a/res/cardsfolder/man_o_war.txt b/res/cardsfolder/man_o_war.txt
index 5b882e34c52..fa5d367ed09 100644
--- a/res/cardsfolder/man_o_war.txt
+++ b/res/cardsfolder/man_o_war.txt
@@ -1,9 +1,10 @@
 Name:Man-o'-War
 ManaCost:2 U
 Types:Creature Jellyfish
-Text:When CARDNAME enters the battlefield, return target creature to its owner's hand.
+Text:no text
 PT:2/2
-K:etbBounceTgt:Creature:Hand
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
+SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4266.jpg
 SetInfo:VIS|Common|http://magiccards.info/scans/en/vi/37.jpg