diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java
index 157c0ec2b0e..3195f145121 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheOrochi.java
@@ -45,7 +45,7 @@ import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.filter.predicate.mageobject.NamePredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -87,7 +87,7 @@ class PatronOfTheOrochiEffect extends OneShotEffect {
 
     private static final FilterPermanent filter = new FilterPermanent();
     static {
-        filter.add(Predicates.or( new NamePredicate("Forest"),
+        filter.add(Predicates.or( new SubtypePredicate("Forest"),
                                   Predicates.and(new CardTypePredicate(CardType.CREATURE),
                                                  new ColorPredicate(ObjectColor.GREEN))
                 ));
diff --git a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java
index 7ecda56ac13..b25f39ca155 100644
--- a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java
+++ b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java
@@ -56,7 +56,7 @@ public class EverbarkShaman extends CardImpl {
     private static final FilterCard filterTreefolk = new FilterCard("Treefolk from your graveyard");
 
     static {
-        filterForest.add(new NamePredicate("Forest"));
+        filterForest.add(new SubtypePredicate("Forest"));
         filterTreefolk.add(new SubtypePredicate("Treefolk"));
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Boil.java b/Mage.Sets/src/mage/sets/tempest/Boil.java
index dcd122b7ce4..030e3c81aba 100644
--- a/Mage.Sets/src/mage/sets/tempest/Boil.java
+++ b/Mage.Sets/src/mage/sets/tempest/Boil.java
@@ -33,7 +33,7 @@ import mage.constants.Rarity;
 import mage.abilities.effects.common.DestroyAllEffect;
 import mage.cards.CardImpl;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.NamePredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
 
 /**
  *
@@ -44,13 +44,15 @@ public class Boil extends CardImpl {
     private static final FilterPermanent filter = new FilterPermanent("islands");
 
     static {
-        filter.add(new NamePredicate("Island"));
+        filter.add(new SubtypePredicate("Island"));
     }
 
     public Boil(UUID ownerId) {
         super(ownerId, 165, "Boil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}");
         this.expansionSetCode = "TMP";
         this.color.setRed(true);
+        
+        // Destroy all Islands.
         this.getSpellAbility().addEffect(new DestroyAllEffect(filter));
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java b/Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java
index 7a0f8407a04..00f3f8baf30 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/LlanowarDruid.java
@@ -40,7 +40,7 @@ import mage.constants.Outcome;
 import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.NamePredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -84,7 +84,7 @@ class LlanowarDruidEffect extends OneShotEffect {
     private static final FilterPermanent filter = new FilterPermanent();
 
     static {
-        filter.add(new NamePredicate("Forest"));
+        filter.add(new SubtypePredicate("Forest"));
     }
 
     public LlanowarDruidEffect() {