diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java
index 5bf01051b9..9c19201f55 100644
--- a/src/main/java/client/Character.java
+++ b/src/main/java/client/Character.java
@@ -233,7 +233,7 @@ public class Character extends AbstractCharacterObject {
     private Map<String, Events> events = new LinkedHashMap<>();
     private PartyQuest partyQuest = null;
     private final List<Pair<DelayedQuestUpdate, Object[]>> npcUpdateQuests = new LinkedList<>();
-    private MapleDragon dragon = null;
+    private Dragon dragon = null;
     private Ring marriageRing;
     private int marriageItemid = -1;
     private int partnerId = -1;
@@ -10615,14 +10615,14 @@ public class Character extends AbstractCharacterObject {
     }
 
     public void createDragon() {
-        dragon = new MapleDragon(this);
+        dragon = new Dragon(this);
     }
 
-    public MapleDragon getDragon() {
+    public Dragon getDragon() {
         return dragon;
     }
 
-    public void setDragon(MapleDragon dragon) {
+    public void setDragon(Dragon dragon) {
         this.dragon = dragon;
     }
 
diff --git a/src/main/java/net/server/channel/handlers/MoveDragonHandler.java b/src/main/java/net/server/channel/handlers/MoveDragonHandler.java
index f6f1900af3..bd36928bbc 100644
--- a/src/main/java/net/server/channel/handlers/MoveDragonHandler.java
+++ b/src/main/java/net/server/channel/handlers/MoveDragonHandler.java
@@ -24,7 +24,7 @@ package net.server.channel.handlers;
 import client.Character;
 import client.Client;
 import net.packet.InPacket;
-import server.maps.MapleDragon;
+import server.maps.Dragon;
 import tools.PacketCreator;
 import tools.exceptions.EmptyMovementException;
 
@@ -36,7 +36,7 @@ public class MoveDragonHandler extends AbstractMovementPacketHandler {
     public void handlePacket(InPacket p, Client c) {
         final Character chr = c.getPlayer();
         final Point startPos = new Point(p.readShort(), p.readShort());
-        final MapleDragon dragon = chr.getDragon();
+        final Dragon dragon = chr.getDragon();
         if (dragon != null) {
             try {
                 int movementDataStart = p.getPosition();
diff --git a/src/main/java/server/maps/MapleDragon.java b/src/main/java/server/maps/Dragon.java
similarity index 91%
rename from src/main/java/server/maps/MapleDragon.java
rename to src/main/java/server/maps/Dragon.java
index 0fee16cf69..99aeae754f 100644
--- a/src/main/java/server/maps/MapleDragon.java
+++ b/src/main/java/server/maps/Dragon.java
@@ -26,12 +26,10 @@ import client.Client;
 import tools.PacketCreator;
 
 
+public class Dragon extends AbstractAnimatedMapObject {
+    private final Character owner;
 
-public class MapleDragon extends AbstractAnimatedMapObject {
-
-    private Character owner;
-
-    public MapleDragon(Character chr) {
+    public Dragon(Character chr) {
         super();
         this.owner = chr;
         this.setPosition(chr.getPosition());
@@ -58,8 +56,8 @@ public class MapleDragon extends AbstractAnimatedMapObject {
     public void sendDestroyData(Client c) {
         c.sendPacket(PacketCreator.removeDragon(owner.getId()));
     }
-    
+
     public Character getOwner() {
-    	return owner;
+        return owner;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java
index e84059341d..f121a291dd 100644
--- a/src/main/java/server/maps/MapleMap.java
+++ b/src/main/java/server/maps/MapleMap.java
@@ -2523,7 +2523,7 @@ public class MapleMap {
             addMapObject(chr.getPlayerShop());
         }
         
-        final MapleDragon dragon = chr.getDragon();
+        final Dragon dragon = chr.getDragon();
         if (dragon != null) {
             dragon.setPosition(chr.getPosition());
             this.addMapObject(dragon);
diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java
index f6d80cd18d..8c738d1080 100644
--- a/src/main/java/tools/PacketCreator.java
+++ b/src/main/java/tools/PacketCreator.java
@@ -7276,7 +7276,7 @@ public class PacketCreator {
         return p;
     }
 
-    public static Packet spawnDragon(MapleDragon dragon) {
+    public static Packet spawnDragon(Dragon dragon) {
         OutPacket p = OutPacket.create(SendOpcode.SPAWN_DRAGON);
         p.writeInt(dragon.getOwner().getId());//objectid = owner id
         p.writeShort(dragon.getPosition().x);
@@ -7289,7 +7289,7 @@ public class PacketCreator {
         return p;
     }
 
-    public static Packet moveDragon(MapleDragon dragon, Point startPos, InPacket movementPacket, long movementDataLength) {
+    public static Packet moveDragon(Dragon dragon, Point startPos, InPacket movementPacket, long movementDataLength) {
         final OutPacket p = OutPacket.create(SendOpcode.MOVE_DRAGON);
         p.writeInt(dragon.getOwner().getId());
         p.writePos(startPos);