diff --git a/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah.java b/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah1.java
similarity index 92%
rename from Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah.java
rename to Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah1.java
index 77bc94ac9a..4a269ec16f 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah1.java
@@ -39,11 +39,11 @@ import mage.filter.common.FilterAttackingCreature;
  *
  * @author fireshoes
  */
-public class ArmyOfAllah extends CardImpl {
+public class ArmyOfAllah1 extends CardImpl {
     
     private static final FilterAttackingCreature filter = new FilterAttackingCreature("Attacking creatures");
 
-    public ArmyOfAllah(UUID ownerId) {
+    public ArmyOfAllah1(UUID ownerId) {
         super(ownerId, 56, "Army of Allah", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}{W}");
         this.expansionSetCode = "ARN";
 
@@ -51,12 +51,12 @@ public class ArmyOfAllah extends CardImpl {
         this.getSpellAbility().addEffect(new BoostAllEffect(2, 0, Duration.EndOfTurn, filter, false));
     }
 
-    public ArmyOfAllah(final ArmyOfAllah card) {
+    public ArmyOfAllah1(final ArmyOfAllah1 card) {
         super(card);
     }
 
     @Override
-    public ArmyOfAllah copy() {
-        return new ArmyOfAllah(this);
+    public ArmyOfAllah1 copy() {
+        return new ArmyOfAllah1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah2.java b/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah2.java
new file mode 100644
index 0000000000..b50534ab8c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/arabiannights/ArmyOfAllah2.java
@@ -0,0 +1,51 @@
+/*
+ *  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.arabiannights;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class ArmyOfAllah2 extends ArmyOfAllah1 {
+    
+    public ArmyOfAllah2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 57;
+    }
+
+    public ArmyOfAllah2(final ArmyOfAllah2 card) {
+        super(card);
+    }
+
+    @Override
+    public ArmyOfAllah2 copy() {
+        return new ArmyOfAllah2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/arabiannights/NafsAsp.java b/Mage.Sets/src/mage/sets/arabiannights/NafsAsp1.java
similarity index 94%
rename from Mage.Sets/src/mage/sets/arabiannights/NafsAsp.java
rename to Mage.Sets/src/mage/sets/arabiannights/NafsAsp1.java
index 810922c640..45e7c572cd 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/NafsAsp.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/NafsAsp1.java
@@ -42,9 +42,9 @@ import mage.constants.Rarity;
  *
  * @author LoneFox
  */
-public class NafsAsp extends CardImpl {
+public class NafsAsp1 extends CardImpl {
 
-    public NafsAsp(UUID ownerId) {
+    public NafsAsp1(UUID ownerId) {
         super(ownerId, 36, "Nafs Asp", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}");
         this.expansionSetCode = "ARN";
         this.subtype.add("Snake");
@@ -58,12 +58,12 @@ public class NafsAsp extends CardImpl {
             false, true));
     }
 
-    public NafsAsp(final NafsAsp card) {
+    public NafsAsp1(final NafsAsp1 card) {
         super(card);
     }
 
     @Override
-    public NafsAsp copy() {
-        return new NafsAsp(this);
+    public NafsAsp1 copy() {
+        return new NafsAsp1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/NafsAsp2.java b/Mage.Sets/src/mage/sets/arabiannights/NafsAsp2.java
new file mode 100644
index 0000000000..1a040c0bd0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/arabiannights/NafsAsp2.java
@@ -0,0 +1,51 @@
+/*
+ *  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.arabiannights;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class NafsAsp2 extends NafsAsp1 {
+
+    public NafsAsp2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 37;
+    }
+
+    public NafsAsp2(final NafsAsp2 card) {
+        super(card);
+    }
+
+    @Override
+    public NafsAsp2 copy() {
+        return new NafsAsp2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java b/Mage.Sets/src/mage/sets/arabiannights/Oubliette1.java
similarity index 95%
rename from Mage.Sets/src/mage/sets/arabiannights/Oubliette.java
rename to Mage.Sets/src/mage/sets/arabiannights/Oubliette1.java
index 984bb3bef1..8e8babad4d 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Oubliette1.java
@@ -56,13 +56,13 @@ import mage.target.TargetPermanent;
  *
  * @author MarcoMarin
  */
-public class Oubliette extends CardImpl {
+public class Oubliette1 extends CardImpl {
 
     public Counters godHelpMe = null;
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target creature");
 
-    public Oubliette(UUID ownerId) {
+    public Oubliette1(UUID ownerId) {
         super(ownerId, 11, "Oubliette", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}");
         this.expansionSetCode = "ARN";
 
@@ -77,13 +77,13 @@ public class Oubliette extends CardImpl {
         this.addAbility(ability2);
     }
 
-    public Oubliette(final Oubliette card) {
+    public Oubliette1(final Oubliette1 card) {
         super(card);
     }
 
     @Override
-    public Oubliette copy() {
-        return new Oubliette(this);
+    public Oubliette1 copy() {
+        return new Oubliette1(this);
     }
 }
 
@@ -134,7 +134,7 @@ class OublietteEffect extends OneShotEffect {
                 }
 
                 //((Oubliette)enchantment.getMainCard()).godHelpMe = enchantedCreature.getCounters(game); //why doesn't work? should return the same card, no?
-                ((Oubliette) game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy();
+                ((Oubliette1) game.getCard(source.getSourceId())).godHelpMe = enchantedCreature.getCounters(game).copy();
                 /*
                 if (!(enchantedCreature instanceof Token)) {
 
@@ -220,7 +220,7 @@ class OublietteReturnEffect extends OneShotEffect {
                 if (oubliette == null) {
                     return false;//1st stab at getting those counters back
                 }
-                for (Counter c : ((Oubliette) oubliette).godHelpMe.values()) { //would be nice if could just use that copy function to set the whole field
+                for (Counter c : ((Oubliette1) oubliette).godHelpMe.values()) { //would be nice if could just use that copy function to set the whole field
                     if (c != null) {
                         newPermanent.getCounters(game).addCounter(c);
                     }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Oubliette2.java b/Mage.Sets/src/mage/sets/arabiannights/Oubliette2.java
new file mode 100644
index 0000000000..ecbb541a22
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/arabiannights/Oubliette2.java
@@ -0,0 +1,51 @@
+/*
+ *  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.arabiannights;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Oubliette2 extends Oubliette1 {
+
+    public Oubliette2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 12;
+    }
+
+    public Oubliette2(final Oubliette2 card) {
+        super(card);
+    }
+
+    @Override
+    public Oubliette2 copy() {
+        return new Oubliette2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Piety.java b/Mage.Sets/src/mage/sets/arabiannights/Piety1.java
similarity index 94%
rename from Mage.Sets/src/mage/sets/arabiannights/Piety.java
rename to Mage.Sets/src/mage/sets/arabiannights/Piety1.java
index 2d7d6c4392..9c74f54244 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Piety.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Piety1.java
@@ -41,11 +41,11 @@ import mage.filter.common.FilterBlockingCreature;
  *
  * @author MarcoMarin
  */
-public class Piety extends CardImpl {
+public class Piety1 extends CardImpl {
 
     public static final FilterBlockingCreature filter = new FilterBlockingCreature();
     
-    public Piety(UUID ownerId) {
+    public Piety1(UUID ownerId) {
         super(ownerId, 64, "Piety", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}");
         this.expansionSetCode = "ARN";
 
@@ -54,12 +54,12 @@ public class Piety extends CardImpl {
         //this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_POST, "end Piety", true, new BoostAllEffect(0, 3, Duration.EndOfTurn, filter, false)));
     }
 
-    public Piety(final Piety card) {
+    public Piety1(final Piety1 card) {
         super(card);
     }
 
     @Override
-    public Piety copy() {
-        return new Piety(this);
+    public Piety1 copy() {
+        return new Piety1(this);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/arabiannights/Piety2.java b/Mage.Sets/src/mage/sets/arabiannights/Piety2.java
new file mode 100644
index 0000000000..2ee8a1bc53
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/arabiannights/Piety2.java
@@ -0,0 +1,51 @@
+/*
+ *  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.arabiannights;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fwannmacher
+ */
+public class Piety2 extends Piety1 {
+
+    public Piety2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 65;
+    }
+
+    public Piety2(final Piety2 card) {
+        super(card);
+    }
+
+    @Override
+    public Piety2 copy() {
+        return new Piety2(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/fourthedition/NafsAsp.java b/Mage.Sets/src/mage/sets/fourthedition/NafsAsp.java
index 401909eda2..d40c749ca7 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/NafsAsp.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/NafsAsp.java
@@ -33,7 +33,7 @@ import java.util.UUID;
  *
  * @author LoneFox
  */
-public class NafsAsp extends mage.sets.arabiannights.NafsAsp {
+public class NafsAsp extends mage.sets.arabiannights.NafsAsp1 {
 
     public NafsAsp(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Piety.java b/Mage.Sets/src/mage/sets/fourthedition/Piety.java
index adcd28acb4..5bfba697c8 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/Piety.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/Piety.java
@@ -33,7 +33,7 @@ import java.util.UUID;
  *
  * @author MarcoMarin
  */
-public class Piety extends mage.sets.arabiannights.Piety {
+public class Piety extends mage.sets.arabiannights.Piety1 {
 
     public Piety(UUID ownerId) {
         super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Oubliette.java b/Mage.Sets/src/mage/sets/mastersedition/Oubliette.java
index c5f7813330..11b6fa1d94 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Oubliette.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Oubliette.java
@@ -33,7 +33,7 @@ import java.util.UUID;
  *
  * @author MarcoMarin
  */
-public class Oubliette extends mage.sets.arabiannights.Oubliette {
+public class Oubliette extends mage.sets.arabiannights.Oubliette1 {
 
     public Oubliette(UUID ownerId) {
         super(ownerId);