diff --git a/conf/dataManager.conf b/conf/dataManager.conf
index 5f6d72f176f077caf1399c0b3dde569fb67bb15c..d22a9a535524693ef7394e32eca64930053d9292 100644
--- a/conf/dataManager.conf
+++ b/conf/dataManager.conf
@@ -60,5 +60,5 @@ logfilePath         = /space/projects/live-viewer/logs
 #logfilePath         = /home/p11user/live-viewer/logs
 
 # Filename used for logging
-logfileName         = zmq_sender.log
+logfileName         = dataManager.log
 
diff --git a/src/DataManager.py b/src/DataManager.py
index ebc26a672f6900824f5fdd1328ee630ef0a56e38..2a5ac816f1904b7382caa6a1077fb43ff33a992a 100644
--- a/src/DataManager.py
+++ b/src/DataManager.py
@@ -272,7 +272,7 @@ if __name__ == '__main__':
         from subprocess import call
 
         #enable logging
-        helpers.initLogging(BASE_PATH + "/logs/dataManager.log", verbose=True, onScreenLogLevel="debug")
+        helpers.initLogging(BASE_PATH + "/logs/dataManager_test.log", verbose=True, onScreenLogLevel="debug")
 
         class Test_Receiver_Stream():
             def __init__(self, comPort, fixedRecvPort, receivingPort, receivingPort2):