diff --git a/forge-gui/res/cardsfolder/b/black_poplar_shaman.txt b/forge-gui/res/cardsfolder/b/black_poplar_shaman.txt
index b7e9f97a0ff..7161c18958a 100644
--- a/forge-gui/res/cardsfolder/b/black_poplar_shaman.txt
+++ b/forge-gui/res/cardsfolder/b/black_poplar_shaman.txt
@@ -2,6 +2,6 @@ Name:Black Poplar Shaman
 ManaCost:2 B
 Types:Creature Treefolk Shaman
 PT:1/3
-A:AB$ Regenerate | ValidTgts$ Creature.Treefolk | TgtPrompt$ Select target Treefolk. | Cost$ 2 B | SpellDescription$ Regenerate target Treefolk.
+A:AB$ Regenerate | ValidTgts$ Treefolk | TgtPrompt$ Select target Treefolk. | Cost$ 2 B | SpellDescription$ Regenerate target Treefolk.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/black_poplar_shaman.jpg
 Oracle:{2}{B}: Regenerate target Treefolk.
diff --git a/forge-gui/res/cardsfolder/e/elephant_graveyard.txt b/forge-gui/res/cardsfolder/e/elephant_graveyard.txt
index c4af3978e94..cc5e961bbb6 100644
--- a/forge-gui/res/cardsfolder/e/elephant_graveyard.txt
+++ b/forge-gui/res/cardsfolder/e/elephant_graveyard.txt
@@ -2,7 +2,7 @@ Name:Elephant Graveyard
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Regenerate | ValidTgts$ Creature.Elephant | TgtPrompt$ Select target Elephant | Cost$ T | SpellDescription$ Regenerate target Elephant.
+A:AB$ Regenerate | ValidTgts$ Elephant | TgtPrompt$ Select target Elephant | Cost$ T | SpellDescription$ Regenerate target Elephant.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elephant_graveyard.jpg
 AI:RemoveDeck:Random
 DeckNeeds:Type$Elephant
diff --git a/forge-gui/res/cardsfolder/e/ezuri_renegade_leader.txt b/forge-gui/res/cardsfolder/e/ezuri_renegade_leader.txt
index 760093f6213..8348d0d7ab5 100644
--- a/forge-gui/res/cardsfolder/e/ezuri_renegade_leader.txt
+++ b/forge-gui/res/cardsfolder/e/ezuri_renegade_leader.txt
@@ -3,6 +3,6 @@ ManaCost:1 G G
 Types:Legendary Creature Elf Warrior
 PT:2/2
 A:AB$ PumpAll | Cost$ 2 G G G | ValidCards$ Creature.Elf+YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Elf creatures you control get +3/+3 and gain trample until end of turn.
-A:AB$ Regenerate | ValidTgts$ Creature.Elf+Other | TgtPrompt$ Select another target Elf | Cost$ G | SpellDescription$ Regenerate another target Elf.
+A:AB$ Regenerate | ValidTgts$ Elf.Other | TgtPrompt$ Select another target Elf | Cost$ G | SpellDescription$ Regenerate another target Elf.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ezuri_renegade_leader.jpg
 Oracle:{G}: Regenerate another target Elf.\n{2}{G}{G}{G}: Elf creatures you control get +3/+3 and gain trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/m/mad_auntie.txt b/forge-gui/res/cardsfolder/m/mad_auntie.txt
index 998e5e5da27..b10490a1d80 100644
--- a/forge-gui/res/cardsfolder/m/mad_auntie.txt
+++ b/forge-gui/res/cardsfolder/m/mad_auntie.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Goblin Shaman
 PT:2/2
 S:Mode$ Continuous | Affected$ Creature.Goblin+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Goblin creatures you control get +1/+1.
-A:AB$ Regenerate | ValidTgts$ Creature.Goblin+Other | TgtPrompt$ Select another target Goblin | Cost$ T | SpellDescription$ Regenerate another target Goblin.
+A:AB$ Regenerate | ValidTgts$ Goblin.Other | TgtPrompt$ Select another target Goblin | Cost$ T | SpellDescription$ Regenerate another target Goblin.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mad_auntie.jpg
 Oracle:Other Goblin creatures you control get +1/+1.\n{T}: Regenerate another target Goblin.