diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index e6523f75e25..58a57c2299b 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -8316,9 +8316,6 @@ public class Card extends GameEntity implements Comparable<Card> {
                     final String[] characteristics = characteristic.split(",");
                     final String exception = kws.length > 3 ? kws[3] : null; // check "This effect cannot remove sth"
                     if (source.isValid(characteristics, this.getController(), this)
-                      && !source.getName().contains("Flickering Ward") && !source.getName().contains("Pentarch Ward")
-                      && !source.getName().contains("Cho-Manno's Blessing") && !source.getName().contains("Floating Shield")
-                      && !source.getName().contains("Ward of Lights")
                       && (!checkSBA || exception == null || !source.isValid(exception, this.getController(), this))) {
                         return true;
                     }
diff --git a/forge-gui/res/cardsfolder/c/cho_mannos_blessing.txt b/forge-gui/res/cardsfolder/c/cho_mannos_blessing.txt
index 2fb485462be..6a5fe54791c 100644
--- a/forge-gui/res/cardsfolder/c/cho_mannos_blessing.txt
+++ b/forge-gui/res/cardsfolder/c/cho_mannos_blessing.txt
@@ -6,6 +6,6 @@ K:Enchant creature
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInHumanDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
 A:SP$ Attach | Cost$ W W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor:Card.CardUID_HostCardUID | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cho_mannos_blessing.jpg
 Oracle:Flash\nEnchant creature\nAs Cho-Manno's Blessing enters the battlefield, choose a color.\nEnchanted creature has protection from the chosen color. This effect doesn't remove Cho-Manno's Blessing.
diff --git a/forge-gui/res/cardsfolder/f/flickering_ward.txt b/forge-gui/res/cardsfolder/f/flickering_ward.txt
index 423a5badf2e..78040fe4b23 100644
--- a/forge-gui/res/cardsfolder/f/flickering_ward.txt
+++ b/forge-gui/res/cardsfolder/f/flickering_ward.txt
@@ -5,7 +5,7 @@ K:Enchant creature
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInHumanDeck
 A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor:Card.CardUID_HostCardUID | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
 A:AB$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flickering_ward.jpg
diff --git a/forge-gui/res/cardsfolder/f/floating_shield.txt b/forge-gui/res/cardsfolder/f/floating_shield.txt
index 7408ed7edee..a14669460bb 100644
--- a/forge-gui/res/cardsfolder/f/floating_shield.txt
+++ b/forge-gui/res/cardsfolder/f/floating_shield.txt
@@ -5,7 +5,7 @@ K:Enchant creature
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInHumanDeck
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor:Card.CardUID_HostCardUID | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
 A:AB$ Protection | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Gains$ ChosenColor | SpellDescription$ Target creature gains protection from the chosen color until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/floating_shield.jpg
diff --git a/forge-gui/res/cardsfolder/p/pentarch_ward.txt b/forge-gui/res/cardsfolder/p/pentarch_ward.txt
index cf6159fa179..938af220c12 100644
--- a/forge-gui/res/cardsfolder/p/pentarch_ward.txt
+++ b/forge-gui/res/cardsfolder/p/pentarch_ward.txt
@@ -7,6 +7,6 @@ SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor:Card.CardUID_HostCardUID | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pentarch_ward.jpg
 Oracle:Enchant creature\nAs Pentarch Ward enters the battlefield, choose a color.\nWhen Pentarch Ward enters the battlefield, draw a card.\nEnchanted creature has protection from the chosen color. This effect doesn't remove Pentarch Ward.
diff --git a/forge-gui/res/cardsfolder/w/ward_of_lights.txt b/forge-gui/res/cardsfolder/w/ward_of_lights.txt
index 98ba0e8a501..cf528103938 100644
--- a/forge-gui/res/cardsfolder/w/ward_of_lights.txt
+++ b/forge-gui/res/cardsfolder/w/ward_of_lights.txt
@@ -10,7 +10,7 @@ SVar:Sac:AB$ Sacrifice | Cost$ 0 | Defined$ Self
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInHumanDeck
 A:SP$ Attach | Cost$ W W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor:Card.CardUID_HostCardUID | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ward_of_lights.jpg
 Oracle:You may cast Ward of Lights as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.\nEnchant creature\nAs Ward of Lights enters the battlefield, choose a color.\nEnchanted creature has protection from the chosen color. This effect doesn't remove Ward of Lights.