diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java
index 4a17a76b32..69d53b25f1 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java
@@ -28,6 +28,7 @@
 package mage.sets.dragonsoftarkir;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.costs.common.RevealTargetFromHandCost;
 import mage.abilities.effects.OneShotEffect;
@@ -38,7 +39,7 @@ import mage.constants.AbilityType;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.FilterCard;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -53,7 +54,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
  */
 public class DraconicRoar extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)");
+    private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
 
     static {
         filter.add(new SubtypePredicate("Dragon"));
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/FoulTongueInvocation.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/FoulTongueInvocation.java
index 502f541dbe..cc33bfc074 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/FoulTongueInvocation.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/FoulTongueInvocation.java
@@ -28,6 +28,7 @@
 package mage.sets.dragonsoftarkir;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.costs.common.RevealTargetFromHandCost;
 import mage.abilities.effects.OneShotEffect;
@@ -38,7 +39,7 @@ import mage.constants.AbilityType;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.FilterCard;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
@@ -53,7 +54,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
  */
 public class FoulTongueInvocation extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)");
+    private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
 
     static {
         filter.add(new SubtypePredicate("Dragon"));
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/OratorOfOjutai.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/OratorOfOjutai.java
index ce081b5113..9ff1ddda30 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/OratorOfOjutai.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/OratorOfOjutai.java
@@ -28,6 +28,7 @@
 package mage.sets.dragonsoftarkir;
 
 import java.util.UUID;
+
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@@ -43,7 +44,7 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.FilterCard;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -57,7 +58,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
  */
 public class OratorOfOjutai extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)");
+    private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
 
     static {
         filter.add(new SubtypePredicate("Dragon"));
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarsScorn.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarsScorn.java
index 025081a2b8..a878897703 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarsScorn.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarsScorn.java
@@ -28,6 +28,7 @@
 package mage.sets.dragonsoftarkir;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.costs.Cost;
 import mage.abilities.costs.common.RevealTargetFromHandCost;
@@ -39,7 +40,7 @@ import mage.constants.AbilityType;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.FilterCard;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.stack.StackObject;
@@ -54,7 +55,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
  */
 public class SilumgarsScorn extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)");
+    private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
 
     static {
         filter.add(new SubtypePredicate("Dragon"));
diff --git a/Mage.Sets/src/mage/sets/gameday/ScaleguardSentinels.java b/Mage.Sets/src/mage/sets/gameday/ScaleguardSentinels.java
index 6b1fbd0cdf..07ed157378 100644
--- a/Mage.Sets/src/mage/sets/gameday/ScaleguardSentinels.java
+++ b/Mage.Sets/src/mage/sets/gameday/ScaleguardSentinels.java
@@ -28,6 +28,7 @@
 package mage.sets.gameday;
 
 import java.util.UUID;
+
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldAbility;
@@ -40,7 +41,7 @@ import mage.constants.AbilityType;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.counters.CounterType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.FilterCard;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -54,7 +55,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
  */
 public class ScaleguardSentinels extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)");
+    private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
 
     static {
         filter.add(new SubtypePredicate("Dragon"));
diff --git a/Mage/src/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java b/Mage/src/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java
index 2267b30f7b..873a5699f6 100644
--- a/Mage/src/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java
+++ b/Mage/src/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java
@@ -30,10 +30,11 @@ package mage.watchers.common;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
+
 import mage.abilities.costs.Cost;
 import mage.abilities.costs.common.RevealTargetFromHandCost;
 import mage.constants.WatcherScope;
-import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.FilterPermanent;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.stack.Spell;
@@ -45,7 +46,7 @@ import mage.watchers.Watcher;
  */
 public class DragonOnTheBattlefieldWhileSpellWasCastWatcher extends Watcher {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon", "Dragons");
+    private static final FilterPermanent filter = new FilterPermanent("Dragon", "Dragons");
 
     private final Set<UUID> castWithDragonOnTheBattlefield = new HashSet<>();