diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java
index ef153108a..c990307e5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java
@@ -124,9 +124,9 @@ public class StorageFactory {
             case MYSQL:
                 return new SQLBacking(plugin, new MySQLProvider(plugin.getConfiguration().get(ConfigKeys.DATABASE_VALUES)), plugin.getConfiguration().get(ConfigKeys.SQL_TABLE_PREFIX));
             case SQLITE:
-                return new SQLBacking(plugin, new SQLiteProvider(new File(plugin.getDataDirectory(), "luckperms.sqlite")), plugin.getConfiguration().get(ConfigKeys.SQL_TABLE_PREFIX));
+                return new SQLBacking(plugin, new SQLiteProvider(new File(plugin.getDataDirectory(), "luckperms-sqlite.db")), plugin.getConfiguration().get(ConfigKeys.SQL_TABLE_PREFIX));
             case H2:
-                return new SQLBacking(plugin, new H2Provider(new File(plugin.getDataDirectory(), "luckperms.db")), plugin.getConfiguration().get(ConfigKeys.SQL_TABLE_PREFIX));
+                return new SQLBacking(plugin, new H2Provider(new File(plugin.getDataDirectory(), "luckperms-h2")), plugin.getConfiguration().get(ConfigKeys.SQL_TABLE_PREFIX));
             case POSTGRESQL:
                 return new SQLBacking(plugin, new PostgreSQLProvider(plugin.getConfiguration().get(ConfigKeys.DATABASE_VALUES)), plugin.getConfiguration().get(ConfigKeys.SQL_TABLE_PREFIX));
             case MONGODB:
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/backing/sqlprovider/H2Provider.java b/common/src/main/java/me/lucko/luckperms/common/storage/backing/sqlprovider/H2Provider.java
index ca05047bb..8ee55c1cf 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/backing/sqlprovider/H2Provider.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/backing/sqlprovider/H2Provider.java
@@ -27,6 +27,12 @@ import java.io.File;
 public class H2Provider extends FlatfileProvider {
     public H2Provider(File file) {
         super("H2", file);
+
+        // backwards compat
+        File data = new File(file.getParent(), "luckperms.db.mv.db");
+        if (data.exists()) {
+            data.renameTo(new File(file.getParent(), "luckperms-h2.mv.db"));
+        }
     }
 
     @Override
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/backing/sqlprovider/SQLiteProvider.java b/common/src/main/java/me/lucko/luckperms/common/storage/backing/sqlprovider/SQLiteProvider.java
index 73042d39a..d2cf130b8 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/backing/sqlprovider/SQLiteProvider.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/backing/sqlprovider/SQLiteProvider.java
@@ -27,6 +27,12 @@ import java.io.File;
 public class SQLiteProvider extends FlatfileProvider {
     public SQLiteProvider(File file) {
         super("SQLite", file);
+
+        // backwards compat
+        File data = new File(file.getParent(), "luckperms.sqlite");
+        if (data.exists()) {
+            data.renameTo(new File(file.getParent(), "luckperms-sqlite.db"));
+        }
     }
 
     @Override