diff --git a/Mage.Sets/src/mage/cards/a/AnZerrinRuins.java b/Mage.Sets/src/mage/cards/a/AnZerrinRuins.java
index 37622e6c77b..d8817ae4672 100644
--- a/Mage.Sets/src/mage/cards/a/AnZerrinRuins.java
+++ b/Mage.Sets/src/mage/cards/a/AnZerrinRuins.java
@@ -62,7 +62,7 @@ class AnZerrinRuinsDontUntapEffect extends DontUntapInControllersUntapStepAllEff
         if (super.applies(event, source, game)) {
             Permanent permanent = game.getPermanent(event.getTargetId());
             if (permanent != null) {
-                if (permanent.hasSubtype(ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game), game)) {
+                if (permanent.hasSubtype(ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game), game)) {
                     return true;
                 }
             }
diff --git a/Mage.Sets/src/mage/cards/a/ArcaneAdaptation.java b/Mage.Sets/src/mage/cards/a/ArcaneAdaptation.java
index 0a0d05fd249..ee192097ff1 100644
--- a/Mage.Sets/src/mage/cards/a/ArcaneAdaptation.java
+++ b/Mage.Sets/src/mage/cards/a/ArcaneAdaptation.java
@@ -64,7 +64,7 @@ class ConspyEffect extends ContinuousEffectImpl {
     @Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
         Player controller = game.getPlayer(source.getControllerId());
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         if (controller != null && subType != null) {
             // Creature cards you own that aren't on the battlefield
             // in graveyard
diff --git a/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java b/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java
index 98879879a76..8af731bee2b 100644
--- a/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java
+++ b/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java
@@ -57,7 +57,7 @@ class AshesOfTheFallenEffect extends ContinuousEffectImpl {
         Player controller = game.getPlayer(source.getControllerId());
         Permanent permanent = game.getPermanent(source.getSourceId());
         if (controller != null && permanent != null) {
-            SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(permanent.getId(), game);
+            SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(permanent.getId(), game);
             if (subType != null) {
                 for (UUID cardId : controller.getGraveyard()) {
                     Card card = game.getCard(cardId);
diff --git a/Mage.Sets/src/mage/cards/c/CavernOfSouls.java b/Mage.Sets/src/mage/cards/c/CavernOfSouls.java
index 41c2bea64a0..e1a5f5a2a11 100644
--- a/Mage.Sets/src/mage/cards/c/CavernOfSouls.java
+++ b/Mage.Sets/src/mage/cards/c/CavernOfSouls.java
@@ -64,7 +64,7 @@ class CavernOfSoulsManaBuilder extends ConditionalManaBuilder {
 
     @Override
     public ConditionalManaBuilder setMana(Mana mana, Ability source, Game game) {
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         if (subType != null) {
             creatureType = subType;
         }
diff --git a/Mage.Sets/src/mage/cards/c/Conspiracy.java b/Mage.Sets/src/mage/cards/c/Conspiracy.java
index 1b305eff23b..dcac9387fbb 100644
--- a/Mage.Sets/src/mage/cards/c/Conspiracy.java
+++ b/Mage.Sets/src/mage/cards/c/Conspiracy.java
@@ -66,7 +66,7 @@ class ConspiracyEffect extends ContinuousEffectImpl {
     @Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
         Player controller = game.getPlayer(source.getControllerId());
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         if (controller != null && subType != null) {
             // Creature cards you own that aren't on the battlefield
             // in graveyard
diff --git a/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java b/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java
index 3e5a023a7f0..1c464ed1802 100644
--- a/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java
+++ b/Mage.Sets/src/mage/cards/c/CoverOfDarkness.java
@@ -61,7 +61,7 @@ class FilterCoverOfDarkness extends FilterCreaturePermanent {
     public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
         if (super.match(permanent, sourceId, playerId, game)) {
             if (subType == null) {
-                subType = ChooseCreatureTypeEffect.getChoosenCreatureType(sourceId, game);
+                subType = ChooseCreatureTypeEffect.getChosenCreatureType(sourceId, game);
                 if (subType == null) {
                     return false;
                 }
diff --git a/Mage.Sets/src/mage/cards/d/DoomCannon.java b/Mage.Sets/src/mage/cards/d/DoomCannon.java
index 7fb9aada5c1..3414f1ebe79 100644
--- a/Mage.Sets/src/mage/cards/d/DoomCannon.java
+++ b/Mage.Sets/src/mage/cards/d/DoomCannon.java
@@ -70,7 +70,7 @@ class DoomCannonFilter extends FilterControlledCreaturePermanent {
     @Override
     public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
         if (super.match(permanent, sourceId, playerId, game)) {
-            SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(sourceId, game);
+            SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(sourceId, game);
             if (subType != null && permanent.hasSubtype(subType, game)) {
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java b/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java
index 5f196a12056..b7d72e91a18 100644
--- a/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java
+++ b/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java
@@ -71,7 +71,7 @@ class AddCounterAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(getSourceId(), game);
         if (subType != null) {
             Spell spell = game.getStack().getSpell(event.getTargetId());
             if (spell != null
diff --git a/Mage.Sets/src/mage/cards/k/KindredCharge.java b/Mage.Sets/src/mage/cards/k/KindredCharge.java
index 1f15370a375..7702fbfbb77 100644
--- a/Mage.Sets/src/mage/cards/k/KindredCharge.java
+++ b/Mage.Sets/src/mage/cards/k/KindredCharge.java
@@ -69,7 +69,7 @@ class KindredChargeEffect extends OneShotEffect {
         Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = game.getObject(source.getSourceId());
         if (controller != null && sourceObject != null) {
-            SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+            SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
             if (subType != null) {
                 FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control of the chosen type");
                 filter.add(new SubtypePredicate(subType));
diff --git a/Mage.Sets/src/mage/cards/k/KindredSummons.java b/Mage.Sets/src/mage/cards/k/KindredSummons.java
index e317062a4c5..7854b94e6ae 100644
--- a/Mage.Sets/src/mage/cards/k/KindredSummons.java
+++ b/Mage.Sets/src/mage/cards/k/KindredSummons.java
@@ -70,7 +70,7 @@ class KindredSummonsEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+            SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
             if (subType == null) {
                 return false;
             }
diff --git a/Mage.Sets/src/mage/cards/m/MetallicMimic.java b/Mage.Sets/src/mage/cards/m/MetallicMimic.java
index 9dfcca6887d..2fbc1bc0d90 100644
--- a/Mage.Sets/src/mage/cards/m/MetallicMimic.java
+++ b/Mage.Sets/src/mage/cards/m/MetallicMimic.java
@@ -80,7 +80,7 @@ class MetallicMimicReplacementEffect extends ReplacementEffectImpl {
                 && enteringCreature.isControlledBy(source.getControllerId())
                 && enteringCreature.isCreature()
                 && !event.getTargetId().equals(source.getSourceId())) {
-            SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+            SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
             return subType != null && enteringCreature.hasSubtype(subType, game);
         }
         return false;
diff --git a/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java b/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java
index 83dd0a6bad3..7a3269d833c 100644
--- a/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java
+++ b/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java
@@ -66,7 +66,7 @@ class ObeliskOfUrdBoostEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(source.getSourceId());
         if (permanent != null) {
-            SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+            SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
             if (subType != null) {
                 for (Permanent perm : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
                     if (perm.hasSubtype(subType, game)) {
diff --git a/Mage.Sets/src/mage/cards/p/PillarOfOrigins.java b/Mage.Sets/src/mage/cards/p/PillarOfOrigins.java
index 99502464e1d..80b830551cc 100644
--- a/Mage.Sets/src/mage/cards/p/PillarOfOrigins.java
+++ b/Mage.Sets/src/mage/cards/p/PillarOfOrigins.java
@@ -53,7 +53,7 @@ class PillarOfOriginsManaBuilder extends ConditionalManaBuilder {
 
     @Override
     public ConditionalManaBuilder setMana(Mana mana, Ability source, Game game) {
-        creatureType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        creatureType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = game.getObject(source.getSourceId());
         if (controller != null && sourceObject != null) {
diff --git a/Mage.Sets/src/mage/cards/r/RidersOfGavony.java b/Mage.Sets/src/mage/cards/r/RidersOfGavony.java
index da80ddce32d..0fc541dfe5f 100644
--- a/Mage.Sets/src/mage/cards/r/RidersOfGavony.java
+++ b/Mage.Sets/src/mage/cards/r/RidersOfGavony.java
@@ -81,7 +81,7 @@ class RidersOfGavonyGainAbilityControlledEffect extends ContinuousEffectImpl {
         if (protectionFilter == null) {
             Permanent permanent = game.getPermanent(source.getSourceId());
             if (permanent != null) {
-                SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(permanent.getId(), game);
+                SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(permanent.getId(), game);
                 if (subType != null) {
                     protectionFilter = new FilterPermanent(subType.getDescription() + 's');
                     protectionFilter.add(new SubtypePredicate(subType));
diff --git a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java
index 3540b2d40af..2d4c1e5c7ea 100644
--- a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java
+++ b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java
@@ -23,7 +23,6 @@ import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.permanent.token.RiptideReplicatorToken;
-import mage.game.permanent.token.TokenImpl;
 import mage.game.permanent.token.Token;
 
 /**
@@ -80,7 +79,7 @@ class RiptideReplicatorEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         ObjectColor color = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color");
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         if (subType == null) {
             return false;
         }
diff --git a/Mage.Sets/src/mage/cards/s/SteelyResolve.java b/Mage.Sets/src/mage/cards/s/SteelyResolve.java
index 8deff75df2a..2c33f36dab8 100644
--- a/Mage.Sets/src/mage/cards/s/SteelyResolve.java
+++ b/Mage.Sets/src/mage/cards/s/SteelyResolve.java
@@ -57,7 +57,7 @@ class FilterSteelyResolve extends FilterCreaturePermanent {
     @Override
     public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
         if (super.match(permanent, sourceId, playerId, game)) {
-            SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(sourceId, game);
+            SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(sourceId, game);
             if (subType != null && permanent.hasSubtype(subType, game)) {
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/u/UnclaimedTerritory.java b/Mage.Sets/src/mage/cards/u/UnclaimedTerritory.java
index bc26083105e..9b3cd9cc205 100644
--- a/Mage.Sets/src/mage/cards/u/UnclaimedTerritory.java
+++ b/Mage.Sets/src/mage/cards/u/UnclaimedTerritory.java
@@ -57,7 +57,7 @@ class UnclaimedTerritoryManaBuilder extends ConditionalManaBuilder {
 
     @Override
     public ConditionalManaBuilder setMana(Mana mana, Ability source, Game game) {
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         if (subType != null) {
             creatureType = subType;
         }
diff --git a/Mage.Sets/src/mage/cards/v/VanquishersBanner.java b/Mage.Sets/src/mage/cards/v/VanquishersBanner.java
index 87a0cc004f9..63a8cfd65d3 100644
--- a/Mage.Sets/src/mage/cards/v/VanquishersBanner.java
+++ b/Mage.Sets/src/mage/cards/v/VanquishersBanner.java
@@ -81,7 +81,7 @@ class DrawCardIfCreatureTypeAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(getSourceId(), game);
         if (subType != null) {
             Spell spell = game.getStack().getSpell(event.getTargetId());
             if (spell != null
diff --git a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java
index faeaa328c4d..3ddb23ac0cb 100644
--- a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java
+++ b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java
@@ -19,7 +19,6 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.game.Game;
-import mage.game.permanent.token.TokenImpl;
 import mage.game.permanent.token.Token;
 import mage.game.permanent.token.VolrathsLaboratoryToken;
 
@@ -74,7 +73,7 @@ class VolrathsLaboratoryEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         ObjectColor color = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color");
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         Token token = new VolrathsLaboratoryToken(color, subType);
         return token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
     }
diff --git a/Mage.Sets/src/mage/cards/x/Xenograft.java b/Mage.Sets/src/mage/cards/x/Xenograft.java
index c25914ae081..2e08278a7a9 100644
--- a/Mage.Sets/src/mage/cards/x/Xenograft.java
+++ b/Mage.Sets/src/mage/cards/x/Xenograft.java
@@ -53,7 +53,7 @@ class XenograftAddSubtypeEffect extends ContinuousEffectImpl {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         if (subType != null) {
             List<Permanent> permanents = game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), game);
             for (Permanent permanent : permanents) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java
index a41257ec935..c1bdd3f9f48 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java
@@ -62,7 +62,7 @@ public class ChooseCreatureTypeEffect extends OneShotEffect {
      * @param game
      * @return
      */
-    public static SubType getChoosenCreatureType(UUID objectId, Game game) {
+    public static SubType getChosenCreatureType(UUID objectId, Game game) {
         SubType creatureType = null;
         Object savedCreatureType = game.getState().getValue(objectId + "_type");
         if (savedCreatureType != null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java
index bb86dce4a5d..cf8c158d7bb 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddChosenSubtypeEffect.java
@@ -22,7 +22,7 @@ public class AddChosenSubtypeEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(source.getSourceId());
         if (permanent != null) {
-            SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(permanent.getId(), game);
+            SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(permanent.getId(), game);
             if (subType != null && !permanent.hasSubtype(subType, game)) {
                 permanent.getSubtype(game).add(subType);
             }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java
index 7ee579c1fb4..cfc1f2a7b57 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java
@@ -49,7 +49,7 @@ public class BoostAllOfChosenSubtypeEffect extends BoostAllEffect {
 
     @Override
     protected void setRuntimeData(Ability source, Game game) {
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         if (subType != null) {
             subtype = subType;
         } else {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllOfChosenSubtypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllOfChosenSubtypeEffect.java
index 4a8fdf40d0b..76553629060 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllOfChosenSubtypeEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllOfChosenSubtypeEffect.java
@@ -37,7 +37,7 @@ public class SpellsCostReductionAllOfChosenSubtypeEffect extends SpellsCostReduc
 
     @Override
     protected boolean selectedByRuntimeData(Card card, Ability source, Game game) {
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(source.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game);
         if (subType != null) {
             return card.hasSubtype(subType, game);
         }
diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java
index 21a8c11bf8b..576783bdc7a 100644
--- a/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java
+++ b/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java
@@ -19,7 +19,7 @@ public class ChosenSubtypePredicate implements ObjectPlayerPredicate<ObjectSourc
 
     @Override
     public boolean apply(ObjectSourcePlayer<MageObject> input, Game game) {
-        SubType subType = ChooseCreatureTypeEffect.getChoosenCreatureType(input.getSourceId(), game);
+        SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(input.getSourceId(), game);
         return input.getObject().hasSubtype(subType, game);
     }