diff --git a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java
index 98f55dca4f3..325ac1cee38 100644
--- a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java
+++ b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java
@@ -12,7 +12,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.BeastToken2;
+import mage.game.permanent.token.Beast44Token;
 import mage.watchers.common.PermanentsEnteredBattlefieldWatcher;
 
 import java.util.List;
@@ -31,7 +31,7 @@ public final class BalothCageTrap extends CardImpl {
         this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{1}{G}"), BalothCageTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher());
 
         // Create a 4/4 green Beast creature token.
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2()));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new Beast44Token()));
     }
 
     private BalothCageTrap(final BalothCageTrap card) {
diff --git a/Mage.Sets/src/mage/cards/b/BalothPrime.java b/Mage.Sets/src/mage/cards/b/BalothPrime.java
index 36f0ce7a90a..d72b7a115e7 100644
--- a/Mage.Sets/src/mage/cards/b/BalothPrime.java
+++ b/Mage.Sets/src/mage/cards/b/BalothPrime.java
@@ -18,7 +18,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.counters.CounterType;
 import mage.filter.StaticFilters;
-import mage.game.permanent.token.BeastToken2;
+import mage.game.permanent.token.Beast44Token;
 
 import java.util.UUID;
 
@@ -44,7 +44,7 @@ public final class BalothPrime extends CardImpl {
 
         // Whenever you sacrifice a land, create a tapped 4/4 green Beast creature token and untap this creature.
         ability = new SacrificePermanentTriggeredAbility(
-                new CreateTokenEffect(new BeastToken2(), 1, true), StaticFilters.FILTER_LAND
+                new CreateTokenEffect(new Beast44Token(), 1, true), StaticFilters.FILTER_LAND
         );
         ability.addEffect(new UntapSourceEffect().concatBy("and"));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/b/BeastAttack.java b/Mage.Sets/src/mage/cards/b/BeastAttack.java
index 4115ee5181a..27cd130aa6d 100644
--- a/Mage.Sets/src/mage/cards/b/BeastAttack.java
+++ b/Mage.Sets/src/mage/cards/b/BeastAttack.java
@@ -8,8 +8,7 @@ import mage.abilities.keyword.FlashbackAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.TimingRule;
-import mage.game.permanent.token.BeastToken2;
+import mage.game.permanent.token.Beast44Token;
 
 /**
  *
@@ -21,7 +20,7 @@ public final class BeastAttack extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}{G}{G}");
 
         // Create a 4/4 green Beast creature token.
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2()));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new Beast44Token()));
 
         // Flashback {2}{G}{G}{G}
         this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{2}{G}{G}{G}")));
diff --git a/Mage.Sets/src/mage/cards/c/CombineChrysalis.java b/Mage.Sets/src/mage/cards/c/CombineChrysalis.java
index 979f146e16b..d0353522974 100644
--- a/Mage.Sets/src/mage/cards/c/CombineChrysalis.java
+++ b/Mage.Sets/src/mage/cards/c/CombineChrysalis.java
@@ -16,9 +16,7 @@ import mage.constants.Duration;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.permanent.TokenPredicate;
-import mage.game.permanent.token.BeastToken2;
-import mage.target.common.TargetControlledPermanent;
-
+import mage.game.permanent.token.Beast44Token;
 import java.util.UUID;
 
 /**
@@ -42,7 +40,7 @@ public final class CombineChrysalis extends CardImpl {
 
         // {2}{G}{U}, {T}, Sacrifice a token: Create a 4/4 green Beast creature token. Activate only as a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(
-                new CreateTokenEffect(new BeastToken2()), new ManaCostsImpl<>("{2}{G}{U}")
+                new CreateTokenEffect(new Beast44Token()), new ManaCostsImpl<>("{2}{G}{U}")
         );
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeTargetCost(filter));
diff --git a/Mage.Sets/src/mage/cards/h/HerdBaloth.java b/Mage.Sets/src/mage/cards/h/HerdBaloth.java
index 3718440edda..2868dfe2d58 100644
--- a/Mage.Sets/src/mage/cards/h/HerdBaloth.java
+++ b/Mage.Sets/src/mage/cards/h/HerdBaloth.java
@@ -7,7 +7,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.game.permanent.token.BeastToken2;
+import mage.game.permanent.token.Beast44Token;
 
 import java.util.UUID;
 
@@ -25,7 +25,7 @@ public final class HerdBaloth extends CardImpl {
 
         // Whenever one or more +1/+1 counters are put on Herd Baloth, you may create a 4/4 green Beast creature token.
         this.addAbility(new OneOrMoreCountersAddedTriggeredAbility(
-                new CreateTokenEffect(new BeastToken2()), true
+                new CreateTokenEffect(new Beast44Token()), true
         ));
     }
 
diff --git a/Mage.Sets/src/mage/cards/h/HuntingPack.java b/Mage.Sets/src/mage/cards/h/HuntingPack.java
index 9c41fa59822..70e7b3ffeac 100644
--- a/Mage.Sets/src/mage/cards/h/HuntingPack.java
+++ b/Mage.Sets/src/mage/cards/h/HuntingPack.java
@@ -7,7 +7,7 @@ import mage.abilities.keyword.StormAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.BeastToken2;
+import mage.game.permanent.token.Beast44Token;
 
 /**
  *
@@ -19,7 +19,7 @@ public final class HuntingPack extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{5}{G}{G}");
 
         // Create a 4/4 green Beast creature token.
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2(), 1));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new Beast44Token(), 1));
         // Storm
         this.addAbility(new StormAbility());
     }
diff --git a/Mage.Sets/src/mage/cards/r/RampagingBaloths.java b/Mage.Sets/src/mage/cards/r/RampagingBaloths.java
index 71ff997bab7..2d793999252 100644
--- a/Mage.Sets/src/mage/cards/r/RampagingBaloths.java
+++ b/Mage.Sets/src/mage/cards/r/RampagingBaloths.java
@@ -11,7 +11,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.game.permanent.token.BeastToken2;
+import mage.game.permanent.token.Beast44Token;
 
 /**
  *
@@ -26,7 +26,7 @@ public final class RampagingBaloths extends CardImpl {
         this.power = new MageInt(6);
         this.toughness = new MageInt(6);
         this.addAbility(TrampleAbility.getInstance());
-        this.addAbility(new LandfallAbility(new CreateTokenEffect(new BeastToken2()), false));
+        this.addAbility(new LandfallAbility(new CreateTokenEffect(new Beast44Token()), false));
     }
 
     private RampagingBaloths(final RampagingBaloths card) {
diff --git a/Mage.Sets/src/mage/cards/s/ShadowbeastSighting.java b/Mage.Sets/src/mage/cards/s/ShadowbeastSighting.java
index 6fdbb21cf82..8cc7bd54c7a 100644
--- a/Mage.Sets/src/mage/cards/s/ShadowbeastSighting.java
+++ b/Mage.Sets/src/mage/cards/s/ShadowbeastSighting.java
@@ -6,8 +6,7 @@ import mage.abilities.keyword.FlashbackAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.TimingRule;
-import mage.game.permanent.token.BeastToken2;
+import mage.game.permanent.token.Beast44Token;
 
 import java.util.UUID;
 
@@ -20,7 +19,7 @@ public final class ShadowbeastSighting extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{G}");
 
         // Create a 4/4 green Beast creature token.
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2()));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new Beast44Token()));
 
         // Flashback {6}{G}
         this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{6}{G}")));
diff --git a/Mage.Sets/src/mage/cards/s/SomberwaldBeastmaster.java b/Mage.Sets/src/mage/cards/s/SomberwaldBeastmaster.java
index 8a6d63343e3..ba83d63b6ed 100644
--- a/Mage.Sets/src/mage/cards/s/SomberwaldBeastmaster.java
+++ b/Mage.Sets/src/mage/cards/s/SomberwaldBeastmaster.java
@@ -13,7 +13,7 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.filter.StaticFilters;
 import mage.game.permanent.token.BeastToken;
-import mage.game.permanent.token.BeastToken2;
+import mage.game.permanent.token.Beast44Token;
 import mage.game.permanent.token.WolfToken;
 
 import java.util.UUID;
@@ -32,7 +32,7 @@ public final class SomberwaldBeastmaster extends CardImpl {
         this.toughness = new MageInt(1);
 
         // When Somberwald Beastmaster enters the battlefield, create a 2/2 green Wolf creature token, a 3/3 green Beast creature token, and a 4/4 green Beast creature token.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken()).withAdditionalTokens(new BeastToken(), new BeastToken2())));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken()).withAdditionalTokens(new BeastToken(), new Beast44Token())));
 
         // Creature tokens you control have deathtouch.
         this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(
diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/Beast44Token.java
similarity index 68%
rename from Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
rename to Mage/src/main/java/mage/game/permanent/token/Beast44Token.java
index 166aa0d2856..060c6fd8c4e 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/Beast44Token.java
@@ -7,9 +7,9 @@ import mage.constants.SubType;
 /**
  * @author LoneFox
  */
-public final class BeastToken2 extends TokenImpl {
+public final class Beast44Token extends TokenImpl {
 
-    public BeastToken2() {
+    public Beast44Token() {
         super("Beast Token", "4/4 green Beast creature token");
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
@@ -18,12 +18,12 @@ public final class BeastToken2 extends TokenImpl {
         toughness = new MageInt(4);
     }
 
-    protected BeastToken2(final BeastToken2 token) {
+    protected Beast44Token(final Beast44Token token) {
         super(token);
     }
 
     @Override
-    public BeastToken2 copy() {
-        return new BeastToken2(this);
+    public Beast44Token copy() {
+        return new Beast44Token(this);
     }
 }
diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt
index ffb57233fc9..ae119e699d1 100644
--- a/Mage/src/main/resources/tokens-database.txt
+++ b/Mage/src/main/resources/tokens-database.txt
@@ -282,7 +282,7 @@
 |TOK:C14|Angel||AngelToken|
 |TOK:C14|Ape||ApeToken|
 |TOK:C14|Beast|1|BeastToken|
-|TOK:C14|Beast|2|BeastToken2|
+|TOK:C14|Beast|2|Beast44Token|
 |TOK:C14|Cat||CatToken|
 |TOK:C14|Demon|1|DemonToken|
 |TOK:C14|Demon|2|DemonFlyingToken|
@@ -316,7 +316,7 @@
 # C15
 |TOK:C15|Angel||AngelToken|
 |TOK:C15|Bear||BearToken|
-|TOK:C15|Beast||BeastToken2|
+|TOK:C15|Beast||Beast44Token|
 |TOK:C15|Cat||CatToken|
 |TOK:C15|Dragon||DragonToken2|
 |TOK:C15|Drake||DrakeToken|
@@ -376,7 +376,7 @@
 
 # C18
 |TOK:C18|Angel||AngelToken|
-|TOK:C18|Beast|1|BeastToken2|
+|TOK:C18|Beast|1|Beast44Token|
 |TOK:C18|Beast|2|SpawningGroundsBeastToken|
 |TOK:C18|Cat||CatToken|
 |TOK:C18|Cat Warrior||CatWarriorToken|
@@ -404,7 +404,7 @@
 # C19
 |TOK:C19|Assassin||AssassinToken|
 |TOK:C19|Beast|1|BeastToken|
-|TOK:C19|Beast|2|BeastToken2|
+|TOK:C19|Beast|2|Beast44Token|
 |TOK:C19|Bird|1|RocEggToken|
 |TOK:C19|Bird|2|WingmateRocToken|
 |TOK:C19|Centaur||CentaurToken|
@@ -429,7 +429,7 @@
 
 # CMA
 |TOK:CMA|Beast|1|BeastToken|
-|TOK:CMA|Beast|2|BeastToken2|
+|TOK:CMA|Beast|2|Beast44Token|
 |TOK:CMA|Dragon||DragonToken2|
 |TOK:CMA|Drake||LeafdrakeRoostDrakeToken|
 |TOK:CMA|Elemental||TitaniaProtectorOfArgothElementalToken|
@@ -481,7 +481,7 @@
 # GVL
 |TOK:GVL|Bat||BatToken|
 |TOK:GVL|Beast|1|BeastToken|
-|TOK:GVL|Beast|2|BeastToken2|
+|TOK:GVL|Beast|2|Beast44Token|
 |TOK:GVL|Elephant||ElephantToken|
 
 # DDC
@@ -491,7 +491,7 @@
 
 # DDD
 |TOK:DDD|Beast|1|BeastToken|
-|TOK:DDD|Beast|2|BeastToken2|
+|TOK:DDD|Beast|2|Beast44Token|
 |TOK:DDD|Elephant||ElephantToken|
 
 # DDE
@@ -578,7 +578,7 @@
 
 # E01
 |TOK:E01|Beast|1|BeastToken|
-|TOK:E01|Beast|2|BeastToken2|
+|TOK:E01|Beast|2|Beast44Token|
 |TOK:E01|Soldier||SoldierToken|
 |TOK:E01|Spirit||SpiritWhiteToken|
 
@@ -814,7 +814,7 @@
 # MM3
 |TOK:MM3|Angel||AngelToken|
 |TOK:MM3|Beast|1|BeastToken|
-|TOK:MM3|Beast|2|BeastToken2|
+|TOK:MM3|Beast|2|Beast44Token|
 |TOK:MM3|Bird||BirdToken|
 |TOK:MM3|Centaur||CentaurToken|
 |TOK:MM3|Dragon||DragonToken|
@@ -863,7 +863,7 @@
 
 # ODY
 |TOK:ODY|Bear||BearToken|
-|TOK:ODY|Beast||BeastToken2|
+|TOK:ODY|Beast||Beast44Token|
 |TOK:ODY|Elephant||ElephantToken|
 |TOK:ODY|Squirrel||SquirrelToken|
 |TOK:ODY|Wurm||WurmToken|
@@ -1032,7 +1032,7 @@
 
 # ZEN
 |TOK:ZEN|Angel||AngelToken|
-|TOK:ZEN|Beast||BeastToken2|
+|TOK:ZEN|Beast||Beast44Token|
 |TOK:ZEN|Bird||BirdToken|
 |TOK:ZEN|Elemental||RedElementalWithTrampleAndHaste|
 |TOK:ZEN|Illusion||IllusionToken|
@@ -1188,7 +1188,7 @@
 
 # C20
 |TOK:C20|Angel||AngelToken|
-|TOK:C20|Beast||BeastToken2|
+|TOK:C20|Beast||Beast44Token|
 |TOK:C20|Bird||BirdToken|
 |TOK:C20|Bird Illusion||BirdIllusionToken|
 |TOK:C20|Dinosaur Cat||DinosaurCatToken|
@@ -1240,7 +1240,7 @@
 |TOK:ZNR|Plant||PlantToken|
 
 # ZNC
-|TOK:ZNC|Beast||BeastToken2|
+|TOK:ZNC|Beast||Beast44Token|
 |TOK:ZNC|Bird||BirdToken|
 |TOK:ZNC|Elemental|1|OmnathElementalToken|
 |TOK:ZNC|Elemental|2|ZendikarsRoilElementalToken|
@@ -1257,7 +1257,7 @@
 # CMR
 |TOK:CMR|Angel||AngelToken|
 |TOK:CMR|Beast|1|BeastToken|
-|TOK:CMR|Beast|2|BeastToken2|
+|TOK:CMR|Beast|2|Beast44Token|
 |TOK:CMR|Cat||CatToken|
 |TOK:CMR|Dragon||DragonEggDragonToken|
 |TOK:CMR|Elephant||ElephantToken|
@@ -1335,7 +1335,7 @@
 
 # C21
 |TOK:C21|Beast|1|BeastToken|
-|TOK:C21|Beast|2|BeastToken2|
+|TOK:C21|Beast|2|Beast44Token|
 |TOK:C21|Boar||Boar2Token|
 |TOK:C21|Construct|1|MetallurgicSummoningsConstructToken|
 |TOK:C21|Construct|2|KarnConstructToken|
@@ -1364,7 +1364,7 @@
 |TOK:C21|Zombie||ZombieToken|
 
 # MH2
-|TOK:MH2|Beast||BeastToken2|
+|TOK:MH2|Beast||Beast44Token|
 |TOK:MH2|Bird||BirdToken|
 |TOK:MH2|Clue|1|ClueArtifactToken|
 |TOK:MH2|Clue|2|ClueArtifactToken|
@@ -1429,7 +1429,7 @@
 
 # MID
 |TOK:MID|Bat||BatToken|
-|TOK:MID|Beast||BeastToken2|
+|TOK:MID|Beast||Beast44Token|
 |TOK:MID|Bird||OminousRoostBirdToken|
 |TOK:MID|Clue||ClueArtifactToken|
 |TOK:MID|Devil||DevilToken|
@@ -1679,7 +1679,7 @@
 
 # IMA
 |TOK:IMA|Angel||AngelToken|
-|TOK:IMA|Beast||BeastToken2|
+|TOK:IMA|Beast||Beast44Token|
 |TOK:IMA|Bird||BirdToken|
 |TOK:IMA|Djinn Monk||DjinnMonkToken|
 |TOK:IMA|Dragon|1|DragonEggDragonToken|
@@ -1747,7 +1747,7 @@
 |TOK:DDR|Zombie Giant||QuestForTheGravelordZombieToken|
 
 # DDS
-|TOK:DDS|Beast||BeastToken2|
+|TOK:DDS|Beast||Beast44Token|
 |TOK:DDS|Drake||DrakeToken|
 |TOK:DDS|Elemental||RedElementalToken|
 |TOK:DDS|Elephant||ElephantToken|
@@ -2086,7 +2086,7 @@
 |TOK:MOC|Angel|1|Angel33Token|
 |TOK:MOC|Angel|2|AngelToken|
 |TOK:MOC|Assassin||QueenMarchesaAssassinToken|
-|TOK:MOC|Beast||BeastToken2|
+|TOK:MOC|Beast||Beast44Token|
 |TOK:MOC|Bird||BirdToken|
 |TOK:MOC|Blood||BloodToken|
 |TOK:MOC|Butterfly||ButterflyToken|
@@ -2551,7 +2551,7 @@
 |TOK:M3C|Ape||ApeToken|
 |TOK:M3C|Beast|1|GarrukApexPredatorBeastToken|
 |TOK:M3C|Beast|2|BeastToken|
-|TOK:M3C|Beast|3|BeastToken2|
+|TOK:M3C|Beast|3|Beast44Token|
 |TOK:M3C|Boar||Boar2Token|
 |TOK:M3C|Construct||StoneIdolToken|
 |TOK:M3C|Dragon||DragonToken2|
@@ -2590,7 +2590,7 @@
 
 # BLC
 |TOK:BLC|Beast|1|BeastToken|
-|TOK:BLC|Beast|2|BeastToken2|
+|TOK:BLC|Beast|2|Beast44Token|
 |TOK:BLC|Bird|1|SwanSongBirdToken|
 |TOK:BLC|Bird|2|BirdToken|
 |TOK:BLC|Blood||BloodToken|
@@ -2651,7 +2651,7 @@
 
 # FDN
 |TOK:FDN|Beast|1|BeastToken|
-|TOK:FDN|Beast|2|BeastToken2|
+|TOK:FDN|Beast|2|Beast44Token|
 |TOK:FDN|Cat|1|CatToken3|
 |TOK:FDN|Cat|2|CatToken2|
 |TOK:FDN|Cat|3|CatToken|
@@ -2871,7 +2871,7 @@
 
 # EOC
 |TOK:EOC|Beast|1|BeastToken|
-|TOK:EOC|Beast|2|BeastToken2|
+|TOK:EOC|Beast|2|Beast44Token|
 |TOK:EOC|Bird||SwanSongBirdToken|
 |TOK:EOC|Clue||ClueArtifactToken|
 |TOK:EOC|Elemental|1|TitaniaProtectorOfArgothElementalToken|
@@ -2987,7 +2987,7 @@
 
 # MPR
 |TOK:MPR|Bear||BearToken|
-|TOK:MPR|Beast||BeastToken2|
+|TOK:MPR|Beast||Beast44Token|
 |TOK:MPR|Bird||BlueBirdToken|
 |TOK:MPR|Elephant||ElephantToken|
 |TOK:MPR|Goblin Soldier||GoblinSoldierToken|