diff --git a/scripts/osm2pgsql/createNewDatabase.ts b/scripts/osm2pgsql/createNewDatabase.ts
index 87ee167488..a4afd31cd7 100644
--- a/scripts/osm2pgsql/createNewDatabase.ts
+++ b/scripts/osm2pgsql/createNewDatabase.ts
@@ -13,7 +13,7 @@ class CreateNewDatabase extends Script {
         const overwrite = args[1] === "--overwrite"
         const db = new OsmPoiDatabase("postgresql://user:password@localhost:5444")
         const knownDatabases = await db.findSuitableDatabases()
-        if (knownDatabases.indexOf(targetName) > 0) {
+        if (knownDatabases.indexOf(OsmPoiDatabase.databaseNameFor(targetName)) > 0) {
             if (overwrite) {
                 await db.deleteDatabase(targetName)
             } else {
diff --git a/scripts/osm2pgsql/osmPoiDatabase.ts b/scripts/osm2pgsql/osmPoiDatabase.ts
index 4789f75876..8b55bcac8c 100644
--- a/scripts/osm2pgsql/osmPoiDatabase.ts
+++ b/scripts/osm2pgsql/osmPoiDatabase.ts
@@ -104,8 +104,12 @@ export class OsmPoiDatabase {
         return "osm-poi." + latest
     }
 
+    public static databaseNameFor(date: string) {
+        return `${OsmPoiDatabase._prefix}.${date}`
+    }
+
     async createNew(date: string) {
-        const dbname = `${OsmPoiDatabase._prefix}.${date}`
+        const dbname = OsmPoiDatabase.databaseNameFor(date)
         console.log("Attempting to create a new database with name", dbname)
         const metaclient = this.getMetaClient()
         await metaclient.connect()