diff --git a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestRead_jo.py
index c29aae601927a83f6a6b3dfc02d7231385629cb3..20acd7151f1a34a7f6ee400793af8965ddd12102 100755
--- a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestRead_jo.py
@@ -40,7 +40,7 @@ fullItemList+=["DMTest::BAuxVec#bauxvec"]
 fullItemList+=["DMTest::BAuxStandalone#b"]
 fullItemList+=["DMTest::BAuxVec#copy_bauxvec"]
 fullItemList+=["DMTest::BAuxStandalone#copy_b"]
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
+
 
 #--------------------------------------------------------------
 # Event related parameters
@@ -65,7 +65,8 @@ topSequence += DMTest__AuxDataTestDecor ('AuxDataTestDecor1',
                                          Offset = 100)
 
 # Stream's output file
-Stream1 = AthenaPoolOutputStream( "Stream1", asAlg = True )
+from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+Stream1 = createOutputStream( "Stream1", asAlg = True, noTag = True )
 Stream1.OutputFile =   "auxdata2.root"
 Stream1.ItemList   += fullItemList # List of DO's to write out
 
@@ -76,7 +77,7 @@ topSequence += DMTest__AuxDataTestDecor ('AuxDataTestDecor2',
                                          Offset = 200)
 
 # Stream's output file
-Stream2 = AthenaPoolOutputStream( "Stream2", asAlg = True )
+Stream2 = createOutputStream( "Stream2", asAlg = True, noTag = True )
 Stream2.OutputFile =   "auxdata2b.root"
 Stream2.ItemList   += fullItemList # List of DO's to write out
 
diff --git a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestTypelessRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestTypelessRead_jo.py
index 8c20acc68a08f7dd56caa6120fcaa33df72eaa0a..37ccd67d45f896ddc7c3ffe4988701026e851be8 100644
--- a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestTypelessRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestTypelessRead_jo.py
@@ -42,8 +42,8 @@ fullItemList+=["DMTest::BAuxVec#copy_bauxvec"]
 fullItemList+=["DMTest::BAuxStandalone#copy_b"]
 
 # Stream's output file
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1" )
+from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+Stream1 = createOutputStream( "Stream1", noTag = True )
 Stream1.OutputFile =   "auxdata3.root"
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestWrite_jo.py b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestWrite_jo.py
index 0e651c6ac4bf743896ba48d82053cff892839772..19b0d38677a5150008bd8722430219946ad0560b 100755
--- a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestWrite_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestWrite_jo.py
@@ -56,8 +56,8 @@ fullItemList+=["DMTest::BAuxVec#bauxvec"]
 fullItemList+=["DMTest::BAuxStandalone#b"]
 
 # Stream's output file
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1" )
+from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+Stream1 = createOutputStream( "Stream1", noTag = True )
 Stream1.OutputFile =   "auxdata.root"
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/Control/DataModelTest/DataModelRunTests/share/DataModelTestRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/DataModelTestRead_jo.py
index 9ee50f37fc5ec03d9548a64088cf73631211a6f3..c7a8a01840828e1bbcfd40d348868851fbb5ed8a 100755
--- a/Control/DataModelTest/DataModelRunTests/share/DataModelTestRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/DataModelTestRead_jo.py
@@ -51,8 +51,8 @@ fullItemList+=["DMTest::ELVec#elvec"]
 fullItemList+=["DMTest::ELVec#elv_remap"]
 
 # Stream's output file
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1" )
+from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+Stream1 = createOutputStream( "Stream1", noTag = True )
 Stream1.OutputFile =   "SimplePoolFile2.root"
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/Control/DataModelTest/DataModelRunTests/share/DataModelTestWrite_jo.py b/Control/DataModelTest/DataModelRunTests/share/DataModelTestWrite_jo.py
index b81bba147f1b562f266fa22d59e81d200b8a1df5..7575420c6477da1be36d2ce5ecc9a38935da641b 100755
--- a/Control/DataModelTest/DataModelRunTests/share/DataModelTestWrite_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/DataModelTestWrite_jo.py
@@ -62,8 +62,8 @@ fullItemList+=["DMTest::ELVec#elvec"]
 fullItemList+=["DMTest::ELVec#elv_remap"]
 
 # Stream's output file
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1" )
+from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+Stream1 = createOutputStream( "Stream1", noTag = True )
 Stream1.OutputFile =   "SimplePoolFile.root"
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py
index 18f7972f0b10d9b06e3d6705ea58f685281df78c..e9a061e64f204b14a912b68b43a142191d2d75be 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py
@@ -88,7 +88,7 @@ topSequence += DMTest__xAODTestReadHVec ("xAODTestReadHVec_scopy",
                                          HViewKey = "")
 
 # Stream's output file
-Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata2x.root',asAlg=True)
+Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata2x.root',asAlg=True, noTag=True)
 Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
 Stream1 = Stream1_Augmented.GetEventStream()
 Stream1.WritingTool.SubLevelBranchName = '<key>'
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadFilter_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadFilter_jo.py
index 30ee137e122c18b109b4bad876918d82246c9c6b..37c679335a528b28473200b9583960a3af772655 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadFilter_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadFilter_jo.py
@@ -73,7 +73,7 @@ topSequence += DMTest__xAODTestFilterCVec ('xAODTestFilterCVec')
 
 
 # Stream's output file
-Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata_filt.root',asAlg=True)
+Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata_filt.root',asAlg=True,noTag=True)
 Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
 Stream1 = Stream1_Augmented.GetEventStream()
 Stream1.WritingTool.SubLevelBranchName = '<key>'
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
index 853e1beffb8f4601acb2e1cd518be68ee5a57d9a..1edfc016e5a776d66c723c516cee3a81f229a593 100755
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
@@ -135,7 +135,7 @@ topSequence += DMTest__xAODTestDecor ('AuxDataTestDecor1_scopy',
                                       Offset = 300)
 
 # Stream's output file
-Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata2.root',asAlg=True)
+Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata2.root',asAlg=True, noTag=True)
 Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
 Stream1 = Stream1_Augmented.GetEventStream()
 Stream1.WritingTool.SubLevelBranchName = '<key>'
@@ -154,7 +154,7 @@ topSequence += DMTest__xAODTestDecor ('AuxDataTestDecor2_scopy',
                                       DecorName = 'dInt250',
                                       Offset = 600)
 # Stream's output file
-Stream2_Augmented = MSMgr.NewPoolStream ('Stream2','xaoddata2b.root',asAlg=True)
+Stream2_Augmented = MSMgr.NewPoolStream ('Stream2','xaoddata2b.root',asAlg=True, noTag=True)
 Stream2_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
 Stream2 = Stream2_Augmented.GetEventStream()
 Stream2.WritingTool.SubLevelBranchName = '<key>'
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestTypelessRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestTypelessRead_jo.py
index aa49faf3623a853f91a0a1b21f28f5640bd66ea6..556c605d02d7800b098332f90a46977d08dc2e16 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestTypelessRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestTypelessRead_jo.py
@@ -99,7 +99,7 @@ ROOT.DMTest.setConverterLibrary ('libDataModelTestDataReadCnvPoolCnv.so')
 
 # Stream's output file
 from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata3.root',asAlg=True)
+Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata3.root',asAlg=True,noTag=True)
 Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
 Stream1 = Stream1_Augmented.GetEventStream()
 Stream1.WritingTool.SubLevelBranchName = '<key>'
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
index c860adf3cfd0a0534b3f7e1f877df7aa512f25a0..d42be61fe514c91130f7d54258464e0a8bf7d558 100755
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
@@ -102,7 +102,7 @@ ServiceMgr += fmtsvc
 
 # Stream's output file
 from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata.root', asAlg=True)
+Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata.root', asAlg=True, noTag=True)
 Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
 Stream1 = Stream1_Augmented.GetEventStream()
 Stream1.WritingTool.SubLevelBranchName = '<key>'