diff --git a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java
index e27c5176a25..654c17694a4 100644
--- a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java
+++ b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java
@@ -5,7 +5,7 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.Effect;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -35,7 +35,7 @@ public final class AkronLegionnaire extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack.
-        Effect effect = new CantAttackAnyPlayerAllEffect(Duration.WhileOnBattlefield, filter);
+        Effect effect = new CantAttackAllEffect(Duration.WhileOnBattlefield, filter);
         effect.setText("Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
         
diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java
index f1f8eae8db6..490279aaebf 100644
--- a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java
+++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java
@@ -5,7 +5,7 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.SimpleEvasionAbility;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -36,7 +36,7 @@ public final class EvilEyeOfOrmsByGore extends CardImpl {
         this.toughness = new MageInt(6);
 
         // Non-Eye creatures you control can't attack.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAnyPlayerAllEffect(Duration.WhileOnBattlefield, cantAttackFilter)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter)));
 
         // Evil Eye of Orms-by-Gore can't be blocked except by Walls.
         this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(cantBeBlockedByFilter, Duration.WhileOnBattlefield)));
diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java
index 44640df7f6b..01452b51c52 100644
--- a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java
+++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java
@@ -6,7 +6,7 @@ import mage.MageInt;
 import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.DestroyTargetEffect;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -33,7 +33,7 @@ public final class EvilEyeOfUrborg extends CardImpl {
         this.toughness = new MageInt(3);
 
         // Non-Eye creatures you control can't attack.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAnyPlayerAllEffect(Duration.WhileOnBattlefield, cantAttackFilter)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter)));
         
         // Whenever Evil Eye of Urborg becomes blocked by a creature, destroy that creature.
         this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new DestroyTargetEffect(), false));
diff --git a/Mage.Sets/src/mage/cards/f/Festival.java b/Mage.Sets/src/mage/cards/f/Festival.java
index af1b49fd4e0..ce71913d2b8 100644
--- a/Mage.Sets/src/mage/cards/f/Festival.java
+++ b/Mage.Sets/src/mage/cards/f/Festival.java
@@ -4,7 +4,7 @@ package mage.cards.f;
 import java.util.UUID;
 import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
 import mage.abilities.condition.common.OnOpponentsTurnCondition;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -26,7 +26,7 @@ public final class Festival extends CardImpl {
                 "Cast this spell only during an opponent's upkeep"));
 
         // Creatures can't attack this turn.
-        this.getSpellAbility().addEffect(new CantAttackAnyPlayerAllEffect(Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES));
+        this.getSpellAbility().addEffect(new CantAttackAllEffect(Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES));
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/f/FightOrFlight.java b/Mage.Sets/src/mage/cards/f/FightOrFlight.java
index be2d92f210b..ea78fca2827 100644
--- a/Mage.Sets/src/mage/cards/f/FightOrFlight.java
+++ b/Mage.Sets/src/mage/cards/f/FightOrFlight.java
@@ -3,7 +3,7 @@ package mage.cards.f;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfCombatTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -96,7 +96,7 @@ class FightOrFlightEffect extends OneShotEffect {
         List<Permanent> canAttack = choice ? pile1 : pile2;
         FilterCreaturePermanent filterRestriction = new FilterCreaturePermanent();
         filterRestriction.add(Predicates.not(new PermanentReferenceInCollectionPredicate(canAttack, game)));
-        game.addEffect(new CantAttackAnyPlayerAllEffect(Duration.EndOfTurn, filterRestriction), source);
+        game.addEffect(new CantAttackAllEffect(Duration.EndOfTurn, filterRestriction), source);
         game.informPlayers("Creatures that can attack this turn: " + canAttack
                 .stream()
                 .map(Permanent::getLogName)
diff --git a/Mage.Sets/src/mage/cards/g/GlacialChasm.java b/Mage.Sets/src/mage/cards/g/GlacialChasm.java
index 56b8620bd1c..d3790bb7f58 100644
--- a/Mage.Sets/src/mage/cards/g/GlacialChasm.java
+++ b/Mage.Sets/src/mage/cards/g/GlacialChasm.java
@@ -7,7 +7,7 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.PayLifeCost;
 import mage.abilities.effects.common.PreventDamageToControllerEffect;
 import mage.abilities.effects.common.SacrificeControllerEffect;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.abilities.keyword.CumulativeUpkeepAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -34,7 +34,7 @@ public final class GlacialChasm extends CardImpl {
         // Creatures you control can't attack.
         FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control");
         filter.add(TargetController.YOU.getControllerPredicate());
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAnyPlayerAllEffect(Duration.WhileOnBattlefield, filter)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter)));
         // Prevent all damage that would be dealt to you.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.WhileOnBattlefield)));
     }
diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java b/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java
index 23101e5272f..96f070e81a3 100644
--- a/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java
+++ b/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java
@@ -4,7 +4,7 @@ package mage.cards.m;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -36,7 +36,7 @@ public final class MagusOfTheMoat extends CardImpl {
         this.toughness = new MageInt(3);
 
         // Creatures without flying can't attack.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAnyPlayerAllEffect(Duration.WhileOnBattlefield, filter)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter)));
     }
 
     private MagusOfTheMoat(final MagusOfTheMoat card) {
diff --git a/Mage.Sets/src/mage/cards/m/Moat.java b/Mage.Sets/src/mage/cards/m/Moat.java
index d8313fa18dc..6263b56fe2b 100644
--- a/Mage.Sets/src/mage/cards/m/Moat.java
+++ b/Mage.Sets/src/mage/cards/m/Moat.java
@@ -3,7 +3,7 @@ package mage.cards.m;
 
 import java.util.UUID;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -31,7 +31,7 @@ public final class Moat extends CardImpl {
 
 
         // Creatures without flying can't attack.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAnyPlayerAllEffect(Duration.WhileOnBattlefield, filter)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter)));
     }
 
     private Moat(final Moat card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrimsChant.java b/Mage.Sets/src/mage/cards/o/OrimsChant.java
index 355b4cdea6f..73383bf002c 100644
--- a/Mage.Sets/src/mage/cards/o/OrimsChant.java
+++ b/Mage.Sets/src/mage/cards/o/OrimsChant.java
@@ -6,7 +6,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.KickedCondition;
 import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.abilities.keyword.KickerAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -97,7 +97,7 @@ class OrimsChantEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null && KickedCondition.ONCE.apply(game, source)) {
-            game.addEffect(new CantAttackAnyPlayerAllEffect(Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES), source);
+            game.addEffect(new CantAttackAllEffect(Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES), source);
             return true;
         }
         return false;
diff --git a/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java b/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java
index 31f38970151..5afb8234567 100644
--- a/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java
+++ b/Mage.Sets/src/mage/cards/o/OrissSamiteGuardian.java
@@ -11,7 +11,7 @@ import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.PreventDamageToTargetEffect;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -19,7 +19,6 @@ import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.ControllerIdPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
 import mage.players.Player;
 import mage.target.TargetPlayer;
 import mage.target.common.TargetCreaturePermanent;
@@ -83,7 +82,7 @@ class OrissSamiteGuardianEffect extends OneShotEffect {
             game.addEffect(new OrissSamiteGuardianCantCastEffect(), source);
             FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures that player controls");
             filter.add(new ControllerIdPredicate(getTargetPointer().getFirst(game, source)));
-            ContinuousEffect effect = new CantAttackAnyPlayerAllEffect(Duration.EndOfTurn, filter);
+            ContinuousEffect effect = new CantAttackAllEffect(Duration.EndOfTurn, filter);
             game.addEffect(effect, source);
             return true;
         }
diff --git a/Mage.Sets/src/mage/cards/s/StormtideLeviathan.java b/Mage.Sets/src/mage/cards/s/StormtideLeviathan.java
index 79cd384b4d8..2de7de7f62e 100644
--- a/Mage.Sets/src/mage/cards/s/StormtideLeviathan.java
+++ b/Mage.Sets/src/mage/cards/s/StormtideLeviathan.java
@@ -2,7 +2,7 @@ package mage.cards.s;
 
 import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect;
+import mage.abilities.effects.common.combat.CantAttackAllEffect;
 import mage.abilities.effects.common.continuous.AddBasicLandTypeAllLandsEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.IslandwalkAbility;
@@ -45,7 +45,7 @@ public final class StormtideLeviathan extends CardImpl {
                 .setText("all lands are Islands in addition to their other types")));
 
         // Creatures without flying or islandwalk can't attack.
-        this.addAbility(new SimpleStaticAbility(new CantAttackAnyPlayerAllEffect(Duration.WhileOnBattlefield, filter)));
+        this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, filter)));
     }
 
     private StormtideLeviathan(final StormtideLeviathan card) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAllEffect.java
similarity index 77%
rename from Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java
rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAllEffect.java
index 6c748169ae2..73fe191f5ab 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAllEffect.java
@@ -12,11 +12,11 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-public class CantAttackAnyPlayerAllEffect extends RestrictionEffect {
+public class CantAttackAllEffect extends RestrictionEffect {
 
     private final FilterCreaturePermanent filter;
 
-    public CantAttackAnyPlayerAllEffect(Duration duration, FilterCreaturePermanent filter) {
+    public CantAttackAllEffect(Duration duration, FilterCreaturePermanent filter) {
         super(duration);
         this.filter = filter;
         StringBuilder sb = new StringBuilder(filter.getMessage()).append(" can't attack");
@@ -30,7 +30,7 @@ public class CantAttackAnyPlayerAllEffect extends RestrictionEffect {
         staticText = sb.toString();
     }
 
-    protected CantAttackAnyPlayerAllEffect(final CantAttackAnyPlayerAllEffect effect) {
+    protected CantAttackAllEffect(final CantAttackAllEffect effect) {
         super(effect);
         this.filter = effect.filter;
     }
@@ -46,8 +46,8 @@ public class CantAttackAnyPlayerAllEffect extends RestrictionEffect {
     }
 
     @Override
-    public CantAttackAnyPlayerAllEffect copy() {
-        return new CantAttackAnyPlayerAllEffect(this);
+    public CantAttackAllEffect copy() {
+        return new CantAttackAllEffect(this);
     }
 
 }