diff --git a/src/magic/data/CardDefinitions.java b/src/magic/data/CardDefinitions.java
index 1709bc9a2a..f1392d25c3 100644
--- a/src/magic/data/CardDefinitions.java
+++ b/src/magic/data/CardDefinitions.java
@@ -30,7 +30,6 @@ import magic.utility.MagicSystem;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicChangeCardDefinition;
 import magic.model.MagicColor;
-import magic.model.MagicCubeDefinition;
 import magic.model.event.MagicHandCastActivation;
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;
@@ -216,7 +215,7 @@ public class CardDefinitions {
         reporter.setMessage("Loading cards...100%");
         
         // update card lists
-        final MagicCubeDefinition cube = CubeDefinitions.DEFAULT_CUBE;
+        final MagicCustomFormat cube = CustomFormats.DEFAULT_CUBE;
         for (final MagicCardDefinition cardDefinition : allPlayableCardDefs.values()) {
             if (cardDefinition.isToken() == false && cardDefinition.isHidden() == false) {
                 defaultPlayableCardDefs.add(cardDefinition);
diff --git a/src/magic/data/CubeDefinitions.java b/src/magic/data/CustomFormats.java
similarity index 77%
rename from src/magic/data/CubeDefinitions.java
rename to src/magic/data/CustomFormats.java
index c279122d00..0e79b756dc 100644
--- a/src/magic/data/CubeDefinitions.java
+++ b/src/magic/data/CustomFormats.java
@@ -10,11 +10,10 @@ import java.util.Collections;
 import java.util.List;
 import magic.utility.MagicSystem;
 import magic.model.MagicCardDefinition;
-import magic.model.MagicCubeDefinition;
 import magic.utility.MagicFileSystem;
 import magic.utility.MagicFileSystem.DataPath;
 
-public class CubeDefinitions {
+public class CustomFormats {
 
     private static final String CUBE_FILE_EXTENSION = "_cube.txt";
     private static final FileFilter CUBE_FILE_FILTER = new FileFilter() {
@@ -24,22 +23,22 @@ public class CubeDefinitions {
         }
     };
 
-    public static final MagicCubeDefinition DEFAULT_CUBE = new MagicCubeDefinition("all");
+    public static final MagicCustomFormat DEFAULT_CUBE = new MagicCustomFormat("all");
 
-    private static final List<MagicCubeDefinition> cubeDefinitions = new ArrayList<>();
-    private static MagicCubeDefinition currentCube;
+    private static final List<MagicCustomFormat> cubeDefinitions = new ArrayList<>();
+    private static MagicCustomFormat currentCube;
     static {
         cubeDefinitions.add(DEFAULT_CUBE);
         currentCube = DEFAULT_CUBE;
     }
 
-    public static MagicCubeDefinition[] getCubesArray() {
-        return cubeDefinitions.toArray(new MagicCubeDefinition[cubeDefinitions.size()]);
+    public static MagicCustomFormat[] getCubesArray() {
+        return cubeDefinitions.toArray(new MagicCustomFormat[cubeDefinitions.size()]);
     }
 
     public static String[] getFilterValues() {
         final List<String> values = new ArrayList<>();
-        for (MagicCubeDefinition cube : cubeDefinitions) {
+        for (MagicCustomFormat cube : cubeDefinitions) {
             if (cube != DEFAULT_CUBE) {
                 values.add(cube.getLabel());
             }
@@ -57,7 +56,7 @@ public class CubeDefinitions {
             ex.printStackTrace();
             return;
         }
-        final MagicCubeDefinition cubeDefinition = new MagicCubeDefinition(name);
+        final MagicCustomFormat cubeDefinition = new MagicCustomFormat(name);
         for (final String line: content) {
             final String cardName = line.trim();
             if (!cardName.isEmpty()) {
@@ -79,18 +78,18 @@ public class CubeDefinitions {
 
         if (MagicSystem.showStartupStats()) {
             System.err.println(cubeDefinitions.size()+" cube definitions");
-            for (final MagicCubeDefinition cubeDefinition : cubeDefinitions) {
+            for (final MagicCustomFormat cubeDefinition : cubeDefinitions) {
                 System.err.println("Cube " + cubeDefinition);
             }
         }
     }
 
     public static boolean isCardInCube(final MagicCardDefinition card, final String cubeName) {
-        final MagicCubeDefinition cube = getCube(cubeName);
+        final MagicCustomFormat cube = getCube(cubeName);
         return cube.isCardLegal(card);
     }
 
-    public static MagicCubeDefinition getCube(final String cubeLabel) {
+    public static MagicCustomFormat getCube(final String cubeLabel) {
 
         // prior to 1.62 the cube label including card count was saved to the duel
         // config file so for backwards compatibility during import need to check
@@ -98,7 +97,7 @@ public class CubeDefinitions {
         final String cubeName = getCubeNameWithoutSize(cubeLabel);
         
         if (!currentCube.getName().equals(cubeName)) {
-            for (MagicCubeDefinition cube : cubeDefinitions) {
+            for (MagicCustomFormat cube : cubeDefinitions) {
                 if (cube.getName().equals(cubeName)) {
                     currentCube = cube;
                     break;
@@ -109,8 +108,8 @@ public class CubeDefinitions {
         
     }
 
-    public static MagicCubeDefinition createCube(Collection<MagicCardDefinition> cardPool) {
-        final MagicCubeDefinition cubeDefinition = new MagicCubeDefinition("random");
+    public static MagicCustomFormat createCube(Collection<MagicCardDefinition> cardPool) {
+        final MagicCustomFormat cubeDefinition = new MagicCustomFormat("random");
         for (MagicCardDefinition card : cardPool) {
             cubeDefinition.add(card.getName());
         }
diff --git a/src/magic/data/DeckGenerator.java b/src/magic/data/DeckGenerator.java
index df5a315f31..0f4079b03b 100644
--- a/src/magic/data/DeckGenerator.java
+++ b/src/magic/data/DeckGenerator.java
@@ -4,7 +4,6 @@ import java.util.Collection;
 import magic.generator.RandomDeckGenerator;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicColor;
-import magic.model.MagicCubeDefinition;
 import magic.model.MagicDeck;
 import magic.model.MagicDeckProfile;
 
@@ -48,7 +47,7 @@ public class DeckGenerator {
     }
 
     public MagicDeck getRandomDeck(final Collection<MagicCardDefinition> cardPool) {
-        final MagicCubeDefinition cubeDefinition = CubeDefinitions.createCube(cardPool);
+        final MagicCustomFormat cubeDefinition = CustomFormats.createCube(cardPool);
         final RandomDeckGenerator generator = new RandomDeckGenerator(cubeDefinition);
         deck = new MagicDeck();
         deckProfile = MagicDeckProfile.getDeckProfile(getColorText());
diff --git a/src/magic/data/DeckGenerators.java b/src/magic/data/DeckGenerators.java
index ab7654e46f..1e27bc93a8 100644
--- a/src/magic/data/DeckGenerators.java
+++ b/src/magic/data/DeckGenerators.java
@@ -3,7 +3,6 @@ package magic.data;
 import magic.utility.DeckUtils;
 import magic.utility.FileIO;
 import magic.generator.RandomDeckGenerator;
-import magic.model.MagicCubeDefinition;
 
 import magic.model.DuelPlayerConfig;
 import java.io.IOException;
@@ -117,7 +116,7 @@ public class DeckGenerators {
     private static void setRandomColorDeck(final DuelPlayerConfig player) {
         final MagicDeckProfile deckProfile = player.getDeckProfile();
         final MagicDeck deck = player.getDeck();
-        final MagicCubeDefinition cubeDefinition = DuelConfig.getInstance().getCube();
+        final MagicCustomFormat cubeDefinition = DuelConfig.getInstance().getCube();
         final RandomDeckGenerator defaultGenerator = new RandomDeckGenerator(cubeDefinition);
         final RandomDeckGenerator customGenerator = DeckGenerators.getDeckGenerator(deckProfile);
         if (customGenerator == null) {
diff --git a/src/magic/data/DuelConfig.java b/src/magic/data/DuelConfig.java
index d1e97a6f8f..7a7e1543c8 100644
--- a/src/magic/data/DuelConfig.java
+++ b/src/magic/data/DuelConfig.java
@@ -6,7 +6,6 @@ import java.util.Properties;
 import magic.model.MagicDeckProfile;
 import magic.model.MagicDuel;
 import magic.model.DuelPlayerConfig;
-import magic.model.MagicCubeDefinition;
 import magic.model.player.PlayerProfile;
 import magic.model.player.PlayerProfiles;
 
@@ -28,7 +27,7 @@ public class DuelConfig {
     private int startLife = 20;
     private int handSize = 7;
     private int games = 7;
-    private MagicCubeDefinition cube = CubeDefinitions.DEFAULT_CUBE;
+    private MagicCustomFormat cube = CustomFormats.DEFAULT_CUBE;
     private DuelPlayerConfig[] players = new DuelPlayerConfig[MAX_PLAYERS];
 
     // CTR
@@ -69,10 +68,10 @@ public class DuelConfig {
         return games;
     }
 
-    public MagicCubeDefinition getCube() {
+    public MagicCustomFormat getCube() {
         return cube;
     }
-    public void setCube(final MagicCubeDefinition aCube) {
+    public void setCube(final MagicCustomFormat aCube) {
         this.cube = aCube;
     }
 
@@ -95,7 +94,7 @@ public class DuelConfig {
         startLife = Integer.parseInt(properties.getProperty(START_LIFE, Integer.toString(startLife)));
         handSize = Integer.parseInt(properties.getProperty(HAND_SIZE, Integer.toString(handSize)));
         games = Integer.parseInt(properties.getProperty(GAMES, Integer.toString(games)));
-        cube = CubeDefinitions.getCube(properties.getProperty(CUBE, cube.getName()));
+        cube = CustomFormats.getCube(properties.getProperty(CUBE, cube.getName()));
         loadPlayerConfigs(properties, loadPlayerDecks);
     }
 
diff --git a/src/magic/model/MagicCubeDefinition.java b/src/magic/data/MagicCustomFormat.java
similarity index 71%
rename from src/magic/model/MagicCubeDefinition.java
rename to src/magic/data/MagicCustomFormat.java
index bd3e82e5e6..ea2c958453 100644
--- a/src/magic/model/MagicCubeDefinition.java
+++ b/src/magic/data/MagicCustomFormat.java
@@ -1,17 +1,16 @@
-package magic.model;
+package magic.data;
 
 import java.util.Set;
 import java.util.HashSet;
 
-import magic.data.MagicFormat;
-import magic.data.CardLegality;
+import magic.model.MagicCardDefinition;
 
-public class MagicCubeDefinition extends MagicFormat {
+public class MagicCustomFormat extends MagicFormat {
 
     private final Set<String> legal = new HashSet<>();
     private final String name;
 
-    public MagicCubeDefinition(final String name) {
+    public MagicCustomFormat(final String name) {
         this.name=name;
     }
 
@@ -20,7 +19,7 @@ public class MagicCubeDefinition extends MagicFormat {
     }
 
     @Override
-    public CardLegality getCardLegality(MagicCardDefinition card, int cardCount) {
+    public CardLegality getCardLegality(final MagicCardDefinition card, final int cardCount) {
         return (legal.contains(card.getName())) ? CardLegality.Legal : CardLegality.Illegal;
     }
 
diff --git a/src/magic/generator/RandomDeckGenerator.java b/src/magic/generator/RandomDeckGenerator.java
index dabdcfbe3e..1a0bfd85fd 100644
--- a/src/magic/generator/RandomDeckGenerator.java
+++ b/src/magic/generator/RandomDeckGenerator.java
@@ -1,16 +1,16 @@
 package magic.generator;
 
 import magic.data.CardDefinitions;
+import magic.data.MagicCustomFormat;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicCondensedDeck;
-import magic.model.MagicCubeDefinition;
 import magic.model.MagicDeck;
 import magic.model.MagicDeckProfile;
 import magic.model.MagicRandom;
 
 import java.util.ArrayList;
 import java.util.List;
-import magic.data.CubeDefinitions;
+import magic.data.CustomFormats;
 import magic.data.DeckGenerator;
 
 public class RandomDeckGenerator {
@@ -18,17 +18,17 @@ public class RandomDeckGenerator {
     private final List<MagicCardDefinition> spellCards = new ArrayList<>();
     private final List<MagicCardDefinition> landCards = new ArrayList<>();
 
-    private MagicCubeDefinition cubeDefinition;
+    private MagicCustomFormat cubeDefinition;
 
-    public RandomDeckGenerator(final MagicCubeDefinition cubeDefinition) {
+    public RandomDeckGenerator(final MagicCustomFormat cubeDefinition) {
         this.cubeDefinition = cubeDefinition;
     }
 
     public RandomDeckGenerator() {
-        this(CubeDefinitions.DEFAULT_CUBE);
+        this(CustomFormats.DEFAULT_CUBE);
     }
 
-    public void setCubeDefinition(final MagicCubeDefinition cube) {
+    public void setCubeDefinition(final MagicCustomFormat cube) {
         cubeDefinition = cube;
     }
 
diff --git a/src/magic/ui/CardFilterPanel.java b/src/magic/ui/CardFilterPanel.java
index 9d06aa2c6d..96b9e7abbd 100644
--- a/src/magic/ui/CardFilterPanel.java
+++ b/src/magic/ui/CardFilterPanel.java
@@ -18,7 +18,7 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import magic.data.CardDefinitions;
-import magic.data.CubeDefinitions;
+import magic.data.CustomFormats;
 import magic.data.MagicPredefinedFormat;
 import magic.data.MagicSetDefinitions;
 import magic.data.MagicSets;
@@ -169,7 +169,7 @@ public class CardFilterPanel extends TexturedPanel implements ActionListener {
 
     private void addCubeFilter() {
         cubePopup = addFilterPopupPanel("Cube");
-        final String[] filterValues = CubeDefinitions.getFilterValues();
+        final String[] filterValues = CustomFormats.getFilterValues();
         cubeCheckBoxes = new JCheckBox[filterValues.length];
         cubeFilterChoices = new JRadioButton[FILTER_CHOICES.length];
         populateCheckboxPopup(cubePopup, filterValues, cubeCheckBoxes, cubeFilterChoices, false);
@@ -302,7 +302,7 @@ public class CardFilterPanel extends TexturedPanel implements ActionListener {
                 @Override
                 public boolean checkCard(final MagicCardDefinition card, final int i) {
                     final String cubeName = cubeCheckBoxes[i].getText();
-                    return CubeDefinitions.isCardInCube(card, cubeName);
+                    return CustomFormats.isCardInCube(card, cubeName);
                 }
             })) {
             return false;
diff --git a/src/magic/ui/dialog/DuelPropertiesDialog.java b/src/magic/ui/dialog/DuelPropertiesDialog.java
index 0482fbd333..3631cf2a87 100644
--- a/src/magic/ui/dialog/DuelPropertiesDialog.java
+++ b/src/magic/ui/dialog/DuelPropertiesDialog.java
@@ -1,7 +1,8 @@
 package magic.ui.dialog;
 
 import magic.utility.MagicSystem;
-import magic.data.CubeDefinitions;
+import magic.data.CustomFormats;
+import magic.data.MagicCustomFormat;
 import magic.ui.MagicFrame;
 import magic.ui.widget.SliderPanel;
 import net.miginfocom.swing.MigLayout;
@@ -16,9 +17,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRootPane;
 import javax.swing.KeyStroke;
-
 import java.awt.event.ActionEvent;
-import magic.model.MagicCubeDefinition;
 
 @SuppressWarnings("serial")
 public class DuelPropertiesDialog extends JDialog {
@@ -26,7 +25,7 @@ public class DuelPropertiesDialog extends JDialog {
     private final SliderPanel handSizeSliderPanel;
     private final SliderPanel lifeSliderPanel;
     private final SliderPanel winsSliderPanel;
-    private final JComboBox<MagicCubeDefinition> cubeComboBox;
+    private final JComboBox<MagicCustomFormat> cubeComboBox;
     private boolean isCancelled = false;
 
     // CTR : edit an existing profile.
@@ -35,7 +34,7 @@ public class DuelPropertiesDialog extends JDialog {
         final int handSize,
         final int initialLife,
         final int maxGames,
-        final MagicCubeDefinition cube
+        final MagicCustomFormat cube
     ) {
 
         super(frame, true);
@@ -49,7 +48,7 @@ public class DuelPropertiesDialog extends JDialog {
         handSizeSliderPanel = new SliderPanel("Hand size:", null, 6, 8, 1, handSize);
         winsSliderPanel = new SliderPanel("Max. games:", null, 1, 11, 2, maxGames);
 
-        cubeComboBox = new JComboBox<>(CubeDefinitions.getCubesArray());
+        cubeComboBox = new JComboBox<>(CustomFormats.getCubesArray());
         cubeComboBox.setLightWeightPopupEnabled(false);
         cubeComboBox.setFocusable(false);
         cubeComboBox.setSelectedItem(cube);
@@ -130,7 +129,7 @@ public class DuelPropertiesDialog extends JDialog {
         return winsSliderPanel.getValue();
     }
 
-    public MagicCubeDefinition getCube() {
+    public MagicCustomFormat getCube() {
         return cubeComboBox.getItemAt(cubeComboBox.getSelectedIndex());
     }
 
diff --git a/src/magic/ui/screen/NewDuelSettingsScreen.java b/src/magic/ui/screen/NewDuelSettingsScreen.java
index 105f03adbe..94941ada20 100644
--- a/src/magic/ui/screen/NewDuelSettingsScreen.java
+++ b/src/magic/ui/screen/NewDuelSettingsScreen.java
@@ -10,8 +10,8 @@ import javax.swing.JPanel;
 import magic.data.DeckType;
 import magic.utility.DeckUtils;
 import magic.data.DuelConfig;
+import magic.data.MagicCustomFormat;
 import magic.exception.InvalidDeckException;
-import magic.model.MagicCubeDefinition;
 import magic.model.MagicDeck;
 import magic.model.player.IPlayerProfileListener;
 import magic.model.player.PlayerProfile;
@@ -203,7 +203,7 @@ public class NewDuelSettingsScreen
             }
         }
 
-        public MagicCubeDefinition getCube() {
+        public MagicCustomFormat getCube() {
             return duelSettingsPanel.getCube();
         }
 
diff --git a/src/magic/ui/screen/widget/DuelSettingsPanel.java b/src/magic/ui/screen/widget/DuelSettingsPanel.java
index 25ae762c3b..9bb6ab201e 100644
--- a/src/magic/ui/screen/widget/DuelSettingsPanel.java
+++ b/src/magic/ui/screen/widget/DuelSettingsPanel.java
@@ -7,10 +7,10 @@ import java.awt.event.MouseEvent;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
-import magic.data.CubeDefinitions;
+import magic.data.CustomFormats;
 import magic.data.DuelConfig;
 import magic.data.MagicIcon;
-import magic.model.MagicCubeDefinition;
+import magic.data.MagicCustomFormat;
 import magic.ui.utility.GraphicsUtils;
 import magic.ui.IconImages;
 import magic.ui.MagicFrame;
@@ -30,7 +30,7 @@ public class DuelSettingsPanel extends TexturedPanel implements IThemeStyle {
     private int startLife;
     private int handSize;
     private int maxGames = 7;
-    private MagicCubeDefinition cube = CubeDefinitions.DEFAULT_CUBE;
+    private MagicCustomFormat cube = CustomFormats.DEFAULT_CUBE;
     private final MouseAdapter mouseAdapter = getMouseAdapter();
 
     public DuelSettingsPanel(final MagicFrame frame, final DuelConfig config) {
@@ -137,7 +137,7 @@ public class DuelSettingsPanel extends TexturedPanel implements IThemeStyle {
         config.setCube(cube);
     }
 
-    public MagicCubeDefinition getCube() {
+    public MagicCustomFormat getCube() {
         return cube;
     }
 
diff --git a/src/magic/utility/MagicSystem.java b/src/magic/utility/MagicSystem.java
index 51ff0bb7f4..2fc6a2169e 100644
--- a/src/magic/utility/MagicSystem.java
+++ b/src/magic/utility/MagicSystem.java
@@ -2,7 +2,7 @@ package magic.utility;
 
 import magic.data.DeckGenerators;
 import magic.data.KeywordDefinitions;
-import magic.data.CubeDefinitions;
+import magic.data.CustomFormats;
 import magic.data.CardDefinitions;
 import magic.data.UnimplementedParser;
 import magic.data.GeneralConfig;
@@ -172,7 +172,7 @@ final public class MagicSystem {
         }
 
         reporter.setMessage("Loading cube definitions...");
-        CubeDefinitions.loadCubeDefinitions();
+        CustomFormats.loadCubeDefinitions();
         reporter.setMessage("Loading deck generators...");
         DeckGenerators.getInstance().loadDeckGenerators();
         reporter.setMessage("Loading keyword definitions...");