diff --git a/public/app.js b/public/app.js
index 9bfacfd..197e6b7 100644
--- a/public/app.js
+++ b/public/app.js
@@ -2260,13 +2260,13 @@ async function performExport(mode, selectedColumns) {
   const link = document.createElement('a');
   const url = URL.createObjectURL(blob);
 
-  let filename = currentTable;
+  let basename = currentTable;
   if (mode === 'template') {
-    filename += '_template';
+    basename += '_template';
   } else if (mode === 'selected') {
-    filename += '_selected';
+    basename += '_selected';
   }
-  filename += '_' + new Date().toISOString().slice(0, 10) + '.csv';
+  const filename = new Date().toISOString().slice(0, 10) + '-' + basename + '.csv';
 
   link.setAttribute('href', url);
   link.setAttribute('download', filename);
diff --git a/public/index.php b/public/index.php
index ccb5315..e2c4478 100644
--- a/public/index.php
+++ b/public/index.php
@@ -364,7 +364,7 @@ $app->get('/api/backup/all', function (Request $request, Response $response) use
         $pdo = $container->get('db');
         $backup = new \App\BackupService($_SESSION['db_user'], $_SESSION['db_pass']);
         $tempFile = $backup->dumpAllDatabases($pdo);
-        $filename = 'backup_all_' . date('Y-m-d_H-i-s') . '.sql.gz';
+        $filename = date('Y-m-d') . '-backup_all.sql.gz';
 
         $stream = fopen($tempFile, 'rb');
         $filesize = filesize($tempFile);
@@ -391,7 +391,7 @@ $app->get('/api/backup/database/{name}', function (Request $request, Response $r
         $database = $args['name'];
         $backup = new \App\BackupService($_SESSION['db_user'], $_SESSION['db_pass']);
         $tempFile = $backup->dumpDatabase($database);
-        $filename = $database . '_' . date('Y-m-d_H-i-s') . '.sql.gz';
+        $filename = date('Y-m-d') . '-' . $database . '.sql.gz';
 
         $stream = fopen($tempFile, 'rb');
         $filesize = filesize($tempFile);