diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java
index 892a326f..5c46bb1b 100644
--- a/src/me/libraryaddict/disguise/DisguiseAPI.java
+++ b/src/me/libraryaddict/disguise/DisguiseAPI.java
@@ -27,7 +27,7 @@ import me.libraryaddict.disguise.disguisetypes.MobDisguise;
 import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
 import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
 import me.libraryaddict.disguise.disguisetypes.TargetedDisguise.TargetType;
-import me.libraryaddict.disguise.disguisetypes.watchers.HorseAbstractWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.AbstractHorseWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.HorseWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
@@ -83,7 +83,7 @@ public class DisguiseAPI {
                 ItemStack saddle = horseInventory.getSaddle();
 
                 if (saddle != null && saddle.getType() == Material.SADDLE) {
-                    ((HorseAbstractWatcher) watcher).setSaddled(true);
+                    ((AbstractHorseWatcher) watcher).setSaddled(true);
                 }
 
                 if (watcher instanceof HorseWatcher)
diff --git a/src/me/libraryaddict/disguise/disguisetypes/FlagType.java b/src/me/libraryaddict/disguise/disguisetypes/FlagType.java
index ac76e61d..f6bebdd0 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/FlagType.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/FlagType.java
@@ -34,8 +34,8 @@ import me.libraryaddict.disguise.disguisetypes.watchers.FireworkWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.FishingHookWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.GhastWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.GuardianWatcher;
-import me.libraryaddict.disguise.disguisetypes.watchers.HorseAbstractWatcher;
-import me.libraryaddict.disguise.disguisetypes.watchers.HorseChestedWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.AbstractHorseWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ChestedHorseWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.HorseWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.InsentientWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.IronGolemWatcher;
@@ -172,13 +172,13 @@ public class FlagType<Y> {
 
     public static FlagType<Integer> HORSE_ARMOR = new FlagType<Integer>(HorseWatcher.class, 1, 0);
 
-    public static FlagType<Boolean> HORSE_CHESTED_CARRYING_CHEST = new FlagType<Boolean>(HorseChestedWatcher.class, 0, false);
+    public static FlagType<Boolean> HORSE_CHESTED_CARRYING_CHEST = new FlagType<Boolean>(ChestedHorseWatcher.class, 0, false);
 
     public static FlagType<Integer> HORSE_COLOR = new FlagType<Integer>(HorseWatcher.class, 0, 0);
 
-    public static FlagType<Byte> HORSE_META = new FlagType<Byte>(HorseAbstractWatcher.class, 0, (byte) 0);
+    public static FlagType<Byte> HORSE_META = new FlagType<Byte>(AbstractHorseWatcher.class, 0, (byte) 0);
 
-    public static FlagType<Optional<UUID>> HORSE_OWNER = new FlagType<Optional<UUID>>(HorseAbstractWatcher.class, 1,
+    public static FlagType<Optional<UUID>> HORSE_OWNER = new FlagType<Optional<UUID>>(AbstractHorseWatcher.class, 1,
             Optional.<UUID> absent());
 
     // public static FlagType<Integer> HORSE_VARIANT = new FlagType<Integer>(HorseWatcher.class, 0, 0);
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseAbstractWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java
similarity index 90%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/HorseAbstractWatcher.java
rename to src/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java
index eaa58b2c..1a0ce803 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseAbstractWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java
@@ -7,8 +7,8 @@ import com.google.common.base.Optional;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.FlagType;
 
-public class HorseAbstractWatcher extends AgeableWatcher {
-    public HorseAbstractWatcher(Disguise disguise) {
+public class AbstractHorseWatcher extends AgeableWatcher {
+    public AbstractHorseWatcher(Disguise disguise) {
         super(disguise);
     }
 
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseChestedWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java
similarity index 78%
rename from src/me/libraryaddict/disguise/disguisetypes/watchers/HorseChestedWatcher.java
rename to src/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java
index 7d5d0a3f..2576f163 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseChestedWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java
@@ -3,9 +3,9 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.FlagType;
 
-public class HorseChestedWatcher extends HorseAbstractWatcher {
+public class ChestedHorseWatcher extends AbstractHorseWatcher {
 
-    public HorseChestedWatcher(Disguise disguise) {
+    public ChestedHorseWatcher(Disguise disguise) {
         super(disguise);
     }
 
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/DonkeyWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/DonkeyWatcher.java
index 7fbaad49..33d5e2ce 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/DonkeyWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/DonkeyWatcher.java
@@ -2,7 +2,7 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
 
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 
-public class DonkeyWatcher extends HorseChestedWatcher {
+public class DonkeyWatcher extends ChestedHorseWatcher {
 
     public DonkeyWatcher(Disguise disguise) {
         super(disguise);
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java
index 04dc028c..da5fb93e 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java
@@ -9,7 +9,7 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.FlagType;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 
-public class HorseWatcher extends HorseAbstractWatcher {
+public class HorseWatcher extends AbstractHorseWatcher {
     public HorseWatcher(Disguise disguise) {
         super(disguise);
 
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java
index 3fbaddc9..0a857d0a 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java
@@ -6,7 +6,7 @@ import me.libraryaddict.disguise.disguisetypes.AnimalColor;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.FlagType;
 
-public class LlamaWatcher extends HorseChestedWatcher {
+public class LlamaWatcher extends ChestedHorseWatcher {
 
     public LlamaWatcher(Disguise disguise) {
         super(disguise);
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/MuleWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/MuleWatcher.java
index fe57446b..22ddeaa8 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/MuleWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/MuleWatcher.java
@@ -2,7 +2,7 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
 
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 
-public class MuleWatcher extends HorseChestedWatcher {
+public class MuleWatcher extends ChestedHorseWatcher {
 
     public MuleWatcher(Disguise disguise) {
         super(disguise);
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonHorseWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonHorseWatcher.java
index b75a4bd9..b8067f69 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonHorseWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonHorseWatcher.java
@@ -2,7 +2,7 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
 
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 
-public class SkeletonHorseWatcher extends HorseAbstractWatcher {
+public class SkeletonHorseWatcher extends AbstractHorseWatcher {
 
     public SkeletonHorseWatcher(Disguise disguise) {
         super(disguise);
diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieHorseWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieHorseWatcher.java
index 39dc5967..f83f303d 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieHorseWatcher.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieHorseWatcher.java
@@ -2,7 +2,7 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
 
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 
-public class ZombieHorseWatcher extends HorseAbstractWatcher {
+public class ZombieHorseWatcher extends AbstractHorseWatcher {
 
     public ZombieHorseWatcher(Disguise disguise) {
         super(disguise);