diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
index 87bb8b48e0a..3b23a851054 100644
--- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
+++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
@@ -130,6 +130,7 @@ public abstract class DeckGeneratorBase {
         int res = 0;
         while (res < cnt) {
             PaperCard cp = source.get(MyRandom.getRandom().nextInt(srcLen));
+            // TODO AltName conversion needed?
             int newCount = cardCounts.get(cp.getName()) + 1;
 
             //add card to deck if not already maxed out on card
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
index 750d7c94112..08289e0b102 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
@@ -215,7 +215,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
         Iterable<Entry<String,Integer>> cardsByName = null;
         if (deck != null) {
             final CardPool allCards = deck.getAllCardsInASinglePool(deck.has(DeckSection.Commander));
-            cardsByName = Aggregates.groupSumBy(allCards, PaperCard.FN_GET_NAME);
+            cardsByName = Aggregates.groupSumBy(allCards, pc -> pc.getRules().getNormalizedName());
         }
 
         for (final Entry<TItem, Integer> itemEntry : itemsToAdd) {
@@ -237,7 +237,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
                 Entry<String, Integer> cardAmountInfo = Iterables.find(cardsByName, new Predicate<Entry<String, Integer>>() {
                     @Override
                     public boolean apply(Entry<String, Integer> t) {
-                        return t.getKey().equals(card.getName());
+                        return t.getKey().equals(card.getRules().getNormalizedName());
                     }
                 }, null);
                 if (cardAmountInfo != null) {