diff --git a/core/src/main/java/de/bluecolored/bluemap/core/storage/file/FileMapStorage.java b/core/src/main/java/de/bluecolored/bluemap/core/storage/file/FileMapStorage.java
index 58dce1add..acfadb5d5 100644
--- a/core/src/main/java/de/bluecolored/bluemap/core/storage/file/FileMapStorage.java
+++ b/core/src/main/java/de/bluecolored/bluemap/core/storage/file/FileMapStorage.java
@@ -77,22 +77,22 @@ public FileMapStorage(Path root, Compression compression, boolean atomic) {
         ));
 
         this.tileStateStorage = new FileGridStorage(
-                root.resolve(RENDER_STATE_PATH),
-                ".tiles.dat",
+                root.resolve(RENDER_STATE_PATH).resolve("tiles"),
+                ".dat",
                 Compression.GZIP,
                 atomic
         );
 
         this.chunkStateStorage = new FileGridStorage(
-                root.resolve(RENDER_STATE_PATH),
-                ".chunks.dat",
+                root.resolve(RENDER_STATE_PATH).resolve("chunks"),
+                ".dat",
                 Compression.GZIP,
                 atomic
         );
 
         this.regionStateStorage = new FileGridStorage(
                 root.resolve(RENDER_STATE_PATH).resolve("regions"),
-                ".regions.dat",
+                ".dat",
                 Compression.GZIP,
                 atomic
         );