diff --git a/.gitattributes b/.gitattributes
index 31edb37c39a..9ce23918dcb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10273,8 +10273,8 @@ src/main/java/forge/Computer.java svneol=native#text/plain
 src/main/java/forge/ComputerAIGeneral.java svneol=native#text/plain
 src/main/java/forge/ComputerAIInput.java svneol=native#text/plain
 src/main/java/forge/ComputerUtil.java svneol=native#text/plain
-src/main/java/forge/ComputerUtilAttack2.java svneol=native#text/plain
-src/main/java/forge/ComputerUtilBlock2.java svneol=native#text/plain
+src/main/java/forge/ComputerUtilAttack.java svneol=native#text/plain
+src/main/java/forge/ComputerUtilBlock.java svneol=native#text/plain
 src/main/java/forge/Constant.java svneol=native#text/plain
 src/main/java/forge/ConstantStringArrayList.java svneol=native#text/plain
 src/main/java/forge/ConstantStringHashMap.java svneol=native#text/plain
@@ -10290,7 +10290,7 @@ src/main/java/forge/FileUtil.java svneol=native#text/plain
 src/main/java/forge/GameAction.java svneol=native#text/plain
 src/main/java/forge/GameActionUtil.java svneol=native#text/plain
 src/main/java/forge/GameEntity.java -text
-src/main/java/forge/GuiDisplay4.java svneol=native#text/plain
+src/main/java/forge/GuiDisplay.java svneol=native#text/plain
 src/main/java/forge/GuiDisplayUtil.java svneol=native#text/plain
 src/main/java/forge/GuiDownloadPicturesLQ.java svneol=native#text/plain
 src/main/java/forge/GuiDownloadPrices.java svneol=native#text/plain
@@ -10300,7 +10300,7 @@ src/main/java/forge/GuiDownloader.java -text
 src/main/java/forge/GuiImportPicture.java svneol=native#text/plain
 src/main/java/forge/GuiInput.java svneol=native#text/plain
 src/main/java/forge/GuiMigrateLocalMWSSetPicturesHQ.java svneol=native#text/plain
-src/main/java/forge/GuiMultipleBlockers4.java svneol=native#text/plain
+src/main/java/forge/GuiMultipleBlockers.java svneol=native#text/plain
 src/main/java/forge/GuiNewGame.java svneol=native#text/plain
 src/main/java/forge/GuiProgressBarWindow.java svneol=native#text/plain
 src/main/java/forge/HandSizeOp.java svneol=native#text/plain
diff --git a/pom.xml b/pom.xml
index 6b60b009303..7ccc1ecf830 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,7 +231,7 @@
                     </descriptorRefs>
                     <archive>
                         <manifest>
-                            <mainClass>forge.Gui_NewGame</mainClass>
+                            <mainClass>forge.GuiNewGame</mainClass>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                         <manifestEntries>
@@ -704,7 +704,7 @@
                                     <errTitle>forge</errTitle>
                                     <icon>${configSourceDirectory}/forge.ico</icon>
                                     <classPath>
-                                        <mainClass>forge.Gui_NewGame</mainClass>
+                                        <mainClass>forge.GuiNewGame</mainClass>
                                         <addDependencies>false</addDependencies>
                                         <preCp>anything</preCp>
                                     </classPath>
@@ -870,7 +870,7 @@
                                         <mkdir dir="${project.build.directory}/res/cardsfolder" />
                                         <zip destfile="${project.build.directory}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" />
                                         <taskdef name="jarbundler" classpathref="maven.runtime.classpath" classname="net.sourceforge.jarbundler.JarBundler" />
-                                        <jarbundler dir="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" version="${project.version}" mainclass="forge.Gui_NewGame" icon="${basedir}/${configSourceDirectory}/Forge.icns" jvmversion="1.6+" vmoptions="-Xmx1024m" shortname="${project.name}" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" jar="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar">
+                                        <jarbundler dir="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" version="${project.version}" mainclass="forge.GuiNewGame" icon="${basedir}/${configSourceDirectory}/Forge.icns" jvmversion="1.6+" vmoptions="-Xmx1024m" shortname="${project.name}" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" jar="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar">
                                             <javafileset dir="${basedir}">
                                                 <include name="*.properties" />
                                                 <include name="res/**" />
diff --git a/src/main/java/forge/ComputerAIGeneral.java b/src/main/java/forge/ComputerAIGeneral.java
index b8011e5a4f3..8399301e5ee 100644
--- a/src/main/java/forge/ComputerAIGeneral.java
+++ b/src/main/java/forge/ComputerAIGeneral.java
@@ -416,7 +416,7 @@ public class ComputerAIGeneral implements Computer {
     public final void declareBlockers() {
         CardList blockers = AllZoneUtil.getCreaturesInPlay(AllZone.getComputerPlayer());
 
-        AllZone.setCombat(ComputerUtilBlock2.getBlockers(AllZone.getCombat(), blockers));
+        AllZone.setCombat(ComputerUtilBlock.getBlockers(AllZone.getCombat(), blockers));
 
         CombatUtil.showCombat();
 
diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/ComputerUtil.java
index 0766e87f9b5..794a57125b9 100644
--- a/src/main/java/forge/ComputerUtil.java
+++ b/src/main/java/forge/ComputerUtil.java
@@ -1402,7 +1402,7 @@ public class ComputerUtil {
      * @return a {@link forge.Combat} object.
      */
     public static Combat getAttackers() {
-        ComputerUtilAttack2 att = new ComputerUtilAttack2(AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield),
+        ComputerUtilAttack att = new ComputerUtilAttack(AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield),
                 AllZone.getHumanPlayer().getCardsIn(Zone.Battlefield), AllZone.getHumanPlayer().getLife());
 
         return att.getAttackers();
@@ -1418,7 +1418,7 @@ public class ComputerUtil {
     public static Combat getBlockers() {
         CardList blockers = AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield);
 
-        return ComputerUtilBlock2.getBlockers(AllZone.getCombat(), blockers);
+        return ComputerUtilBlock.getBlockers(AllZone.getCombat(), blockers);
     }
 
     /**
diff --git a/src/main/java/forge/ComputerUtilAttack2.java b/src/main/java/forge/ComputerUtilAttack.java
similarity index 99%
rename from src/main/java/forge/ComputerUtilAttack2.java
rename to src/main/java/forge/ComputerUtilAttack.java
index 50567d3410d..dc007dd1287 100644
--- a/src/main/java/forge/ComputerUtilAttack2.java
+++ b/src/main/java/forge/ComputerUtilAttack.java
@@ -17,7 +17,7 @@ import forge.card.trigger.Trigger;
  * @author Forge
  * @version $Id$
  */
-public class ComputerUtilAttack2 {
+public class ComputerUtilAttack {
 
     // possible attackers and blockers
     private CardList attackers;
@@ -46,7 +46,7 @@ public class ComputerUtilAttack2 {
      * @param blockerLife
      *            a int.
      */
-    public ComputerUtilAttack2(final Card[] possibleAttackers, final Card[] possibleBlockers, final int blockerLife) {
+    public ComputerUtilAttack(final Card[] possibleAttackers, final Card[] possibleBlockers, final int blockerLife) {
         this(new CardList(possibleAttackers), new CardList(possibleBlockers), blockerLife);
     }
 
@@ -62,7 +62,7 @@ public class ComputerUtilAttack2 {
      * @param blockerLife
      *            a int.
      */
-    public ComputerUtilAttack2(final CardList possibleAttackers,
+    public ComputerUtilAttack(final CardList possibleAttackers,
             final CardList possibleBlockers, final int blockerLife) {
         humanList = new CardList(possibleBlockers.toArray());
         humanList = humanList.getType("Creature");
diff --git a/src/main/java/forge/ComputerUtilBlock2.java b/src/main/java/forge/ComputerUtilBlock.java
similarity index 99%
rename from src/main/java/forge/ComputerUtilBlock2.java
rename to src/main/java/forge/ComputerUtilBlock.java
index a96737833a0..7e75f61e859 100644
--- a/src/main/java/forge/ComputerUtilBlock2.java
+++ b/src/main/java/forge/ComputerUtilBlock.java
@@ -12,7 +12,7 @@ import forge.card.cardFactory.CardFactoryUtil;
  * @author Forge
  * @version $Id$
  */
-public class ComputerUtilBlock2 {
+public class ComputerUtilBlock {
     /** Constant <code>attackers</code>. */
     private static CardList attackers = new CardList(); // all attackers
     /** Constant <code>attackersLeft</code>. */
@@ -147,7 +147,7 @@ public class ComputerUtilBlock2 {
      *            a int.
      */
     private static void setDiff(final int diff) {
-        ComputerUtilBlock2.diff = (diff);
+        ComputerUtilBlock.diff = (diff);
     }
 
     // finds the creatures able to block the attacker
diff --git a/src/main/java/forge/GuiDisplay4.java b/src/main/java/forge/GuiDisplay.java
similarity index 99%
rename from src/main/java/forge/GuiDisplay4.java
rename to src/main/java/forge/GuiDisplay.java
index 8f27115eb76..adece26b4d6 100644
--- a/src/main/java/forge/GuiDisplay4.java
+++ b/src/main/java/forge/GuiDisplay.java
@@ -102,7 +102,7 @@ import forge.properties.NewConstants;
  * @author Forge
  * @version $Id$
  */
-public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewConstants, NewConstants.Gui.GuiDisplay,
+public class GuiDisplay extends JFrame implements CardContainer, Display, NewConstants, NewConstants.Gui.GuiDisplay,
         NewConstants.Lang.GuiDisplay {
     /** Constant <code>serialVersionUID=4519302185194841060L</code>. */
     private static final long serialVersionUID = 4519302185194841060L;
@@ -137,7 +137,7 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
      * Constructor for GuiDisplay4.
      * </p>
      */
-    public GuiDisplay4() {
+    public GuiDisplay() {
         AllZone.setDisplay(this);
         setupActions();
         initComponents();
@@ -168,7 +168,7 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
         if (damage <= 0) {
             return;
         }
-        new GuiMultipleBlockers4(attacker, blockers, damage, this);
+        new GuiMultipleBlockers(attacker, blockers, damage, this);
     }
 
     /**
@@ -334,7 +334,7 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
             };
             // end DevMode SetLife
 
-            Object[] objDev = { GuiDisplay4.canLoseByDecking, viewAIHand, viewAILibrary, viewHumanLibrary,
+            Object[] objDev = { GuiDisplay.canLoseByDecking, viewAIHand, viewAILibrary, viewHumanLibrary,
                     generateMana, setupBattleField, tutor, addCounter, tapPerm, untapPerm, unlimitedLand, setLife };
             for (Object o : objDev) {
                 if (o instanceof ForgeAction) {
diff --git a/src/main/java/forge/GuiMultipleBlockers4.java b/src/main/java/forge/GuiMultipleBlockers.java
similarity index 97%
rename from src/main/java/forge/GuiMultipleBlockers4.java
rename to src/main/java/forge/GuiMultipleBlockers.java
index 27179bc412c..3d35916b67a 100644
--- a/src/main/java/forge/GuiMultipleBlockers4.java
+++ b/src/main/java/forge/GuiMultipleBlockers.java
@@ -26,7 +26,7 @@ import forge.gui.game.CardPanel;
  * very hacky.
  * 
  */
-class GuiMultipleBlockers4 extends JFrame {
+class GuiMultipleBlockers extends JFrame {
     /** Constant <code>serialVersionUID=7622818310877381045L</code>. */
     private static final long serialVersionUID = 7622818310877381045L;
 
@@ -57,7 +57,7 @@ class GuiMultipleBlockers4 extends JFrame {
      * @param display
      *            a {@link forge.CardContainer} object.
      */
-    GuiMultipleBlockers4(final Card attacker, final CardList creatureList,
+    GuiMultipleBlockers(final Card attacker, final CardList creatureList,
             final int damage, final CardContainer display) {
         this();
         assignDamage = damage;
@@ -90,7 +90,7 @@ class GuiMultipleBlockers4 extends JFrame {
      * Constructor for Gui_MultipleBlockers4.
      * </p>
      */
-    public GuiMultipleBlockers4() {
+    public GuiMultipleBlockers() {
         try {
             jbInit();
         } catch (Exception ex) {
diff --git a/src/main/java/forge/quest/gui/QuestMainPanel.java b/src/main/java/forge/quest/gui/QuestMainPanel.java
index 9f313be4b05..b1f31570ff1 100644
--- a/src/main/java/forge/quest/gui/QuestMainPanel.java
+++ b/src/main/java/forge/quest/gui/QuestMainPanel.java
@@ -29,7 +29,7 @@ import javax.swing.border.TitledBorder;
 import forge.AllZone;
 import forge.Command;
 import forge.Constant;
-import forge.GuiDisplay4;
+import forge.GuiDisplay;
 import forge.ImageCache;
 import forge.deck.Deck;
 import forge.gui.GuiUtils;
@@ -758,7 +758,7 @@ public class QuestMainPanel extends QuestAbstractPanel {
         // DO NOT CHANGE THIS ORDER, GuiDisplay needs to be created before cards
         // are added
         // if (newGUICheckbox.isSelected()) {
-        AllZone.setDisplay(new GuiDisplay4());
+        AllZone.setDisplay(new GuiDisplay());
         // } else {
         // AllZone.setDisplay(new GuiDisplay3());
         // }
diff --git a/src/main/java/forge/view/swing/Gui_HomeScreen.java b/src/main/java/forge/view/swing/Gui_HomeScreen.java
index ac6679bbbed..7d7e8451b2b 100644
--- a/src/main/java/forge/view/swing/Gui_HomeScreen.java
+++ b/src/main/java/forge/view/swing/Gui_HomeScreen.java
@@ -41,7 +41,7 @@ import forge.AllZone;
 import forge.Command;
 import forge.Constant;
 import forge.GuiImportPicture;
-import forge.GuiDisplay4;
+import forge.GuiDisplay;
 import forge.GuiDownloadPrices;
 import forge.GuiDownloadSetPicturesLQ;
 import forge.MyRandom;
@@ -1182,7 +1182,7 @@ public class Gui_HomeScreen {
                 return;
             }
 
-            AllZone.setDisplay(new GuiDisplay4());
+            AllZone.setDisplay(new GuiDisplay());
             AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]);
             AllZone.getDisplay().setVisible(true);
         }
diff --git a/src/main/java/forge/view/swing/OldGuiNewGame.java b/src/main/java/forge/view/swing/OldGuiNewGame.java
index 875a3d8ac74..db2ce238bfd 100644
--- a/src/main/java/forge/view/swing/OldGuiNewGame.java
+++ b/src/main/java/forge/view/swing/OldGuiNewGame.java
@@ -50,7 +50,7 @@ import forge.Constant;
 import forge.ConstantStringArrayList;
 import forge.FileUtil;
 import forge.GuiImportPicture;
-import forge.GuiDisplay4;
+import forge.GuiDisplay;
 import forge.GuiDownloadQuestImages;
 import forge.GuiDownloadPicturesLQ;
 import forge.GuiDownloadPrices;
@@ -849,7 +849,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
         // Constant.Runtime.DevMode[0] = devModeCheckBox.isSelected();
 
         // if (newGuiCheckBox.isSelected())
-        AllZone.setDisplay(new GuiDisplay4());
+        AllZone.setDisplay(new GuiDisplay());
         // else AllZone.setDisplay(new GuiDisplay3());
 
         Constant.Runtime.SMOOTH[0] = OldGuiNewGame.getSmoothLandCheckBox().isSelected();
diff --git a/src/test/java/forge/GuiMultipleBlockers4Test.java b/src/test/java/forge/GuiMultipleBlockers4Test.java
index 95f96c08e1f..57078dd5f5c 100644
--- a/src/test/java/forge/GuiMultipleBlockers4Test.java
+++ b/src/test/java/forge/GuiMultipleBlockers4Test.java
@@ -22,7 +22,7 @@ public class GuiMultipleBlockers4Test {
         list.add(AllZone.getCardFactory().getCard("Frostling", null));
 
         for (int i = 0; i < 2; i++) {
-            new GuiMultipleBlockers4(null, list, i + 1, null);
+            new GuiMultipleBlockers(null, list, i + 1, null);
         }
     }
 }