diff --git a/Mage.Sets/src/mage/cards/a/AjanisLastStand.java b/Mage.Sets/src/mage/cards/a/AjanisLastStand.java
index e6137f7e1d3..d22437ac2db 100644
--- a/Mage.Sets/src/mage/cards/a/AjanisLastStand.java
+++ b/Mage.Sets/src/mage/cards/a/AjanisLastStand.java
@@ -13,7 +13,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledPermanent;
-import mage.game.permanent.token.AvatarToken2;
+import mage.game.permanent.token.AvatarFlyingToken;
 
 import java.util.UUID;
 
@@ -31,12 +31,12 @@ public final class AjanisLastStand extends CardImpl {
 
         // Whenever a creature or planeswalker you control dies, you may sacrifice Ajani's Last Stand. If you do, create a 4/4 white Avatar creature token with flying.
         this.addAbility(new DiesCreatureTriggeredAbility(
-                new DoIfCostPaid(new CreateTokenEffect(new AvatarToken2()), new SacrificeSourceCost()),
+                new DoIfCostPaid(new CreateTokenEffect(new AvatarFlyingToken()), new SacrificeSourceCost()),
                 false, StaticFilters.FILTER_CONTROLLED_PERMANENT_CREATURE_OR_PLANESWALKER
         ));
 
         // When a spell or ability an opponent controls causes you to discard this card, if you control a Plains, create a 4/4 white Avatar creature token with flying.
-        this.addAbility(new DiscardedByOpponentTriggeredAbility(new CreateTokenEffect(new AvatarToken2())).withInterveningIf(condition));
+        this.addAbility(new DiscardedByOpponentTriggeredAbility(new CreateTokenEffect(new AvatarFlyingToken())).withInterveningIf(condition));
     }
 
     private AjanisLastStand(final AjanisLastStand card) {
diff --git a/Mage.Sets/src/mage/cards/v/VraskaSwarmsEminence.java b/Mage.Sets/src/mage/cards/v/VraskaSwarmsEminence.java
index 40db4401fe8..33317860ac9 100644
--- a/Mage.Sets/src/mage/cards/v/VraskaSwarmsEminence.java
+++ b/Mage.Sets/src/mage/cards/v/VraskaSwarmsEminence.java
@@ -19,7 +19,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.AssassinToken2;
+import mage.game.permanent.token.AssassinDeathtouchToken;
 import mage.target.targetpointer.FixedTarget;
 
 import java.util.UUID;
@@ -42,7 +42,7 @@ public final class VraskaSwarmsEminence extends CardImpl {
         );
 
         // -2: Create a 1/1 black Assassin creature token with deathtouch and "Whenever this creature deals damage to a planeswalker, destroy that planeswalker."
-        this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new AssassinToken2()), -2));
+        this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new AssassinDeathtouchToken()), -2));
     }
 
     private VraskaSwarmsEminence(final VraskaSwarmsEminence card) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java b/Mage/src/main/java/mage/game/permanent/token/AssassinDeathtouchToken.java
similarity index 74%
rename from Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java
rename to Mage/src/main/java/mage/game/permanent/token/AssassinDeathtouchToken.java
index 35fe6790e62..53d20a3d7a0 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AssassinDeathtouchToken.java
@@ -9,9 +9,9 @@ import mage.constants.SubType;
 /**
  * @author TheElk801
  */
-public final class AssassinToken2 extends TokenImpl {
+public final class AssassinDeathtouchToken extends TokenImpl {
 
-    public AssassinToken2() {
+    public AssassinDeathtouchToken() {
         super("Assassin Token", "1/1 black Assassin creature token with deathtouch and \"Whenever this creature deals damage to a planeswalker, destroy that planeswalker.\"");
         cardType.add(CardType.CREATURE);
         color.setBlack(true);
@@ -22,12 +22,11 @@ public final class AssassinToken2 extends TokenImpl {
         addAbility(new DestroyPlaneswalkerWhenDamagedTriggeredAbility());
     }
 
-    private AssassinToken2(final AssassinToken2 token) {
+    private AssassinDeathtouchToken(final AssassinDeathtouchToken token) {
         super(token);
     }
 
-    public AssassinToken2 copy() {
-        return new AssassinToken2(this);
+    public AssassinDeathtouchToken copy() {
+        return new AssassinDeathtouchToken(this);
     }
 }
-
diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java b/Mage/src/main/java/mage/game/permanent/token/AvatarFlyingToken.java
similarity index 68%
rename from Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java
rename to Mage/src/main/java/mage/game/permanent/token/AvatarFlyingToken.java
index 822a94c8ef2..9f21235cfaf 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AvatarFlyingToken.java
@@ -5,9 +5,9 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
-public final class AvatarToken2 extends TokenImpl {
+public final class AvatarFlyingToken extends TokenImpl {
 
-    public AvatarToken2() {
+    public AvatarFlyingToken() {
         super("Avatar Token", "4/4 white Avatar creature token with flying");
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
@@ -17,11 +17,11 @@ public final class AvatarToken2 extends TokenImpl {
         addAbility(FlyingAbility.getInstance());
     }
 
-    protected AvatarToken2(final AvatarToken2 token) {
+    protected AvatarFlyingToken(final AvatarFlyingToken token) {
         super(token);
     }
 
-    public AvatarToken2 copy() {
-        return new AvatarToken2(this);
+    public AvatarFlyingToken copy() {
+        return new AvatarFlyingToken(this);
     }
 }
diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt
index 995dac22a63..329b32e0451 100644
--- a/Mage/src/main/resources/tokens-database.txt
+++ b/Mage/src/main/resources/tokens-database.txt
@@ -1067,7 +1067,7 @@
 
 # WAR
 |TOK:WAR|Angel||AngelVigilanceToken|
-|TOK:WAR|Assassin||AssassinToken2|
+|TOK:WAR|Assassin||AssassinDeathtouchToken|
 |TOK:WAR|Citizen||PlanewideCelebrationToken|
 |TOK:WAR|Devil||DevilToken|
 |TOK:WAR|Dragon||DragonToken|
@@ -1108,7 +1108,7 @@
 
 # M19
 |TOK:M19|Angel||AngelVigilanceToken|
-|TOK:M19|Avatar||AvatarToken2|
+|TOK:M19|Avatar||AvatarFlyingToken|
 |TOK:M19|Bat||BatToken|
 |TOK:M19|Beast||BeastToken|
 |TOK:M19|Cat||CatToken2|