diff --git a/Mage.Sets/src/mage/sets/magic2015/AccursedSpirit.java b/Mage.Sets/src/mage/sets/magic2015/AccursedSpirit.java
index b7999a6fcc..e98896f63c 100644
--- a/Mage.Sets/src/mage/sets/magic2015/AccursedSpirit.java
+++ b/Mage.Sets/src/mage/sets/magic2015/AccursedSpirit.java
@@ -37,7 +37,7 @@ public class AccursedSpirit extends mage.sets.magic2014.AccursedSpirit {
 
     public AccursedSpirit(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9901;
+        this.cardNumber = 85;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/BronzeSable.java b/Mage.Sets/src/mage/sets/magic2015/BronzeSable.java
index 94ad7e2f3d..66f833ad2f 100644
--- a/Mage.Sets/src/mage/sets/magic2015/BronzeSable.java
+++ b/Mage.Sets/src/mage/sets/magic2015/BronzeSable.java
@@ -37,7 +37,7 @@ public class BronzeSable extends mage.sets.theros.BronzeSable {
 
     public BronzeSable(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9902;
+        this.cardNumber = 214;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/CausticTar.java b/Mage.Sets/src/mage/sets/magic2015/CausticTar.java
index 3c3d90ab28..49ea8c8cde 100644
--- a/Mage.Sets/src/mage/sets/magic2015/CausticTar.java
+++ b/Mage.Sets/src/mage/sets/magic2015/CausticTar.java
@@ -38,7 +38,7 @@ public class CausticTar extends mage.sets.odyssey.CausticTar {
 
     public CausticTar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9903;
+        this.cardNumber = 89;
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/ChildOfNight.java b/Mage.Sets/src/mage/sets/magic2015/ChildOfNight.java
index 9afebaef4d..4fe55155d1 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ChildOfNight.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ChildOfNight.java
@@ -37,7 +37,7 @@ public class ChildOfNight extends mage.sets.magic2010.ChildOfNight {
 
     public ChildOfNight(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9904;
+        this.cardNumber = 90;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/ClearAPath.java b/Mage.Sets/src/mage/sets/magic2015/ClearAPath.java
index 2fd717ff7e..030d72855f 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ClearAPath.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ClearAPath.java
@@ -37,7 +37,7 @@ public class ClearAPath extends mage.sets.dragonsmaze.ClearAPath {
 
     public ClearAPath(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9905;
+        this.cardNumber = 136;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Encrust.java b/Mage.Sets/src/mage/sets/magic2015/Encrust.java
index 9cf7aae954..9f4c1c8f9f 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Encrust.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Encrust.java
@@ -37,7 +37,7 @@ public class Encrust extends mage.sets.magic2013.Encrust {
 
     public Encrust(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9906;
+        this.cardNumber = 53;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/GargoyleSentinel.java b/Mage.Sets/src/mage/sets/magic2015/GargoyleSentinel.java
index 87a19edcb3..abf5b7eecc 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GargoyleSentinel.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GargoyleSentinel.java
@@ -38,7 +38,7 @@ public class GargoyleSentinel extends mage.sets.magic2011.GargoyleSentinel {
 
     public GargoyleSentinel(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9907;
+        this.cardNumber = 216;
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/GatherCourage.java b/Mage.Sets/src/mage/sets/magic2015/GatherCourage.java
index 8298989998..6092da5f49 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GatherCourage.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GatherCourage.java
@@ -37,7 +37,7 @@ public class GatherCourage extends mage.sets.ravnika.GatherCourage {
 
     public GatherCourage(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9908;
+        this.cardNumber = 175;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/HeatRay.java b/Mage.Sets/src/mage/sets/magic2015/HeatRay.java
index 0aa256ca88..f3dc131036 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HeatRay.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HeatRay.java
@@ -37,7 +37,7 @@ public class HeatRay extends mage.sets.riseoftheeldrazi.HeatRay {
 
     public HeatRay(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9909;
+        this.cardNumber = 148;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/HeliodsPilgrim.java b/Mage.Sets/src/mage/sets/magic2015/HeliodsPilgrim.java
index 32773a4ae4..626af4bbbf 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HeliodsPilgrim.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HeliodsPilgrim.java
@@ -53,7 +53,7 @@ public class HeliodsPilgrim extends CardImpl {
     }
 
     public HeliodsPilgrim(UUID ownerId) {
-        super(ownerId, 9925, "Heliod's Pilgrim", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+        super(ownerId, 14, "Heliod's Pilgrim", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
         this.expansionSetCode = "M15";
         this.subtype.add("Human");
         this.subtype.add("Cleric");
diff --git a/Mage.Sets/src/mage/sets/magic2015/HoardingDragon.java b/Mage.Sets/src/mage/sets/magic2015/HoardingDragon.java
index a7f705672a..06ecafabc3 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HoardingDragon.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HoardingDragon.java
@@ -37,7 +37,7 @@ public class HoardingDragon extends mage.sets.magic2011.HoardingDragon {
 
     public HoardingDragon(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9910;
+        this.cardNumber = 149;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/HornetQueen.java b/Mage.Sets/src/mage/sets/magic2015/HornetQueen.java
index 30a5b495b7..9bf4adb9b8 100644
--- a/Mage.Sets/src/mage/sets/magic2015/HornetQueen.java
+++ b/Mage.Sets/src/mage/sets/magic2015/HornetQueen.java
@@ -37,7 +37,7 @@ public class HornetQueen extends mage.sets.commander.HornetQueen {
 
     public HornetQueen(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9923;
+        this.cardNumber = 178;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Juggernaut.java b/Mage.Sets/src/mage/sets/magic2015/Juggernaut.java
index 2f89a516e0..577fa8d7d9 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Juggernaut.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Juggernaut.java
@@ -38,7 +38,7 @@ public class Juggernaut extends mage.sets.tenth.Juggernaut {
 
     public Juggernaut(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9911;
+        this.cardNumber = 220;
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/Naturalize.java b/Mage.Sets/src/mage/sets/magic2015/Naturalize.java
index d057736d61..59271895e3 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Naturalize.java
@@ -37,7 +37,7 @@ public class Naturalize extends mage.sets.tenth.Naturalize {
 
     public Naturalize(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9912;
+        this.cardNumber = 185;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Ornithopter.java b/Mage.Sets/src/mage/sets/magic2015/Ornithopter.java
index 08aa0318b9..1632c47f60 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Ornithopter.java
@@ -38,7 +38,7 @@ public class Ornithopter extends mage.sets.tenth.Ornithopter {
 
     public Ornithopter(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9913;
+        this.cardNumber = 223;
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/Overwhelm.java b/Mage.Sets/src/mage/sets/magic2015/Overwhelm.java
index 7cea251aba..08f62a935b 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Overwhelm.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Overwhelm.java
@@ -38,7 +38,7 @@ public class Overwhelm extends mage.sets.ravnika.Overwhelm {
 
     public Overwhelm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9914;
+        this.cardNumber = 189;
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/PeelFromReality.java b/Mage.Sets/src/mage/sets/magic2015/PeelFromReality.java
index e6acbe0851..a6b29c039e 100644
--- a/Mage.Sets/src/mage/sets/magic2015/PeelFromReality.java
+++ b/Mage.Sets/src/mage/sets/magic2015/PeelFromReality.java
@@ -37,7 +37,7 @@ public class PeelFromReality extends mage.sets.avacynrestored.PeelFromReality {
 
     public PeelFromReality(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9915;
+        this.cardNumber = 74;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/Restock.java b/Mage.Sets/src/mage/sets/magic2015/Restock.java
index 2eb55d9cf6..54454dbfcd 100644
--- a/Mage.Sets/src/mage/sets/magic2015/Restock.java
+++ b/Mage.Sets/src/mage/sets/magic2015/Restock.java
@@ -37,7 +37,7 @@ public class Restock extends mage.sets.invasion.Restock {
 
     public Restock(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9916;
+        this.cardNumber = 195;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SelflessCathar.java b/Mage.Sets/src/mage/sets/magic2015/SelflessCathar.java
index dd84a0a8c3..01a90e2e74 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SelflessCathar.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SelflessCathar.java
@@ -37,7 +37,7 @@ public class SelflessCathar extends mage.sets.innistrad.SelflessCathar {
 
     public SelflessCathar(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9917;
+        this.cardNumber = 31;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SeraphOfTheMasses.java b/Mage.Sets/src/mage/sets/magic2015/SeraphOfTheMasses.java
index 41d84fcebe..f9aa704951 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SeraphOfTheMasses.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SeraphOfTheMasses.java
@@ -50,7 +50,7 @@ public class SeraphOfTheMasses extends CardImpl {
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control");
 
     public SeraphOfTheMasses(UUID ownerId) {
-        super(ownerId, 9927, "Seraph of the Masses", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
+        super(ownerId, 32, "Seraph of the Masses", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
         this.expansionSetCode = "M15";
         this.subtype.add("Angel");
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java b/Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java
index 7eb34030a9..29343c11df 100644
--- a/Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java
+++ b/Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java
@@ -37,7 +37,7 @@ public class SiegeWurm extends mage.sets.ravnika.SiegeWurm {
 
     public SiegeWurm(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9918;
+        this.cardNumber = 200;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/StabWound.java b/Mage.Sets/src/mage/sets/magic2015/StabWound.java
index 9de2c872fd..983a5f2cc6 100644
--- a/Mage.Sets/src/mage/sets/magic2015/StabWound.java
+++ b/Mage.Sets/src/mage/sets/magic2015/StabWound.java
@@ -37,7 +37,7 @@ public class StabWound extends mage.sets.returntoravnica.StabWound {
 
     public StabWound(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9919;
+        this.cardNumber = 116;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/TorchFiend.java b/Mage.Sets/src/mage/sets/magic2015/TorchFiend.java
index 88bdaa1d2e..f5882b2617 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TorchFiend.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TorchFiend.java
@@ -37,7 +37,7 @@ public class TorchFiend extends mage.sets.darkascension.TorchFiend {
 
     public TorchFiend(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9920;
+        this.cardNumber = 166;
         this.expansionSetCode = "M15";
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2015/TurnToFrog.java b/Mage.Sets/src/mage/sets/magic2015/TurnToFrog.java
index d278f64abe..d148cdb027 100644
--- a/Mage.Sets/src/mage/sets/magic2015/TurnToFrog.java
+++ b/Mage.Sets/src/mage/sets/magic2015/TurnToFrog.java
@@ -38,7 +38,7 @@ public class TurnToFrog extends mage.sets.magic2012.TurnToFrog {
 
     public TurnToFrog(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9921;
+        this.cardNumber = 81;
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/WallOfFrost.java b/Mage.Sets/src/mage/sets/magic2015/WallOfFrost.java
index 5cdcecb65f..4fb353cf41 100644
--- a/Mage.Sets/src/mage/sets/magic2015/WallOfFrost.java
+++ b/Mage.Sets/src/mage/sets/magic2015/WallOfFrost.java
@@ -38,7 +38,7 @@ public class WallOfFrost extends mage.sets.magic2010.WallOfFrost {
 
     public WallOfFrost(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9922;
+        this.cardNumber = 83;
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }
diff --git a/Mage.Sets/src/mage/sets/magic2015/WallOfMulch.java b/Mage.Sets/src/mage/sets/magic2015/WallOfMulch.java
index 9fe7b56d64..53888249aa 100644
--- a/Mage.Sets/src/mage/sets/magic2015/WallOfMulch.java
+++ b/Mage.Sets/src/mage/sets/magic2015/WallOfMulch.java
@@ -38,7 +38,7 @@ public class WallOfMulch extends mage.sets.onslaught.WallOfMulch {
 
     public WallOfMulch(UUID ownerId) {
         super(ownerId);
-        this.cardNumber = 9924;
+        this.cardNumber = 208;
         this.expansionSetCode = "M15";
         this.rarity = Rarity.COMMON;
     }