diff --git a/.gitattributes b/.gitattributes
index 9a23872ce40..0cc93ac71e4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6740,7 +6740,7 @@ src/forge/properties/Preferences.java svneol=native#text/plain
 src/forge/properties/SavePreferencesListener.java svneol=native#text/plain
 src/forge/quest/Gui_QuestOptions.java svneol=native#text/plain
 src/forge/quest/Gui_Quest_Assignments.java svneol=native#text/plain
-src/forge/quest/QuestMainFrame.java svneol=native#text/plain
+src/forge/quest/QuestFrame.java svneol=native#text/plain
 src/forge/quest/QuestMainPanel.java svneol=native#text/plain
 src/forge/quest/QuestOpponent.java svneol=native#text/plain
 src/forge/quest/bazaar/QuestAbstractBazaarItem.java svneol=native#text/plain
diff --git a/src/forge/Gui_QuestOptions.java b/src/forge/Gui_QuestOptions.java
index 02bb4c1b87e..08b29aa9bc6 100644
--- a/src/forge/Gui_QuestOptions.java
+++ b/src/forge/Gui_QuestOptions.java
@@ -1,6 +1,6 @@
 package forge;
 import forge.error.ErrorViewer;
-import forge.quest.QuestMainFrame;
+import forge.quest.QuestFrame;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -202,7 +202,7 @@ public class Gui_QuestOptions extends JFrame {
         
         if(useNewQuestUI.isSelected()){
             AllZone.QuestData.useNewQuestUI = true;
-            new QuestMainFrame();
+            new QuestFrame();
         }
         else
         {
@@ -253,7 +253,7 @@ public class Gui_QuestOptions extends JFrame {
         dispose();
         if(useNewQuestUI.isSelected()){
             AllZone.QuestData.useNewQuestUI = true;
-            new QuestMainFrame();
+            new QuestFrame();
         }
         else{
             AllZone.QuestData.useNewQuestUI = false;
diff --git a/src/forge/Gui_WinLose.java b/src/forge/Gui_WinLose.java
index 8edcca6aa77..a8a3dc1db2c 100644
--- a/src/forge/Gui_WinLose.java
+++ b/src/forge/Gui_WinLose.java
@@ -6,7 +6,7 @@ import forge.error.ErrorViewer;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.properties.NewConstants.LANG.Gui_WinLose.WINLOSE_TEXT;
-import forge.quest.QuestMainFrame;
+import forge.quest.QuestFrame;
 import net.miginfocom.swing.MigLayout;
 
 import javax.swing.*;
@@ -488,7 +488,7 @@ public class Gui_WinLose extends JFrame implements NewConstants {
             
             QuestData.saveData(quest);
             if (AllZone.QuestData.useNewQuestUI){
-                new QuestMainFrame();
+                new QuestFrame();
             }
             else{
                 new Gui_Quest();
diff --git a/src/forge/quest/Gui_QuestOptions.java b/src/forge/quest/Gui_QuestOptions.java
index ca0711f0f3e..dd9f14ef6ae 100644
--- a/src/forge/quest/Gui_QuestOptions.java
+++ b/src/forge/quest/Gui_QuestOptions.java
@@ -196,7 +196,7 @@ public class Gui_QuestOptions extends JFrame {
         AllZone.QuestData = QuestData.loadData();
         AllZone.QuestData.setDifficultyIndex();
         dispose();
-        new QuestMainFrame();
+        new QuestFrame();
     }
     
     void newQuestButton_actionPerformed(ActionEvent e) {
@@ -238,7 +238,7 @@ public class Gui_QuestOptions extends JFrame {
         AllZone.QuestData = questData;
         
         dispose();
-        new QuestMainFrame();
+        new QuestFrame();
     }
     
     //copy AI decks from old to newData
diff --git a/src/forge/quest/Gui_Quest_Assignments.java b/src/forge/quest/Gui_Quest_Assignments.java
index 70b22f42db6..d106f3c5663 100644
--- a/src/forge/quest/Gui_Quest_Assignments.java
+++ b/src/forge/quest/Gui_Quest_Assignments.java
@@ -270,7 +270,7 @@ public class Gui_Quest_Assignments extends JFrame implements NewConstants{
     
     void quitButton_actionPerformed() {
         dispose();
-        new QuestMainFrame();
+        new QuestFrame();
 
     }
 
diff --git a/src/forge/quest/QuestMainFrame.java b/src/forge/quest/QuestFrame.java
similarity index 94%
rename from src/forge/quest/QuestMainFrame.java
rename to src/forge/quest/QuestFrame.java
index de7562d9ef5..8a9ef5af241 100644
--- a/src/forge/quest/QuestMainFrame.java
+++ b/src/forge/quest/QuestFrame.java
@@ -12,7 +12,7 @@ import java.awt.CardLayout;
 import java.awt.Dimension;
 import java.awt.HeadlessException;
 
-public class QuestMainFrame extends JFrame {
+public class QuestFrame extends JFrame {
 	private static final long serialVersionUID = -2832625381531838412L;
 	
 	JPanel visiblePanel;
@@ -21,7 +21,7 @@ public class QuestMainFrame extends JFrame {
     public static final String MAIN_PANEL = "Main";
     public static final String BAZAAR_PANEL = "Bazaar";
 
-    public QuestMainFrame() throws HeadlessException {
+    public QuestFrame() throws HeadlessException {
         this.setTitle("Quest Mode");
 
         visiblePanel = new JPanel(new BorderLayout());
diff --git a/src/forge/quest/QuestMainPanel.java b/src/forge/quest/QuestMainPanel.java
index 1abd97a7a4e..ce22dc4da06 100644
--- a/src/forge/quest/QuestMainPanel.java
+++ b/src/forge/quest/QuestMainPanel.java
@@ -24,7 +24,7 @@ import java.util.List;
 public class QuestMainPanel extends JPanel {
     private QuestData questData;
 
-    private QuestMainFrame mainFrame;
+    private QuestFrame mainFrame;
 
     JLabel creditsLabel = new JLabel();
     JLabel lifeLabel = new JLabel();
@@ -47,7 +47,7 @@ public class QuestMainPanel extends JPanel {
 
     private static final String NO_DECKS_AVAILABLE = "No decks available";
 
-    public QuestMainPanel(QuestMainFrame mainFrame) {
+    public QuestMainPanel(QuestFrame mainFrame) {
         questData = AllZone.QuestData;
         this.mainFrame = mainFrame;
 
@@ -334,7 +334,7 @@ public class QuestMainPanel extends JPanel {
                 //saves all deck data
                 QuestData.saveData(AllZone.QuestData);
 
-                new QuestMainFrame();
+                new QuestFrame();
             }
         };
 
@@ -346,7 +346,7 @@ public class QuestMainPanel extends JPanel {
     }//deck editor button
 
     void showBazaar() {
-        mainFrame.showPane(QuestMainFrame.BAZAAR_PANEL);
+        mainFrame.showPane(QuestFrame.BAZAAR_PANEL);
     }
 
     void showCardShop() {
@@ -357,7 +357,7 @@ public class QuestMainPanel extends JPanel {
                 //saves all deck data
                 QuestData.saveData(AllZone.QuestData);
 
-                new QuestMainFrame();
+                new QuestFrame();
             }
         };
 
diff --git a/src/forge/quest/bazaar/QuestBazaarPanel.java b/src/forge/quest/bazaar/QuestBazaarPanel.java
index e5155f16ccb..d5211dd1398 100644
--- a/src/forge/quest/bazaar/QuestBazaarPanel.java
+++ b/src/forge/quest/bazaar/QuestBazaarPanel.java
@@ -1,6 +1,6 @@
 package forge.quest.bazaar;
 
-import forge.quest.QuestMainFrame;
+import forge.quest.QuestFrame;
 
 import javax.swing.*;
 import java.awt.BorderLayout;
@@ -16,7 +16,7 @@ import java.util.List;
 public class QuestBazaarPanel extends JPanel{
 	private static final long serialVersionUID = 1418913010051869222L;
 	
-	QuestMainFrame mainFrame;
+	QuestFrame mainFrame;
     static List<QuestAbstractBazaarStall> stallList = new ArrayList<QuestAbstractBazaarStall>();
 
     JPanel buttonPanel = new JPanel(new BorderLayout());
@@ -28,7 +28,7 @@ public class QuestBazaarPanel extends JPanel{
 
     CardLayout stallLayout = new CardLayout();
 
-    public QuestBazaarPanel(QuestMainFrame mainFrame) {
+    public QuestBazaarPanel(QuestFrame mainFrame) {
         this.mainFrame = mainFrame;
         this.setLayout(new BorderLayout());
 
@@ -99,7 +99,7 @@ public class QuestBazaarPanel extends JPanel{
         quitButton.setSize(max);
         quitButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                QuestBazaarPanel.this.mainFrame.showPane(QuestMainFrame.MAIN_PANEL);
+                QuestBazaarPanel.this.mainFrame.showPane(QuestFrame.MAIN_PANEL);
             }
         });