Refactor/rename AvatarToken2 to AvatarFlyingToken to fit naming convention

Author: muz

Mage.Sets/src/mage/cards/a/AjanisLastStand.java

@@ -13,7 +13,7 @@
 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 AjanisLastStand(UUID ownerId, CardSetInfo setInfo) {
 
         // 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) {

…e/game/permanent/token/AvatarToken2.java …e/permanent/token/AvatarFlyingToken.javaMage/src/main/java/mage/game/permanent/token/AvatarToken2.java renamed to Mage/src/main/java/mage/game/permanent/token/AvatarFlyingToken.java Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java renamed to Mage/src/main/java/mage/game/permanent/token/AvatarFlyingToken.java

@@ -5,9 +5,9 @@
 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 AvatarToken2() {
         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);
     }
 }

Mage/src/main/resources/tokens-database.txt

@@ -1098,7 +1098,7 @@
 
 # M19
 |Generate|TOK:M19|Angel|||AngelVigilanceToken|
-|Generate|TOK:M19|Avatar|||AvatarToken2|
+|Generate|TOK:M19|Avatar|||AvatarFlyingToken|
 |Generate|TOK:M19|Bat|||BatToken|
 |Generate|TOK:M19|Beast|||BeastToken|
 |Generate|TOK:M19|Cat|||CatToken2|