diff --git a/src/main/java/forge/control/KeyboardShortcuts.java b/src/main/java/forge/control/KeyboardShortcuts.java
index 3402036cd8b..6c80aa68f0c 100644
--- a/src/main/java/forge/control/KeyboardShortcuts.java
+++ b/src/main/java/forge/control/KeyboardShortcuts.java
@@ -52,7 +52,7 @@ public class KeyboardShortcuts {
             @Override
             public void actionPerformed(final ActionEvent e) {
                 if (Singletons.getControl().getState() != 1) { return; }
-                SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
+                SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
             }
         };
 
@@ -61,7 +61,7 @@ public class KeyboardShortcuts {
             @Override
             public void actionPerformed(final ActionEvent e) {
                 if (Singletons.getControl().getState() != 1) { return; }
-                SDisplayUtil.showTab(EDocID.REPORT_COMBAT.getDoc());
+                SDisplayUtil.showTab(EDocID.MATCH_COMBAT.getDoc());
             }
         };
 
@@ -70,7 +70,7 @@ public class KeyboardShortcuts {
             @Override
             public void actionPerformed(final ActionEvent e) {
                 if (Singletons.getControl().getState() != 1) { return; }
-                SDisplayUtil.showTab(EDocID.REPORT_LOG.getDoc());
+                SDisplayUtil.showTab(EDocID.MATCH_LOG.getDoc());
             }
         };
 
@@ -79,7 +79,7 @@ public class KeyboardShortcuts {
             @Override
             public void actionPerformed(final ActionEvent e) {
                 if (Singletons.getControl().getState() != 1) { return; }
-                SDisplayUtil.showTab(EDocID.REPORT_PLAYERS.getDoc());
+                SDisplayUtil.showTab(EDocID.MATCH_PLAYERS.getDoc());
             }
         };
 
@@ -88,7 +88,7 @@ public class KeyboardShortcuts {
             @Override
             public void actionPerformed(final ActionEvent e) {
                 if (Singletons.getControl().getState() != 1) { return; }
-                SDisplayUtil.showTab(EDocID.DEV_MODE.getDoc());
+                SDisplayUtil.showTab(EDocID.MATCH_DEV_MODE.getDoc());
             }
         };
 
diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java
index c76443325b2..9dfc733065c 100644
--- a/src/main/java/forge/game/phase/CombatUtil.java
+++ b/src/main/java/forge/game/phase/CombatUtil.java
@@ -2401,7 +2401,7 @@ public class CombatUtil {
             } // loop through attackers
         }
 
-        SDisplayUtil.showTab(EDocID.REPORT_COMBAT.getDoc());
+        SDisplayUtil.showTab(EDocID.MATCH_COMBAT.getDoc());
         VCombat.SINGLETON_INSTANCE.updateCombat(display.toString().trim());
     } // showBlockers()
 
diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java
index 1954b03ad2e..e58ca36bbc2 100644
--- a/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/src/main/java/forge/game/phase/PhaseHandler.java
@@ -330,7 +330,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
 
         switch(phase) {
             case UNTAP:
-                //SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
+                //SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
                 PhaseUtil.handleUntap();
                 break;
 
@@ -415,12 +415,12 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
                 AllZone.getEndOfCombat().executeUntil();
                 AllZone.getEndOfCombat().executeAt();
                 CombatUtil.showCombat();
-                //SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
+                //SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
                 break;
 
             case MAIN2:
                 CombatUtil.showCombat();
-                //SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
+                //SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
                 break;
 
             case END_OF_TURN:
@@ -535,7 +535,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
         }
 
         if (this.getPhase() == PhaseType.COMBAT_END) {
-            //SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
+            //SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
             AllZone.getCombat().reset();
             this.resetAttackedThisCombat(this.getPlayerTurn());
             this.bCombat = false;
diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java
index 7aa3b41dd3f..66b5e3143cc 100644
--- a/src/main/java/forge/game/zone/MagicStack.java
+++ b/src/main/java/forge/game/zone/MagicStack.java
@@ -917,7 +917,7 @@ public class MagicStack extends MyObservable {
         final SpellAbilityStackInstance si = new SpellAbilityStackInstance(sp);
         this.getStack().push(si);
 
-        SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
+        SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
         this.updateObservers();
 
         if (sp.isSpell() && !sp.getSourceCard().isCopiedSpell()) {
diff --git a/src/main/java/forge/gui/framework/EDocID.java b/src/main/java/forge/gui/framework/EDocID.java
index 3491faca9b2..389663b7600 100644
--- a/src/main/java/forge/gui/framework/EDocID.java
+++ b/src/main/java/forge/gui/framework/EDocID.java
@@ -29,6 +29,9 @@ import forge.gui.match.views.VStack;
  * <br><br><i>(E at beginning of class name denotes an enum.)</i>
  */
 public enum EDocID { /** */
+    CARD_PICTURE (VPicture.SINGLETON_INSTANCE), /** */
+    CARD_DETAIL (VDetail.SINGLETON_INSTANCE), /** */
+
     EDITOR_FILTERS (VFilters.SINGLETON_INSTANCE), /** */
     EDITOR_PREFERENCES (VEditorPreferences.SINGLETON_INSTANCE), /** */
     EDITOR_ALLDECKS (VAllDecks.SINGLETON_INSTANCE), /** */
@@ -38,26 +41,22 @@ public enum EDocID { /** */
     EDITOR_CURRENTDECK (VCurrentDeck.SINGLETON_INSTANCE), /** */
     EDITOR_DECKGEN (VDeckgen.SINGLETON_INSTANCE), /** */
 
-    CARD_PICTURE (VPicture.SINGLETON_INSTANCE), /** */
-    CARD_DETAIL (VDetail.SINGLETON_INSTANCE), /** */
-    CARD_ANTES (VAntes.SINGLETON_INSTANCE), /** */
-
-    REPORT_MESSAGE (VMessage.SINGLETON_INSTANCE), /** */
-    REPORT_STACK (VStack.SINGLETON_INSTANCE), /** */
-    REPORT_COMBAT (VCombat.SINGLETON_INSTANCE), /** */
-    REPORT_LOG (VLog.SINGLETON_INSTANCE), /** */
-    REPORT_PLAYERS (VPlayers.SINGLETON_INSTANCE), /** */
-
-    DEV_MODE (VDev.SINGLETON_INSTANCE), /** */
-    BUTTON_DOCK (VDock.SINGLETON_INSTANCE), /** */
+    MATCH_ANTES (VAntes.SINGLETON_INSTANCE), /** */
+    MATCH_MESSAGE (VMessage.SINGLETON_INSTANCE), /** */
+    MATCH_STACK (VStack.SINGLETON_INSTANCE), /** */
+    MATCH_COMBAT (VCombat.SINGLETON_INSTANCE), /** */
+    MATCH_LOG (VLog.SINGLETON_INSTANCE), /** */
+    MATCH_PLAYERS (VPlayers.SINGLETON_INSTANCE), /** */
+    MATCH_DEV_MODE (VDev.SINGLETON_INSTANCE), /** */
+    MATCH_DOCK (VDock.SINGLETON_INSTANCE), /** */
 
     // Non-user battlefields (AI or teammate), use setDoc to register.
-    FIELD_0 (null), /** */
-    FIELD_1 (null), /** */
+    MATCH_FIELD_0 (null), /** */
+    MATCH_FIELD_1 (null), /** */
 
     // Non-user hands (AI or teammate), use setDoc to register.
-    HAND_0 (null), /** */
-    HAND_1 (null);
+    MATCH_HAND_0 (null), /** */
+    MATCH_HAND_1 (null);
 
     // End enum declarations, start enum methods.
     private IVDoc vDoc;
diff --git a/src/main/java/forge/gui/match/CMatchUI.java b/src/main/java/forge/gui/match/CMatchUI.java
index 2063701dfe2..581f4a5f249 100644
--- a/src/main/java/forge/gui/match/CMatchUI.java
+++ b/src/main/java/forge/gui/match/CMatchUI.java
@@ -67,7 +67,7 @@ public enum CMatchUI implements CardContainer {
      * 
      */
     public void initMatch(final String strAvatarIcon) {
-        SDisplayUtil.showTab(EDocID.REPORT_LOG.getDoc());
+        SDisplayUtil.showTab(EDocID.MATCH_LOG.getDoc());
 
         // Update avatars
         final String[] indices = Singletons.getModel().getPreferences().getPref(FPref.UI_AVATARS).split(",");
diff --git a/src/main/java/forge/gui/match/VMatchUI.java b/src/main/java/forge/gui/match/VMatchUI.java
index 91d580a5d35..7a00a499ed6 100644
--- a/src/main/java/forge/gui/match/VMatchUI.java
+++ b/src/main/java/forge/gui/match/VMatchUI.java
@@ -26,11 +26,11 @@ public enum VMatchUI implements IVTopLevelUI {
     SINGLETON_INSTANCE;
 
     // Instantiate non-singleton tab instances
-    private final IVDoc field0 = new VField(EDocID.FIELD_0, AllZone.getComputerPlayer());
-    private final IVDoc field1 = new VField(EDocID.FIELD_1, AllZone.getHumanPlayer());
+    private final IVDoc field0 = new VField(EDocID.MATCH_FIELD_0, AllZone.getComputerPlayer());
+    private final IVDoc field1 = new VField(EDocID.MATCH_FIELD_1, AllZone.getHumanPlayer());
 
-    private final IVDoc hand0 = new VHand(EDocID.HAND_0, AllZone.getComputerPlayer());
-    private final IVDoc hand1 = new VHand(EDocID.HAND_1, AllZone.getHumanPlayer());
+    private final IVDoc hand0 = new VHand(EDocID.MATCH_HAND_0, AllZone.getComputerPlayer());
+    private final IVDoc hand1 = new VHand(EDocID.MATCH_HAND_1, AllZone.getHumanPlayer());
 
 
     // Other instantiations
diff --git a/src/main/java/forge/gui/match/views/VAntes.java b/src/main/java/forge/gui/match/views/VAntes.java
index baaa6437846..b2216cbcc3b 100644
--- a/src/main/java/forge/gui/match/views/VAntes.java
+++ b/src/main/java/forge/gui/match/views/VAntes.java
@@ -106,7 +106,7 @@ public enum VAntes implements IVDoc {
      */
     @Override
     public EDocID getDocumentID() {
-        return EDocID.CARD_ANTES;
+        return EDocID.MATCH_ANTES;
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/gui/match/views/VCombat.java b/src/main/java/forge/gui/match/views/VCombat.java
index a0aaacf44ea..f19e024e8b8 100644
--- a/src/main/java/forge/gui/match/views/VCombat.java
+++ b/src/main/java/forge/gui/match/views/VCombat.java
@@ -75,7 +75,7 @@ public enum VCombat implements IVDoc {
      */
     @Override
     public EDocID getDocumentID() {
-        return EDocID.REPORT_COMBAT;
+        return EDocID.MATCH_COMBAT;
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/gui/match/views/VDev.java b/src/main/java/forge/gui/match/views/VDev.java
index 966ed9d93c5..251f2b2d5f1 100644
--- a/src/main/java/forge/gui/match/views/VDev.java
+++ b/src/main/java/forge/gui/match/views/VDev.java
@@ -139,7 +139,7 @@ public enum VDev implements IVDoc {
      */
     @Override
     public EDocID getDocumentID() {
-        return EDocID.DEV_MODE;
+        return EDocID.MATCH_DEV_MODE;
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/gui/match/views/VDock.java b/src/main/java/forge/gui/match/views/VDock.java
index a69f21c7ecf..52462279c2a 100644
--- a/src/main/java/forge/gui/match/views/VDock.java
+++ b/src/main/java/forge/gui/match/views/VDock.java
@@ -108,7 +108,7 @@ public enum VDock implements IVDoc {
      */
     @Override
     public EDocID getDocumentID() {
-        return EDocID.BUTTON_DOCK;
+        return EDocID.MATCH_DOCK;
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/gui/match/views/VLog.java b/src/main/java/forge/gui/match/views/VLog.java
index f9e69a653b6..1d7b3fc483c 100644
--- a/src/main/java/forge/gui/match/views/VLog.java
+++ b/src/main/java/forge/gui/match/views/VLog.java
@@ -74,7 +74,7 @@ public enum VLog implements IVDoc {
      */
     @Override
     public EDocID getDocumentID() {
-        return EDocID.REPORT_LOG;
+        return EDocID.MATCH_LOG;
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/gui/match/views/VMessage.java b/src/main/java/forge/gui/match/views/VMessage.java
index 326e1b586c6..e79db5511fd 100644
--- a/src/main/java/forge/gui/match/views/VMessage.java
+++ b/src/main/java/forge/gui/match/views/VMessage.java
@@ -105,7 +105,7 @@ public enum VMessage implements IVDoc {
      */
     @Override
     public EDocID getDocumentID() {
-        return EDocID.REPORT_MESSAGE;
+        return EDocID.MATCH_MESSAGE;
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/gui/match/views/VPlayers.java b/src/main/java/forge/gui/match/views/VPlayers.java
index 970708a3f6f..a67c428aa6a 100644
--- a/src/main/java/forge/gui/match/views/VPlayers.java
+++ b/src/main/java/forge/gui/match/views/VPlayers.java
@@ -123,7 +123,7 @@ public enum VPlayers implements IVDoc {
      */
     @Override
     public EDocID getDocumentID() {
-        return EDocID.REPORT_PLAYERS;
+        return EDocID.MATCH_PLAYERS;
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/gui/match/views/VStack.java b/src/main/java/forge/gui/match/views/VStack.java
index d8fab898e54..3fe6022b62d 100644
--- a/src/main/java/forge/gui/match/views/VStack.java
+++ b/src/main/java/forge/gui/match/views/VStack.java
@@ -95,7 +95,7 @@ public enum VStack implements IVDoc {
      */
     @Override
     public EDocID getDocumentID() {
-        return EDocID.REPORT_STACK;
+        return EDocID.MATCH_STACK;
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/properties/NewConstants.java b/src/main/java/forge/properties/NewConstants.java
index b0f09dfa2b4..be45269be80 100644
--- a/src/main/java/forge/properties/NewConstants.java
+++ b/src/main/java/forge/properties/NewConstants.java
@@ -799,7 +799,7 @@ public final class NewConstants {
                 /** The AI_LAND. */
                 public static final String AI_LAND = "%s/NewGame/ailand";
 
-                /** The DEV_MODE. */
+                /** The MATCH_DEV_MODE. */
                 public static final String DEV_MODE = "%s/NewGame/devmode";
 
                 /** The QUEST_MODE. */