diff --git a/forge-core/src/main/java/forge/token/ITokenDatabase.java b/forge-core/src/main/java/forge/token/ITokenDatabase.java
index f3dc9323848..3973250f24f 100644
--- a/forge-core/src/main/java/forge/token/ITokenDatabase.java
+++ b/forge-core/src/main/java/forge/token/ITokenDatabase.java
@@ -12,9 +12,9 @@ public interface ITokenDatabase extends Iterable<PaperToken> {
     PaperToken getToken(String tokenName);
     PaperToken getToken(String tokenName, String edition);
     PaperToken getToken(String tokenName, String edition, int artIndex);
-    PaperToken getTokenFromEdition(String tokenName, CardDb.CardArtPreference fromSet);
-    PaperToken getTokenFromEdition(String tokenName, Date printedBefore, CardDb.CardArtPreference fromSet);
-    PaperToken getTokenFromEdition(String tokenName, Date printedBefore, CardDb.CardArtPreference fromSet, int artIndex);
+    PaperToken getTokenFromEditions(String tokenName, CardDb.CardArtPreference fromSet);
+    PaperToken getTokenFromEditions(String tokenName, Date printedBefore, CardDb.CardArtPreference fromSet);
+    PaperToken getTokenFromEditions(String tokenName, Date printedBefore, CardDb.CardArtPreference fromSet, int artIndex);
 
     PaperToken getFoiled(PaperToken cpi);
 
diff --git a/forge-core/src/main/java/forge/token/TokenDb.java b/forge-core/src/main/java/forge/token/TokenDb.java
index 421b12f16d2..d26f1927450 100644
--- a/forge-core/src/main/java/forge/token/TokenDb.java
+++ b/forge-core/src/main/java/forge/token/TokenDb.java
@@ -1,20 +1,14 @@
 package forge.token;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.base.Predicate;
 import com.google.common.collect.Maps;
-
 import forge.card.CardDb;
 import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.item.PaperToken;
 
+import java.util.*;
+
 public class TokenDb implements ITokenDatabase {
     // Expected naming convention of scripts
     // token_name
@@ -80,17 +74,17 @@ public class TokenDb implements ITokenDatabase {
     }
 
     @Override
-    public PaperToken getTokenFromEdition(String tokenName, CardDb.SetPreference fromSet) {
+    public PaperToken getTokenFromEditions(String tokenName, CardDb.CardArtPreference fromSet) {
         return null;
     }
 
     @Override
-    public PaperToken getTokenFromEdition(String tokenName, Date printedBefore, CardDb.SetPreference fromSet) {
+    public PaperToken getTokenFromEditions(String tokenName, Date printedBefore, CardDb.CardArtPreference fromSet) {
         return null;
     }
 
     @Override
-    public PaperToken getTokenFromEdition(String tokenName, Date printedBefore, CardDb.SetPreference fromSet, int artIndex) {
+    public PaperToken getTokenFromEditions(String tokenName, Date printedBefore, CardDb.CardArtPreference fromSet, int artIndex) {
         return null;
     }