diff --git a/src/main/java/forge/deck/CardCollections.java b/src/main/java/forge/deck/CardCollections.java
index 23c503818c1..d669de66eb2 100644
--- a/src/main/java/forge/deck/CardCollections.java
+++ b/src/main/java/forge/deck/CardCollections.java
@@ -51,7 +51,7 @@ public class CardCollections {
         this.scheme = new StorageImmediatelySerialized<Deck>(new DeckSerializer(new File(NewConstants.DECK_SCHEME_DIR)));
         this.plane = new StorageImmediatelySerialized<Deck>(new DeckSerializer(new File(NewConstants.DECK_PLANE_DIR)));
 
-        System.out.printf("Read decks: %d constructed, %d sealed, %d draft, %d cubes, %d scheme, %d planar.%n", constructed.getCount(), sealed.getCount(), draft.getCount(), cube.getCount(), scheme.getCount(), plane.getCount());
+        System.out.printf("Read decks: %d constructed, %d sealed, %d draft, %d cubes, %d scheme, %d planar.%n", constructed.size(), sealed.size(), draft.size(), cube.size(), scheme.size(), plane.size());
 
         // remove this after most people have been switched to new layout
         final OldDeckParser oldParser = new OldDeckParser(this.constructed, this.draft, this.sealed, this.cube);
diff --git a/src/main/java/forge/deck/DeckgenUtil.java b/src/main/java/forge/deck/DeckgenUtil.java
index eebc05c4ca9..80008c79432 100644
--- a/src/main/java/forge/deck/DeckgenUtil.java
+++ b/src/main/java/forge/deck/DeckgenUtil.java
@@ -153,7 +153,7 @@ public class DeckgenUtil {
     /** @return {@link forge.deck.Deck} */
     public static Deck getRandomCustomDeck() {
         final IStorage<Deck> allDecks = Singletons.getModel().getDecks().getConstructed();
-        final int rand = (int) (Math.floor(Math.random() * allDecks.getCount()));
+        final int rand = (int) (Math.floor(Math.random() * allDecks.size()));
         final String name = allDecks.getNames().toArray(new String[0])[rand];
         return allDecks.get(name);
     }
diff --git a/src/main/java/forge/quest/QuestDeckMap.java b/src/main/java/forge/quest/QuestDeckMap.java
index 8f51b5ee2c6..d78063dc08a 100644
--- a/src/main/java/forge/quest/QuestDeckMap.java
+++ b/src/main/java/forge/quest/QuestDeckMap.java
@@ -121,7 +121,7 @@ public class QuestDeckMap implements IStorage<Deck> {
      * @see forge.util.IStorageView#getCount()
      */
     @Override
-    public int getCount() {
+    public int size() {
         return map.size();
     }
 
diff --git a/src/main/java/forge/util/storage/IStorageView.java b/src/main/java/forge/util/storage/IStorageView.java
index 6f539662d77..7188b9336db 100644
--- a/src/main/java/forge/util/storage/IStorageView.java
+++ b/src/main/java/forge/util/storage/IStorageView.java
@@ -56,6 +56,6 @@ public interface IStorageView<T> extends Iterable<T> {
      *
      * @return the count
      */
-    int getCount();
+    int size();
 
 }
diff --git a/src/main/java/forge/util/storage/StorageView.java b/src/main/java/forge/util/storage/StorageView.java
index 311d2f7d192..5206c08f1a2 100644
--- a/src/main/java/forge/util/storage/StorageView.java
+++ b/src/main/java/forge/util/storage/StorageView.java
@@ -77,16 +77,6 @@ public class StorageView<T> implements IStorageView<T> {
         return this.map;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Iterable#iterator()
-     */
-    /*
-     * (non-Javadoc)
-     * 
-     * @see forge.deck.IFolderMapView#iterator()
-     */
     @Override
     public Iterator<T> iterator() {
         return this.map.values().iterator();
@@ -101,7 +91,7 @@ public class StorageView<T> implements IStorageView<T> {
     }
 
     @Override
-    public int getCount() {
+    public int size() {
         return this.map.size();
     }
 }