diff --git a/src/main/java/client/SkillFactory.java b/src/main/java/client/SkillFactory.java
index 326b68cc3f..8a80c8d06b 100644
--- a/src/main/java/client/SkillFactory.java
+++ b/src/main/java/client/SkillFactory.java
@@ -41,7 +41,7 @@ public class SkillFactory {
     public static void loadAllSkills() {
         final Map<Integer, Skill> loadedSkills = new HashMap<>();
         final DataDirectoryEntry root = datasource.getRoot();
-        for (MapleDataFileEntry topDir : root.getFiles()) { // Loop thru jobs
+        for (DataFileEntry topDir : root.getFiles()) { // Loop thru jobs
             if (topDir.getName().length() <= 8) {
                 for (Data data : datasource.getData(topDir.getName())) { // Loop thru each jobs
                     if (data.getName().equals("skill")) {
diff --git a/src/main/java/constants/game/GameConstants.java b/src/main/java/constants/game/GameConstants.java
index 3f1fc09be5..05d5c6d5ed 100644
--- a/src/main/java/constants/game/GameConstants.java
+++ b/src/main/java/constants/game/GameConstants.java
@@ -685,7 +685,7 @@ public class GameConstants {
                 continue;
             }
             
-            for (MapleDataFileEntry obj : objData.getFiles()) {
+            for (DataFileEntry obj : objData.getFiles()) {
                 for (Data l0 : mapSource.getData(objData.getName() + "/" + obj.getName()).getChildren()) {
                     for (Data l1 : l0.getChildren()) {
                         for (Data l2 : l1.getChildren()) {
diff --git a/src/main/java/provider/DataDirectoryEntry.java b/src/main/java/provider/DataDirectoryEntry.java
index a61bab01aa..4e916ca449 100644
--- a/src/main/java/provider/DataDirectoryEntry.java
+++ b/src/main/java/provider/DataDirectoryEntry.java
@@ -28,6 +28,6 @@ import java.util.List;
  */
 public interface DataDirectoryEntry extends DataEntry {
     List<DataDirectoryEntry> getSubdirectories();
-    List<MapleDataFileEntry> getFiles();
+    List<DataFileEntry> getFiles();
     DataEntry getEntry(String name);
 }
diff --git a/src/main/java/provider/MapleDataFileEntry.java b/src/main/java/provider/DataFileEntry.java
similarity index 94%
rename from src/main/java/provider/MapleDataFileEntry.java
rename to src/main/java/provider/DataFileEntry.java
index 395d99b4c7..f8371b9d32 100644
--- a/src/main/java/provider/MapleDataFileEntry.java
+++ b/src/main/java/provider/DataFileEntry.java
@@ -22,9 +22,8 @@
 package provider;
 
 /**
- *
  * @author Matze
  */
-public interface MapleDataFileEntry extends DataEntry {
+public interface DataFileEntry extends DataEntry {
     void setOffset(int offset);
 }
diff --git a/src/main/java/provider/wz/WZDirectoryEntry.java b/src/main/java/provider/wz/WZDirectoryEntry.java
index 3a96143d81..d34eeba5bb 100644
--- a/src/main/java/provider/wz/WZDirectoryEntry.java
+++ b/src/main/java/provider/wz/WZDirectoryEntry.java
@@ -24,13 +24,13 @@ package provider.wz;
 import provider.DataDirectoryEntry;
 import provider.DataEntity;
 import provider.DataEntry;
-import provider.MapleDataFileEntry;
+import provider.DataFileEntry;
 
 import java.util.*;
 
 public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
     private List<DataDirectoryEntry> subdirs = new ArrayList<>();
-    private List<MapleDataFileEntry> files = new ArrayList<>();
+    private List<DataFileEntry> files = new ArrayList<>();
     private Map<String, DataEntry> entries = new HashMap<>();
 
     public WZDirectoryEntry(String name, int size, int checksum, DataEntity parent) {
@@ -46,7 +46,7 @@ public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
         entries.put(dir.getName(), dir);
     }
 
-    public void addFile(MapleDataFileEntry fileEntry) {
+    public void addFile(DataFileEntry fileEntry) {
         files.add(fileEntry);
         entries.put(fileEntry.getName(), fileEntry);
     }
@@ -55,7 +55,7 @@ public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
         return Collections.unmodifiableList(subdirs);
     }
 
-    public List<MapleDataFileEntry> getFiles() {
+    public List<DataFileEntry> getFiles() {
         return Collections.unmodifiableList(files);
     }
 
diff --git a/src/main/java/provider/wz/WZFileEntry.java b/src/main/java/provider/wz/WZFileEntry.java
index acf9aa1eeb..2550b1e5b4 100644
--- a/src/main/java/provider/wz/WZFileEntry.java
+++ b/src/main/java/provider/wz/WZFileEntry.java
@@ -22,9 +22,9 @@
 package provider.wz;
 
 import provider.DataEntity;
-import provider.MapleDataFileEntry;
+import provider.DataFileEntry;
 
-public class WZFileEntry extends WZEntry implements MapleDataFileEntry {
+public class WZFileEntry extends WZEntry implements DataFileEntry {
     private int offset;
 
     public WZFileEntry(String name, int size, int checksum, DataEntity parent) {
diff --git a/src/main/java/server/MapleItemInformationProvider.java b/src/main/java/server/MapleItemInformationProvider.java
index 4cfc290bd5..1c4f69cf75 100644
--- a/src/main/java/server/MapleItemInformationProvider.java
+++ b/src/main/java/server/MapleItemInformationProvider.java
@@ -273,7 +273,7 @@ public class MapleItemInformationProvider {
         String idStr = "0" + String.valueOf(itemId);
         DataDirectoryEntry root = itemData.getRoot();
         for (DataDirectoryEntry topDir : root.getSubdirectories()) {
-            for (MapleDataFileEntry iFile : topDir.getFiles()) {
+            for (DataFileEntry iFile : topDir.getFiles()) {
                 if (iFile.getName().equals(idStr.substring(0, 4) + ".img")) {
                     ret = itemData.getData(topDir.getName() + "/" + iFile.getName());
                     if (ret == null) {
@@ -288,7 +288,7 @@ public class MapleItemInformationProvider {
         }
         root = equipData.getRoot();
         for (DataDirectoryEntry topDir : root.getSubdirectories()) {
-            for (MapleDataFileEntry iFile : topDir.getFiles()) {
+            for (DataFileEntry iFile : topDir.getFiles()) {
                 if (iFile.getName().equals(idStr + ".img")) {
                     return equipData.getData(topDir.getName() + "/" + iFile.getName());
                 }
diff --git a/src/main/java/tools/mapletools/MonsterStatFetcher.java b/src/main/java/tools/mapletools/MonsterStatFetcher.java
index c1d316a7a0..4f3ba06db3 100644
--- a/src/main/java/tools/mapletools/MonsterStatFetcher.java
+++ b/src/main/java/tools/mapletools/MonsterStatFetcher.java
@@ -23,7 +23,7 @@ public class MonsterStatFetcher {
         DataDirectoryEntry root = data.getRoot();
 
         System.out.print("Parsing mob stats... ");
-        for (MapleDataFileEntry mFile : root.getFiles()) {
+        for (DataFileEntry mFile : root.getFiles()) {
             try {
                 String fileName = mFile.getName();
 
diff --git a/src/main/java/tools/mapletools/NoItemNameFetcher.java b/src/main/java/tools/mapletools/NoItemNameFetcher.java
index 32df8d97e6..7e4a9e65a1 100644
--- a/src/main/java/tools/mapletools/NoItemNameFetcher.java
+++ b/src/main/java/tools/mapletools/NoItemNameFetcher.java
@@ -166,7 +166,7 @@ public class NoItemNameFetcher {
     private static void readEquipNodeData(MapleDataProvider data, DataDirectoryEntry mDir, String wzFileName, String dirName) {
         EquipType eqType = getEquipTypeFromDirectoryName(dirName);
 
-        for (MapleDataFileEntry mFile : mDir.getFiles()) {
+        for (DataFileEntry mFile : mDir.getFiles()) {
             String fileName = mFile.getName();
 
             try {
@@ -224,7 +224,7 @@ public class NoItemNameFetcher {
 
             curType = getItemTypeFromDirectoryName(dirName);
             if (!dirName.contentEquals("Pet")) {
-                for (MapleDataFileEntry mFile : mDir.getFiles()) {
+                for (DataFileEntry mFile : mDir.getFiles()) {
                     String fileName = mFile.getName();
 
                     Data fileData = data.getData(dirName + "/" + fileName);