diff --git a/Mage.Sets/src/mage/sets/alliances/Astrolabe.java b/Mage.Sets/src/mage/sets/alliances/Astrolabe1.java
similarity index 89%
rename from Mage.Sets/src/mage/sets/alliances/Astrolabe.java
rename to Mage.Sets/src/mage/sets/alliances/Astrolabe1.java
index 33660230615..ec59b50b40d 100644
--- a/Mage.Sets/src/mage/sets/alliances/Astrolabe.java
+++ b/Mage.Sets/src/mage/sets/alliances/Astrolabe1.java
@@ -33,20 +33,20 @@ import java.util.UUID;
  *
  * @author fireshoes
  */
-public class Astrolabe extends mage.sets.masterseditioniii.Astrolabe {
+public class Astrolabe1 extends mage.sets.masterseditioniii.Astrolabe {
 
-    public Astrolabe(UUID ownerId) {
+    public Astrolabe1(UUID ownerId) {
         super(ownerId);
         this.cardNumber = 159;
         this.expansionSetCode = "ALL";
     }
 
-    public Astrolabe(final Astrolabe card) {
+    public Astrolabe1(final Astrolabe1 card) {
         super(card);
     }
 
     @Override
-    public Astrolabe copy() {
-        return new Astrolabe(this);
+    public Astrolabe1 copy() {
+        return new Astrolabe1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/alliances/Astrolabe2.java b/Mage.Sets/src/mage/sets/alliances/Astrolabe2.java
new file mode 100644
index 00000000000..1ef02040269
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/Astrolabe2.java
@@ -0,0 +1,52 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.alliances;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class Astrolabe2 extends mage.sets.masterseditioniii.Astrolabe {
+
+    public Astrolabe2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 160;
+        this.expansionSetCode = "ALL";
+    }
+
+    public Astrolabe2(final Astrolabe2 card) {
+        super(card);
+    }
+
+    @Override
+    public Astrolabe2 copy() {
+        return new Astrolabe2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/FeastOrFamine.java b/Mage.Sets/src/mage/sets/alliances/FeastOrFamine1.java
similarity index 88%
rename from Mage.Sets/src/mage/sets/alliances/FeastOrFamine.java
rename to Mage.Sets/src/mage/sets/alliances/FeastOrFamine1.java
index 338c1d5b0b4..dcdb28a3477 100644
--- a/Mage.Sets/src/mage/sets/alliances/FeastOrFamine.java
+++ b/Mage.Sets/src/mage/sets/alliances/FeastOrFamine1.java
@@ -33,20 +33,20 @@ import java.util.UUID;
  *
  * @author fireshoes
  */
-public class FeastOrFamine extends mage.sets.izzetvsgolgari.FeastOrFamine {
+public class FeastOrFamine1 extends mage.sets.izzetvsgolgari.FeastOrFamine {
 
-    public FeastOrFamine(UUID ownerId) {
+    public FeastOrFamine1(UUID ownerId) {
         super(ownerId);
         this.cardNumber = 8;
         this.expansionSetCode = "ALL";
     }
 
-    public FeastOrFamine(final FeastOrFamine card) {
+    public FeastOrFamine1(final FeastOrFamine1 card) {
         super(card);
     }
 
     @Override
-    public FeastOrFamine copy() {
-        return new FeastOrFamine(this);
+    public FeastOrFamine1 copy() {
+        return new FeastOrFamine1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/alliances/FeastOrFamine2.java b/Mage.Sets/src/mage/sets/alliances/FeastOrFamine2.java
new file mode 100644
index 00000000000..36b61ba137c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/FeastOrFamine2.java
@@ -0,0 +1,52 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.alliances;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class FeastOrFamine2 extends mage.sets.izzetvsgolgari.FeastOrFamine {
+
+    public FeastOrFamine2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 9;
+        this.expansionSetCode = "ALL";
+    }
+
+    public FeastOrFamine2(final FeastOrFamine2 card) {
+        super(card);
+    }
+
+    @Override
+    public FeastOrFamine2 copy() {
+        return new FeastOrFamine2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaShaman.java b/Mage.Sets/src/mage/sets/alliances/GorillaShaman1.java
similarity index 94%
rename from Mage.Sets/src/mage/sets/alliances/GorillaShaman.java
rename to Mage.Sets/src/mage/sets/alliances/GorillaShaman1.java
index bc8eed1bc83..edb27282bc7 100644
--- a/Mage.Sets/src/mage/sets/alliances/GorillaShaman.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaShaman1.java
@@ -50,9 +50,9 @@ import mage.target.TargetPermanent;
  *
  * @author fireshoes
  */
-public class GorillaShaman extends CardImpl {
+public class GorillaShaman1 extends CardImpl {
 
-    public GorillaShaman(UUID ownerId) {
+    public GorillaShaman1(UUID ownerId) {
         super(ownerId, 106, "Gorilla Shaman", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}");
         this.expansionSetCode = "ALL";
         this.subtype.add("Ape");
@@ -65,7 +65,7 @@ public class GorillaShaman extends CardImpl {
         ability.addTarget(new TargetPermanent(new FilterArtifactPermanent("noncreature artifact with converted mana cost X")));
         this.addAbility(ability);
     }
-    
+
     @Override
     public void adjustTargets(Ability ability, Game game) {
         if (ability instanceof SimpleActivatedAbility) {
@@ -79,12 +79,12 @@ public class GorillaShaman extends CardImpl {
         }
     }
 
-    public GorillaShaman(final GorillaShaman card) {
+    public GorillaShaman1(final GorillaShaman1 card) {
         super(card);
     }
 
     @Override
-    public GorillaShaman copy() {
-        return new GorillaShaman(this);
+    public GorillaShaman1 copy() {
+        return new GorillaShaman1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaShaman2.java b/Mage.Sets/src/mage/sets/alliances/GorillaShaman2.java
new file mode 100644
index 00000000000..d6f1c2181d4
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaShaman2.java
@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.alliances;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class GorillaShaman2 extends GorillaShaman1 {
+
+    public GorillaShaman2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 107;
+        this.rarity = Rarity.UNCOMMON;
+    }
+
+    public GorillaShaman2(final GorillaShaman2 card) {
+        super(card);
+    }
+
+    @Override
+    public GorillaShaman2 copy() {
+        return new GorillaShaman2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast.java b/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast1.java
similarity index 84%
rename from Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast.java
rename to Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast1.java
index 552835b9017..5dad7465e1b 100644
--- a/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast.java
+++ b/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast1.java
@@ -31,6 +31,7 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamageControllerEffect;
 import mage.abilities.effects.common.SacrificeTargetEffect;
 import mage.cards.CardImpl;
@@ -43,9 +44,9 @@ import mage.target.common.TargetControlledPermanent;
  *
  * @author fireshoes
  */
-public class PhyrexianWarBeast extends CardImpl {
+public class PhyrexianWarBeast1 extends CardImpl {
 
-    public PhyrexianWarBeast(UUID ownerId) {
+    public PhyrexianWarBeast1(UUID ownerId) {
         super(ownerId, 169, "Phyrexian War Beast", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}");
         this.expansionSetCode = "ALL";
         this.subtype.add("Beast");
@@ -53,18 +54,22 @@ public class PhyrexianWarBeast extends CardImpl {
         this.toughness = new MageInt(4);
 
         // When Phyrexian War Beast leaves the battlefield, sacrifice a land and Phyrexian War Beast deals 1 damage to you.
-        Ability ability = new LeavesBattlefieldTriggeredAbility(new SacrificeTargetEffect(), false);
-        ability.addEffect(new DamageControllerEffect(1));
+        Effect effect = new SacrificeTargetEffect();
+        effect.setText("sacrifice a land");
+        Ability ability = new LeavesBattlefieldTriggeredAbility(effect, false);
+        effect = new DamageControllerEffect(1);
+        effect.setText("and {this} deals 1 damage to you");
+        ability.addEffect(effect);
         ability.addTarget(new TargetControlledPermanent(new FilterControlledLandPermanent()));
         this.addAbility(ability);
     }
 
-    public PhyrexianWarBeast(final PhyrexianWarBeast card) {
+    public PhyrexianWarBeast1(final PhyrexianWarBeast1 card) {
         super(card);
     }
 
     @Override
-    public PhyrexianWarBeast copy() {
-        return new PhyrexianWarBeast(this);
+    public PhyrexianWarBeast1 copy() {
+        return new PhyrexianWarBeast1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast2.java b/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast2.java
new file mode 100644
index 00000000000..baa04a1b989
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/PhyrexianWarBeast2.java
@@ -0,0 +1,52 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.alliances;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class PhyrexianWarBeast2 extends PhyrexianWarBeast1 {
+
+    public PhyrexianWarBeast2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 170;
+    }
+
+    public PhyrexianWarBeast2(final PhyrexianWarBeast2 card) {
+        super(card);
+    }
+
+    @Override
+    public PhyrexianWarBeast2 copy() {
+        return new PhyrexianWarBeast2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/mastersedition/PhyrexianWarBeast.java b/Mage.Sets/src/mage/sets/mastersedition/PhyrexianWarBeast.java
index 67d8bff8d78..cfc764e03a9 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/PhyrexianWarBeast.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/PhyrexianWarBeast.java
@@ -34,7 +34,7 @@ import mage.constants.Rarity;
  *
  * @author fireshoes
  */
-public class PhyrexianWarBeast extends mage.sets.alliances.PhyrexianWarBeast {
+public class PhyrexianWarBeast extends mage.sets.alliances.PhyrexianWarBeast1 {
 
     public PhyrexianWarBeast(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/GorillaShaman.java b/Mage.Sets/src/mage/sets/masterseditionii/GorillaShaman.java
index 38a2dad555f..e9d1bdf4bbc 100644
--- a/Mage.Sets/src/mage/sets/masterseditionii/GorillaShaman.java
+++ b/Mage.Sets/src/mage/sets/masterseditionii/GorillaShaman.java
@@ -34,7 +34,7 @@ import mage.constants.Rarity;
  *
  * @author fireshoes
  */
-public class GorillaShaman extends mage.sets.alliances.GorillaShaman {
+public class GorillaShaman extends mage.sets.alliances.GorillaShaman1 {
 
     public GorillaShaman(UUID ownerId) {
         super(ownerId);