diff --git a/CEP/TBB/TBBdatawriter/CMakeLists.txt b/CEP/TBB/TBBdatawriter/CMakeLists.txt
index c257402ee02298257cf0cf875186e2311ba50a27..d2b8b008c4770e24eed0c92998c6b8c33c3d90d0 100644
--- a/CEP/TBB/TBBdatawriter/CMakeLists.txt
+++ b/CEP/TBB/TBBdatawriter/CMakeLists.txt
@@ -10,7 +10,7 @@ set(_py_files
   currentobs.py
   rundatawriter.py
   TBBdatawriterController.py
-  TBBOTDBBusListener.py
+  TBBTMSSBusListener.py
   TBBsetup.py
 )
 
diff --git a/CEP/TBB/TBBdatawriter/TBBOTDBBusListener.py b/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py
similarity index 100%
rename from CEP/TBB/TBBdatawriter/TBBOTDBBusListener.py
rename to CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py
diff --git a/CEP/TBB/TBBdatawriter/tbbdaemon b/CEP/TBB/TBBdatawriter/tbbdaemon
index 3eea8966e681ab38e3c38626bd6941668fb12a2e..17083a7a9556db92c35dfc3c843f04c99fa55ae9 100755
--- a/CEP/TBB/TBBdatawriter/tbbdaemon
+++ b/CEP/TBB/TBBdatawriter/tbbdaemon
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
 
 if __name__ == '__main__':
-    from lofar.cep.tbb.TBBOTDBBusListener import main
+    from lofar.cep.tbb.TBBTMSSBusListener import main
     main()
diff --git a/CEP/TBB/tbbslurm/docker-launch-tbbmetadata.sh b/CEP/TBB/tbbslurm/docker-launch-tbbmetadata.sh
index c031bda0d49dca82f676347d4f428c49475ce3b1..e29801488ef98e15c3d90d77f95bcfcb67b499fc 100755
--- a/CEP/TBB/tbbslurm/docker-launch-tbbmetadata.sh
+++ b/CEP/TBB/tbbslurm/docker-launch-tbbmetadata.sh
@@ -10,5 +10,5 @@ exec docker-run-slurm.sh \
     -v /data/projects:/data/projects \
     -v /data/log:/data/log \
     -v /globaldata/tbb:/globaldata/tbb \
-    lofar-tbbwriter:IOprio python /opt/lofar/src/CEP/TBB/TBBdatawriter/TBBOTDBBusListener.py metadata
+    lofar-tbbwriter:IOprio python /opt/lofar/src/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py metadata
 
diff --git a/CEP/TBB/tbbslurm/docker-launch-tbbwriteparset.sh b/CEP/TBB/tbbslurm/docker-launch-tbbwriteparset.sh
index fdb3ec11ede49447d010967c70d2d2c7e751f60c..d6f8d36d27b94715ceb6d4ee7ddffb889a6feb62 100755
--- a/CEP/TBB/tbbslurm/docker-launch-tbbwriteparset.sh
+++ b/CEP/TBB/tbbslurm/docker-launch-tbbwriteparset.sh
@@ -12,5 +12,5 @@ exec docker-run-slurm.sh \
     -v /data/config/tbb:/data/config/tbb \
     -v /globaldata/tbb:/globaldata/tbb \
     -e LOFARENV=PRODUCTION \
-    lofar-tbbwriter-control:TBB-Task8589 python /opt/lofar/src/CEP/TBB/TBBdatawriter/TBBOTDBBusListener.py writeparset
+    lofar-tbbwriter-control:TBB-Task8589 python /opt/lofar/src/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py writeparset
 
diff --git a/CEP/TBB/tbbslurm/docker-launch-tbbwriter.sh b/CEP/TBB/tbbslurm/docker-launch-tbbwriter.sh
index 148e4784083328d2cf283603b7f2f983a56dfc4b..dc5cadf1f61aab8dad6454b426f45f15f9e70cb6 100755
--- a/CEP/TBB/tbbslurm/docker-launch-tbbwriter.sh
+++ b/CEP/TBB/tbbslurm/docker-launch-tbbwriter.sh
@@ -11,5 +11,5 @@ exec docker-run-slurm.sh \
     -v /data/log:/data/log \
     -v /globaldata/tbb:/globaldata/tbb \
     --cap-add=sys_nice --cap-add=sys_admin \
-    lofar-tbbwriter:IOprio python /opt/lofar/src/CEP/TBB/TBBdatawriter/TBBOTDBBusListener.py "$@"
+    lofar-tbbwriter:IOprio python /opt/lofar/src/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py "$@"
 
diff --git a/CEP/TBB/tbbslurm/docker-launch-tbbwriter_4_0.sh b/CEP/TBB/tbbslurm/docker-launch-tbbwriter_4_0.sh
index 892f3e72d18bef22b241976f02375ed93f94849e..9fb92e413b0c7fb66b4f4bb1bc11ed610fee17df 100755
--- a/CEP/TBB/tbbslurm/docker-launch-tbbwriter_4_0.sh
+++ b/CEP/TBB/tbbslurm/docker-launch-tbbwriter_4_0.sh
@@ -13,5 +13,5 @@ exec docker-run-slurm.sh \
     -v /globaldata/tbb:/globaldata/tbb \
     -e LOFARENV=PRODUCTION \
     --cap-add=sys_nice --cap-add=sys_admin \
-    lofar-tbbwriter-control:TBB-Task8589 /data/home/lofarsys/tbb-writer/run/run-TBBOTDBBusListenerdatawriter.py "$@"
+    lofar-tbbwriter-control:TBB-Task8589 /data/home/lofarsys/tbb-writer/run/run-TBBTMSSBusListenerdatawriter.py "$@"