diff --git a/Mage.Sets/src/mage/cards/e/EpharaGodOfThePolis.java b/Mage.Sets/src/mage/cards/e/EpharaGodOfThePolis.java
index 01c303b520..8f149ba496 100644
--- a/Mage.Sets/src/mage/cards/e/EpharaGodOfThePolis.java
+++ b/Mage.Sets/src/mage/cards/e/EpharaGodOfThePolis.java
@@ -73,6 +73,6 @@ enum HadAnotherCreatureEnterTheBattlefieldCondition implements Condition {
         PermanentsEnteredBattlefieldWatcher watcher = (PermanentsEnteredBattlefieldWatcher) game.getState().getWatchers().get(PermanentsEnteredBattlefieldWatcher.class.getSimpleName());
         return sourcePermanent != null
                 && watcher != null
-                && watcher.AnotherCreatureEnteredBattlefieldUnderPlayersControlLastTurn(sourcePermanent, game);
+                && watcher.anotherCreatureEnteredBattlefieldUnderPlayersControlLastTurn(sourcePermanent, game);
     }
 }
diff --git a/Mage.Sets/src/mage/cards/g/GraveScrabbler.java b/Mage.Sets/src/mage/cards/g/GraveScrabbler.java
index a51594e9a7..b712d2c869 100644
--- a/Mage.Sets/src/mage/cards/g/GraveScrabbler.java
+++ b/Mage.Sets/src/mage/cards/g/GraveScrabbler.java
@@ -32,7 +32,7 @@ public final class GraveScrabbler extends CardImpl {
         //you may return target creature card from a graveyard to its owner's hand.
         TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true);
         ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")));
-        this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, MadnessAbility.GetCondition(),
+        this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, MadnessAbility.getCondition(),
                 "When {this} enters the battlefield, if its madness cost was paid, you may return target creature card from a graveyard to its owner's hand."));
     }
 
diff --git a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java
index b07de0e0b0..9918789ed2 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java
@@ -71,7 +71,7 @@ public class MadnessAbility extends StaticAbility {
         return new MadnessAbility(this);
     }
 
-    public static Condition GetCondition() {
+    public static Condition getCondition() {
         return MadnessCondition.instance;
     }
 
diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java
index 15e4b052d3..df4b5ae8bd 100644
--- a/Mage/src/main/java/mage/cards/ExpansionSet.java
+++ b/Mage/src/main/java/mage/cards/ExpansionSet.java
@@ -185,7 +185,7 @@ public abstract class ExpansionSet implements Serializable {
         return theBooster;
     }
 
-    protected int AddMissingPartner(List<Card> booster, boolean partnerAllowed, int max, int i) {
+    protected int addMissingPartner(List<Card> booster, boolean partnerAllowed, int max, int i) {
 
         for (Ability ability : booster.get(booster.size() - 1).getAbilities()) {
             //Check if fetched card has the PartnerWithAbility
@@ -328,7 +328,7 @@ public abstract class ExpansionSet implements Serializable {
         for (int i = 0; i < numBoosterUncommon; i++) {
             while (true) {
                 addToBooster(booster, uncommons);
-                int check = AddMissingPartner(booster, partnerAllowed, numBoosterUncommon - 1, i);
+                int check = addMissingPartner(booster, partnerAllowed, numBoosterUncommon - 1, i);
                 if (check == 1) {
                     break;
                 }
@@ -358,7 +358,7 @@ public abstract class ExpansionSet implements Serializable {
             if (ratioBoosterMythic > 0 && RandomUtil.nextInt(ratioBoosterMythic) == 0) {
                 while (true) {
                     addToBooster(booster, mythics);
-                    int check = AddMissingPartner(booster, partnerAllowed, -1, 1);
+                    int check = addMissingPartner(booster, partnerAllowed, -1, 1);
                     if (check == 1) {
                         break;
                     }
@@ -370,7 +370,7 @@ public abstract class ExpansionSet implements Serializable {
             } else {
                 while (true) {
                     addToBooster(booster, rares);
-                    int check = AddMissingPartner(booster, partnerAllowed, -1, 1);
+                    int check = addMissingPartner(booster, partnerAllowed, -1, 1);
                     if (check == 1) {
                         break;
                     }
diff --git a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java
index 071b14bda7..b1fd8ea51f 100644
--- a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java
+++ b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java
@@ -476,7 +476,7 @@ public abstract class TournamentImpl implements Tournament {
     @Override
     public void cleanUpOnTournamentEnd() {
         for (TournamentPlayer tournamentPlayer : players.values()) {
-            tournamentPlayer.CleanUpOnTournamentEnd();
+            tournamentPlayer.cleanUpOnTournamentEnd();
         }
     }
 
diff --git a/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java b/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java
index 6d01e42e08..6072015d4d 100644
--- a/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java
+++ b/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java
@@ -179,7 +179,7 @@ public class TournamentPlayer {
      * Free resources no longer needed if tournament has ended
      *
      */
-    public void CleanUpOnTournamentEnd() {
+    public void cleanUpOnTournamentEnd() {
         this.deck = null;
     }
 
diff --git a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java
index 7fdefbe7cb..870daa230f 100644
--- a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldWatcher.java
@@ -71,7 +71,7 @@ public class PermanentsEnteredBattlefieldWatcher extends Watcher {
         return enteringBattlefield.get(playerId);
     }
 
-    public boolean AnotherCreatureEnteredBattlefieldUnderPlayersControlLastTurn(Permanent sourcePermanent, Game game) {
+    public boolean anotherCreatureEnteredBattlefieldUnderPlayersControlLastTurn(Permanent sourcePermanent, Game game) {
         if (enteringBattlefieldLastTurn.containsKey(sourcePermanent.getControllerId())) {
             for (Permanent permanent : enteringBattlefieldLastTurn.get(sourcePermanent.getControllerId())) {
                 if (!permanent.getId().equals(sourcePermanent.getId())