diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index f24b3ec..1c8f7ca 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi</groupId>
 	<artifactId>fda</artifactId>
-	<version>1.1.38</version>
+	<version>1.1.39</version>
 
 	<dependencies>
 		<dependency>
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/model/ModelManager.java b/ch.psi.fda/src/main/java/ch/psi/fda/model/ModelManager.java
index 3e92aa6..9011532 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/model/ModelManager.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/model/ModelManager.java
@@ -47,6 +47,7 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 import ch.psi.fda.model.v1.Configuration;
+import ch.psi.fda.model.v1.Data;
 
 /**
  * Manage the serialization and deserialization of the model
@@ -173,6 +174,14 @@ public class ModelManager {
 		Schema schema = sf.newSchema(new Source[]{s}); // Use schema reference provided in XML
 		m.setSchema(schema);
 		
+		// Set scan name equal to file name
+		Data d = model.getData();
+		if(d==null){
+			d = new Data();
+			model.setData(d);
+		}
+		d.setFileName(file.getName());
+		
 		m.marshal( new JAXBElement<Configuration>(qname, Configuration.class, model ), file);
 	}
 }
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/model/ModelManagerTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/model/ModelManagerTest.java
index c691f92..54b1c6b 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/model/ModelManagerTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/model/ModelManagerTest.java
@@ -106,7 +106,7 @@ public class ModelManagerTest {
 		Scan s = new Scan();
 		c.setScan(s);
 		
-		ModelManager.marshall(c, new File(tmpDirectory+"/scan.xml"));
+		ModelManager.marshall(c, new File(tmpDirectory+"/scan1234.xml"));
 		
 	}