diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java
similarity index 91%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java
index 6bdbc55be74..072d618c8f6 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion_temp.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java
@@ -72,7 +72,7 @@ public class AuraOfDominion extends CardImpl<AuraOfDominion> {
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Untap));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
-        Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AuraofDominionEffect(), new GenericManaCost(1));
+        Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new AuraOfDominionEffect(), new GenericManaCost(1));
         ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)));
         this.addAbility(ability);
     }
@@ -88,12 +88,12 @@ public class AuraOfDominion extends CardImpl<AuraOfDominion> {
 
 }
 
-class AuraofDominionEffect extends OneShotEffect<AuraofDominionEffect> {
-    AuraofDominionEffect() {
+class AuraOfDominionEffect extends OneShotEffect<AuraOfDominionEffect> {
+    AuraOfDominionEffect() {
         super(Constants.Outcome.Untap);
     }
 
-    AuraofDominionEffect(final AuraofDominionEffect effect) {
+    AuraOfDominionEffect(final AuraOfDominionEffect effect) {
         super(effect);
     }
 
@@ -111,8 +111,8 @@ class AuraofDominionEffect extends OneShotEffect<AuraofDominionEffect> {
     }
 
     @Override
-    public AuraofDominionEffect copy() {
-        return new AuraofDominionEffect(this);
+    public AuraOfDominionEffect copy() {
+        return new AuraOfDominionEffect(this);
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/KondaLordOfEiganjo.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java
similarity index 94%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java
index d79525c3293..e98fb136987 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror_temp.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java
@@ -68,7 +68,7 @@ public class MelokuTheCloudedMirror extends CardImpl<MelokuTheCloudedMirror> {
         this.power = new MageInt(2);
         this.toughness = new MageInt(4);
         this.addAbility(FlyingAbility.getInstance());
-        Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new MelokutheCloudedMirrorToken(), 1), new GenericManaCost(1));
+        Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new MelokuTheCloudedMirrorToken(), 1), new GenericManaCost(1));
         ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter)));
         this.addAbility(ability);
     }
@@ -84,8 +84,8 @@ public class MelokuTheCloudedMirror extends CardImpl<MelokuTheCloudedMirror> {
 
 }
 
-class MelokutheCloudedMirrorToken extends Token {
-    MelokutheCloudedMirrorToken() {
+class MelokuTheCloudedMirrorToken extends Token {
+    MelokuTheCloudedMirrorToken() {
         super("", "a 1/1 blue Illusion creature token with flying");
         cardType.add(CardType.CREATURE);
         color.setBlue(true);
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/OrderOfTheSacredBell.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java
similarity index 88%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java
index 813edbbf7d9..ea12baff172 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil_temp.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java
@@ -50,7 +50,7 @@ public class PartTheVeil extends CardImpl<PartTheVeil> {
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
         this.color.setBlue(true);
-        this.getSpellAbility().addEffect(new ParttheVeilEffect());
+        this.getSpellAbility().addEffect(new PartTheVeilEffect());
     }
 
     public PartTheVeil(final PartTheVeil card) {
@@ -64,12 +64,12 @@ public class PartTheVeil extends CardImpl<PartTheVeil> {
 
 }
 
-class ParttheVeilEffect extends OneShotEffect<ParttheVeilEffect> {
-    public ParttheVeilEffect() {
+class PartTheVeilEffect extends OneShotEffect<PartTheVeilEffect> {
+    public PartTheVeilEffect() {
         super(Constants.Outcome.ReturnToHand);
     }
 
-    public ParttheVeilEffect(final ParttheVeilEffect effect) {
+    public PartTheVeilEffect(final PartTheVeilEffect effect) {
         super(effect);
     }
 
@@ -82,8 +82,8 @@ class ParttheVeilEffect extends OneShotEffect<ParttheVeilEffect> {
     }
 
     @Override
-    public ParttheVeilEffect copy() {
-        return new ParttheVeilEffect(this);
+    public PartTheVeilEffect copy() {
+        return new PartTheVeilEffect(this);
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java
similarity index 95%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java
index b9aa089b576..7e434e052d4 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro_temp.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java
@@ -41,9 +41,7 @@ import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.ManaEffect;
 import mage.abilities.effects.common.continious.BoostControlledEffect;
 import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
-import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java
similarity index 85%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java
index 439eebee783..4f65295fa3b 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed_temp.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java
@@ -36,10 +36,7 @@ import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.Effect;
-import mage.abilities.effects.common.DiscardTargetEffect;
 import mage.abilities.effects.common.DrawCardControllerEffect;
-import mage.abilities.effects.common.UntapAllLandsControllerEffect;
 import mage.abilities.effects.common.continious.BoostControlledEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
@@ -47,7 +44,6 @@ import mage.game.Game;
 import mage.game.events.DamagedPlayerEvent;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
-import mage.target.targetpointer.FixedTarget;
 
 /**
  * @author Loki
@@ -70,7 +66,7 @@ public class SeshiroTheAnointed extends CardImpl<SeshiroTheAnointed> {
         this.power = new MageInt(3);
         this.toughness = new MageInt(4);
         this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Constants.Duration.WhileOnBattlefield, filter, true)));
-        this.addAbility(new SeshirotheAnointedAbility());
+        this.addAbility(new SeshiroTheAnointedAbility());
     }
 
     public SeshiroTheAnointed(final SeshiroTheAnointed card) {
@@ -84,19 +80,19 @@ public class SeshiroTheAnointed extends CardImpl<SeshiroTheAnointed> {
 
 }
 
-class SeshirotheAnointedAbility extends TriggeredAbilityImpl<SeshirotheAnointedAbility> {
+class SeshiroTheAnointedAbility extends TriggeredAbilityImpl<SeshiroTheAnointedAbility> {
 
-    public SeshirotheAnointedAbility() {
+    public SeshiroTheAnointedAbility() {
         super(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true);
     }
 
-    public SeshirotheAnointedAbility(final SeshirotheAnointedAbility ability) {
+    public SeshiroTheAnointedAbility(final SeshiroTheAnointedAbility ability) {
         super(ability);
     }
 
     @Override
-    public SeshirotheAnointedAbility copy() {
-        return new SeshirotheAnointedAbility(this);
+    public SeshiroTheAnointedAbility copy() {
+        return new SeshiroTheAnointedAbility(this);
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope_temp.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java
similarity index 94%
rename from Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope_temp.java
rename to Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java
index 55ac42c5b72..8c2da54776a 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope_temp.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java
@@ -35,14 +35,12 @@ import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SpellCastTriggeredAbility;
-import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.LoseLifeTargetEffect;
 import mage.abilities.keyword.SoulshiftAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.FilterCard;
-import mage.target.common.TargetCreatureOrPlayer;
 import mage.target.common.TargetOpponent;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher_temp.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher_temp.java
rename to Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
diff --git a/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair_temp.java b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/guildpact/AngelOfDespair_temp.java
rename to Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java
diff --git a/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand_temp.java b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand_temp.java
rename to Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java
diff --git a/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper_temp.java b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper_temp.java
rename to Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java
diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinsThirst_temp.java b/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/magic2012/SorinsThirst_temp.java
rename to Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java
diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance_temp.java b/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/magic2012/SorinsVengeance_temp.java
rename to Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java
diff --git a/Mage.Sets/src/mage/sets/tenth/CounselOfTheSoratami_temp.java b/Mage.Sets/src/mage/sets/tenth/CounselOfTheSoratami.java
similarity index 100%
rename from Mage.Sets/src/mage/sets/tenth/CounselOfTheSoratami_temp.java
rename to Mage.Sets/src/mage/sets/tenth/CounselOfTheSoratami.java
diff --git a/Utils/cardClass_temp.tmpl b/Utils/cardClass.tmpl
similarity index 100%
rename from Utils/cardClass_temp.tmpl
rename to Utils/cardClass.tmpl