camelCase refactoring. Will comit fixed clases after this one.

Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion_temp.java

@@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent;
 /**
  * @author Loki
  */
-public class AuraofDominion extends CardImpl<AuraofDominion> {
+public class AuraOfDominion extends CardImpl<AuraOfDominion> {
 
     private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
 
@@ -63,7 +63,7 @@ public class AuraofDominion extends CardImpl<AuraofDominion> {
     }
 
 
-    public AuraofDominion(UUID ownerId) {
+    public AuraOfDominion(UUID ownerId) {
         super(ownerId, 51, "Aura of Dominion", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Aura");
@@ -77,13 +77,13 @@ public class AuraofDominion extends CardImpl<AuraofDominion> {
         this.addAbility(ability);
     }
 
-    public AuraofDominion(final AuraofDominion card) {
+    public AuraOfDominion(final AuraOfDominion card) {
         super(card);
     }
 
     @Override
-    public AuraofDominion copy() {
+    public AuraOfDominion copy() {
-        return new AuraofDominion(this);
+        return new AuraOfDominion(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls_temp.java

@@ -46,7 +46,7 @@ import mage.target.common.TargetControlledPermanent;
  *
  * @author Loki
  */
-public class AzamiLadyofScrolls extends CardImpl<AzamiLadyofScrolls> {
+public class AzamiLadyOfScrolls extends CardImpl<AzamiLadyOfScrolls> {
 
     private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizard you control");
 
@@ -58,7 +58,7 @@ public class AzamiLadyofScrolls extends CardImpl<AzamiLadyofScrolls> {
             filter.setScopeSubtype(Filter.ComparisonScope.Any);
         }
 
-    public AzamiLadyofScrolls (UUID ownerId) {
+    public AzamiLadyOfScrolls (UUID ownerId) {
         super(ownerId, 52, "Azami, Lady of Scrolls", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}{U}{U}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -70,13 +70,13 @@ public class AzamiLadyofScrolls extends CardImpl<AzamiLadyofScrolls> {
         this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false))));
     }
 
-    public AzamiLadyofScrolls (final AzamiLadyofScrolls card) {
+    public AzamiLadyOfScrolls (final AzamiLadyOfScrolls card) {
         super(card);
     }
 
     @Override
-    public AzamiLadyofScrolls copy() {
+    public AzamiLadyOfScrolls copy() {
-        return new AzamiLadyofScrolls(this);
+        return new AzamiLadyOfScrolls(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking_temp.java

@@ -42,9 +42,9 @@ import mage.cards.CardImpl;
  *
  * @author Loki
  */
-public class AzusaLostbutSeeking extends CardImpl<AzusaLostbutSeeking> {
+public class AzusaLostButSeeking extends CardImpl<AzusaLostButSeeking> {
 
-    public AzusaLostbutSeeking (UUID ownerId) {
+    public AzusaLostButSeeking (UUID ownerId) {
         super(ownerId, 201, "Azusa, Lost but Seeking", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -56,13 +56,13 @@ public class AzusaLostbutSeeking extends CardImpl<AzusaLostbutSeeking> {
         this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(2, Constants.Duration.WhileOnBattlefield)));
     }
 
-    public AzusaLostbutSeeking (final AzusaLostbutSeeking card) {
+    public AzusaLostButSeeking (final AzusaLostButSeeking card) {
         super(card);
     }
 
     @Override
-    public AzusaLostbutSeeking copy() {
+    public AzusaLostButSeeking copy() {
-        return new AzusaLostbutSeeking(this);
+        return new AzusaLostButSeeking(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands_temp.java

@@ -34,18 +34,13 @@ import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.CantBlockAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.RestrictionEffect;
 import mage.abilities.effects.common.AttachEffect;
-import mage.abilities.effects.common.CantAttackSourceEffect;
-import mage.abilities.effects.common.CantBlockSourceEffect;
 import mage.abilities.effects.common.ReturnToHandSourceEffect;
-import mage.abilities.effects.common.continious.BoostEnchantedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.FlashAbility;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -56,9 +51,9 @@ import mage.target.common.TargetCreaturePermanent;
  *
  * @author Loki
  */
-public class CageofHands extends CardImpl<CageofHands> {
+public class CageOfHands extends CardImpl<CageOfHands> {
 
-    public CageofHands (UUID ownerId) {
+    public CageOfHands (UUID ownerId) {
         super(ownerId, 3, "Cage of Hands", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Aura");
@@ -68,27 +63,27 @@ public class CageofHands extends CardImpl<CageofHands> {
 		this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Neutral));
 		Ability ability = new EnchantAbility(auraTarget.getTargetName());
 		this.addAbility(ability);
-        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CageofHandsEffect()));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CageOfHandsEffect()));
         this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{W}")));
     }
 
-    public CageofHands (final CageofHands card) {
+    public CageOfHands (final CageOfHands card) {
         super(card);
     }
 
     @Override
-    public CageofHands copy() {
+    public CageOfHands copy() {
-        return new CageofHands(this);
+        return new CageOfHands(this);
     }
 }
 
-class CageofHandsEffect extends RestrictionEffect<CageofHandsEffect> {
+class CageOfHandsEffect extends RestrictionEffect<CageOfHandsEffect> {
 
-	public CageofHandsEffect() {
+	public CageOfHandsEffect() {
 		super(Constants.Duration.WhileOnBattlefield);
 	}
 
-	public CageofHandsEffect(final CageofHandsEffect effect) {
+	public CageOfHandsEffect(final CageOfHandsEffect effect) {
 		super(effect);
 	}
 
@@ -111,8 +106,8 @@ class CageofHandsEffect extends RestrictionEffect<CageofHandsEffect> {
 	}
 
 	@Override
-	public CageofHandsEffect copy() {
+	public CageOfHandsEffect copy() {
-		return new CageofHandsEffect(this);
+		return new CageOfHandsEffect(this);
 	}
 
 	@Override

Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory_temp.java

@@ -46,7 +46,7 @@ import mage.players.Player;
 /**
  * @author Loki
  */
-public class CalltoGlory extends CardImpl<CalltoGlory> {
+public class CallToGlory extends CardImpl<CallToGlory> {
 
 
 private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai");
@@ -56,7 +56,7 @@ private final static FilterCreaturePermanent filter = new FilterCreaturePermanen
         filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
-        public CalltoGlory(UUID ownerId) {
+        public CallToGlory(UUID ownerId) {
         super(ownerId, 4, "Call to Glory", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}");
         this.expansionSetCode = "CHK";
         this.color.setWhite(true);
@@ -64,13 +64,13 @@ private final static FilterCreaturePermanent filter = new FilterCreaturePermanen
         this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, filter, false));
     }
 
-    public CalltoGlory(final CalltoGlory card) {
+    public CallToGlory(final CallToGlory card) {
         super(card);
     }
 
     @Override
-    public CalltoGlory copy() {
+    public CallToGlory copy() {
-        return new CalltoGlory(this);
+        return new CallToGlory(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami_temp.java

@@ -38,22 +38,22 @@ import mage.cards.CardImpl;
  *
  * @author Loki
  */
-public class CounseloftheSoratami extends CardImpl<CounseloftheSoratami> {
+public class CounselOfTheSoratami extends CardImpl<CounselOfTheSoratami> {
 
-    public CounseloftheSoratami (UUID ownerId) {
+    public CounselOfTheSoratami (UUID ownerId) {
         super(ownerId, 55, "Counsel of the Soratami", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{U}");
         this.expansionSetCode = "CHK";
 		this.color.setBlue(true);
         this.getSpellAbility().addEffect(new DrawCardControllerEffect(2));
     }
 
-    public CounseloftheSoratami (final CounseloftheSoratami card) {
+    public CounselOfTheSoratami (final CounselOfTheSoratami card) {
         super(card);
     }
 
     @Override
-    public CounseloftheSoratami copy() {
+    public CounselOfTheSoratami copy() {
-        return new CounseloftheSoratami(this);
+        return new CounselOfTheSoratami(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows_temp.java

@@ -42,9 +42,9 @@ import mage.cards.CardImpl;
  *
  * @author Loki
  */
-public class DanceofShadows extends CardImpl<DanceofShadows> {
+public class DanceOfShadows extends CardImpl<DanceOfShadows> {
 
-    public DanceofShadows (UUID ownerId) {
+    public DanceOfShadows (UUID ownerId) {
         super(ownerId, 108, "Dance of Shadows", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
@@ -53,13 +53,13 @@ public class DanceofShadows extends CardImpl<DanceofShadows> {
         this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn));
     }
 
-    public DanceofShadows (final DanceofShadows card) {
+    public DanceOfShadows (final DanceOfShadows card) {
         super(card);
     }
 
     @Override
-    public DanceofShadows copy() {
+    public DanceOfShadows copy() {
-        return new DanceofShadows(this);
+        return new DanceOfShadows(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere_temp.java

@@ -39,9 +39,9 @@ import mage.target.TargetPermanent;
  *
  * @author Loki
  */
-public class EyeofNowhere extends CardImpl<EyeofNowhere> {
+public class EyeOfNowhere extends CardImpl<EyeOfNowhere> {
 
-    public EyeofNowhere (UUID ownerId) {
+    public EyeOfNowhere (UUID ownerId) {
         super(ownerId, 59, "Eye of Nowhere", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}{U}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
@@ -51,13 +51,13 @@ public class EyeofNowhere extends CardImpl<EyeofNowhere> {
         
     }
 
-    public EyeofNowhere (final EyeofNowhere card) {
+    public EyeOfNowhere (final EyeOfNowhere card) {
         super(card);
     }
 
     @Override
-    public EyeofNowhere copy() {
+    public EyeOfNowhere copy() {
-        return new EyeofNowhere(this);
+        return new EyeOfNowhere(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude_temp.java

@@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent;
 /**
  * @author Loki
  */
-public class GuardianofSolitude extends CardImpl<GuardianofSolitude> {
+public class GuardianOfSolitude extends CardImpl<GuardianOfSolitude> {
 
     private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell");
 
@@ -56,7 +56,7 @@ public class GuardianofSolitude extends CardImpl<GuardianofSolitude> {
         filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
-    public GuardianofSolitude(UUID ownerId) {
+    public GuardianOfSolitude(UUID ownerId) {
         super(ownerId, 64, "Guardian of Solitude", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -68,13 +68,13 @@ public class GuardianofSolitude extends CardImpl<GuardianofSolitude> {
         this.addAbility(ability);
     }
 
-    public GuardianofSolitude(final GuardianofSolitude card) {
+    public GuardianOfSolitude(final GuardianOfSolitude card) {
         super(card);
     }
 
     @Override
-    public GuardianofSolitude copy() {
+    public GuardianOfSolitude copy() {
-        return new GuardianofSolitude(this);
+        return new GuardianOfSolitude(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire_temp.java

@@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledPermanent;
 /**
  * @author Loki
  */
-public class HondenofCleansingFire extends CardImpl<HondenofCleansingFire> {
+public class HondenOfCleansingFire extends CardImpl<HondenOfCleansingFire> {
 
     final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine");
 
@@ -52,7 +52,7 @@ public class HondenofCleansingFire extends CardImpl<HondenofCleansingFire> {
         filter.setScopeCardType(Filter.ComparisonScope.Any);
     }
 
-    public HondenofCleansingFire(UUID ownerId) {
+    public HondenOfCleansingFire(UUID ownerId) {
         super(ownerId, 14, "Honden of Cleansing Fire", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -61,13 +61,13 @@ public class HondenofCleansingFire extends CardImpl<HondenofCleansingFire> {
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter, 2)), Constants.TargetController.YOU, false));
     }
 
-    public HondenofCleansingFire(final HondenofCleansingFire card) {
+    public HondenOfCleansingFire(final HondenOfCleansingFire card) {
         super(card);
     }
 
     @Override
-    public HondenofCleansingFire copy() {
+    public HondenOfCleansingFire copy() {
-        return new HondenofCleansingFire(this);
+        return new HondenOfCleansingFire(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage_temp.java

@@ -46,7 +46,7 @@ import mage.target.common.TargetCreatureOrPlayer;
  *
  * @author Loki
  */
-public class HondenofInfiniteRage extends CardImpl<HondenofInfiniteRage> {
+public class HondenOfInfiniteRage extends CardImpl<HondenOfInfiniteRage> {
 
     final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine");
 
@@ -55,7 +55,7 @@ public class HondenofInfiniteRage extends CardImpl<HondenofInfiniteRage> {
             filter.setScopeCardType(Filter.ComparisonScope.Any);
         }
 
-        public HondenofInfiniteRage (UUID ownerId) {
+        public HondenOfInfiniteRage (UUID ownerId) {
         super(ownerId, 172, "Honden of Infinite Rage", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -66,13 +66,13 @@ public class HondenofInfiniteRage extends CardImpl<HondenofInfiniteRage> {
         this.addAbility(ability);
     }
 
-    public HondenofInfiniteRage (final HondenofInfiniteRage card) {
+    public HondenOfInfiniteRage (final HondenOfInfiniteRage card) {
         super(card);
     }
 
     @Override
-    public HondenofInfiniteRage copy() {
+    public HondenOfInfiniteRage copy() {
-        return new HondenofInfiniteRage(this);
+        return new HondenOfInfiniteRage(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb_temp.java

@@ -44,7 +44,7 @@ import mage.game.permanent.token.SpiritToken;
 /**
  * @author Loki
  */
-public class HondenofLifesWeb extends CardImpl<HondenofLifesWeb> {
+public class HondenOfLifesWeb extends CardImpl<HondenOfLifesWeb> {
 
     final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine");
 
@@ -53,7 +53,7 @@ public class HondenofLifesWeb extends CardImpl<HondenofLifesWeb> {
         filter.setScopeCardType(Filter.ComparisonScope.Any);
     }
 
-    public HondenofLifesWeb(UUID ownerId) {
+    public HondenOfLifesWeb(UUID ownerId) {
         super(ownerId, 213, "Honden of Life's Web", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -62,13 +62,13 @@ public class HondenofLifesWeb extends CardImpl<HondenofLifesWeb> {
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false));
     }
 
-    public HondenofLifesWeb(final HondenofLifesWeb card) {
+    public HondenOfLifesWeb(final HondenOfLifesWeb card) {
         super(card);
     }
 
     @Override
-    public HondenofLifesWeb copy() {
+    public HondenOfLifesWeb copy() {
-        return new HondenofLifesWeb(this);
+        return new HondenOfLifesWeb(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach_temp.java

@@ -45,7 +45,7 @@ import mage.target.common.TargetOpponent;
 /**
  * @author Loki
  */
-public class HondenofNightsReach extends CardImpl<HondenofNightsReach> {
+public class HondenOfNightsReach extends CardImpl<HondenOfNightsReach> {
 
     final static FilterControlledPermanent filter = new FilterControlledPermanent("shrine");
 
@@ -54,7 +54,7 @@ public class HondenofNightsReach extends CardImpl<HondenofNightsReach> {
         filter.setScopeCardType(Filter.ComparisonScope.Any);
     }
 
-    public HondenofNightsReach(UUID ownerId) {
+    public HondenOfNightsReach(UUID ownerId) {
         super(ownerId, 116, "Honden of Night's Reach", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -65,13 +65,13 @@ public class HondenofNightsReach extends CardImpl<HondenofNightsReach> {
         this.addAbility(ability);
     }
 
-    public HondenofNightsReach(final HondenofNightsReach card) {
+    public HondenOfNightsReach(final HondenOfNightsReach card) {
         super(card);
     }
 
     @Override
-    public HondenofNightsReach copy() {
+    public HondenOfNightsReach copy() {
-        return new HondenofNightsReach(this);
+        return new HondenOfNightsReach(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds_temp.java

@@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledPermanent;
 /**
  * @author Loki
  */
-public class HondenofSeeingWinds extends CardImpl<HondenofSeeingWinds> {
+public class HondenOfSeeingWinds extends CardImpl<HondenOfSeeingWinds> {
 
     final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine");
 
@@ -52,7 +52,7 @@ public class HondenofSeeingWinds extends CardImpl<HondenofSeeingWinds> {
         filter.setScopeCardType(Filter.ComparisonScope.Any);
     }
 
-    public HondenofSeeingWinds(UUID ownerId) {
+    public HondenOfSeeingWinds(UUID ownerId) {
         super(ownerId, 69, "Honden of Seeing Winds", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -61,13 +61,13 @@ public class HondenofSeeingWinds extends CardImpl<HondenofSeeingWinds> {
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false));
     }
 
-    public HondenofSeeingWinds(final HondenofSeeingWinds card) {
+    public HondenOfSeeingWinds(final HondenOfSeeingWinds card) {
         super(card);
     }
 
     @Override
-    public HondenofSeeingWinds copy() {
+    public HondenOfSeeingWinds copy() {
-        return new HondenofSeeingWinds(this);
+        return new HondenOfSeeingWinds(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw_temp.java

@@ -47,7 +47,7 @@ import mage.target.TargetPermanent;
  *
  * @author Loki
  */
-public class KamiofAncientLaw extends CardImpl<KamiofAncientLaw> {
+public class KamiOfAncientLaw extends CardImpl<KamiOfAncientLaw> {
     private final static FilterPermanent filter = new FilterPermanent("enchantment");
 
     static {
@@ -55,7 +55,7 @@ public class KamiofAncientLaw extends CardImpl<KamiofAncientLaw> {
         filter.setScopeCardType(Filter.ComparisonScope.Any);
     }
 
-    public KamiofAncientLaw (UUID ownerId) {
+    public KamiOfAncientLaw (UUID ownerId) {
         super(ownerId, 21, "Kami of Ancient Law", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -67,13 +67,13 @@ public class KamiofAncientLaw extends CardImpl<KamiofAncientLaw> {
         this.addAbility(ability);
     }
 
-    public KamiofAncientLaw (final KamiofAncientLaw card) {
+    public KamiOfAncientLaw (final KamiOfAncientLaw card) {
         super(card);
     }
 
     @Override
-    public KamiofAncientLaw copy() {
+    public KamiOfAncientLaw copy() {
-        return new KamiofAncientLaw(this);
+        return new KamiOfAncientLaw(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar_temp.java

@@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent;
 /**
  * @author Loki
  */
-public class KamiofFiresRoar extends CardImpl<KamiofFiresRoar> {
+public class KamiOfFiresRoar extends CardImpl<KamiOfFiresRoar> {
 
     private final static FilterCard filter = new FilterCard("a Spirit of Arcane spell");
 
@@ -56,7 +56,7 @@ public class KamiofFiresRoar extends CardImpl<KamiofFiresRoar> {
         filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
-    public KamiofFiresRoar(UUID ownerId) {
+    public KamiOfFiresRoar(UUID ownerId) {
         super(ownerId, 174, "Kami of Fire's Roar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -68,13 +68,13 @@ public class KamiofFiresRoar extends CardImpl<KamiofFiresRoar> {
         this.addAbility(ability);
     }
 
-    public KamiofFiresRoar(final KamiofFiresRoar card) {
+    public KamiOfFiresRoar(final KamiOfFiresRoar card) {
         super(card);
     }
 
     @Override
-    public KamiofFiresRoar copy() {
+    public KamiOfFiresRoar copy() {
-        return new KamiofFiresRoar(this);
+        return new KamiOfFiresRoar(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy_temp.java

@@ -40,9 +40,9 @@ import mage.cards.CardImpl;
 /**
  * @author Loki
  */
-public class KamiofLunacy extends CardImpl<KamiofLunacy> {
+public class KamiOfLunacy extends CardImpl<KamiOfLunacy> {
 
-    public KamiofLunacy(UUID ownerId) {
+    public KamiOfLunacy(UUID ownerId) {
         super(ownerId, 119, "Kami of Lunacy", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}{B}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -53,13 +53,13 @@ public class KamiofLunacy extends CardImpl<KamiofLunacy> {
         this.addAbility(new SoulshiftAbility(5));
     }
 
-    public KamiofLunacy(final KamiofLunacy card) {
+    public KamiOfLunacy(final KamiOfLunacy card) {
         super(card);
     }
 
     @Override
-    public KamiofLunacy copy() {
+    public KamiOfLunacy copy() {
-        return new KamiofLunacy(this);
+        return new KamiOfLunacy(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone_temp.java

@@ -38,9 +38,9 @@ import mage.cards.CardImpl;
  *
  * @author Loki
  */
-public class KamiofOldStone extends CardImpl<KamiofOldStone> {
+public class KamiOfOldStone extends CardImpl<KamiOfOldStone> {
 
-    public KamiofOldStone (UUID ownerId) {
+    public KamiOfOldStone (UUID ownerId) {
         super(ownerId, 22, "Kami of Old Stone", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -49,13 +49,13 @@ public class KamiofOldStone extends CardImpl<KamiofOldStone> {
         this.toughness = new MageInt(7);
     }
 
-    public KamiofOldStone (final KamiofOldStone card) {
+    public KamiOfOldStone (final KamiOfOldStone card) {
         super(card);
     }
 
     @Override
-    public KamiofOldStone copy() {
+    public KamiOfOldStone copy() {
-        return new KamiofOldStone(this);
+        return new KamiOfOldStone(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt_temp.java

@@ -43,7 +43,7 @@ import mage.filter.FilterCard;
 /**
  * @author Loki
  */
-public class KamioftheHunt extends CardImpl<KamioftheHunt> {
+public class KamiOfTheHunt extends CardImpl<KamiOfTheHunt> {
 
     private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell");
 
@@ -53,7 +53,7 @@ public class KamioftheHunt extends CardImpl<KamioftheHunt> {
         filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
-    public KamioftheHunt(UUID ownerId) {
+    public KamiOfTheHunt(UUID ownerId) {
         super(ownerId, 219, "Kami of the Hunt", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -63,13 +63,13 @@ public class KamioftheHunt extends CardImpl<KamioftheHunt> {
         this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), filter, false));
     }
 
-    public KamioftheHunt(final KamioftheHunt card) {
+    public KamiOfTheHunt(final KamiOfTheHunt card) {
         super(card);
     }
 
     @Override
-    public KamioftheHunt copy() {
+    public KamiOfTheHunt copy() {
-        return new KamioftheHunt(this);
+        return new KamiOfTheHunt(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields_temp.java

@@ -41,9 +41,9 @@ import mage.cards.CardImpl;
 /**
  * @author Loki
  */
-public class KamiofthePalaceFields extends CardImpl<KamiofthePalaceFields> {
+public class KamiOfThePalaceFields extends CardImpl<KamiOfThePalaceFields> {
 
-    public KamiofthePalaceFields(UUID ownerId) {
+    public KamiOfThePalaceFields(UUID ownerId) {
         super(ownerId, 24, "Kami of the Palace Fields", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{W}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -55,13 +55,13 @@ public class KamiofthePalaceFields extends CardImpl<KamiofthePalaceFields> {
         this.addAbility(new SoulshiftAbility(5));
     }
 
-    public KamiofthePalaceFields(final KamiofthePalaceFields card) {
+    public KamiOfThePalaceFields(final KamiOfThePalaceFields card) {
         super(card);
     }
 
     @Override
-    public KamiofthePalaceFields copy() {
+    public KamiOfThePalaceFields copy() {
-        return new KamiofthePalaceFields(this);
+        return new KamiOfThePalaceFields(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon_temp.java

@@ -47,7 +47,7 @@ import mage.target.common.TargetCreaturePermanent;
 /**
  * @author Loki
  */
-public class KamioftheWaningMoon extends CardImpl<KamioftheWaningMoon> {
+public class KamiOfTheWaningMoon extends CardImpl<KamiOfTheWaningMoon> {
 
     private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell");
 
@@ -57,7 +57,7 @@ public class KamioftheWaningMoon extends CardImpl<KamioftheWaningMoon> {
         filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
-    public KamioftheWaningMoon(UUID ownerId) {
+    public KamiOfTheWaningMoon(UUID ownerId) {
         super(ownerId, 120, "Kami of the Waning Moon", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -70,13 +70,13 @@ public class KamioftheWaningMoon extends CardImpl<KamioftheWaningMoon> {
         this.addAbility(ability);
     }
 
-    public KamioftheWaningMoon(final KamioftheWaningMoon card) {
+    public KamiOfTheWaningMoon(final KamiOfTheWaningMoon card) {
         super(card);
     }
 
     @Override
-    public KamioftheWaningMoon copy() {
+    public KamiOfTheWaningMoon copy() {
-        return new KamioftheWaningMoon(this);
+        return new KamiOfTheWaningMoon(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection_temp.java

@@ -44,9 +44,9 @@ import mage.target.common.TargetControlledCreaturePermanent;
 /**
  * @author Loki
  */
-public class KamiofTwistedReflection extends CardImpl<KamiofTwistedReflection> {
+public class KamiOfTwistedReflection extends CardImpl<KamiOfTwistedReflection> {
 
-    public KamiofTwistedReflection(UUID ownerId) {
+    public KamiOfTwistedReflection(UUID ownerId) {
         super(ownerId, 71, "Kami of Twisted Reflection", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -58,13 +58,13 @@ public class KamiofTwistedReflection extends CardImpl<KamiofTwistedReflection> {
         this.addAbility(ability);
     }
 
-    public KamiofTwistedReflection(final KamiofTwistedReflection card) {
+    public KamiOfTwistedReflection(final KamiOfTwistedReflection card) {
         super(card);
     }
 
     @Override
-    public KamiofTwistedReflection copy() {
+    public KamiOfTwistedReflection copy() {
-        return new KamiofTwistedReflection(this);
+        return new KamiOfTwistedReflection(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar_temp.java

@@ -46,9 +46,9 @@ import javax.xml.transform.Source;
 /**
  * @author Loki
  */
-public class KeigatheTideStar extends CardImpl<KeigatheTideStar> {
+public class KeigaTheTideStar extends CardImpl<KeigaTheTideStar> {
 
-    public KeigatheTideStar(UUID ownerId) {
+    public KeigaTheTideStar(UUID ownerId) {
         super(ownerId, 72, "Keiga, the Tide Star", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{U}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -63,13 +63,13 @@ public class KeigatheTideStar extends CardImpl<KeigatheTideStar> {
         this.addAbility(ability);
     }
 
-    public KeigatheTideStar(final KeigatheTideStar card) {
+    public KeigaTheTideStar(final KeigaTheTideStar card) {
         super(card);
     }
 
     @Override
-    public KeigatheTideStar copy() {
+    public KeigaTheTideStar copy() {
-        return new KeigatheTideStar(this);
+        return new KeigaTheTideStar(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree_temp.java

@@ -40,9 +40,9 @@ import mage.cards.CardImpl;
  *
  * @author Loki
  */
-public class KodamaoftheNorthTree extends CardImpl<KodamaoftheNorthTree> {
+public class KodamaOfTheNorthTree extends CardImpl<KodamaOfTheNorthTree> {
 
-    public KodamaoftheNorthTree (UUID ownerId) {
+    public KodamaOfTheNorthTree (UUID ownerId) {
         super(ownerId, 222, "Kodama of the North Tree", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{G}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -54,13 +54,13 @@ public class KodamaoftheNorthTree extends CardImpl<KodamaoftheNorthTree> {
         this.addAbility(ShroudAbility.getInstance());
     }
 
-    public KodamaoftheNorthTree (final KodamaoftheNorthTree card) {
+    public KodamaOfTheNorthTree (final KodamaOfTheNorthTree card) {
         super(card);
     }
 
     @Override
-    public KodamaoftheNorthTree copy() {
+    public KodamaOfTheNorthTree copy() {
-        return new KodamaoftheNorthTree(this);
+        return new KodamaOfTheNorthTree(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree_temp.java

@@ -47,7 +47,7 @@ import mage.filter.common.FilterCreaturePermanent;
 /**
  * @author Loki
  */
-public class KodamaoftheSouthTree extends CardImpl<KodamaoftheSouthTree> {
+public class KodamaOfTheSouthTree extends CardImpl<KodamaOfTheSouthTree> {
 
     private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell");
 
@@ -57,7 +57,7 @@ public class KodamaoftheSouthTree extends CardImpl<KodamaoftheSouthTree> {
         filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
-    public KodamaoftheSouthTree(UUID ownerId) {
+    public KodamaOfTheSouthTree(UUID ownerId) {
         super(ownerId, 223, "Kodama of the South Tree", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -70,13 +70,13 @@ public class KodamaoftheSouthTree extends CardImpl<KodamaoftheSouthTree> {
         this.addAbility(ability);
     }
 
-    public KodamaoftheSouthTree(final KodamaoftheSouthTree card) {
+    public KodamaOfTheSouthTree(final KodamaOfTheSouthTree card) {
         super(card);
     }
 
     @Override
-    public KodamaoftheSouthTree copy() {
+    public KodamaOfTheSouthTree copy() {
-        return new KodamaoftheSouthTree(this);
+        return new KodamaOfTheSouthTree(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar_temp.java

@@ -44,9 +44,9 @@ import mage.game.Game;
 /**
  * @author Loki
  */
-public class KokushotheEveningStar extends CardImpl<KokushotheEveningStar> {
+public class KokushoTheEveningStar extends CardImpl<KokushoTheEveningStar> {
 
-    public KokushotheEveningStar(UUID ownerId) {
+    public KokushoTheEveningStar(UUID ownerId) {
         super(ownerId, 122, "Kokusho, the Evening Star", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}{B}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -56,26 +56,26 @@ public class KokushotheEveningStar extends CardImpl<KokushotheEveningStar> {
         this.power = new MageInt(5);
         this.toughness = new MageInt(5);
         this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new KokushotheEveningStarEffect(), false));
+        this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new KokushoTheEveningStarEffect(), false));
     }
 
-    public KokushotheEveningStar(final KokushotheEveningStar card) {
+    public KokushoTheEveningStar(final KokushoTheEveningStar card) {
         super(card);
     }
 
     @Override
-    public KokushotheEveningStar copy() {
+    public KokushoTheEveningStar copy() {
-        return new KokushotheEveningStar(this);
+        return new KokushoTheEveningStar(this);
     }
 
 }
 
-class KokushotheEveningStarEffect extends OneShotEffect<KokushotheEveningStarEffect> {
+class KokushoTheEveningStarEffect extends OneShotEffect<KokushoTheEveningStarEffect> {
-    public KokushotheEveningStarEffect() {
+    public KokushoTheEveningStarEffect() {
         super(Constants.Outcome.Damage);
     }
 
-    public KokushotheEveningStarEffect(final KokushotheEveningStarEffect effect) {
+    public KokushoTheEveningStarEffect(final KokushoTheEveningStarEffect effect) {
         super(effect);
     }
 
@@ -91,8 +91,8 @@ class KokushotheEveningStarEffect extends OneShotEffect<KokushotheEveningStarEff
     }
 
     @Override
-    public KokushotheEveningStarEffect copy() {
+    public KokushoTheEveningStarEffect copy() {
-        return new KokushotheEveningStarEffect(this);
+        return new KokushoTheEveningStarEffect(this);
     }
 
     @Override

Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo_temp.java

@@ -41,9 +41,9 @@ import mage.cards.CardImpl;
 /**
  * @author Loki
  */
-public class KondaLordofEiganjo extends CardImpl<KondaLordofEiganjo> {
+public class KondaLordOfEiganjo extends CardImpl<KondaLordOfEiganjo> {
 
-    public KondaLordofEiganjo(UUID ownerId) {
+    public KondaLordOfEiganjo(UUID ownerId) {
         super(ownerId, 30, "Konda, Lord of Eiganjo", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -57,13 +57,13 @@ public class KondaLordofEiganjo extends CardImpl<KondaLordofEiganjo> {
         this.addAbility(IndestructibleAbility.getInstance());
     }
 
-    public KondaLordofEiganjo(final KondaLordofEiganjo card) {
+    public KondaLordOfEiganjo(final KondaLordOfEiganjo card) {
         super(card);
     }
 
     @Override
-    public KondaLordofEiganjo copy() {
+    public KondaLordOfEiganjo copy() {
-        return new KondaLordofEiganjo(this);
+        return new KondaLordOfEiganjo(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror_temp.java

@@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent;
 /**
  * @author Loki
  */
-public class MelokutheCloudedMirror extends CardImpl<MelokutheCloudedMirror> {
+public class MelokuTheCloudedMirror extends CardImpl<MelokuTheCloudedMirror> {
 
     private final static FilterControlledPermanent filter = new FilterControlledPermanent("a land");
 
@@ -58,7 +58,7 @@ public class MelokutheCloudedMirror extends CardImpl<MelokutheCloudedMirror> {
         filter.setScopeCardType(Filter.ComparisonScope.Any);
     }
 
-    public MelokutheCloudedMirror(UUID ownerId) {
+    public MelokuTheCloudedMirror(UUID ownerId) {
         super(ownerId, 74, "Meloku the Clouded Mirror", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -73,13 +73,13 @@ public class MelokutheCloudedMirror extends CardImpl<MelokutheCloudedMirror> {
         this.addAbility(ability);
     }
 
-    public MelokutheCloudedMirror(final MelokutheCloudedMirror card) {
+    public MelokuTheCloudedMirror(final MelokuTheCloudedMirror card) {
         super(card);
     }
 
     @Override
-    public MelokutheCloudedMirror copy() {
+    public MelokuTheCloudedMirror copy() {
-        return new MelokutheCloudedMirror(this);
+        return new MelokuTheCloudedMirror(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge_temp.java

@@ -48,7 +48,7 @@ import mage.target.TargetPermanent;
  *
  * @author Loki
  */
-public class MinamoSchoolatWatersEdge extends CardImpl<MinamoSchoolatWatersEdge> {
+public class MinamoSchoolAtWatersEdge extends CardImpl<MinamoSchoolAtWatersEdge> {
 
     private final static FilterPermanent filter = new FilterPermanent("legendary permanent");
 
@@ -58,7 +58,7 @@ public class MinamoSchoolatWatersEdge extends CardImpl<MinamoSchoolatWatersEdge>
     }
 
 
-    public MinamoSchoolatWatersEdge (UUID ownerId) {
+    public MinamoSchoolAtWatersEdge (UUID ownerId) {
         super(ownerId, 279, "Minamo, School at Water's Edge", Rarity.RARE, new CardType[]{CardType.LAND}, null);
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -69,13 +69,13 @@ public class MinamoSchoolatWatersEdge extends CardImpl<MinamoSchoolatWatersEdge>
         this.addAbility(ability);
     }
 
-    public MinamoSchoolatWatersEdge (final MinamoSchoolatWatersEdge card) {
+    public MinamoSchoolAtWatersEdge (final MinamoSchoolAtWatersEdge card) {
         super(card);
     }
 
     @Override
-    public MinamoSchoolatWatersEdge copy() {
+    public MinamoSchoolAtWatersEdge copy() {
-        return new MinamoSchoolatWatersEdge(this);
+        return new MinamoSchoolAtWatersEdge(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal_temp.java

@@ -42,10 +42,10 @@ import mage.filter.common.FilterCreaturePermanent;
  *
  * @author Loki
  */
-public class NightofSoulsBetrayal extends CardImpl<NightofSoulsBetrayal> {
+public class NightOfSoulsBetrayal extends CardImpl<NightOfSoulsBetrayal> {
     private static FilterCreaturePermanent filter = new FilterCreaturePermanent("All creatures");
 
-    public NightofSoulsBetrayal (UUID ownerId) {
+    public NightOfSoulsBetrayal (UUID ownerId) {
         super(ownerId, 133, "Night of Souls' Betrayal", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -53,13 +53,13 @@ public class NightofSoulsBetrayal extends CardImpl<NightofSoulsBetrayal> {
         this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Constants.Duration.WhileOnBattlefield, filter, false)));
     }
 
-    public NightofSoulsBetrayal (final NightofSoulsBetrayal card) {
+    public NightOfSoulsBetrayal (final NightOfSoulsBetrayal card) {
         super(card);
     }
 
     @Override
-    public NightofSoulsBetrayal copy() {
+    public NightOfSoulsBetrayal copy() {
-        return new NightofSoulsBetrayal(this);
+        return new NightOfSoulsBetrayal(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers_temp.java

@@ -47,7 +47,7 @@ import mage.target.TargetPermanent;
 /**
  * @author Loki
  */
-public class OkinaTempletotheGrandfathers extends CardImpl<OkinaTempletotheGrandfathers> {
+public class OkinaTempleToTheGrandfathers extends CardImpl<OkinaTempleToTheGrandfathers> {
 
     private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature");
 
@@ -56,7 +56,7 @@ public class OkinaTempletotheGrandfathers extends CardImpl<OkinaTempletotheGrand
         filter.setScopeSupertype(Filter.ComparisonScope.Any);
     }
 
-    public OkinaTempletotheGrandfathers(UUID ownerId) {
+    public OkinaTempleToTheGrandfathers(UUID ownerId) {
         super(ownerId, 280, "Okina, Temple to the Grandfathers", Rarity.RARE, new CardType[]{CardType.LAND}, null);
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -67,13 +67,13 @@ public class OkinaTempletotheGrandfathers extends CardImpl<OkinaTempletotheGrand
         this.addAbility(ability);
     }
 
-    public OkinaTempletotheGrandfathers(final OkinaTempletotheGrandfathers card) {
+    public OkinaTempleToTheGrandfathers(final OkinaTempleToTheGrandfathers card) {
         super(card);
     }
 
     @Override
-    public OkinaTempletotheGrandfathers copy() {
+    public OkinaTempleToTheGrandfathers copy() {
-        return new OkinaTempletotheGrandfathers(this);
+        return new OkinaTempleToTheGrandfathers(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell_temp.java

@@ -38,9 +38,9 @@ import mage.cards.CardImpl;
  *
  * @author Loki
  */
-public class OrderoftheSacredBell extends CardImpl<OrderoftheSacredBell> {
+public class OrderOfTheSacredBell extends CardImpl<OrderOfTheSacredBell> {
 
-    public OrderoftheSacredBell (UUID ownerId) {
+    public OrderOfTheSacredBell (UUID ownerId) {
         super(ownerId, 232, "Order of the Sacred Bell", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Human");
@@ -50,13 +50,13 @@ public class OrderoftheSacredBell extends CardImpl<OrderoftheSacredBell> {
         this.toughness = new MageInt(3);
     }
 
-    public OrderoftheSacredBell (final OrderoftheSacredBell card) {
+    public OrderOfTheSacredBell (final OrderOfTheSacredBell card) {
         super(card);
     }
 
     @Override
-    public OrderoftheSacredBell copy() {
+    public OrderOfTheSacredBell copy() {
-        return new OrderoftheSacredBell(this);
+        return new OrderOfTheSacredBell(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil_temp.java

@@ -43,9 +43,9 @@ import mage.game.permanent.Permanent;
 /**
  * @author Loki
  */
-public class ParttheVeil extends CardImpl<ParttheVeil> {
+public class PartTheVeil extends CardImpl<PartTheVeil> {
 
-    public ParttheVeil(UUID ownerId) {
+    public PartTheVeil(UUID ownerId) {
         super(ownerId, 77, "Part the Veil", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
@@ -53,13 +53,13 @@ public class ParttheVeil extends CardImpl<ParttheVeil> {
         this.getSpellAbility().addEffect(new ParttheVeilEffect());
     }
 
-    public ParttheVeil(final ParttheVeil card) {
+    public PartTheVeil(final PartTheVeil card) {
         super(card);
     }
 
     @Override
-    public ParttheVeil copy() {
+    public PartTheVeil copy() {
-        return new ParttheVeil(this);
+        return new PartTheVeil(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro_temp.java

@@ -49,7 +49,7 @@ import mage.filter.common.FilterCreaturePermanent;
 /**
  * @author Loki
  */
-public class SachiDaughterofSeshiro extends CardImpl<SachiDaughterofSeshiro> {
+public class SachiDaughterOfSeshiro extends CardImpl<SachiDaughterOfSeshiro> {
 
 
     private final static FilterCreaturePermanent snakeFilter = new FilterCreaturePermanent("Snakes");
@@ -60,7 +60,7 @@ public class SachiDaughterofSeshiro extends CardImpl<SachiDaughterofSeshiro> {
         shamanFilter.getSubtype().add("Shaman");
     }
 
-    public SachiDaughterofSeshiro(UUID ownerId) {
+    public SachiDaughterOfSeshiro(UUID ownerId) {
         super(ownerId, 238, "Sachi, Daughter of Seshiro", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -73,13 +73,13 @@ public class SachiDaughterofSeshiro extends CardImpl<SachiDaughterofSeshiro> {
         this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0)), new TapSourceCost()), Constants.Duration.WhileOnBattlefield, shamanFilter, false)));
     }
 
-    public SachiDaughterofSeshiro(final SachiDaughterofSeshiro card) {
+    public SachiDaughterOfSeshiro(final SachiDaughterOfSeshiro card) {
         super(card);
     }
 
     @Override
-    public SachiDaughterofSeshiro copy() {
+    public SachiDaughterOfSeshiro copy() {
-        return new SachiDaughterofSeshiro(this);
+        return new SachiDaughterOfSeshiro(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth_temp.java

@@ -44,9 +44,9 @@ import mage.cards.CardImpl;
  *
  * @author Loki
  */
-public class SeizanPerverterofTruth extends CardImpl<SeizanPerverterofTruth> {
+public class SeizanPerverterOfTruth extends CardImpl<SeizanPerverterOfTruth> {
 
-    public SeizanPerverterofTruth (UUID ownerId) {
+    public SeizanPerverterOfTruth (UUID ownerId) {
         super(ownerId, 143, "Seizan, Perverter of Truth", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -61,13 +61,13 @@ public class SeizanPerverterofTruth extends CardImpl<SeizanPerverterofTruth> {
 
     }
 
-    public SeizanPerverterofTruth (final SeizanPerverterofTruth card) {
+    public SeizanPerverterOfTruth (final SeizanPerverterOfTruth card) {
         super(card);
     }
 
     @Override
-    public SeizanPerverterofTruth copy() {
+    public SeizanPerverterOfTruth copy() {
-        return new SeizanPerverterofTruth(this);
+        return new SeizanPerverterOfTruth(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed_temp.java

@@ -52,7 +52,7 @@ import mage.target.targetpointer.FixedTarget;
 /**
  * @author Loki
  */
-public class SeshirotheAnointed extends CardImpl<SeshirotheAnointed> {
+public class SeshiroTheAnointed extends CardImpl<SeshiroTheAnointed> {
 
     private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Snakes");
 
@@ -60,7 +60,7 @@ public class SeshirotheAnointed extends CardImpl<SeshirotheAnointed> {
         filter.getSubtype().add("Snake");
     }
 
-    public SeshirotheAnointed(UUID ownerId) {
+    public SeshiroTheAnointed(UUID ownerId) {
         super(ownerId, 241, "Seshiro the Anointed", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -73,13 +73,13 @@ public class SeshirotheAnointed extends CardImpl<SeshirotheAnointed> {
         this.addAbility(new SeshirotheAnointedAbility());
     }
 
-    public SeshirotheAnointed(final SeshirotheAnointed card) {
+    public SeshiroTheAnointed(final SeshiroTheAnointed card) {
         super(card);
     }
 
     @Override
-    public SeshirotheAnointed copy() {
+    public SeshiroTheAnointed copy() {
-        return new SeshirotheAnointed(this);
+        return new SeshiroTheAnointed(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep_temp.java

@@ -48,7 +48,7 @@ import mage.target.TargetPermanent;
 /**
  * @author Loki
  */
-public class ShinkatheBloodsoakedKeep extends CardImpl<ShinkatheBloodsoakedKeep> {
+public class ShinkaTheBloodsoakedKeep extends CardImpl<ShinkaTheBloodsoakedKeep> {
 
     private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature");
 
@@ -57,7 +57,7 @@ public class ShinkatheBloodsoakedKeep extends CardImpl<ShinkatheBloodsoakedKeep>
         filter.setScopeSupertype(Filter.ComparisonScope.Any);
     }
 
-    public ShinkatheBloodsoakedKeep(UUID ownerId) {
+    public ShinkaTheBloodsoakedKeep(UUID ownerId) {
         super(ownerId, 282, "Shinka, the Bloodsoaked Keep", Rarity.RARE, new CardType[]{CardType.LAND}, null);
         this.expansionSetCode = "CHK";
         this.supertype.add("Legendary");
@@ -68,13 +68,13 @@ public class ShinkatheBloodsoakedKeep extends CardImpl<ShinkatheBloodsoakedKeep>
         this.addAbility(ability);
     }
 
-    public ShinkatheBloodsoakedKeep(final ShinkatheBloodsoakedKeep card) {
+    public ShinkaTheBloodsoakedKeep(final ShinkaTheBloodsoakedKeep card) {
         super(card);
     }
 
     @Override
-    public ShinkatheBloodsoakedKeep copy() {
+    public ShinkaTheBloodsoakedKeep copy() {
-        return new ShinkatheBloodsoakedKeep(this);
+        return new ShinkaTheBloodsoakedKeep(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma_temp.java

@@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent;
 /**
  * @author Loki
  */
-public class SoulofMagma extends CardImpl<SoulofMagma> {
+public class SoulOfMagma extends CardImpl<SoulOfMagma> {
 
     private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell");
 
@@ -54,7 +54,7 @@ public class SoulofMagma extends CardImpl<SoulofMagma> {
         filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
-    public SoulofMagma(UUID ownerId) {
+    public SoulOfMagma(UUID ownerId) {
         super(ownerId, 189, "Soul of Magma", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -66,13 +66,13 @@ public class SoulofMagma extends CardImpl<SoulofMagma> {
         this.addAbility(ability);
     }
 
-    public SoulofMagma(final SoulofMagma card) {
+    public SoulOfMagma(final SoulOfMagma card) {
         super(card);
     }
 
     @Override
-    public SoulofMagma copy() {
+    public SoulOfMagma copy() {
-        return new SoulofMagma(this);
+        return new SoulOfMagma(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars_temp.java

@@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent;
  *
  * @author Loki
  */
-public class StrengthofCedars extends CardImpl<StrengthofCedars> {
+public class StrengthOfCedars extends CardImpl<StrengthOfCedars> {
     private final static FilterControlledPermanent filter = new FilterControlledPermanent("land your control");
 
     static {
@@ -53,7 +53,7 @@ public class StrengthofCedars extends CardImpl<StrengthofCedars> {
         filter.setScopeCardType(Filter.ComparisonScope.Any);
     }
 
-    public StrengthofCedars (UUID ownerId) {
+    public StrengthOfCedars (UUID ownerId) {
         super(ownerId, 245, "Strength of Cedars", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{G}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
@@ -63,13 +63,13 @@ public class StrengthofCedars extends CardImpl<StrengthofCedars> {
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
-    public StrengthofCedars (final StrengthofCedars card) {
+    public StrengthOfCedars (final StrengthOfCedars card) {
         super(card);
     }
 
     @Override
-    public StrengthofCedars copy() {
+    public StrengthOfCedars copy() {
-        return new StrengthofCedars(this);
+        return new StrengthOfCedars(this);
     }
 
 }

Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope_temp.java

@@ -48,7 +48,7 @@ import mage.target.common.TargetOpponent;
 /**
  * @author Loki
  */
-public class ThiefofHope extends CardImpl<ThiefofHope> {
+public class ThiefOfHope extends CardImpl<ThiefOfHope> {
 
     private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell");
 
@@ -58,7 +58,7 @@ public class ThiefofHope extends CardImpl<ThiefofHope> {
         filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
-    public ThiefofHope(UUID ownerId) {
+    public ThiefOfHope(UUID ownerId) {
         super(ownerId, 147, "Thief of Hope", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Spirit");
@@ -72,13 +72,13 @@ public class ThiefofHope extends CardImpl<ThiefofHope> {
         this.addAbility(new SoulshiftAbility(2));
     }
 
-    public ThiefofHope(final ThiefofHope card) {
+    public ThiefOfHope(final ThiefOfHope card) {
         super(card);
     }
 
     @Override
-    public ThiefofHope copy() {
+    public ThiefOfHope copy() {
-        return new ThiefofHope(this);
+        return new ThiefOfHope(this);
     }
 
 }

Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher_temp.java

@@ -35,25 +35,20 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.effects.Effect;
-import mage.abilities.effects.common.DiscardTargetEffect;
 import mage.abilities.effects.common.SacrificeTargetEffect;
-import mage.abilities.effects.common.UntapAllLandsControllerEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.DamagedPlayerEvent;
 import mage.game.events.GameEvent;
-import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
-import mage.target.targetpointer.FixedTarget;
 
 /**
  *
  * @author Loki
  */
-public class AshlingtheExtinguisher extends CardImpl<AshlingtheExtinguisher> {
+public class AshlingTheExtinguisher extends CardImpl<AshlingTheExtinguisher> {
 
-    public AshlingtheExtinguisher (UUID ownerId) {
+    public AshlingTheExtinguisher (UUID ownerId) {
         super(ownerId, 33, "Ashling, the Extinguisher", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
         this.expansionSetCode = "EVE";
         this.supertype.add("Legendary");
@@ -62,33 +57,33 @@ public class AshlingtheExtinguisher extends CardImpl<AshlingtheExtinguisher> {
 		this.color.setBlack(true);
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
-        this.addAbility(new AshlingtheExtinguisherTriggeredAbility());
+        this.addAbility(new AshlingTheExtinguisherTriggeredAbility());
     }
 
-    public AshlingtheExtinguisher (final AshlingtheExtinguisher card) {
+    public AshlingTheExtinguisher (final AshlingTheExtinguisher card) {
         super(card);
     }
 
     @Override
-    public AshlingtheExtinguisher copy() {
+    public AshlingTheExtinguisher copy() {
-        return new AshlingtheExtinguisher(this);
+        return new AshlingTheExtinguisher(this);
     }
 
 }
 
-class AshlingtheExtinguisherTriggeredAbility extends TriggeredAbilityImpl<AshlingtheExtinguisherTriggeredAbility> {
+class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl<AshlingTheExtinguisherTriggeredAbility> {
-    public AshlingtheExtinguisherTriggeredAbility() {
+    public AshlingTheExtinguisherTriggeredAbility() {
         super(Constants.Zone.BATTLEFIELD, new SacrificeTargetEffect());
         this.addTarget(new TargetCreaturePermanent());
     }
 
-    public AshlingtheExtinguisherTriggeredAbility(final AshlingtheExtinguisherTriggeredAbility ability) {
+    public AshlingTheExtinguisherTriggeredAbility(final AshlingTheExtinguisherTriggeredAbility ability) {
         super(ability);
     }
 
     @Override
-    public AshlingtheExtinguisherTriggeredAbility copy() {
+    public AshlingTheExtinguisherTriggeredAbility copy() {
-        return new AshlingtheExtinguisherTriggeredAbility(this);
+        return new AshlingTheExtinguisherTriggeredAbility(this);
     }
 
     @Override

Mage.Sets/src/mage/sets/guildpact/AngelOfDespair_temp.java

@@ -32,22 +32,20 @@ import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.Abilities;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
-import mage.sets.conflux.AbsorbVis;
 import mage.target.TargetPermanent;
 
 /**
  *
  * @author Loki
  */
-public class AngelofDespair extends CardImpl<AngelofDespair> {
+public class AngelOfDespair extends CardImpl<AngelOfDespair> {
 
-    public AngelofDespair (UUID ownerId) {
+    public AngelOfDespair (UUID ownerId) {
         super(ownerId, 101, "Angel of Despair", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}{B}{B}");
         this.expansionSetCode = "GPT";
         this.subtype.add("Angel");
@@ -61,13 +59,13 @@ public class AngelofDespair extends CardImpl<AngelofDespair> {
         this.addAbility(ability);
     }
 
-    public AngelofDespair (final AngelofDespair card) {
+    public AngelOfDespair (final AngelOfDespair card) {
         super(card);
     }
 
     @Override
-    public AngelofDespair copy() {
+    public AngelOfDespair copy() {
-        return new AngelofDespair(this);
+        return new AngelOfDespair(this);
     }
 
 }

Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand_temp.java

@@ -38,7 +38,6 @@ import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.CopyTargetSpellEffect;
 import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
-import mage.abilities.effects.common.DrawCardTargetEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
@@ -52,9 +51,9 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author Loki
  */
-public class ChandratheFirebrand extends CardImpl<ChandratheFirebrand> {
+public class ChandraTheFirebrand extends CardImpl<ChandraTheFirebrand> {
 
-    public ChandratheFirebrand (UUID ownerId) {
+    public ChandraTheFirebrand (UUID ownerId) {
         super(ownerId, 124, "Chandra, the Firebrand", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{R}");
         this.expansionSetCode = "M12";
         this.subtype.add("Chandra");
@@ -65,36 +64,36 @@ public class ChandratheFirebrand extends CardImpl<ChandratheFirebrand> {
         ability1.addTarget(new TargetCreatureOrPlayer());
         this.addAbility(ability1);
 
-        this.addAbility(new LoyaltyAbility(new CreateDelayedTriggeredAbilityEffect(new ChandratheFirebrandAbility()), -2));
+        this.addAbility(new LoyaltyAbility(new CreateDelayedTriggeredAbilityEffect(new ChandraTheFirebrandAbility()), -2));
 
         LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(6), -6);
         ability2.addTarget(new TargetCreatureOrPlayer(0, 6));
         this.addAbility(ability2);
     }
 
-    public ChandratheFirebrand (final ChandratheFirebrand card) {
+    public ChandraTheFirebrand (final ChandraTheFirebrand card) {
         super(card);
     }
 
     @Override
-    public ChandratheFirebrand copy() {
+    public ChandraTheFirebrand copy() {
-        return new ChandratheFirebrand(this);
+        return new ChandraTheFirebrand(this);
     }
 
 }
 
-class ChandratheFirebrandAbility extends DelayedTriggeredAbility<ChandratheFirebrandAbility> {
+class ChandraTheFirebrandAbility extends DelayedTriggeredAbility<ChandraTheFirebrandAbility> {
-    ChandratheFirebrandAbility() {
+    ChandraTheFirebrandAbility() {
         super(new CopyTargetSpellEffect());
     }
 
-    ChandratheFirebrandAbility(final ChandratheFirebrandAbility ability) {
+    ChandraTheFirebrandAbility(final ChandraTheFirebrandAbility ability) {
         super(ability);
     }
 
     @Override
-    public ChandratheFirebrandAbility copy() {
+    public ChandraTheFirebrandAbility copy() {
-        return new ChandratheFirebrandAbility(this);
+        return new ChandraTheFirebrandAbility(this);
     }
 
     @Override

Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper_temp.java

@@ -45,9 +45,9 @@ import mage.target.common.TargetCreaturePermanent;
 /**
  * @author Loki
  */
-public class GideonSLawkeeper extends CardImpl<GideonSLawkeeper> {
+public class GideonsLawkeeper extends CardImpl<GideonsLawkeeper> {
 
-    public GideonSLawkeeper(UUID ownerId) {
+    public GideonsLawkeeper(UUID ownerId) {
         super(ownerId, 18, "Gideon's Lawkeeper", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}");
         this.expansionSetCode = "M12";
         this.subtype.add("Human");
@@ -61,13 +61,13 @@ public class GideonSLawkeeper extends CardImpl<GideonSLawkeeper> {
         this.addAbility(ability);
     }
 
-    public GideonSLawkeeper(final GideonSLawkeeper card) {
+    public GideonsLawkeeper(final GideonsLawkeeper card) {
         super(card);
     }
 
     @Override
-    public GideonSLawkeeper copy() {
+    public GideonsLawkeeper copy() {
-        return new GideonSLawkeeper(this);
+        return new GideonsLawkeeper(this);
     }
 
 }

Mage.Sets/src/mage/sets/magic2012/SorinsThirst_temp.java

@@ -40,9 +40,9 @@ import mage.target.common.TargetCreaturePermanent;
  *
  * @author Loki
  */
-public class SorinSThirst extends CardImpl<SorinSThirst> {
+public class SorinsThirst extends CardImpl<SorinsThirst> {
 
-    public SorinSThirst (UUID ownerId) {
+    public SorinsThirst (UUID ownerId) {
         super(ownerId, 110, "Sorin's Thirst", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{B}");
         this.expansionSetCode = "M12";
 		this.color.setBlack(true);
@@ -51,13 +51,13 @@ public class SorinSThirst extends CardImpl<SorinSThirst> {
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
-    public SorinSThirst (final SorinSThirst card) {
+    public SorinsThirst (final SorinsThirst card) {
         super(card);
     }
 
     @Override
-    public SorinSThirst copy() {
+    public SorinsThirst copy() {
-        return new SorinSThirst(this);
+        return new SorinsThirst(this);
     }
 
 }

Mage.Sets/src/mage/sets/magic2012/SorinsVengeance_temp.java

@@ -40,9 +40,9 @@ import mage.target.TargetPlayer;
  *
  * @author Loki
  */
-public class SorinSVengeance extends CardImpl<SorinSVengeance> {
+public class SorinsVengeance extends CardImpl<SorinsVengeance> {
 
-    public SorinSVengeance (UUID ownerId) {
+    public SorinsVengeance (UUID ownerId) {
         super(ownerId, 111, "Sorin's Vengeance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}{B}");
         this.expansionSetCode = "M12";
 		this.color.setBlack(true);
@@ -51,13 +51,13 @@ public class SorinSVengeance extends CardImpl<SorinSVengeance> {
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
 
-    public SorinSVengeance (final SorinSVengeance card) {
+    public SorinsVengeance (final SorinsVengeance card) {
         super(card);
     }
 
     @Override
-    public SorinSVengeance copy() {
+    public SorinsVengeance copy() {
-        return new SorinSVengeance(this);
+        return new SorinsVengeance(this);
     }
 
 }

Mage.Sets/src/mage/sets/tenth/CounselOfTheSoratami_temp.java

@@ -29,31 +29,27 @@
 package mage.sets.tenth;
 
 import java.util.UUID;
-import mage.Constants.CardType;
-import mage.Constants.Rarity;
-import mage.cards.CardImpl;
-import mage.sets.alarareborn.MagefireWings;
 
 /**
  *
  * @author Loki
  */
-public class CounseloftheSoratami extends mage.sets.championsofkamigawa.CounseloftheSoratami {
+public class CounselOfTheSoratami extends mage.sets.championsofkamigawa.CounselOfTheSoratami {
 
-    public CounseloftheSoratami (UUID ownerId) {
+    public CounselOfTheSoratami (UUID ownerId) {
         super(ownerId);
         this.expansionSetCode = "10E";
         this.cardNumber = 76;
 
     }
 
-    public CounseloftheSoratami (final CounseloftheSoratami card) {
+    public CounselOfTheSoratami (final CounselOfTheSoratami card) {
         super(card);
     }
 
     @Override
-    public CounseloftheSoratami copy() {
+    public CounselOfTheSoratami copy() {
-        return new CounseloftheSoratami(this);
+        return new CounselOfTheSoratami(this);
     }
 
 }