diff --git a/docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py b/docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py
index 063ec05fa1ee1e8403d3cd8793e12e425ce1a570..66f835f2072bd8217a06d818e579a5b23371e33b 100644
--- a/docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py
+++ b/docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py
@@ -10,7 +10,7 @@ endpoint = "localhost:8400"
 beamtime = "asapo_test"
 
 # source type 'processed' to write to the core filesystem
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',
                                           beamtime,'auto','test_source','', 1,60000)
 
 # we are sending a message with with index 1 to the default stream. Filename must start with processed/
diff --git a/docs/site/examples/getting_started/python/produce.py b/docs/site/examples/getting_started/python/produce.py
index 063ec05fa1ee1e8403d3cd8793e12e425ce1a570..66f835f2072bd8217a06d818e579a5b23371e33b 100644
--- a/docs/site/examples/getting_started/python/produce.py
+++ b/docs/site/examples/getting_started/python/produce.py
@@ -10,7 +10,7 @@ endpoint = "localhost:8400"
 beamtime = "asapo_test"
 
 # source type 'processed' to write to the core filesystem
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',
                                           beamtime,'auto','test_source','', 1,60000)
 
 # we are sending a message with with index 1 to the default stream. Filename must start with processed/
diff --git a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/bugfix_callback.py b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/bugfix_callback.py
index dff37d791b64a1bec9efdff8fb741891724d3b2a..1c6653284f73d28f2f9bcfd4860e493f59490c6c 100644
--- a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/bugfix_callback.py
+++ b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/bugfix_callback.py
@@ -25,7 +25,7 @@ class AsapoSender:
     def _callback(self, header, err):
     	print ("hello self callback")
 
-producer  = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads, 600000)
+producer  = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads, 600000)
 producer.set_log_level("debug")
 
 print(asapo_producer.__version__)
diff --git a/tests/automatic/producer/aai/producer_aai.py b/tests/automatic/producer/aai/producer_aai.py
index 9d350bee41db6e14340bcc40713f478afa1739b5..2ddf0c99cd646b379abe08177d5f92b11013d72d 100644
--- a/tests/automatic/producer/aai/producer_aai.py
+++ b/tests/automatic/producer/aai/producer_aai.py
@@ -27,7 +27,7 @@ def callback(header,err):
     lock.release()
 
 
-producer  = asapo_producer.create_producer(endpoint,'auto','auto','processed','auto',beamline, data_source, token, nthreads, 60000)
+producer  = asapo_producer.create_producer(endpoint,'processed','auto','auto','auto',beamline, data_source, token, nthreads, 60000)
 
 producer.set_log_level("debug")
 
diff --git a/tests/automatic/producer/python_api/producer_api.py b/tests/automatic/producer/python_api/producer_api.py
index 3208d64bf8c38bc9ac4b8fd20b5aa29c638900de..3ad913e58b1c5744a645ad4a633fe62d29e35639 100644
--- a/tests/automatic/producer/python_api/producer_api.py
+++ b/tests/automatic/producer/python_api/producer_api.py
@@ -47,7 +47,7 @@ def assert_version(version):
     if not ok:
         sys.exit(1)
 
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed', beamtime, 'auto', data_source, token, nthreads, 60000)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto', beamtime, 'auto', data_source, token, nthreads, 60000)
 
 producer.set_log_level("debug")
 
@@ -233,7 +233,7 @@ else:
 
 # create with error
 try:
-    producer = asapo_producer.create_producer(endpoint,'auto','auto','processed', beamtime, 'auto', data_source, token, 0, 0)
+    producer = asapo_producer.create_producer(endpoint,'processed','auto','auto', beamtime, 'auto', data_source, token, 0, 0)
 except asapo_producer.AsapoWrongInputError as e:
     print(e)
 else:
diff --git a/tests/manual/python_tests/producer/short_test.py b/tests/manual/python_tests/producer/short_test.py
index 983225d6256ef9ee80106e18443397f09c691585..61e5bc462311ff0ee9ab092d228284036d01549e 100644
--- a/tests/manual/python_tests/producer/short_test.py
+++ b/tests/manual/python_tests/producer/short_test.py
@@ -26,7 +26,7 @@ def assert_err(err):
         print(err)
         sys.exit(1)
 
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads ,0)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads ,0)
 
 producer.set_log_level("debug")
 
diff --git a/tests/manual/python_tests/producer/test.py b/tests/manual/python_tests/producer/test.py
index 1bb1c5dd887858d7d661e7e80fbb2c16db05ddf1..9cc83aaf97e8a2612a7f0a6b4d9cc464315f7917 100644
--- a/tests/manual/python_tests/producer/test.py
+++ b/tests/manual/python_tests/producer/test.py
@@ -27,7 +27,7 @@ def assert_err(err):
         print(err)
         sys.exit(1)
 
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads ,0)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads ,0)
 
 producer.set_log_level("info")
 
diff --git a/tests/manual/python_tests/producer_wait_bug_mongo/test.py b/tests/manual/python_tests/producer_wait_bug_mongo/test.py
index b622a4e8d4050058502848ea8c896a48f0a9f00d..c1883d3cbcf3a7b704d3deece758a77b67fb3361 100644
--- a/tests/manual/python_tests/producer_wait_bug_mongo/test.py
+++ b/tests/manual/python_tests/producer_wait_bug_mongo/test.py
@@ -27,7 +27,7 @@ def assert_err(err):
         print(err)
         sys.exit(1)
 
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads, 600000)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads, 600000)
 
 producer.set_log_level("debug")
 
diff --git a/tests/manual/python_tests/producer_wait_threads/producer_api.py b/tests/manual/python_tests/producer_wait_threads/producer_api.py
index 2f0acbd52e4d91c825514d56ebfc19bcdf6df792..94321674157fe19a7c2ef93a6c6bfb15a268db8e 100644
--- a/tests/manual/python_tests/producer_wait_threads/producer_api.py
+++ b/tests/manual/python_tests/producer_wait_threads/producer_api.py
@@ -22,7 +22,7 @@ def callback(header,err):
         print ("successfuly sent: ",header)
     lock.release()
 
-producer  = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime, 'auto', data_source, token, nthreads, 600000)
+producer  = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime, 'auto', data_source, token, nthreads, 600000)
 
 producer.set_log_level("info")
 
@@ -63,7 +63,7 @@ if n!=0:
 
 # create with error
 try:
-    producer  = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, 0, 600000)
+    producer  = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, 0, 600000)
 except Exception as Asapo:
     print(e)
 else:
diff --git a/tests/manual/python_tests/producer_wait_threads/test.py b/tests/manual/python_tests/producer_wait_threads/test.py
index bd802d3857e7a570b7b22c024936e9f16d0bb76e..8e969b6fd63ce383b474135c752a385301eb9257 100644
--- a/tests/manual/python_tests/producer_wait_threads/test.py
+++ b/tests/manual/python_tests/producer_wait_threads/test.py
@@ -22,7 +22,7 @@ def callback(header,err):
         print ("successfuly sent: ",header)
     lock.release()
 
-producer  = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads, 600000)
+producer  = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads, 600000)
 
 producer.set_log_level("info")