diff --git a/src/main/java/provider/DataDirectoryEntry.java b/src/main/java/provider/DataDirectoryEntry.java
index beeac136fa..a61bab01aa 100644
--- a/src/main/java/provider/DataDirectoryEntry.java
+++ b/src/main/java/provider/DataDirectoryEntry.java
@@ -26,8 +26,8 @@ import java.util.List;
 /**
  * @author Matze
  */
-public interface DataDirectoryEntry extends MapleDataEntry {
+public interface DataDirectoryEntry extends DataEntry {
     List<DataDirectoryEntry> getSubdirectories();
     List<MapleDataFileEntry> getFiles();
-    MapleDataEntry getEntry(String name);
+    DataEntry getEntry(String name);
 }
diff --git a/src/main/java/provider/MapleDataEntry.java b/src/main/java/provider/DataEntry.java
similarity index 95%
rename from src/main/java/provider/MapleDataEntry.java
rename to src/main/java/provider/DataEntry.java
index 6c99f84711..755468e759 100644
--- a/src/main/java/provider/MapleDataEntry.java
+++ b/src/main/java/provider/DataEntry.java
@@ -22,10 +22,9 @@
 package provider;
 
 /**
- *
  * @author Matze
  */
-public interface MapleDataEntry extends DataEntity {
+public interface DataEntry extends DataEntity {
     String getName();
     int getSize();
     int getChecksum();
diff --git a/src/main/java/provider/MapleDataFileEntry.java b/src/main/java/provider/MapleDataFileEntry.java
index 41d76c322d..395d99b4c7 100644
--- a/src/main/java/provider/MapleDataFileEntry.java
+++ b/src/main/java/provider/MapleDataFileEntry.java
@@ -25,6 +25,6 @@ package provider;
  *
  * @author Matze
  */
-public interface MapleDataFileEntry extends MapleDataEntry {
+public interface MapleDataFileEntry 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 4014cf9f05..3a96143d81 100644
--- a/src/main/java/provider/wz/WZDirectoryEntry.java
+++ b/src/main/java/provider/wz/WZDirectoryEntry.java
@@ -23,7 +23,7 @@ package provider.wz;
 
 import provider.DataDirectoryEntry;
 import provider.DataEntity;
-import provider.MapleDataEntry;
+import provider.DataEntry;
 import provider.MapleDataFileEntry;
 
 import java.util.*;
@@ -31,7 +31,7 @@ import java.util.*;
 public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
     private List<DataDirectoryEntry> subdirs = new ArrayList<>();
     private List<MapleDataFileEntry> files = new ArrayList<>();
-    private Map<String, MapleDataEntry> entries = new HashMap<>();
+    private Map<String, DataEntry> entries = new HashMap<>();
 
     public WZDirectoryEntry(String name, int size, int checksum, DataEntity parent) {
         super(name, size, checksum, parent);
@@ -59,7 +59,7 @@ public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
         return Collections.unmodifiableList(files);
     }
 
-    public MapleDataEntry getEntry(String name) {
+    public DataEntry getEntry(String name) {
         return entries.get(name);
     }
 }
diff --git a/src/main/java/provider/wz/WZEntry.java b/src/main/java/provider/wz/WZEntry.java
index e91459b960..749c73ec91 100644
--- a/src/main/java/provider/wz/WZEntry.java
+++ b/src/main/java/provider/wz/WZEntry.java
@@ -22,9 +22,9 @@
 package provider.wz;
 
 import provider.DataEntity;
-import provider.MapleDataEntry;
+import provider.DataEntry;
 
-public class WZEntry implements MapleDataEntry {
+public class WZEntry implements DataEntry {
     private String name;
     private int size;
     private int checksum;