diff --git a/sist2-admin/sist2_admin/sist2.py b/sist2-admin/sist2_admin/sist2.py
index dd81312..f7edcc1 100644
--- a/sist2-admin/sist2_admin/sist2.py
+++ b/sist2-admin/sist2_admin/sist2.py
@@ -236,7 +236,7 @@ class Sist2:
 
         output_dir = os.path.join(
             self._data_dir,
-            f"scan-{datetime.now()}.sist2"
+            f"scan-{options.name.replace('/', '_')}-{datetime.now()}.sist2"
         )
         options.output = output_dir