diff --git a/config/config.properties b/config/config.properties
index 067706d..f09f7ec 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,9 +1,8 @@
 #Wed Jul 29 14:45:52 CEST 2015
 autoSaveScanData=true
 createSessionFiles=false
-dataFile={data}/{year}_{month}/{date}/{date}_{time}_{context}
 dataFilesCreation=true
-dataPath={data}/{year}_{month}/{date}/{date}_{time}_{context}
+dataPath={data}/{year}_{month}/{date}/{date}_{time}_{exec}
 dataProvider=default
 dataScanFlushRecords=false
 dataScanStrategy=default
diff --git a/config/config.properties~ b/config/config.properties~
new file mode 100644
index 0000000..067706d
--- /dev/null
+++ b/config/config.properties~
@@ -0,0 +1,27 @@
+#Wed Jul 29 14:45:52 CEST 2015
+autoSaveScanData=true
+createSessionFiles=false
+dataFile={data}/{year}_{month}/{date}/{date}_{time}_{context}
+dataFilesCreation=true
+dataPath={data}/{year}_{month}/{date}/{date}_{time}_{context}
+dataProvider=default
+dataScanFlushRecords=false
+dataScanStrategy=default
+devicePoolFile={config}/devices.properties
+deviceUpdateStrategyFile={config}/update.properties
+imageSourcesFile={config}/imaging.properties
+logDaysToLive=-1
+logLevel=Fine
+logLevelConsole=Off
+scriptType=py
+serverEnabled=true
+serverPort=8085
+simulation=false
+tasksFile={config}/tasks.properties
+terminalEnabled=false
+terminalPort=3579
+userAuthenticator=
+userManagement=false
+versionTrackingEnabled=true
+versionTrackingLogin={config}/agkey
+versionTrackingRemote=ssh\://git@github.psi.ch\:7999/psd/x10sa.git
diff --git a/script/local.py b/script/local.py
index a39ef85..c32971f 100644
--- a/script/local.py
+++ b/script/local.py
@@ -2,9 +2,6 @@ import random
 
 
 class SimulatedOutput(Writable):
-    def getName(self):
-        return "SimulatedOutput"
-
     def write(self, value):
         pass
 
@@ -13,9 +10,6 @@ class SimulatedInput(Readable):
     def __init__(self):
         self.x = 0.0
 
-    def getName(self):
-        return "SimulatedInput"
-
     def read(self):
         self.x = self.x + 0.2
         noise = (random.random() - 0.5) / 20.0