diff --git a/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java b/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java
index fc8f101baf..a79746df27 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/GoblinTrenches.java
@@ -75,7 +75,7 @@ public class GoblinTrenches extends CardImpl<GoblinTrenches> {
 
 class GoblinTrenchesToken extends Token {
     GoblinTrenchesToken() {
-        super("", "1/1 red and white Goblin Soldier creature tokens");
+        super("Goblin Soldier", "1/1 red and white Goblin Soldier creature tokens");
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         color.setWhite(true);
diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java
index 04aade6e56..3c02297638 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java
@@ -64,7 +64,7 @@ public class PenumbraBobcat extends CardImpl<PenumbraBobcat> {
 
 class PenumbraBobcatToken extends Token {
     PenumbraBobcatToken() {
-        super("", "2/1 black Cat creature token");
+        super("Cat", "2/1 black Cat creature token");
         cardType.add(CardType.CREATURE);
         color.setBlack(true);
         subtype.add("Cat");
diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java
index e5f332f4f7..e36a2c855c 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java
@@ -64,7 +64,7 @@ public class PenumbraKavu extends CardImpl<PenumbraKavu> {
 
 class PenumbraKavuToken extends Token {
     PenumbraKavuToken() {
-        super("", "3/3 black Kavu creature token");
+        super("Kavu", "3/3 black Kavu creature token");
         cardType.add(CardType.CREATURE);
         color.setBlack(true);
         subtype.add("Kavu");
diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java
index 7aafb2246e..0d5db45369 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java
@@ -66,7 +66,7 @@ public class PenumbraWurm extends CardImpl<PenumbraWurm> {
 
 class PenumbraWurmToken extends Token {
     PenumbraWurmToken() {
-        super("", "6/6 black Wurm creature token with trample");
+        super("Wurm", "6/6 black Wurm creature token with trample");
         cardType.add(CardType.CREATURE);
         color.setBlack(true);
         subtype.add("Wurm");
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java
index 8be6089b35..a848da2e67 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java
@@ -83,7 +83,7 @@ public class MelokuTheCloudedMirror extends CardImpl<MelokuTheCloudedMirror> {
 
 class MelokuTheCloudedMirrorToken extends Token {
     MelokuTheCloudedMirrorToken() {
-        super("", "a 1/1 blue Illusion creature token with flying");
+        super("Illusion", "a 1/1 blue Illusion creature token with flying");
         cardType.add(CardType.CREATURE);
         color.setBlue(true);
         subtype.add("Illusion");
diff --git a/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java b/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java
index 428f6e92ba..7dcdf7bae2 100644
--- a/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java
+++ b/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java
@@ -83,7 +83,7 @@ public class WandOfTheElements extends CardImpl<WandOfTheElements> {
 
 class WandOfTheElementsFirstToken extends Token {
     public WandOfTheElementsFirstToken() {
-        super("", "2/2 blue Elemental creature token with flying");
+        super("Elemental", "2/2 blue Elemental creature token with flying");
         cardType.add(CardType.CREATURE);
         this.subtype.add("Elemental");
         this.color.setBlue(true);
@@ -96,7 +96,7 @@ class WandOfTheElementsFirstToken extends Token {
 
 class WandOfTheElementsSecondToken extends Token {
     public WandOfTheElementsSecondToken() {
-        super("", "3/3 red Elemental creature token");
+        super("Elemental", "3/3 red Elemental creature token");
         cardType.add(CardType.CREATURE);
         this.subtype.add("Elemental");
         this.color.setRed(true);
diff --git a/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java b/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java
index 8010d37be2..eb69121c18 100644
--- a/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java
+++ b/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java
@@ -83,7 +83,7 @@ public class CreakwoodLiege extends CardImpl<CreakwoodLiege> {
 
 class CreakwoodLiegeToken extends Token {
     CreakwoodLiegeToken() {
-        super("", "1/1 black and green Worm creature token");
+        super("Worm", "1/1 black and green Worm creature token");
         cardType.add(CardType.CREATURE);
         color.setBlack(true);
         color.setGreen(true);
diff --git a/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java b/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java
index 21197c811f..b2a3d0a0db 100644
--- a/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java
+++ b/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java
@@ -148,7 +148,7 @@ class KazuulTyrantOfTheCliffsEffect extends OneShotEffect<KazuulTyrantOfTheCliff
 class OgreToken extends Token {
 
     OgreToken() {
-        super("", "3/3 red Ogre creature");
+        super("Ogre", "3/3 red Ogre creature");
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add("Ogre");
diff --git a/Mage/src/mage/game/permanent/token/ElfToken.java b/Mage/src/mage/game/permanent/token/ElfToken.java
index 6d81c62efe..5a1b5060e2 100644
--- a/Mage/src/mage/game/permanent/token/ElfToken.java
+++ b/Mage/src/mage/game/permanent/token/ElfToken.java
@@ -38,7 +38,7 @@ import mage.MageInt;
 public class ElfToken extends Token {
 
     public ElfToken() {
-        super("", "1/1 green Elf Warrior creature token");
+        super("Elf Warrior", "1/1 green Elf Warrior creature token");
         cardType.add(Constants.CardType.CREATURE);
         color.setGreen(true);
         subtype.add("Elf");