diff --git a/Mage.Sets/src/mage/cards/s/SecretsOfTheMausoleum.java b/Mage.Sets/src/mage/cards/m/MausoleumSecrets.java
similarity index 88%
rename from Mage.Sets/src/mage/cards/s/SecretsOfTheMausoleum.java
rename to Mage.Sets/src/mage/cards/m/MausoleumSecrets.java
index fe8f5c1ee7..a85390d9b6 100644
--- a/Mage.Sets/src/mage/cards/s/SecretsOfTheMausoleum.java
+++ b/Mage.Sets/src/mage/cards/m/MausoleumSecrets.java
@@ -1,4 +1,4 @@
-package mage.cards.s;
+package mage.cards.m;
 
 import java.util.UUID;
 import mage.ObjectColor;
@@ -22,22 +22,22 @@ import mage.target.common.TargetCardInLibrary;
  *
  * @author TheElk801
  */
-public final class SecretsOfTheMausoleum extends CardImpl {
+public final class MausoleumSecrets extends CardImpl {
 
-    public SecretsOfTheMausoleum(UUID ownerId, CardSetInfo setInfo) {
+    public MausoleumSecrets(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}");
 
         // Undergrowth — Search your library for a black card with converted mana cost equal to or less than the number of creature cards in your graveyard, reveal it, put it into your hand, then shuffle your library.
         this.getSpellAbility().addEffect(new SecretsOfTheMausoleumEffect());
     }
 
-    public SecretsOfTheMausoleum(final SecretsOfTheMausoleum card) {
+    public MausoleumSecrets(final MausoleumSecrets card) {
         super(card);
     }
 
     @Override
-    public SecretsOfTheMausoleum copy() {
-        return new SecretsOfTheMausoleum(this);
+    public MausoleumSecrets copy() {
+        return new MausoleumSecrets(this);
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/n/NightveilFaerie.java b/Mage.Sets/src/mage/cards/n/NightveilSprite.java
similarity index 77%
rename from Mage.Sets/src/mage/cards/n/NightveilFaerie.java
rename to Mage.Sets/src/mage/cards/n/NightveilSprite.java
index 46f197cbc5..6495bfe954 100644
--- a/Mage.Sets/src/mage/cards/n/NightveilFaerie.java
+++ b/Mage.Sets/src/mage/cards/n/NightveilSprite.java
@@ -14,9 +14,9 @@ import mage.constants.CardType;
  *
  * @author TheElk801
  */
-public final class NightveilFaerie extends CardImpl {
+public final class NightveilSprite extends CardImpl {
 
-    public NightveilFaerie(UUID ownerId, CardSetInfo setInfo) {
+    public NightveilSprite(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}");
 
         this.subtype.add(SubType.FAERIE);
@@ -31,12 +31,12 @@ public final class NightveilFaerie extends CardImpl {
         this.addAbility(new AttacksTriggeredAbility(new SurveilEffect(1), false));
     }
 
-    public NightveilFaerie(final NightveilFaerie card) {
+    public NightveilSprite(final NightveilSprite card) {
         super(card);
     }
 
     @Override
-    public NightveilFaerie copy() {
-        return new NightveilFaerie(this);
+    public NightveilSprite copy() {
+        return new NightveilSprite(this);
     }
 }
diff --git a/Mage.Sets/src/mage/cards/r/RainOfNotions.java b/Mage.Sets/src/mage/cards/n/NotionRain.java
similarity index 77%
rename from Mage.Sets/src/mage/cards/r/RainOfNotions.java
rename to Mage.Sets/src/mage/cards/n/NotionRain.java
index 14df944e0e..171706396c 100644
--- a/Mage.Sets/src/mage/cards/r/RainOfNotions.java
+++ b/Mage.Sets/src/mage/cards/n/NotionRain.java
@@ -1,4 +1,4 @@
-package mage.cards.r;
+package mage.cards.n;
 
 import java.util.UUID;
 import mage.abilities.effects.common.DamageControllerEffect;
@@ -12,9 +12,9 @@ import mage.constants.CardType;
  *
  * @author TheElk801
  */
-public final class RainOfNotions extends CardImpl {
+public final class NotionRain extends CardImpl {
 
-    public RainOfNotions(UUID ownerId, CardSetInfo setInfo) {
+    public NotionRain(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{U}{B}");
 
         // Surveil 2, then draw two cards. Rain of Notions deals 2 damage to you.
@@ -28,12 +28,12 @@ public final class RainOfNotions extends CardImpl {
         this.getSpellAbility().addEffect(new DamageControllerEffect(2));
     }
 
-    public RainOfNotions(final RainOfNotions card) {
+    public NotionRain(final NotionRain card) {
         super(card);
     }
 
     @Override
-    public RainOfNotions copy() {
-        return new RainOfNotions(this);
+    public NotionRain copy() {
+        return new NotionRain(this);
     }
 }
diff --git a/Mage.Sets/src/mage/cards/w/WhisperingSpy.java b/Mage.Sets/src/mage/cards/w/WhisperingSnitch.java
similarity index 92%
rename from Mage.Sets/src/mage/cards/w/WhisperingSpy.java
rename to Mage.Sets/src/mage/cards/w/WhisperingSnitch.java
index 6454069e7c..aa5275300b 100644
--- a/Mage.Sets/src/mage/cards/w/WhisperingSpy.java
+++ b/Mage.Sets/src/mage/cards/w/WhisperingSnitch.java
@@ -22,9 +22,9 @@ import mage.watchers.Watcher;
  *
  * @author TheElk801
  */
-public final class WhisperingSpy extends CardImpl {
+public final class WhisperingSnitch extends CardImpl {
 
-    public WhisperingSpy(UUID ownerId, CardSetInfo setInfo) {
+    public WhisperingSnitch(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}");
 
         this.subtype.add(SubType.VAMPIRE);
@@ -36,13 +36,13 @@ public final class WhisperingSpy extends CardImpl {
         this.addAbility(new WhisperingSpyTriggeredAbility());
     }
 
-    public WhisperingSpy(final WhisperingSpy card) {
+    public WhisperingSnitch(final WhisperingSnitch card) {
         super(card);
     }
 
     @Override
-    public WhisperingSpy copy() {
-        return new WhisperingSpy(this);
+    public WhisperingSnitch copy() {
+        return new WhisperingSnitch(this);
     }
 }
 
diff --git a/Mage.Sets/src/mage/sets/GuildsOfRavnica.java b/Mage.Sets/src/mage/sets/GuildsOfRavnica.java
index 1e5a9fcb25..2696af64ed 100644
--- a/Mage.Sets/src/mage/sets/GuildsOfRavnica.java
+++ b/Mage.Sets/src/mage/sets/GuildsOfRavnica.java
@@ -77,14 +77,14 @@ public final class GuildsOfRavnica extends ExpansionSet {
         cards.add(new SetCardInfo("Murmuring Mystic", 45, Rarity.UNCOMMON, mage.cards.m.MurmuringMystic.class));
         cards.add(new SetCardInfo("Narcomoeba", 47, Rarity.RARE, mage.cards.n.Narcomoeba.class));
         cards.add(new SetCardInfo("Necrotic Wound", 79, Rarity.UNCOMMON, mage.cards.n.NecroticWound.class));
-        cards.add(new SetCardInfo("Nightveil Faerie", 48, Rarity.UNCOMMON, mage.cards.n.NightveilFaerie.class));
+        cards.add(new SetCardInfo("Nightveil Sprite", 48, Rarity.UNCOMMON, mage.cards.n.NightveilSprite.class));
         cards.add(new SetCardInfo("Niv-Mizzet, Parun", 192, Rarity.RARE, mage.cards.n.NivMizzetParun.class));
         cards.add(new SetCardInfo("Nullhide Ferox", 138, Rarity.MYTHIC, mage.cards.n.NullhideFerox.class));
         cards.add(new SetCardInfo("Overgrown Tomb", 253, Rarity.RARE, mage.cards.o.OvergrownTomb.class));
         cards.add(new SetCardInfo("Plains", 260, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Quasiduplicate", 51, Rarity.RARE, mage.cards.q.Quasiduplicate.class));
         cards.add(new SetCardInfo("Radical Idea", 52, Rarity.COMMON, mage.cards.r.RadicalIdea.class));
-        cards.add(new SetCardInfo("Rain of Notions", 193, Rarity.COMMON, mage.cards.r.RainOfNotions.class));
+        cards.add(new SetCardInfo("Notion Rain", 193, Rarity.COMMON, mage.cards.n.NotionRain.class));
         cards.add(new SetCardInfo("Ral's Dispersal", 266, Rarity.RARE, mage.cards.r.RalsDispersal.class));
         cards.add(new SetCardInfo("Ral's Staticaster", 268, Rarity.UNCOMMON, mage.cards.r.RalsStaticaster.class));
         cards.add(new SetCardInfo("Ral, Caller of Storms", 265, Rarity.MYTHIC, mage.cards.r.RalCallerOfStorms.class));
@@ -93,7 +93,7 @@ public final class GuildsOfRavnica extends ExpansionSet {
         cards.add(new SetCardInfo("Rosemane Centaur", 197, Rarity.COMMON, mage.cards.r.RosemaneCentaur.class));
         cards.add(new SetCardInfo("Runaway Steam-Kin", 115, Rarity.RARE, mage.cards.r.RunawaySteamKin.class));
         cards.add(new SetCardInfo("Sacred Foundry", 254, Rarity.RARE, mage.cards.s.SacredFoundry.class));
-        cards.add(new SetCardInfo("Secrets of the Mausoleum", 75, Rarity.RARE, mage.cards.s.SecretsOfTheMausoleum.class));
+        cards.add(new SetCardInfo("Mausoleum Secrets", 75, Rarity.RARE, mage.cards.m.MausoleumSecrets.class));
         cards.add(new SetCardInfo("Selesnya Guildgate", 255, Rarity.COMMON, mage.cards.s.SelesnyaGuildgate.class));
         cards.add(new SetCardInfo("Selesnya Guildgate", 256, Rarity.COMMON, mage.cards.s.SelesnyaGuildgate.class));
         cards.add(new SetCardInfo("Selesnya Locket", 240, Rarity.COMMON, mage.cards.s.SelesnyaLocket.class));
@@ -114,6 +114,6 @@ public final class GuildsOfRavnica extends ExpansionSet {
         cards.add(new SetCardInfo("Wary Okapi", 149, Rarity.COMMON, mage.cards.w.WaryOkapi.class));
         cards.add(new SetCardInfo("Watery Grave", 259, Rarity.RARE, mage.cards.w.WateryGrave.class));
         cards.add(new SetCardInfo("Whisper Agent", 220, Rarity.COMMON, mage.cards.w.WhisperAgent.class));
-        cards.add(new SetCardInfo("Whispering Spy", 90, Rarity.UNCOMMON, mage.cards.w.WhisperingSpy.class));
+        cards.add(new SetCardInfo("Whispering Snitch", 90, Rarity.UNCOMMON, mage.cards.w.WhisperingSnitch.class));
     }
 }