diff --git a/Mage.Sets/src/mage/cards/b/BasriTomorrowsChampion.java b/Mage.Sets/src/mage/cards/b/BasriTomorrowsChampion.java
index 0f7e374d26e..d9a959a23fd 100644
--- a/Mage.Sets/src/mage/cards/b/BasriTomorrowsChampion.java
+++ b/Mage.Sets/src/mage/cards/b/BasriTomorrowsChampion.java
@@ -19,7 +19,7 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.filter.FilterPermanent;
-import mage.game.permanent.token.CatToken2;
+import mage.game.permanent.token.Cat11LifelinkToken;
 
 import java.util.UUID;
 
@@ -40,7 +40,7 @@ public final class BasriTomorrowsChampion extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {W}, {T}, Exert Basri: Create a 1/1 white Cat creature token with lifelink.
-        Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CatToken2()), new ManaCostsImpl<>("{W}"));
+        Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new Cat11LifelinkToken()), new ManaCostsImpl<>("{W}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new ExertSourceCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/c/Cubwarden.java b/Mage.Sets/src/mage/cards/c/Cubwarden.java
index 0d5daa788d5..d9860d6ac3d 100644
--- a/Mage.Sets/src/mage/cards/c/Cubwarden.java
+++ b/Mage.Sets/src/mage/cards/c/Cubwarden.java
@@ -9,7 +9,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.game.permanent.token.CatToken2;
+import mage.game.permanent.token.Cat11LifelinkToken;
 
 import java.util.UUID;
 
@@ -32,7 +32,7 @@ public final class Cubwarden extends CardImpl {
         this.addAbility(LifelinkAbility.getInstance());
 
         // Whenever this creature mutates, create two 1/1 white Cat creature tokens with lifelink.
-        this.addAbility(new MutatesSourceTriggeredAbility(new CreateTokenEffect(new CatToken2(), 2)));
+        this.addAbility(new MutatesSourceTriggeredAbility(new CreateTokenEffect(new Cat11LifelinkToken(), 2)));
     }
 
     private Cubwarden(final Cubwarden card) {
diff --git a/Mage.Sets/src/mage/cards/l/LeoninWarleader.java b/Mage.Sets/src/mage/cards/l/LeoninWarleader.java
index ca430810eb9..ad8121ad217 100644
--- a/Mage.Sets/src/mage/cards/l/LeoninWarleader.java
+++ b/Mage.Sets/src/mage/cards/l/LeoninWarleader.java
@@ -8,7 +8,7 @@ import mage.constants.SubType;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.CatToken2;
+import mage.game.permanent.token.Cat11LifelinkToken;
 
 /**
  *
@@ -26,7 +26,7 @@ public final class LeoninWarleader extends CardImpl {
 
         // Whenever Leonin Warleader attacks, create two 1/1 white Cat creature tokens with lifelink that are tapped and attacking.
         this.addAbility(new AttacksTriggeredAbility(
-                new CreateTokenEffect(new CatToken2(), 2, true, true), false
+                new CreateTokenEffect(new Cat11LifelinkToken(), 2, true, true), false
         ));
     }
 
diff --git a/Mage.Sets/src/mage/cards/l/LiberatedLivestock.java b/Mage.Sets/src/mage/cards/l/LiberatedLivestock.java
index a5d1976e31b..6cb6b394f0c 100644
--- a/Mage.Sets/src/mage/cards/l/LiberatedLivestock.java
+++ b/Mage.Sets/src/mage/cards/l/LiberatedLivestock.java
@@ -26,7 +26,7 @@ public final class LiberatedLivestock extends CardImpl {
 
     public LiberatedLivestock(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}");
-        
+
         this.subtype.add(SubType.CAT);
         this.subtype.add(SubType.BIRD);
         this.subtype.add(SubType.OX);
@@ -63,7 +63,7 @@ class LiberatedLivestockEffect extends OneShotEffect {
         if (controller == null) {
             return false;
         }
-        Token firstToken = new CatToken2();
+        Token firstToken = new Cat11LifelinkToken();
         firstToken.putOntoBattlefield(1, game, source, source.getControllerId(),
                 false, false, null, null, true,
                 Arrays.asList(firstToken, new BirdToken(), new OxToken()));
diff --git a/Mage.Sets/src/mage/cards/p/PrideSovereign.java b/Mage.Sets/src/mage/cards/p/PrideSovereign.java
index 43380775630..db468f536ef 100644
--- a/Mage.Sets/src/mage/cards/p/PrideSovereign.java
+++ b/Mage.Sets/src/mage/cards/p/PrideSovereign.java
@@ -20,7 +20,7 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.AnotherPredicate;
-import mage.game.permanent.token.CatToken2;
+import mage.game.permanent.token.Cat11LifelinkToken;
 
 /**
  *
@@ -44,7 +44,7 @@ public final class PrideSovereign extends CardImpl {
         DynamicValue otherCats = new PermanentsOnBattlefieldCount(filter);
         this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield)));
         // {W}, {t}, Exert Pride Sovereign: Create two 1/1 white Cat creature tokens with lifelink.
-        Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CatToken2(), 2), new ManaCostsImpl<>("{W}"));
+        Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new Cat11LifelinkToken(), 2), new ManaCostsImpl<>("{W}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new ExertSourceCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/r/RegalCaracal.java b/Mage.Sets/src/mage/cards/r/RegalCaracal.java
index 3640cd71b42..560272548af 100644
--- a/Mage.Sets/src/mage/cards/r/RegalCaracal.java
+++ b/Mage.Sets/src/mage/cards/r/RegalCaracal.java
@@ -15,7 +15,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.game.permanent.token.CatToken2;
+import mage.game.permanent.token.Cat11LifelinkToken;
 
 /**
  *
@@ -45,7 +45,7 @@ public final class RegalCaracal extends CardImpl {
         this.addAbility(ability);
 
         // When Regal Caracal enters the battlefield, create two 1/1 white Cat creature tokens with lifelink.
-        Effect effect2 = new CreateTokenEffect(new CatToken2(), 2);
+        Effect effect2 = new CreateTokenEffect(new Cat11LifelinkToken(), 2);
         effect2.setText("create two 1/1 white Cat creature tokens with lifelink");
         this.addAbility(new EntersBattlefieldTriggeredAbility(effect2));
     }
diff --git a/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java
index 6eb1729ca9c..b23b5e767af 100644
--- a/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java
@@ -5,7 +5,7 @@ import mage.abilities.effects.common.CreateTokenEffect;
 import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.game.command.Emblem;
-import mage.game.permanent.token.CatToken2;
+import mage.game.permanent.token.Cat11LifelinkToken;
 
 /**
  * @author TheElk801
@@ -16,7 +16,7 @@ public final class AjaniAdversaryOfTyrantsEmblem extends Emblem {
     public AjaniAdversaryOfTyrantsEmblem() {
         super("Emblem Ajani");
         this.getAbilities().add(new BeginningOfEndStepTriggeredAbility(
-                Zone.COMMAND, TargetController.YOU, new CreateTokenEffect(new CatToken2(), 3),
+                Zone.COMMAND, TargetController.YOU, new CreateTokenEffect(new Cat11LifelinkToken(), 3),
                 false, null
         ));
     }
diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java b/Mage/src/main/java/mage/game/permanent/token/Cat11LifelinkToken.java
similarity index 69%
rename from Mage/src/main/java/mage/game/permanent/token/CatToken2.java
rename to Mage/src/main/java/mage/game/permanent/token/Cat11LifelinkToken.java
index 3e7e7017829..856c9982b8c 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/Cat11LifelinkToken.java
@@ -8,9 +8,9 @@ import mage.constants.SubType;
 /**
  * @author fireshoes
  */
-public final class CatToken2 extends TokenImpl {
+public final class Cat11LifelinkToken extends TokenImpl {
 
-    public CatToken2() {
+    public Cat11LifelinkToken() {
         super("Cat Token", "1/1 white Cat creature token with lifelink");
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
@@ -20,12 +20,12 @@ public final class CatToken2 extends TokenImpl {
         addAbility(LifelinkAbility.getInstance());
     }
 
-    protected CatToken2(final CatToken2 token) {
+    protected Cat11LifelinkToken(final Cat11LifelinkToken token) {
         super(token);
     }
 
-    public CatToken2 copy() {
-        return new CatToken2(this);
+    public Cat11LifelinkToken copy() {
+        return new Cat11LifelinkToken(this);
     }
 
 }
diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt
index acb2bdc30c0..f9180c96951 100644
--- a/Mage/src/main/resources/tokens-database.txt
+++ b/Mage/src/main/resources/tokens-database.txt
@@ -217,7 +217,7 @@
 
 # AKH
 |TOK:AKH|Beast||Beast42Token|
-|TOK:AKH|Cat||CatToken2|
+|TOK:AKH|Cat||Cat11LifelinkToken|
 |TOK:AKH|Drake||DrakeToken|
 |TOK:AKH|Hippo||Hippo33Token|
 |TOK:AKH|Insect||NestOfScarabsBlackInsectToken|
@@ -1111,7 +1111,7 @@
 |TOK:M19|Avatar||AvatarToken2|
 |TOK:M19|Bat||BatToken|
 |TOK:M19|Beast||BeastToken|
-|TOK:M19|Cat||CatToken2|
+|TOK:M19|Cat||Cat11LifelinkToken|
 |TOK:M19|Dragon|1|DragonEggDragonToken|
 |TOK:M19|Dragon|2|DragonToken2|
 |TOK:M19|Elf Warrior||ElfWarriorToken|
@@ -1175,7 +1175,7 @@
 
 # IKO
 |TOK:IKO|Beast||BeastToken|
-|TOK:IKO|Cat||CatToken2|
+|TOK:IKO|Cat||Cat11LifelinkToken|
 |TOK:IKO|Cat Bird||CatBirdToken|
 |TOK:IKO|Dinosaur||DinosaurHasteToken|
 |TOK:IKO|Dinosaur Beast||DinosaurBeastToken|
@@ -1528,8 +1528,8 @@
 |TOK:SLD|Angel||AngelToken|
 |TOK:SLD|Blood||BloodToken|
 |TOK:SLD|Cat|1|GreenCatToken|
-|TOK:SLD|Cat|2|CatToken2|
-|TOK:SLD|Cat|3|CatToken2|
+|TOK:SLD|Cat|2|Cat11LifelinkToken|
+|TOK:SLD|Cat|3|Cat11LifelinkToken|
 |TOK:SLD|Clue||ClueArtifactToken|
 |TOK:SLD|Cordyceps Infected|1|CordycepsInfectedToken|
 |TOK:SLD|Cordyceps Infected|2|CordycepsInfectedToken|
@@ -2653,7 +2653,7 @@
 |TOK:FDN|Beast|1|BeastToken|
 |TOK:FDN|Beast|2|Beast44Token|
 |TOK:FDN|Cat|1|Cat11Token|
-|TOK:FDN|Cat|2|CatToken2|
+|TOK:FDN|Cat|2|Cat11LifelinkToken|
 |TOK:FDN|Cat|3|CatToken|
 |TOK:FDN|Cat Beast||CatBeastToken|
 |TOK:FDN|Dog||WhiteDogToken|
@@ -2706,7 +2706,7 @@
 |TOK:INR|Zombie|3|ZombieDecayedToken|
 
 # DFT
-|TOK:DFT|Cat||CatToken2|
+|TOK:DFT|Cat||Cat11LifelinkToken|
 |TOK:DFT|Dinosaur Dragon||DinDragonToken|
 |TOK:DFT|Elephant||ElephantToken|
 |TOK:DFT|Goblin||GoblinToken|