diff --git a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
index a27e9cce549..1ad6c3e509a 100644
--- a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
+++ b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
@@ -186,11 +186,11 @@ public abstract class GenerateColoredDeckBase {
 
         // start with all cards
         // remove cards that generated decks don't like
-        Predicate<CardRules> canPlay = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay;
+        Predicate<CardRules> canPlay = pt == PlayerType.HUMAN ? GenerateDeckUtil.HUMAN_CAN_PLAY : GenerateDeckUtil.AI_CAN_PLAY;
         Predicate<CardRules> hasColor = new GenerateDeckUtil.ContainsAllColorsFrom(colors);
 
         if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
-            hasColor = Predicate.or(hasColor, GenerateDeckUtil.colorlessCards);
+            hasColor = Predicate.or(hasColor, GenerateDeckUtil.COLORLESS_CARDS);
         }
 
         return Predicate.and(canPlay, hasColor).select(CardDb.instance().getAllCards(), CardPrinted.FN_GET_RULES);
diff --git a/src/main/java/forge/deck/generate/GenerateDeckUtil.java b/src/main/java/forge/deck/generate/GenerateDeckUtil.java
index 76d44ed03e4..e8464a26534 100644
--- a/src/main/java/forge/deck/generate/GenerateDeckUtil.java
+++ b/src/main/java/forge/deck/generate/GenerateDeckUtil.java
@@ -38,21 +38,21 @@ import forge.util.closures.Predicate;
  */
 public class GenerateDeckUtil {
 
-    public static final Predicate<CardRules> aiCanPlay = new Predicate<CardRules>() {
+    public static final Predicate<CardRules> AI_CAN_PLAY = new Predicate<CardRules>() {
         @Override
         public boolean isTrue(CardRules c) {
             return !c.getRemAIDecks() && !c.getRemRandomDecks();
         }
     };
 
-    public static final Predicate<CardRules> humanCanPlay = new Predicate<CardRules>() {
+    public static final Predicate<CardRules> HUMAN_CAN_PLAY = new Predicate<CardRules>() {
         @Override
         public boolean isTrue(CardRules c) {
             return !c.getRemRandomDecks();
         }
     };
 
-    public static final Predicate<CardRules> colorlessCards = new Predicate<CardRules>() {
+    public static final Predicate<CardRules> COLORLESS_CARDS = new Predicate<CardRules>() {
         @Override
         public boolean isTrue(CardRules c) {
             CardManaCost mc = c.getManaCost();