diff --git a/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java b/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java
index f38591d5010..f6f8171bece 100644
--- a/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java
+++ b/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java
@@ -14,7 +14,7 @@ import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.filter.StaticFilters;
 import mage.game.Game;
-import mage.game.permanent.token.ElementalTokenWithHaste;
+import mage.game.permanent.token.ElementalHasteToken;
 import mage.players.Player;
 
 import java.util.UUID;
@@ -73,7 +73,7 @@ class ChandraElementalEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            CreateTokenEffect effect = new CreateTokenEffect(new ElementalTokenWithHaste(), 2);
+            CreateTokenEffect effect = new CreateTokenEffect(new ElementalHasteToken(), 2);
             effect.apply(game, source);
             effect.exileTokensCreatedAtNextEndStep(game, source);
             return true;
diff --git a/Mage.Sets/src/mage/cards/f/FeralLightning.java b/Mage.Sets/src/mage/cards/f/FeralLightning.java
index 3d7472fb2d9..298249c2cbb 100644
--- a/Mage.Sets/src/mage/cards/f/FeralLightning.java
+++ b/Mage.Sets/src/mage/cards/f/FeralLightning.java
@@ -8,7 +8,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.ElementalTokenWithHaste;
+import mage.game.permanent.token.ElementalHasteToken;
 import mage.players.Player;
 
 import java.util.UUID;
@@ -56,7 +56,7 @@ class FeralLightningEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            CreateTokenEffect effect = new CreateTokenEffect(new ElementalTokenWithHaste(), 3);
+            CreateTokenEffect effect = new CreateTokenEffect(new ElementalHasteToken(), 3);
             effect.apply(game, source);
             effect.exileTokensCreatedAtNextEndStep(game, source);
             return true;
diff --git a/Mage.Sets/src/mage/cards/l/LightningCoils.java b/Mage.Sets/src/mage/cards/l/LightningCoils.java
index 6f3d4b17890..55f0b335e8e 100644
--- a/Mage.Sets/src/mage/cards/l/LightningCoils.java
+++ b/Mage.Sets/src/mage/cards/l/LightningCoils.java
@@ -14,7 +14,7 @@ import mage.counters.CounterType;
 import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.ElementalTokenWithHaste;
+import mage.game.permanent.token.ElementalHasteToken;
 import mage.players.Player;
 
 import java.util.UUID;
@@ -67,7 +67,7 @@ class LightningCoilsEffect extends OneShotEffect {
             if (counters >= 5) {
                 // remove all the counters and create that many tokens
                 permanent.removeAllCounters(CounterType.CHARGE.getName(), source, game);
-                CreateTokenEffect effect = new CreateTokenEffect(new ElementalTokenWithHaste(), counters);
+                CreateTokenEffect effect = new CreateTokenEffect(new ElementalHasteToken(), counters);
                 effect.apply(game, source);
 
                 // exile those tokens at next end step
diff --git a/Mage.Sets/src/mage/cards/r/RakkaMar.java b/Mage.Sets/src/mage/cards/r/RakkaMar.java
index 166b104cf31..4bf388e2fbf 100644
--- a/Mage.Sets/src/mage/cards/r/RakkaMar.java
+++ b/Mage.Sets/src/mage/cards/r/RakkaMar.java
@@ -13,7 +13,7 @@ import mage.constants.CardType;
 import mage.constants.ColoredManaSymbol;
 import mage.constants.SubType;
 import mage.constants.SuperType;
-import mage.game.permanent.token.ElementalTokenWithHaste;
+import mage.game.permanent.token.ElementalHasteToken;
 
 import java.util.UUID;
 
@@ -33,7 +33,7 @@ public final class RakkaMar extends CardImpl {
         this.addAbility(HasteAbility.getInstance());
 
         Ability ability = new SimpleActivatedAbility(
-                new CreateTokenEffect(new ElementalTokenWithHaste()),
+                new CreateTokenEffect(new ElementalHasteToken()),
                 new ColoredManaCost(ColoredManaSymbol.R)
         );
         ability.addCost(new TapSourceCost());
diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/ElementalHasteToken.java
similarity index 66%
rename from Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
rename to Mage/src/main/java/mage/game/permanent/token/ElementalHasteToken.java
index ba0ececf504..1a8240ba182 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ElementalHasteToken.java
@@ -8,9 +8,9 @@ import mage.constants.SubType;
 /**
  * @author magenoxx
  */
-public final class ElementalTokenWithHaste extends TokenImpl {
+public final class ElementalHasteToken extends TokenImpl {
 
-    public ElementalTokenWithHaste() {
+    public ElementalHasteToken() {
         super("Elemental Token", "3/1 red Elemental creature token with haste");
         cardType.add(CardType.CREATURE);
         color.setRed(true);
@@ -20,11 +20,11 @@ public final class ElementalTokenWithHaste extends TokenImpl {
         this.addAbility(HasteAbility.getInstance());
     }
 
-    protected ElementalTokenWithHaste(final ElementalTokenWithHaste token) {
+    protected ElementalHasteToken(final ElementalHasteToken token) {
         super(token);
     }
 
-    public ElementalTokenWithHaste copy() {
-        return new ElementalTokenWithHaste(this);
+    public ElementalHasteToken copy() {
+        return new ElementalHasteToken(this);
     }
 }
diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt
index 6ada85836ec..35bee9cb31d 100644
--- a/Mage/src/main/resources/tokens-database.txt
+++ b/Mage/src/main/resources/tokens-database.txt
@@ -471,7 +471,7 @@
 
 # CON
 |TOK:CON|Angel||AngelToken|
-|TOK:CON|Elemental||ElementalTokenWithHaste|
+|TOK:CON|Elemental||ElementalHasteToken|
 
 # DVD
 |TOK:DVD|Demon||DemonFlyingToken|
@@ -878,7 +878,7 @@
 |TOK:OGW|Eldrazi Scion|5|EldraziScionToken|
 |TOK:OGW|Eldrazi Scion|6|EldraziScionToken|
 |TOK:OGW|Elemental|1|ElementalXXGreenToken|
-|TOK:OGW|Elemental|2|ElementalTokenWithHaste|
+|TOK:OGW|Elemental|2|ElementalHasteToken|
 |TOK:OGW|Plant||PlantToken|
 |TOK:OGW|Zombie||ZombieToken|
 
@@ -1193,7 +1193,7 @@
 |TOK:C20|Bird Illusion||BirdIllusionToken|
 |TOK:C20|Dinosaur Cat||DinosaurCatToken|
 |TOK:C20|Drake||DrakeToken|
-|TOK:C20|Elemental|1|ElementalTokenWithHaste|
+|TOK:C20|Elemental|1|ElementalHasteToken|
 |TOK:C20|Elemental|2|WhiteElementalToken|
 |TOK:C20|Goblin Warrior||GoblinWarriorToken|
 |TOK:C20|Human||HumanToken|
@@ -2186,7 +2186,7 @@
 |TOK:CMM|Eldrazi Scion||EldraziScionToken|
 |TOK:CMM|Eldrazi Spawn||EldraziSpawnToken|
 |TOK:CMM|Elemental|1|Elemental11HasteToken|
-|TOK:CMM|Elemental|2|ElementalTokenWithHaste|
+|TOK:CMM|Elemental|2|ElementalHasteToken|
 |TOK:CMM|Elemental|3|Elemental31TrampleHasteToken|
 |TOK:CMM|Elemental|4|Elemental44Token|
 |TOK:CMM|Elephant||ElephantToken|