diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h
index a0736b515..042b9ed4f 100644
--- a/cockatrice/src/game/cards/card_database.h
+++ b/cockatrice/src/game/cards/card_database.h
@@ -31,13 +31,13 @@ class CardSet : public QList<CardInfoPtr>
 {
 public:
     enum Priority {
-        UNDEFINED = 0,
-        PRIMARY = 10,
-        SECONDARY = 20,
-        REPRINT = 30,
-        OTHER = 40,
-        FALLBACK = 50,
-        LOWEST = 100,
+        PriorityUndefined = 0,
+        PriorityPrimary = 10,
+        PrioritySecondary = 20,
+        PriorityReprint = 30,
+        PriorityOther = 40,
+        PriorityFallback = 50,
+        PriorityLowest = 100,
     };
 
 private:
@@ -53,12 +53,12 @@ public:
                      const QString &_longName = QString(),
                      const QString &_setType = QString(),
                      const QDate &_releaseDate = QDate(),
-                     const Priority _priority = Priority::UNDEFINED);
+                     const Priority _priority = PriorityUndefined);
     static CardSetPtr newInstance(const QString &_shortName = QString(),
                                   const QString &_longName = QString(),
                                   const QString &_setType = QString(),
                                   const QDate &_releaseDate = QDate(),
-                                  const Priority _priority = Priority::UNDEFINED);
+                                  const Priority _priority = PriorityUndefined);
     QString getCorrectedShortName() const;
     QString getShortName() const
     {
@@ -78,7 +78,7 @@ public:
     }
     Priority getPriority() const
     {
-        return priority ? priority : Priority::FALLBACK;
+        return priority ? priority : PriorityFallback;
     }
     void setLongName(const QString &_longName)
     {
diff --git a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h
index 0a953b38e..8d72b743b 100644
--- a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h
+++ b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h
@@ -33,7 +33,7 @@ protected:
                               const QString &longName = "",
                               const QString &setType = "",
                               const QDate &releaseDate = QDate(),
-                              const CardSet::Priority priority = CardSet::Priority::UNDEFINED);
+                              const CardSet::Priority priority = CardSet::PriorityUndefined);
 signals:
     virtual void addCard(CardInfoPtr card) = 0;
     virtual void addSet(CardSetPtr set) = 0;
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 7faf64d18..989328199 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -24,9 +24,9 @@ CardSet::Priority OracleImporter::getSetPriority(QString &setType, QString &shor
     if (!setTypePriorities.contains(setType.toLower())) {
         qDebug() << "warning: Set type" << setType << "unrecognized for prioritization";
     }
-    CardSet::Priority priority = setTypePriorities.value(setType.toLower(), CardSet::Priority::UNDEFINED);
+    CardSet::Priority priority = setTypePriorities.value(setType.toLower(), CardSet::PriorityUndefined);
     if (nonEnglishSets.contains(shortName)) {
-        priority = CardSet::Priority::LOWEST;
+        priority = CardSet::PriorityLowest;
     }
     return priority;
 }
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index 805c329ac..9a3b7baf0 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -9,32 +9,32 @@
 // many users prefer not to see these sets with non english arts
 const QStringList nonEnglishSets = {"4BB", "FBB", "PS11", "PSAL", "REN", "RIN"};
 const QMap<QString, CardSet::Priority> setTypePriorities{
-    {"core",             CardSet::Priority::PRIMARY},
-    {"expansion",        CardSet::Priority::PRIMARY},
+    {"core",             CardSet::PriorityPrimary},
+    {"expansion",        CardSet::PriorityPrimary},
 
-    {"commander",        CardSet::Priority::SECONDARY},
-    {"starter",          CardSet::Priority::SECONDARY},
+    {"commander",        CardSet::PrioritySecondary},
+    {"starter",          CardSet::PrioritySecondary},
 
-    {"archenemy",        CardSet::Priority::REPRINT},
-    {"arsenal",          CardSet::Priority::REPRINT},
-    {"box",              CardSet::Priority::REPRINT},
-    {"draft_innovation", CardSet::Priority::REPRINT},
-    {"duel_deck",        CardSet::Priority::REPRINT},
-    {"from_the_vault",   CardSet::Priority::REPRINT},
-    {"masterpiece",      CardSet::Priority::REPRINT},
-    {"masters",          CardSet::Priority::REPRINT},
-    {"memorabilia",      CardSet::Priority::REPRINT},
-    {"planechase",       CardSet::Priority::REPRINT},
-    {"premium_deck",     CardSet::Priority::REPRINT},
-    {"promo",            CardSet::Priority::REPRINT},
-    {"spellbook",        CardSet::Priority::REPRINT},
-    {"token",            CardSet::Priority::REPRINT},
-    {"treasure_chest",   CardSet::Priority::REPRINT},
+    {"archenemy",        CardSet::PriorityReprint},
+    {"arsenal",          CardSet::PriorityReprint},
+    {"box",              CardSet::PriorityReprint},
+    {"draft_innovation", CardSet::PriorityReprint},
+    {"duel_deck",        CardSet::PriorityReprint},
+    {"from_the_vault",   CardSet::PriorityReprint},
+    {"masterpiece",      CardSet::PriorityReprint},
+    {"masters",          CardSet::PriorityReprint},
+    {"memorabilia",      CardSet::PriorityReprint},
+    {"planechase",       CardSet::PriorityReprint},
+    {"premium_deck",     CardSet::PriorityReprint},
+    {"promo",            CardSet::PriorityReprint},
+    {"spellbook",        CardSet::PriorityReprint},
+    {"token",            CardSet::PriorityReprint},
+    {"treasure_chest",   CardSet::PriorityReprint},
 
-    {"alchemy",          CardSet::Priority::OTHER},
-    {"funny",            CardSet::Priority::OTHER},
-    {"minigame",         CardSet::Priority::OTHER},
-    {"vanguard",         CardSet::Priority::OTHER},
+    {"alchemy",          CardSet::PriorityOther},
+    {"funny",            CardSet::PriorityOther},
+    {"minigame",         CardSet::PriorityOther},
+    {"vanguard",         CardSet::PriorityOther},
 };
 
 class SetToDownload