diff --git a/server/AyaNova/Controllers/ExportController.cs b/server/AyaNova/Controllers/ExportController.cs
index 344e2dff..7655c8f7 100644
--- a/server/AyaNova/Controllers/ExportController.cs
+++ b/server/AyaNova/Controllers/ExportController.cs
@@ -82,10 +82,12 @@ namespace AyaNova.Api.Controllers
             log.LogDebug($"Fetching data for {dataListSelection.SelectedRowIds.Length} {dataListSelection.ObjectType} items");
             var TheData = await ((IExportAbleObject)biz).GetExportData(dataListSelection.SelectedRowIds);
 
-            string outputRandomFileNameNoExtension = StringUtil.ReplaceLastOccurrence(FileUtil.NewRandomFileName, ".", "");
-            string outputSourceFileName = outputRandomFileNameNoExtension + "." + format;
+            string baseFileName = FileUtil.StringToSafeFileName($"{dataListSelection.ObjectType.ToString().ToLowerInvariant()}-{FileUtil.GetSafeDateFileName()}");
+
+            // string outputRandomFileNameNoExtension = StringUtil.ReplaceLastOccurrence(FileUtil.NewRandomFileName, ".", "");
+            string outputSourceFileName = baseFileName + "." + format;
             string outputSourceFullPath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, outputSourceFileName);
-            string outputZipFullpath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, outputRandomFileNameNoExtension + ".zip");
+            string outputZipFullpath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, baseFileName + ".zip");
             // string outputFullPathSourceFile=outputFullPathNoExtension
             // string outputFullpathZipFile=outputFullPathNoExtension + ".zip";
             log.LogDebug($"Calling render export data to file");
@@ -111,7 +113,7 @@ namespace AyaNova.Api.Controllers
             }
 
             log.LogDebug($"Completed, returning results");
-            return Ok(ApiOkResponse.Response(outputRandomFileNameNoExtension + ".zip"));
+            return Ok(ApiOkResponse.Response(baseFileName + ".zip"));
 
 
         }