diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
index 716f52f4..d56eb9c0 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
@@ -225,8 +225,10 @@ public class Disguise {
         boolean throwError = false;
         try {
             String name;
-            if (getType().isPlayer()) {
-                name = "Player";
+            if (getType() == DisguiseType.MINECART_FURNACE || getType() == DisguiseType.MINECART_HOPPER
+                    || getType() == DisguiseType.MINECART_MOB_SPAWNER || getType() == DisguiseType.MINECART_RIDEABLE
+                    || getType() == DisguiseType.MINECART_TNT || getType() == DisguiseType.MINECART_CHEST) {
+                name = "Minecart";
             } else {
                 name = toReadable(getType().name());
             }
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartChestWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartChestWatcher.java
deleted file mode 100644
index 84a8c842..00000000
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartChestWatcher.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.libraryaddict.disguise.DisguiseTypes.Watchers;
-
-public class MinecartChestWatcher extends MinecartAbstractWatcher {
-
-    public MinecartChestWatcher(int entityId) {
-        super(entityId);
-    }
-
-}
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartFurnaceWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartFurnaceWatcher.java
deleted file mode 100644
index 9126f594..00000000
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartFurnaceWatcher.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.libraryaddict.disguise.DisguiseTypes.Watchers;
-
-public class MinecartFurnaceWatcher extends MinecartAbstractWatcher {
-
-    public MinecartFurnaceWatcher(int entityId) {
-        super(entityId);
-    }
-
-}
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartHopperWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartHopperWatcher.java
deleted file mode 100644
index a1e518de..00000000
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartHopperWatcher.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.libraryaddict.disguise.DisguiseTypes.Watchers;
-
-public class MinecartHopperWatcher extends MinecartAbstractWatcher{
-
-    public MinecartHopperWatcher(int entityId) {
-        super(entityId);
-    }
-
-}
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartMobSpawnerWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartMobSpawnerWatcher.java
deleted file mode 100644
index 17d144f7..00000000
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartMobSpawnerWatcher.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.libraryaddict.disguise.DisguiseTypes.Watchers;
-
-public class MinecartMobSpawnerWatcher extends MinecartAbstractWatcher{
-
-    public MinecartMobSpawnerWatcher(int entityId) {
-        super(entityId);
-    }
-
-}
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartRideableWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartRideableWatcher.java
deleted file mode 100644
index e5e6c0d9..00000000
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartRideableWatcher.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.libraryaddict.disguise.DisguiseTypes.Watchers;
-
-public class MinecartRideableWatcher extends MinecartAbstractWatcher{
-
-    public MinecartRideableWatcher(int entityId) {
-        super(entityId);
-    }
-
-}
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartTntWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartTntWatcher.java
deleted file mode 100644
index 2a55ad12..00000000
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartTntWatcher.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.libraryaddict.disguise.DisguiseTypes.Watchers;
-
-public class MinecartTntWatcher extends MinecartAbstractWatcher{
-
-    public MinecartTntWatcher(int entityId) {
-        super(entityId);
-    }
-
-}
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartAbstractWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartWatcher.java
similarity index 74%
rename from src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartAbstractWatcher.java
rename to src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartWatcher.java
index 055094e6..29b97b50 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartAbstractWatcher.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartWatcher.java
@@ -2,9 +2,9 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
 import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
 
-public abstract class MinecartAbstractWatcher extends FlagWatcher {
+public abstract class MinecartWatcher extends FlagWatcher {
 
-    public MinecartAbstractWatcher(int entityId) {
+    public MinecartWatcher(int entityId) {
         super(entityId);
         setValue(16, (byte) 0);
         setValue(17, 0);