diff --git a/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java b/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
index dd80c8a8951856e9a30732ab3af91a78bc7edb06..b25ab717d687c6814118e7bdbeb1dc07d0a387d0 100644
--- a/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
+++ b/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlZipEntry.java
@@ -32,7 +32,7 @@ public class CityGmlZipEntry {
             try {
                 CityGmlParser.gagLogger(true);
                 CityDoctorModel model = CityGmlParser.parseCityGmlZipEntry(entry, archive, config);
-                return new CityGmlZipEntry(entry.getName(), model);
+                return new CityGmlZipEntry(entry, model);
             } catch (CityGmlParseException | InvalidGmlFileException e) {
                 logger.error(e);
                 return new ErroneousEntry(entry, ZipEntryErrorType.INVALID_CITY_GML_FILE);
@@ -43,13 +43,13 @@ public class CityGmlZipEntry {
         }
     }
 
-    private CityGmlZipEntry(String filename, CityDoctorModel model){
-        this.fileName = filename;
+    private CityGmlZipEntry(ZipEntry entry, CityDoctorModel model){
+        this.fileName = entry.getName().substring(entry.getName().lastIndexOf('/') + 1);
         this.model = model;
     }
 
     protected CityGmlZipEntry(ZipEntry entry) {
-        this.fileName = entry.getName();
+        this.fileName = entry.getName().substring(entry.getName().lastIndexOf('/') + 1);
         this.model = null;
     }