diff --git a/.gitattributes b/.gitattributes
index 512ec24fb00..eb653e03089 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14133,7 +14133,7 @@ src/main/java/forge/control/input/InputBlock.java svneol=native#text/plain
 src/main/java/forge/control/input/InputCleanup.java svneol=native#text/plain
 src/main/java/forge/control/input/InputLockUI.java -text
 src/main/java/forge/control/input/InputMulligan.java svneol=native#text/plain
-src/main/java/forge/control/input/InputPartialParisMulligan.java -text
+src/main/java/forge/control/input/InputMulliganPartialParis.java -text
 src/main/java/forge/control/input/InputPassPriority.java svneol=native#text/plain
 src/main/java/forge/control/input/InputPayManaBase.java -text
 src/main/java/forge/control/input/InputPayManaExecuteCommands.java svneol=native#text/plain
diff --git a/src/main/java/forge/control/input/InputPartialParisMulligan.java b/src/main/java/forge/control/input/InputMulliganPartialParis.java
similarity index 95%
rename from src/main/java/forge/control/input/InputPartialParisMulligan.java
rename to src/main/java/forge/control/input/InputMulliganPartialParis.java
index bbb67843f2d..36fc4ef46ee 100644
--- a/src/main/java/forge/control/input/InputPartialParisMulligan.java
+++ b/src/main/java/forge/control/input/InputMulliganPartialParis.java
@@ -43,7 +43,7 @@ import forge.view.ButtonUtil;
   * @author Forge
   * @version $Id: InputMulligan.java 20698 2013-04-01 09:56:12Z Max mtg $
   */
-public class InputPartialParisMulligan extends InputBase {
+public class InputMulliganPartialParis extends InputBase {
     /** Constant <code>serialVersionUID=-8112954303001155622L</code>. */
     private static final long serialVersionUID = -8112954303001155622L;
     
@@ -53,7 +53,7 @@ public class InputPartialParisMulligan extends InputBase {
     private final List<Card> lastExiled = new ArrayList<Card>();
     private final List<Card> allExiled = new ArrayList<Card>();
     
-    public InputPartialParisMulligan(MatchController match0, Player humanPlayer) {
+    public InputMulliganPartialParis(MatchController match0, Player humanPlayer) {
         super(humanPlayer);
         match = match0;
         game = match.getCurrentGame();
diff --git a/src/main/java/forge/control/input/InputQueue.java b/src/main/java/forge/control/input/InputQueue.java
index 424549cfa47..1a079c1a8e2 100644
--- a/src/main/java/forge/control/input/InputQueue.java
+++ b/src/main/java/forge/control/input/InputQueue.java
@@ -127,7 +127,7 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
         GameAge age = game.getAge();
         if ( age == GameAge.Mulligan ) {
             Player human = Singletons.getControl().getPlayer();
-            return game.getType() == GameType.Commander ? new InputPartialParisMulligan(match, human) : new InputMulligan(match, human);
+            return game.getType() == GameType.Commander ? new InputMulliganPartialParis(match, human) : new InputMulligan(match, human);
         }
 
         if ( age != GameAge.Play )