diff --git a/src/magic/ui/ScreenController.java b/src/magic/ui/ScreenController.java
index f91a7bcfbf..387934f5c9 100644
--- a/src/magic/ui/ScreenController.java
+++ b/src/magic/ui/ScreenController.java
@@ -22,7 +22,7 @@ import magic.ui.screen.MScreen;
 import magic.ui.screen.about.AboutScreen;
 import magic.ui.screen.card.explorer.ExplorerScreen;
 import magic.ui.screen.card.script.CardScriptScreen;
-import magic.ui.screen.deck.DeckViewScreen;
+import magic.ui.screen.deck.DeckScreen;
 import magic.ui.screen.deck.editor.DeckEditorScreen;
 import magic.ui.screen.deck.editor.DeckEditorSplitScreen;
 import magic.ui.screen.deck.editor.IDeckEditorClient;
@@ -250,7 +250,7 @@ public final class ScreenController {
     }
 
     public static void showDeckViewScreen(MagicDeck deck, MagicCardDefinition selectedCard) {
-        showScreen(() -> new DeckViewScreen(deck, selectedCard));
+        showScreen(() -> new DeckScreen(deck, selectedCard));
     }
 
     public static void showSampleHandScreen(final MagicDeck deck) {
diff --git a/src/magic/ui/screen/deck/DeckViewScreen.java b/src/magic/ui/screen/deck/DeckScreen.java
similarity index 89%
rename from src/magic/ui/screen/deck/DeckViewScreen.java
rename to src/magic/ui/screen/deck/DeckScreen.java
index 90fc3ff5d5..7ce05ea023 100644
--- a/src/magic/ui/screen/deck/DeckViewScreen.java
+++ b/src/magic/ui/screen/deck/DeckScreen.java
@@ -13,7 +13,7 @@ import magic.ui.screen.widget.MenuButton;
 import magic.ui.widget.deck.DeckStatusPanel;
 
 @SuppressWarnings("serial")
-public class DeckViewScreen extends HeaderFooterScreen
+public class DeckScreen extends HeaderFooterScreen
     implements IDeckConsumer {
 
     // translatable strings
@@ -25,12 +25,12 @@ public class DeckViewScreen extends HeaderFooterScreen
     private static final String _S7 = "Deck is empty! Nothing to show.";
     private static final String _S8 = "Deck";
 
-    private DeckViewPanel screenContent;
+    private DeckScreenPanel screenContent;
     private final DeckStatusPanel deckStatusPanel = new DeckStatusPanel();
 
-    public DeckViewScreen(final MagicDeck deck, final MagicCardDefinition selectedCard) {
+    public DeckScreen(final MagicDeck deck, final MagicCardDefinition selectedCard) {
         super(MText.get(_S8));
-        screenContent = new DeckViewPanel(deck, selectedCard);
+        screenContent = new DeckScreenPanel(deck, selectedCard);
         setMainContent(screenContent);
         setHeaderContent(deckStatusPanel);
         addToFooter(MenuButton.build(this::showSampleHand,
@@ -41,7 +41,7 @@ public class DeckViewScreen extends HeaderFooterScreen
         setDeck(deck);
     }
 
-    public DeckViewScreen(final MagicDeck deck) {
+    public DeckScreen(final MagicDeck deck) {
         this(deck, null);
     }
 
diff --git a/src/magic/ui/screen/deck/DeckViewPanel.java b/src/magic/ui/screen/deck/DeckScreenPanel.java
similarity index 93%
rename from src/magic/ui/screen/deck/DeckViewPanel.java
rename to src/magic/ui/screen/deck/DeckScreenPanel.java
index 3119fca3c9..9c4c1c8410 100644
--- a/src/magic/ui/screen/deck/DeckViewPanel.java
+++ b/src/magic/ui/screen/deck/DeckScreenPanel.java
@@ -10,14 +10,14 @@ import magic.ui.widget.cards.table.CardTablePanelA;
 import net.miginfocom.swing.MigLayout;
 
 @SuppressWarnings("serial")
-class DeckViewPanel extends JPanel {
+class DeckScreenPanel extends JPanel {
 
     private MagicDeck deck;
     private final MigLayout migLayout = new MigLayout();
     private final DeckSideBar sideBarPanel;
     private final CardTablePanelA deckTable;
 
-    DeckViewPanel(final MagicDeck aDeck, final MagicCardDefinition selectedCard) {
+    DeckScreenPanel(final MagicDeck aDeck, final MagicCardDefinition selectedCard) {
 
         this.deck = aDeck;
 
@@ -40,7 +40,7 @@ class DeckViewPanel extends JPanel {
 
     }
 
-    DeckViewPanel(final MagicDeck aDeck) {
+    DeckScreenPanel(final MagicDeck aDeck) {
         this(aDeck, null);
     }