diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureCnv.cxx
index 5fe3b34deda2ba5202c02dbb04f93c005191379d..b6a83b4a3bf19fb804a1c30d9e32ed948c0c7603 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureCnv.cxx
@@ -25,9 +25,9 @@ CombinedMuonFeatureCnv::~CombinedMuonFeatureCnv()
 CombinedMuonFeature_PERS *
 CombinedMuonFeatureCnv::createPersistent( CombinedMuonFeature *transObj)
 {
-  MsgStream mlog(messageService(), "CombinedMuonFeatureConverter" );
+  MsgStream mlog(msgSvc(), "CombinedMuonFeatureConverter" );
   
-  mlog << MSG::DEBUG << "CombinedMuonFeatureCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "CombinedMuonFeatureCnv::createPersistent" << endmsg;
 
   CombinedMuonFeature_PERS *persObj = m_TPConverter->createPersistent( transObj, mlog );
   
@@ -39,9 +39,9 @@ CombinedMuonFeatureCnv::createPersistent( CombinedMuonFeature *transObj)
 //-----------------------------------------------------------------------------
 CombinedMuonFeature *CombinedMuonFeatureCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CombinedMuonFeatureConverter" );
+  MsgStream mlog(msgSvc(), "CombinedMuonFeatureConverter" );
   
-  mlog << MSG::DEBUG << "CombinedMuonFeatureCnv::createTransient " << endreq;
+  mlog << MSG::DEBUG << "CombinedMuonFeatureCnv::createTransient " << endmsg;
   
   CombinedMuonFeature       *transObj(0);
   
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureContainerCnv.cxx
index 58db56720b4aa1777bd8b613ac6fb55acf090884..72dc0b1dd7ecc3998dc18547275b5c204e183c0b 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/CombinedMuonFeatureContainerCnv.cxx
@@ -22,9 +22,9 @@ static CombinedMuonFeatureContainerCnv_p4     TPconverter;
 //createPersistent 
 CombinedMuonFeatureContainer_PERS * CombinedMuonFeatureContainerCnv::createPersistent( CombinedMuonFeatureContainer *transObj)
 {
-  MsgStream mlog(messageService(), "CombinedMuonFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "CombinedMuonFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "CombinedMuonFeatureContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "CombinedMuonFeatureContainerCnv::createPersistent called" << endmsg;
   
   CombinedMuonFeatureContainer_PERS * p_cont = TPconverter.createPersistent( transObj, mlog );
   
@@ -36,9 +36,9 @@ CombinedMuonFeatureContainer_PERS * CombinedMuonFeatureContainerCnv::createPersi
 //createTransient
 CombinedMuonFeatureContainer * CombinedMuonFeatureContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CombinedMuonFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "CombinedMuonFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "CombinedMuonFeatureContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "CombinedMuonFeatureContainerCnv::createTransient called" << endmsg;
   
   static pool::Guid p4_guid( "A06B9B51-FFA9-4AC1-9079-8AF49C4A9B87" );
   static pool::Guid p3_guid( "02262E5F-7645-4919-9CD9-66D88796DCFA" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/ElectronMuonTopoInfoContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/ElectronMuonTopoInfoContainerCnv.cxx
index 7205766ea4b7e1cdd029e384204d20d651e7adcd..2b0d642642249efd0560efaf2d644aec8e0c194a 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/ElectronMuonTopoInfoContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/ElectronMuonTopoInfoContainerCnv.cxx
@@ -10,9 +10,9 @@ static ElectronMuonTopoInfoContainerCnv_p1   TPConverter;
 //createPersistent 
 ElectronMuonTopoInfoContainer_PERS * ElectronMuonTopoInfoContainerCnv::createPersistent( ElectronMuonTopoInfoContainer *transObj)
 {
-  MsgStream mlog(messageService(), "ElectronMuonTopoInfoContainerConverter" );
+  MsgStream mlog(msgSvc(), "ElectronMuonTopoInfoContainerConverter" );
 
-  mlog << MSG::DEBUG << "ElectronMuonTopoInfoContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "ElectronMuonTopoInfoContainerCnv::createPersistent called" << endmsg;
 
   ElectronMuonTopoInfoContainer_PERS * p_emTopoCont = TPConverter.createPersistent( transObj, mlog );
  
@@ -23,9 +23,9 @@ ElectronMuonTopoInfoContainer_PERS * ElectronMuonTopoInfoContainerCnv::createPer
 //createTransient
 ElectronMuonTopoInfoContainer * ElectronMuonTopoInfoContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "ElectronMuonTopoInfoContainerConverter" );
+  MsgStream mlog(msgSvc(), "ElectronMuonTopoInfoContainerConverter" );
   
-  mlog << MSG::DEBUG << "ElectronMuonTopoInfoContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "ElectronMuonTopoInfoContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p1_guid( "0A775717-3FC9-4FF4-A18B-3F520B2D4DAC" );
 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/FTK_RawTrackContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/FTK_RawTrackContainerCnv.cxx
index 17558dd8ab5c23c5b9e4b4b5baaab6847ec97f6b..ba5eab8f9d51731af9ee2211b1aab0ce49604e75 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/FTK_RawTrackContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/FTK_RawTrackContainerCnv.cxx
@@ -22,8 +22,8 @@ FTK_RawTrackContainerCnv::~FTK_RawTrackContainerCnv()
 
 //create persistent
 FTK_RawTrackContainer_PERS* FTK_RawTrackContainerCnv::createPersistent(FTK_RawTrackContainer* transObj) {
-    MsgStream mlog(messageService(), "FTK_RawTrackContainerConverter" );
-    mlog << MSG::DEBUG << "FTK_RawTrackContainerCnv::createPersistent" << endreq;
+    MsgStream mlog(msgSvc(), "FTK_RawTrackContainerConverter" );
+    mlog << MSG::DEBUG << "FTK_RawTrackContainerCnv::createPersistent" << endmsg;
 
     FTK_RawTrackContainer_PERS* persObj = m_tlp_Converter->createPersistent( transObj, mlog );
 
@@ -33,15 +33,15 @@ FTK_RawTrackContainer_PERS* FTK_RawTrackContainerCnv::createPersistent(FTK_RawTr
 //create transient
 FTK_RawTrackContainer* FTK_RawTrackContainerCnv::createTransient() {
   
-  MsgStream mlog(messageService(), "FTK_RawTrackContainerConverter" );
-  mlog << MSG::DEBUG << "FTK_RawTrackContainerCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "FTK_RawTrackContainerConverter" );
+  mlog << MSG::DEBUG << "FTK_RawTrackContainerCnv::createTransient " << endmsg;
 
   static pool::Guid tlp1_guid("C1A5436E-8520-4399-82FC-E6828B19688D");
   
   FTK_RawTrackContainer  *transObj = 0;
   if( compareClassGuid(tlp1_guid) ) {
     
-    mlog << MSG::DEBUG << "FTK_RawTrackContainerCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "FTK_RawTrackContainerCnv::reading tlp1 persistent object" << endmsg;
     FTK_RawTrackContainerCnv_tlp1 tlp1_Converter;
     poolReadObject< FTK_RawTrackContainer_tlp1 >( tlp1_Converter );
     transObj = tlp1_Converter.createTransient( mlog );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureCnv.cxx
index 6700e82a971d760fe4ef957039d362ffc8b99672..0e0727e2caf12f8a408303d643c6e1decf8ebf34 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureCnv.cxx
@@ -24,9 +24,9 @@ IsoMuonFeatureCnv::~IsoMuonFeatureCnv()
 IsoMuonFeature_PERS *
 IsoMuonFeatureCnv::createPersistent( IsoMuonFeature *transObj)
 {
-  MsgStream mlog(messageService(), "IsoMuonFeatureConverter" );
+  MsgStream mlog(msgSvc(), "IsoMuonFeatureConverter" );
   
-  mlog << MSG::DEBUG << "IsoMuonFeatureCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "IsoMuonFeatureCnv::createPersistent" << endmsg;
 
   IsoMuonFeature_PERS *persObj = m_TPConverter->createPersistent( transObj, mlog );
   
@@ -38,9 +38,9 @@ IsoMuonFeatureCnv::createPersistent( IsoMuonFeature *transObj)
 //-----------------------------------------------------------------------------
 IsoMuonFeature *IsoMuonFeatureCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "IsoMuonFeatureConverter" );
+  MsgStream mlog(msgSvc(), "IsoMuonFeatureConverter" );
   
-  mlog << MSG::DEBUG << "IsoMuonFeatureCnv::createTransient " << endreq;
+  mlog << MSG::DEBUG << "IsoMuonFeatureCnv::createTransient " << endmsg;
   
   IsoMuonFeature       *transObj(0);
   
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureContainerCnv.cxx
index 34ae4a57063ccdb4c250e50194f81225b9e5aa87..362d6cf3f533641861457d32ad7897fd24606e4a 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/IsoMuonFeatureContainerCnv.cxx
@@ -19,9 +19,9 @@ static IsoMuonFeatureContainerCnv_p3     TPconverter;
 //createPersistent 
 IsoMuonFeatureContainer_PERS * IsoMuonFeatureContainerCnv::createPersistent( IsoMuonFeatureContainer *transObj)
 {
-  MsgStream mlog(messageService(), "IsoMuonFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "IsoMuonFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "IsoMuonFeatureContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "IsoMuonFeatureContainerCnv::createPersistent called" << endmsg;
   
   IsoMuonFeatureContainer_PERS * p_cont = TPconverter.createPersistent( transObj, mlog );
   
@@ -32,9 +32,9 @@ IsoMuonFeatureContainer_PERS * IsoMuonFeatureContainerCnv::createPersistent( Iso
 //createTransient
 IsoMuonFeatureContainer * IsoMuonFeatureContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "IsoMuonFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "IsoMuonFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "IsoMuonFeatureContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "IsoMuonFeatureContainerCnv::createTransient called" << endmsg;
   
   static pool::Guid p3_guid( "291897DE-5380-424C-AE8F-FFE69DCC8F15" );  
   static pool::Guid p2_guid( "A9A660B1-DEFD-4B56-A10D-9F41178715BD" );  
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureCnv.cxx
index 8d2d476c8dcdbfffe57e554b7dd4d724ecd5c01b..af8a339d8df1adb9d761a610914bdcbd99c50218 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureCnv.cxx
@@ -11,9 +11,9 @@ MuonFeatureCnv::~MuonFeatureCnv(){}
 
 //createPersistent
 MuonFeature_PERS* MuonFeatureCnv::createPersistent(MuonFeature* transObj) {
-    MsgStream mlog(messageService(), "MuonFeatureConverter" );
+    MsgStream mlog(msgSvc(), "MuonFeatureConverter" );
 
-    mlog << MSG::DEBUG << "MuonFeatureCnv::createPersistent" << endreq;
+    mlog << MSG::DEBUG << "MuonFeatureCnv::createPersistent" << endmsg;
 
     MuonFeatureCnv_p2   converter;
     MuonFeature_PERS *persObj = converter.createPersistent( transObj, mlog );
@@ -23,9 +23,9 @@ MuonFeature_PERS* MuonFeatureCnv::createPersistent(MuonFeature* transObj) {
 
 //createTransient
 MuonFeature* MuonFeatureCnv::createTransient() {
-    MsgStream mlog(messageService(), "MuonFeatureConverter" );
+    MsgStream mlog(msgSvc(), "MuonFeatureConverter" );
 
-    mlog << MSG::DEBUG << "MuonFeatureCnv::createTransient " << endreq;
+    mlog << MSG::DEBUG << "MuonFeatureCnv::createTransient " << endmsg;
 
     static pool::Guid p2_guid("3785A9E4-7845-4B54-B49F-DCC2A24409C0");
     static pool::Guid p1_guid("3DFFECBF-3251-4BE7-9D12-B3A9FCAC486E");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureContainerCnv.cxx
index 7462dd0ac3764882251eee46ee3df029f44c9119..fd41bb7eea6ef220dcfce6d0ff691658bd64aeb2 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureContainerCnv.cxx
@@ -16,9 +16,9 @@ static MuonFeatureContainerCnv_p3     TPconverter;
 //createPersistent 
 MuonFeatureContainer_PERS * MuonFeatureContainerCnv::createPersistent( MuonFeatureContainer *transObj)
 {
-  MsgStream mlog(messageService(), "MuonFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "MuonFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "MuonFeatureContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "MuonFeatureContainerCnv::createPersistent called" << endmsg;
   
   MuonFeatureContainer_PERS * p_cont = TPconverter.createPersistent( transObj, mlog );
   
@@ -30,9 +30,9 @@ MuonFeatureContainer_PERS * MuonFeatureContainerCnv::createPersistent( MuonFeatu
 //createTransient
 MuonFeatureContainer * MuonFeatureContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "MuonFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "MuonFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "MuonFeatureContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "MuonFeatureContainerCnv::createTransient called" << endmsg;
   
   static pool::Guid p3_guid( "5B571BCD-FE49-4C56-A357-1B535FE65829" );
   static pool::Guid tlp2_guid( "2F4ABBC8-EA77-487B-820F-76179BB3828C" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsCnv.cxx
index 67748b1bb3300da7be3ec1e21cd3d55b768d28af..5799e0639c4af6a96201da579b4bfdbbad59e261 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsCnv.cxx
@@ -10,9 +10,9 @@ MuonFeatureDetailsCnv::~MuonFeatureDetailsCnv(){}
 
 //createPersistent
 MuonFeatureDetails_PERS* MuonFeatureDetailsCnv::createPersistent(MuonFeatureDetails* transObj) {
-    MsgStream mlog(messageService(), "MuonFeatureDetailsConverter" );
+    MsgStream mlog(msgSvc(), "MuonFeatureDetailsConverter" );
 
-    mlog << MSG::DEBUG << "MuonFeatureDetailsCnv::createPersistent" << endreq;
+    mlog << MSG::DEBUG << "MuonFeatureDetailsCnv::createPersistent" << endmsg;
 
     MuonFeatureDetailsCnv_p1   converter;
     MuonFeatureDetails_PERS *persObj = converter.createPersistent( transObj, mlog );
@@ -22,9 +22,9 @@ MuonFeatureDetails_PERS* MuonFeatureDetailsCnv::createPersistent(MuonFeatureDeta
 
 //createTransient
 MuonFeatureDetails* MuonFeatureDetailsCnv::createTransient() {
-    MsgStream mlog(messageService(), "MuonFeatureDetailsConverter" );
+    MsgStream mlog(msgSvc(), "MuonFeatureDetailsConverter" );
 
-    mlog << MSG::DEBUG << "MuonFeatureDetailsCnv::createTransient " << endreq;
+    mlog << MSG::DEBUG << "MuonFeatureDetailsCnv::createTransient " << endmsg;
 
     static pool::Guid p1_guid("E841B555-766B-48EF-96F8-F4BE39EE8BCB");
 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsContainerCnv.cxx
index 81b704f5bad8f73c829ffbbe7d45258a422e965f..1a19c52ba0ad82837d9ed8f61fd399da761df166 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/MuonFeatureDetailsContainerCnv.cxx
@@ -13,8 +13,8 @@ static MuonFeatureDetailsContainerCnv_tlp1   TLPconverter1;
 static MuonFeatureDetailsContainerCnv_p2     TPconverter;
   
 MuonFeatureDetailsContainer_PERS * MuonFeatureDetailsContainerCnv::createPersistent( MuonFeatureDetailsContainer *transObj) {
-    MsgStream mlog(messageService(), "MuonFeatureDetailsContainerConverter" );
-    mlog << MSG::DEBUG << "MuonFeatureDetailsContainerCnv::createPersistent called" << endreq;
+    MsgStream mlog(msgSvc(), "MuonFeatureDetailsContainerConverter" );
+    mlog << MSG::DEBUG << "MuonFeatureDetailsContainerCnv::createPersistent called" << endmsg;
 
     MuonFeatureDetailsContainer_PERS * p_cont = TPconverter.createPersistent( transObj, mlog );
 
@@ -24,8 +24,8 @@ MuonFeatureDetailsContainer_PERS * MuonFeatureDetailsContainerCnv::createPersist
 
 MuonFeatureDetailsContainer * MuonFeatureDetailsContainerCnv::createTransient() {
     
-    MsgStream mlog(messageService(), "MuonFeatureDetailsContainerConverter" );
-    // mlog << MSG::DEBUG << "MuonFeatureDetailsContainerCnv::createTransient called" << endreq;
+    MsgStream mlog(msgSvc(), "MuonFeatureDetailsContainerConverter" );
+    // mlog << MSG::DEBUG << "MuonFeatureDetailsContainerCnv::createTransient called" << endmsg;
 
     static pool::Guid tlp1_guid( "CF2FFCB2-3936-4800-9146-52B203A47478" );
     static pool::Guid p2_guid( "95327E52-C8B2-45E4-9EAF-C65A17AB27F5" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsCnv.cxx
index 4b9813abdde50a2dcac5ed965d8b95b1333caea1..7dd41f24936e6e3d0f9e7457c51f2d9317f74fc1 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsCnv.cxx
@@ -17,8 +17,8 @@ RingerRingsCnv::~RingerRingsCnv()
 
 
 RingerRings_PERS* RingerRingsCnv::createPersistent(RingerRings* transCont) {
-  MsgStream mlog(messageService(), "RingerRingsConverter" );
-  mlog << MSG::DEBUG << "RingerRingsCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "RingerRingsConverter" );
+  mlog << MSG::DEBUG << "RingerRingsCnv::createPersistent" << endmsg;
 
   RingerRings_PERS *persObj = m_TPConverter->createPersistent(transCont, mlog);
   
@@ -27,15 +27,15 @@ RingerRings_PERS* RingerRingsCnv::createPersistent(RingerRings* transCont) {
 
 
 RingerRings* RingerRingsCnv::createTransient() {
-  MsgStream mlog(messageService(), "RingerRingsConverter" );
-  mlog << MSG::DEBUG << "RingerRingsCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "RingerRingsConverter" );
+  mlog << MSG::DEBUG << "RingerRingsCnv::createTransient " << endmsg;
   
   static pool::Guid tlp1_guid("7A3BC015-8ECE-44A9-A2BD-9D52B3D2B354");
   
   RingerRings *trans_cont(0);
   
   if (compareClassGuid(tlp1_guid) ) {
-    mlog << MSG::DEBUG << "RingerRingsCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "RingerRingsCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr<RingerRings_tlp1> col_vect(this->poolReadObject<RingerRings_tlp1>());
     trans_cont = m_TPConverter->createTransient(col_vect.get(), mlog);
   } else {
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsContainerCnv.cxx
index f4c754bb56547eb6a35ccfe1b02895d2615f154d..a43c3c3cc80793457aad1357be9ec185eead4728 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/RingerRingsContainerCnv.cxx
@@ -11,9 +11,9 @@ static RingerRingsContainerCnv_p2 TPConverter;
  
 // createPersistent
 RingerRingsContainer_PERS *RingerRingsContainerCnv::createPersistent(RingerRingsContainer *transObj) {
-  MsgStream mlog(messageService(), "RingerRingsContainerConverter");
+  MsgStream mlog(msgSvc(), "RingerRingsContainerConverter");
 
-  mlog << MSG::DEBUG << "RingerRingsContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "RingerRingsContainerCnv::createPersistent called" << endmsg;
 
   RingerRingsContainer_PERS *p_RingerRingsCont = TPConverter.createPersistent(transObj, mlog);
  
@@ -24,9 +24,9 @@ RingerRingsContainer_PERS *RingerRingsContainerCnv::createPersistent(RingerRings
 // createTransient
 RingerRingsContainer *RingerRingsContainerCnv::createTransient() {
 
-  MsgStream mlog(messageService(), "RingerRingsContainerConverter");
+  MsgStream mlog(msgSvc(), "RingerRingsContainerConverter");
   
-  mlog << MSG::DEBUG << "RingerRingsContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "RingerRingsContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p2_guid("30D29B68-6D41-429E-AC16-930ACF71280D");
   static pool::Guid tlp1_guid("B5587828-50D8-4DAA-97F3-5E41A7F3E3FE");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureCnv.cxx
index e29549affc5f0acd8cfb58d008bd8e64290b8117..53c4429151ff43ee9515e656440d224c02e8b126 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureCnv.cxx
@@ -17,9 +17,9 @@ TileMuFeatureCnv::~TileMuFeatureCnv(){}
 
 //createPersistent
 TileMuFeature_PERS* TileMuFeatureCnv::createPersistent(TileMuFeature* transObj) {
-    MsgStream mlog(messageService(), "TileMuFeatureConverter" );
+    MsgStream mlog(msgSvc(), "TileMuFeatureConverter" );
 
-    mlog << MSG::DEBUG << "TileMuFeatureCnv::createPersistent" << endreq;
+    mlog << MSG::DEBUG << "TileMuFeatureCnv::createPersistent" << endmsg;
 
     TileMuFeatureCnv_p1   converter;
     TileMuFeature_PERS *persObj = converter.createPersistent( transObj, mlog );
@@ -28,9 +28,9 @@ TileMuFeature_PERS* TileMuFeatureCnv::createPersistent(TileMuFeature* transObj)
 
 //createTransient
 TileMuFeature* TileMuFeatureCnv::createTransient() {
-    MsgStream mlog(messageService(), "TileMuFeatureConverter" );
+    MsgStream mlog(msgSvc(), "TileMuFeatureConverter" );
 
-    mlog << MSG::DEBUG << "TileMuFeatureCnv::createTransient " << endreq;
+    mlog << MSG::DEBUG << "TileMuFeatureCnv::createTransient " << endmsg;
   
     static pool::Guid p1_guid("F853E605-AFD5-44F9-98BC-4D777CBCBEE4");
         // from "TrigEvent/TrigMuonEventTPCnv/TrigMuonEventTPCnv/selection.xml"
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureContainerCnv.cxx
index b8db9150317de28555aa83f3b5496a2ba1db56b1..fe3d90d2b0d1b99b3fe031b3cbe323fe0d61fafd 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileMuFeatureContainerCnv.cxx
@@ -14,9 +14,9 @@ static TileMuFeatureContainerCnv_p2     TPconverter;
 //createPersistent
 TileMuFeatureContainer_PERS * TileMuFeatureContainerCnv::createPersistent( TileMuFeatureContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TileMuFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "TileMuFeatureContainerConverter" );
 
-  mlog << MSG::DEBUG << "TileMuFeatureContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TileMuFeatureContainerCnv::createPersistent called" << endmsg;
 
   TileMuFeatureContainer_PERS * p_cont = TPconverter.createPersistent( transObj, mlog );
 
@@ -27,9 +27,9 @@ TileMuFeatureContainer_PERS * TileMuFeatureContainerCnv::createPersistent( TileM
 //createTransient
 TileMuFeatureContainer * TileMuFeatureContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TileMuFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "TileMuFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "TileMuFeatureContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TileMuFeatureContainerCnv::createTransient called" << endmsg;
   
   static pool::Guid p2_guid( "D7B3C086-B471-47EE-B8EC-E58DC4CD2AD9" );
   static pool::Guid tlp1_guid( "4684172D-3590-4464-BCA6-477725ADD755" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileTrackMuFeatureContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileTrackMuFeatureContainerCnv.cxx
index c7821ded25a2b6c7bb3a7a1a77681d3bb18d25fc..6dfd3f78ee9906d84cee57611bbcd5f4d5a7ffc0 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TileTrackMuFeatureContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TileTrackMuFeatureContainerCnv.cxx
@@ -14,9 +14,9 @@ static TileTrackMuFeatureContainerCnv_p3     TPconverter;
 //createPersistent 
 TileTrackMuFeatureContainer_PERS * TileTrackMuFeatureContainerCnv::createPersistent( TileTrackMuFeatureContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TileTrackMuFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "TileTrackMuFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "TileTrackMuFeatureContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TileTrackMuFeatureContainerCnv::createPersistent called" << endmsg;
 
   TileTrackMuFeatureContainer_PERS * p_cont = TPconverter.createPersistent( transObj, mlog );
 
@@ -28,9 +28,9 @@ TileTrackMuFeatureContainer_PERS * TileTrackMuFeatureContainerCnv::createPersist
 //createTransient
 TileTrackMuFeatureContainer * TileTrackMuFeatureContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TileTrackMuFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "TileTrackMuFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "TileTrackMuFeatureContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TileTrackMuFeatureContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p3_guid( "25018D00-1D18-4B4C-9C07-37993260EADB");  
   static pool::Guid tlp1_guid( "983ED5FE-D0A2-43AE-90A9-268C8B61E8B3");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCaloClusterContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCaloClusterContainerCnv.cxx
index ec3b6c6d873b6605513e1bab40b2ea5ef44842b0..baf0a3db1253652cabb82877f6774bb7c8bb3c11 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCaloClusterContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCaloClusterContainerCnv.cxx
@@ -10,9 +10,9 @@ static TrigCaloClusterContainerCnv_p3   TPConverter;
 //createPersistent 
 TrigCaloClusterContainer_PERS * TrigCaloClusterContainerCnv::createPersistent( TrigCaloClusterContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigCaloClusterContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigCaloClusterContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigCaloClusterContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigCaloClusterContainerCnv::createPersistent called" << endmsg;
 
   TrigCaloClusterContainer_PERS * p_CaloClusterCont = TPConverter.createPersistent( transObj, mlog );
  
@@ -23,9 +23,9 @@ TrigCaloClusterContainer_PERS * TrigCaloClusterContainerCnv::createPersistent( T
 //createTransient
 TrigCaloClusterContainer * TrigCaloClusterContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigCaloClusterContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigCaloClusterContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigCaloClusterContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigCaloClusterContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p3_guid( "98A28943-662A-4141-82C3-537447264DA3" );
 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeCnv.cxx
index 1473efa747eb22823b016107c63116c656107831..a5463740a8734bc6d38d1e1cf3352c11d2a5e429 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeCnv.cxx
@@ -23,8 +23,8 @@ TrigCompositeCnv::~TrigCompositeCnv()
 
 TrigComposite_PERS* TrigCompositeCnv::createPersistent(TrigComposite* transCont) 
 {
-  MsgStream mlog(messageService(), "TrigCompositeConverter" );
-  mlog << MSG::DEBUG << "TrigCompositeCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigCompositeConverter" );
+  mlog << MSG::DEBUG << "TrigCompositeCnv::createPersistent" << endmsg;
 
   TrigComposite_PERS *persObj = m_impl->m_TPConverter.createPersistent( transCont, mlog );
   
@@ -34,8 +34,8 @@ TrigComposite_PERS* TrigCompositeCnv::createPersistent(TrigComposite* transCont)
 
 TrigComposite* TrigCompositeCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigCompositeConverter" );
-  mlog << MSG::DEBUG << "TrigCompositeCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigCompositeConverter" );
+  mlog << MSG::DEBUG << "TrigCompositeCnv::createTransient " << endmsg;
   
   static pool::Guid p1_guid("53F70884-38EE-4D08-9F03-FA8BED725B63");
   
@@ -43,7 +43,7 @@ TrigComposite* TrigCompositeCnv::createTransient()
   
   if( compareClassGuid(p1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigCompositeCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigCompositeCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigComposite_p1 >   col_vect( this->poolReadObject< TrigComposite_p1 >() );
     trans_cont = m_impl->m_TPConverter.createTransient( col_vect.get(), mlog );
 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeContainerCnv.cxx
index 7e388410c5650330b3176b68d9be6da45a4a739a..5f4a9df343c374f5e7328b0777094bf1b9987f13 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigCompositeContainerCnv.cxx
@@ -10,9 +10,9 @@ static TrigCompositeContainerCnv_p1   TPConverter;
 //createPersistent 
 TrigCompositeContainer_PERS * TrigCompositeContainerCnv::createPersistent( TrigCompositeContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigCompositeContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigCompositeContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigCompositeContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigCompositeContainerCnv::createPersistent called" << endmsg;
 
   TrigCompositeContainer_PERS * p_CompositeCont = TPConverter.createPersistent( transObj, mlog );
  
@@ -23,9 +23,9 @@ TrigCompositeContainer_PERS * TrigCompositeContainerCnv::createPersistent( TrigC
 //createTransient
 TrigCompositeContainer * TrigCompositeContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigCompositeContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigCompositeContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigCompositeContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigCompositeContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p1_guid( "6D16EA6B-968C-41F0-B5E8-9CC6D5BD7F9A" );
 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.cxx
index 65b8e79346a58f9649fb4c4e37a7a9fdef4e59c2..0b7edc0ae1ac482b8fe64075e17c724468d6af31 100755
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigDecisionCnv.cxx
@@ -23,7 +23,7 @@ TrigDecisionCnv::~TrigDecisionCnv () {}
 
 TrigDecision_PERS* TrigDecisionCnv::createPersistent(TrigDec::TrigDecision* transCont)
 {
-  MsgStream log(messageService(), "TrigDecisionConverter" );
+  MsgStream log(msgSvc(), "TrigDecisionConverter" );
 
   //  TrigDec::TrigDecisionCnv_p1  converter;
   TrigDec::TrigDecisionCnv_p5  converter;
@@ -35,7 +35,7 @@ TrigDecision_PERS* TrigDecisionCnv::createPersistent(TrigDec::TrigDecision* tran
 
 TrigDec::TrigDecision* TrigDecisionCnv::createTransient()
 {
-  MsgStream log(messageService(), "TrigDecisionConverter" );
+  MsgStream log(msgSvc(), "TrigDecisionConverter" );
 
   static pool::Guid p1_guid("83D7E08D-CF8C-47A0-963F-5618A9509334");
   static pool::Guid p2_guid("6BE81E51-B42B-4783-957D-84E7F383E9D5");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBjetContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBjetContainerCnv.cxx
index cd373773615f67a7f773cb74de95f52cde37b3b9..556ddd52fb63846379996e7d04b4137b5333cbaa 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBjetContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBjetContainerCnv.cxx
@@ -29,9 +29,9 @@ TrigEFBjetContainerCnv::~TrigEFBjetContainerCnv()
 //* createPersistent *//
 TrigEFBjetContainer_PERS * TrigEFBjetContainerCnv::createPersistent( TrigEFBjetContainer *transObj) {
 
-  MsgStream mlog(messageService(), "TrigEFBjetContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigEFBjetContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigEFBjetContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigEFBjetContainerCnv::createPersistent called" << endmsg;
 
   TrigEFBjetContainer_PERS * p_EFBjetCont = m_impl->m_TPConverter_tlp2.createPersistent( transObj, m_impl->m_log );
  
@@ -42,9 +42,9 @@ TrigEFBjetContainer_PERS * TrigEFBjetContainerCnv::createPersistent( TrigEFBjetC
 //* createTransient *//
 TrigEFBjetContainer * TrigEFBjetContainerCnv::createTransient() {
 
-  MsgStream mlog(messageService(), "TrigEFBjetContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigEFBjetContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigEFBjetContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigEFBjetContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid tlp2_guid( "91EA22B6-9273-4206-AEB5-FE23A269C5AA" );
   static pool::Guid tlp1_guid( "F933A067-5788-4AD6-B696-C8B0E988EF2D" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBphysContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBphysContainerCnv.cxx
index 3824fb61fadac1a17725d23ab40db5cb076c7717..152f59622bd9edccc38b2826790a408df62ab5e0 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBphysContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEFBphysContainerCnv.cxx
@@ -28,9 +28,9 @@ TrigEFBphysContainerCnv::~TrigEFBphysContainerCnv()
 //createPersistent
 TrigEFBphysContainer_PERS * TrigEFBphysContainerCnv::createPersistent( TrigEFBphysContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigEFBphysContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigEFBphysContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigEFBphysContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigEFBphysContainerCnv::createPersistent called" << endmsg;
 
   TrigEFBphysContainer_PERS * p_EFBphysCont = m_impl->m_TPConverter.createPersistent( transObj, m_impl->m_log );
  
@@ -42,9 +42,9 @@ TrigEFBphysContainer_PERS * TrigEFBphysContainerCnv::createPersistent( TrigEFBph
 //createTransient
 TrigEFBphysContainer * TrigEFBphysContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigEFBphysContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigEFBphysContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigEFBphysContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigEFBphysContainerCnv::createTransient called" << endmsg;
   
   static pool::Guid tlp2_guid( "D93906C2-4F81-44A7-98BE-71302891FE44" );
   static pool::Guid tlp1_guid( "5F5B068F-32DB-4CC9-BA9E-C74C076AAAA1" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterCnv.cxx
index 8b473c513d0ed37d9ff83b75097b311d615cc943..bf078fef815ca0564f37f6d26ec6053b0c54addf 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterCnv.cxx
@@ -24,8 +24,8 @@ TrigEMClusterCnv::~TrigEMClusterCnv()
 
 TrigEMCluster_PERS* TrigEMClusterCnv::createPersistent(TrigEMCluster* transCont) 
 {
-  MsgStream mlog(messageService(), "TrigEMClusterConverter" );
-  mlog << MSG::DEBUG << "TrigEMClusterCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigEMClusterConverter" );
+  mlog << MSG::DEBUG << "TrigEMClusterCnv::createPersistent" << endmsg;
 
   TrigEMCluster_PERS *persObj = m_impl->m_TPConverter2.createPersistent( transCont, mlog );
   
@@ -35,8 +35,8 @@ TrigEMCluster_PERS* TrigEMClusterCnv::createPersistent(TrigEMCluster* transCont)
 
 TrigEMCluster* TrigEMClusterCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigEMClusterConverter" );
-  mlog << MSG::DEBUG << "TrigEMClusterCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigEMClusterConverter" );
+  mlog << MSG::DEBUG << "TrigEMClusterCnv::createTransient " << endmsg;
   
   static pool::Guid tlp2_guid("61D02BB3-0F97-4809-AC93-72B2DC2DF624");
   static pool::Guid tlp1_guid("EF5124F2-7B9C-4CBE-8D7F-1AD368A8A125");
@@ -46,20 +46,20 @@ TrigEMCluster* TrigEMClusterCnv::createTransient()
   
   if( compareClassGuid(tlp2_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigEMClusterCnv::reading tlp2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigEMClusterCnv::reading tlp2 persistent object" << endmsg;
     std::auto_ptr< TrigEMCluster_tlp2 >   col_vect( this->poolReadObject< TrigEMCluster_tlp2 >() );
     trans_cont = m_impl->m_TPConverter2.createTransient( col_vect.get(), mlog );
 
   } else if( compareClassGuid(tlp1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigEMClusterCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigEMClusterCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigEMCluster_tlp1 >   col_vect( this->poolReadObject< TrigEMCluster_tlp1 >() );
     trans_cont = m_impl->m_TPConverter.createTransient( col_vect.get(), mlog );
 
   }
   else if( compareClassGuid(p0_guid) ) {
 
-    mlog << MSG::DEBUG << "TrigEMClusterCnv::reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigEMClusterCnv::reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     trans_cont = this->poolReadObject<TrigEMCluster>();
 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterContainerCnv.cxx
index 343571ee7e0422e78595407fec32152c69e6d796..ef7d588675aaf485ef8a1ec53a514f6eed91d701 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigEMClusterContainerCnv.cxx
@@ -14,9 +14,9 @@ static TrigEMClusterContainerCnv_p3   TPConverter_p3;
 //createPersistent 
 TrigEMClusterContainer_PERS * TrigEMClusterContainerCnv::createPersistent( TrigEMClusterContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigEMClusterContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigEMClusterContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigEMClusterContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigEMClusterContainerCnv::createPersistent called" << endmsg;
 
   TrigEMClusterContainer_PERS * p_EMClusterCont = TPConverter.createPersistent( transObj, mlog );
  
@@ -27,9 +27,9 @@ TrigEMClusterContainer_PERS * TrigEMClusterContainerCnv::createPersistent( TrigE
 //createTransient
 TrigEMClusterContainer * TrigEMClusterContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigEMClusterContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigEMClusterContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigEMClusterContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigEMClusterContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p3_guid( "0BF627E6-52A0-4F10-9FFD-A513DF2DBC31" );
   static pool::Guid p4_guid( "7B430CA8-5D16-4E26-B0A4-461F983610EB" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigElectronContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigElectronContainerCnv.cxx
index 34858e551e9df726212b67f83d5188adedbc34bd..3c9031214997fddb8d1b0d64e1280807fef332ea 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigElectronContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigElectronContainerCnv.cxx
@@ -16,8 +16,8 @@ static TrigElectronContainerCnv_p3    TPConverter;
 //create persistent
 TrigElectronContainer_PERS* TrigElectronContainerCnv::createPersistent(TrigElectronContainer* transCont) 
 {
-    MsgStream mlog(messageService(), "TrigElectronContainerConverter" );
-    mlog << MSG::DEBUG << "TrigElectronContainerCnv::createPersistent" << endreq;
+    MsgStream mlog(msgSvc(), "TrigElectronContainerConverter" );
+    mlog << MSG::DEBUG << "TrigElectronContainerCnv::createPersistent" << endmsg;
 
     TrigElectronContainer_PERS *persObj = TPConverter.createPersistent( transCont, mlog );
 
@@ -27,8 +27,8 @@ TrigElectronContainer_PERS* TrigElectronContainerCnv::createPersistent(TrigElect
 //create transient
 TrigElectronContainer* TrigElectronContainerCnv::createTransient() 
 {
-    MsgStream mlog(messageService(), "TrigElectronContainerConverter" );
-    mlog << MSG::DEBUG << "TrigElectronContainerCnv::createTransient" << endreq;
+    MsgStream mlog(msgSvc(), "TrigElectronContainerConverter" );
+    mlog << MSG::DEBUG << "TrigElectronContainerCnv::createTransient" << endmsg;
 
     static pool::Guid p3_guid("F2E0066A-3BC5-44F2-A18C-57C63481988D");
     static pool::Guid tlp2_guid("2EDB14B9-0B61-4014-90C2-20AEB7AAFEBE");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DCnv.cxx
index ab1bd11da55e689c77d8fe1f376f3f11784e5ec4..d8cb3fce5c971fa885330ba16efe4561500db10d 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DCnv.cxx
@@ -9,8 +9,8 @@ TrigHisto1DCnv::TrigHisto1DCnv(ISvcLocator* svcloc): TrigHisto1DCnvBase(svcloc)
 TrigHisto1DCnv::~TrigHisto1DCnv(){}
 
 TrigHisto1D_p1* TrigHisto1DCnv::createPersistent(TrigHisto1D* transObj)  {
-  MsgStream mlog(messageService(), "TrigHisto1DConverter" );
-  mlog << MSG::DEBUG << "TrigHisto1DCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigHisto1DConverter" );
+  mlog << MSG::DEBUG << "TrigHisto1DCnv::createPersistent" << endmsg;
   
   TrigHisto1DCnv_p1 converter;
   TrigHisto1D_p1 *persObj = converter.createPersistent( transObj, mlog );
@@ -19,15 +19,15 @@ TrigHisto1D_p1* TrigHisto1DCnv::createPersistent(TrigHisto1D* transObj)  {
 }
 
 TrigHisto1D* TrigHisto1DCnv::createTransient() {
-  MsgStream mlog(messageService(), "TrigHisto1DConverter" );
-  mlog << MSG::DEBUG << "TrigHisto1DCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigHisto1DConverter" );
+  mlog << MSG::DEBUG << "TrigHisto1DCnv::createTransient " << endmsg;
  
   static pool::Guid p1_guid("C304621E-2266-4863-9B47-7C3450B00399");
 
   TrigHisto1D *transObj = 0;
   
   if( compareClassGuid(p1_guid) ) {   
-    mlog << MSG::DEBUG << "TrigHisto1DCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigHisto1DCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr<TrigHisto1D_p1> pers_ptr( poolReadObject<TrigHisto1D_p1>() );
     TrigHisto1DCnv_p1 converter;
     transObj = converter.createTransient(pers_ptr.get(), mlog);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DContainerCnv.cxx
index 0429860dd0b4c05e1bf204610ab63c0848297d5d..2109d7f7c396af4ee20f37025b359fd5cdcf938e 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto1DContainerCnv.cxx
@@ -21,9 +21,9 @@ TrigHisto1DContainerCnv::~TrigHisto1DContainerCnv()
 //createPersistent 
 TrigHisto1DContainer_PERS * TrigHisto1DContainerCnv::createPersistent( TrigHisto1DContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigHisto1DContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigHisto1DContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigHisto1DContainerCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigHisto1DContainerCnv::createPersistent" << endmsg;
 
   TrigHisto1DContainer_PERS* persObj = m_TPConverter->createPersistent( transObj, mlog );
  
@@ -35,9 +35,9 @@ TrigHisto1DContainer_PERS * TrigHisto1DContainerCnv::createPersistent( TrigHisto
 //createTransient
 TrigHisto1DContainer* TrigHisto1DContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigHisto1DContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigHisto1DContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigHisto1DContainerCnv::createTransient" << endreq;
+  mlog << MSG::DEBUG << "TrigHisto1DContainerCnv::createTransient" << endmsg;
 
   static pool::Guid tlp1_guid( "CDC70E22-85DF-45B4-B69E-FC7FD70987A9" );
   static pool::Guid p1_guid( "B6240954-1842-45F5-AB5B-50934C633B1E" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DCnv.cxx
index 5aec63b44f6d264b221660c58f184c301aaace78..fb5b1dfbe3bf07219f3b8c5eb870fce73a917a36 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DCnv.cxx
@@ -9,8 +9,8 @@ TrigHisto2DCnv::TrigHisto2DCnv(ISvcLocator* svcloc): TrigHisto2DCnvBase(svcloc)
 TrigHisto2DCnv::~TrigHisto2DCnv(){}
 
 TrigHisto2D_p1* TrigHisto2DCnv::createPersistent(TrigHisto2D* transObj)  {
-  MsgStream mlog(messageService(), "TrigHisto2DConverter" );
-  mlog << MSG::DEBUG << "TrigHisto2DCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigHisto2DConverter" );
+  mlog << MSG::DEBUG << "TrigHisto2DCnv::createPersistent" << endmsg;
   
   TrigHisto2DCnv_p1 converter;
   TrigHisto2D_p1 *persObj = converter.createPersistent( transObj, mlog );
@@ -19,15 +19,15 @@ TrigHisto2D_p1* TrigHisto2DCnv::createPersistent(TrigHisto2D* transObj)  {
 }
 
 TrigHisto2D* TrigHisto2DCnv::createTransient() {
-  MsgStream mlog(messageService(), "TrigHisto2DConverter" );
-  mlog << MSG::DEBUG << "TrigHisto2DCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigHisto2DConverter" );
+  mlog << MSG::DEBUG << "TrigHisto2DCnv::createTransient " << endmsg;
   
   static pool::Guid p1_guid("8CF4D0A0-2957-4014-AEB2-140D1A013E7F");
 
   TrigHisto2D *transObj = 0;
 
   if( compareClassGuid(p1_guid) ) {
-    mlog << MSG::DEBUG << "TrigHisto2DCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigHisto2DCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr<TrigHisto2D_p1> pers_ptr( poolReadObject<TrigHisto2D_p1>() );
     TrigHisto2DCnv_p1 converter;
     transObj = converter.createTransient(pers_ptr.get(), mlog);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DContainerCnv.cxx
index de7c66b7932820b4f8e33f572ec92d8adf62ff2b..aecec1990925b196589cef8f61b2e156fbd46969 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigHisto2DContainerCnv.cxx
@@ -20,9 +20,9 @@ TrigHisto2DContainerCnv::~TrigHisto2DContainerCnv()
 //createPersistent 
 TrigHisto2DContainer_PERS * TrigHisto2DContainerCnv::createPersistent( TrigHisto2DContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigHisto2DContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigHisto2DContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigHisto2DContainerCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigHisto2DContainerCnv::createPersistent" << endmsg;
 
   TrigHisto2DContainer_PERS* persObj = m_TPConverter->createPersistent( transObj, mlog );
  
@@ -34,9 +34,9 @@ TrigHisto2DContainer_PERS * TrigHisto2DContainerCnv::createPersistent( TrigHisto
 //createTransient
 TrigHisto2DContainer* TrigHisto2DContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigHisto2DContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigHisto2DContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigHisto2DContainerCnv::createTransient" << endreq;
+  mlog << MSG::DEBUG << "TrigHisto2DContainerCnv::createTransient" << endmsg;
 
   static pool::Guid tlp1_guid( "59C6A169-C537-4DEC-984D-41CE2544F96E" );
   static pool::Guid p1_guid( "C9FE79CB-6875-4E35-A1E3-23DFA6F94DFE" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigInDetTrackCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigInDetTrackCollectionCnv.cxx
index 22d6db1599f0901c0b33bae3b53d9185bb97aef9..269c1cd30b7215d2976ee48e3d4e5adea5c4fe69 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigInDetTrackCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigInDetTrackCollectionCnv.cxx
@@ -32,8 +32,8 @@ TrigInDetTrackCollectionCnv::~TrigInDetTrackCollectionCnv()
 
 //create persistent
 TrigInDetTrackCollection_PERS* TrigInDetTrackCollectionCnv::createPersistent(TrigInDetTrackCollection* transObj) {
-    MsgStream mlog(messageService(), "TrigInDetTrackCollectionConverter" );
-    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::createPersistent" << endreq;
+    MsgStream mlog(msgSvc(), "TrigInDetTrackCollectionConverter" );
+    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::createPersistent" << endmsg;
 
     TrigInDetTrackCollection_PERS* persObj = m_tlp_Converter->createPersistent( transObj, mlog );
 
@@ -43,8 +43,8 @@ TrigInDetTrackCollection_PERS* TrigInDetTrackCollectionCnv::createPersistent(Tri
 //create transient
 TrigInDetTrackCollection* TrigInDetTrackCollectionCnv::createTransient() {
   
-  MsgStream mlog(messageService(), "TrigInDetTrackCollectionConverter" );
-  mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigInDetTrackCollectionConverter" );
+  mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::createTransient " << endmsg;
 
   static pool::Guid tlp4_guid("E1B8EE19-4F7B-4EF2-8FDC-45AA871BD628");
   static pool::Guid tlp3_guid("196F811B-382D-47A9-8551-D2038343BFFA");
@@ -55,25 +55,25 @@ TrigInDetTrackCollection* TrigInDetTrackCollectionCnv::createTransient() {
   TrigInDetTrackCollection  *transObj = 0;
   if( compareClassGuid(tlp4_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading tlp4 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading tlp4 persistent object" << endmsg;
     TrigInDetTrackCollectionCnv_tlp4 tlp4_Converter;
     poolReadObject< TrigInDetTrackCollection_tlp4 >( tlp4_Converter );
     transObj = tlp4_Converter.createTransient( mlog );
   } else  if( compareClassGuid(tlp3_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading tlp3 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading tlp3 persistent object" << endmsg;
     TrigInDetTrackCollectionCnv_tlp3 tlp3_Converter;
     poolReadObject< TrigInDetTrackCollection_tlp3 >( tlp3_Converter );
     transObj = tlp3_Converter.createTransient( mlog );
   } else if( compareClassGuid(tlp2_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading tlp2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading tlp2 persistent object" << endmsg;
     TrigInDetTrackCollectionCnv_tlp2 tlp2_Converter;
     poolReadObject< TrigInDetTrackCollection_tlp2 >( tlp2_Converter );
     transObj = tlp2_Converter.createTransient( mlog );
   } else if( compareClassGuid(tlp1_guid) ) {
       
-    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading tlp1 persistent object" << endmsg;
     TrigInDetTrackCollectionCnv_tlp1 tlp1_Converter;
     poolReadObject< TrigInDetTrackCollection_tlp1 >( tlp1_Converter );
     transObj = tlp1_Converter.createTransient( mlog );
@@ -82,7 +82,7 @@ TrigInDetTrackCollection* TrigInDetTrackCollectionCnv::createTransient() {
   
   else if( compareClassGuid(p0_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigInDetTrackCollectionCnv::reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     transObj = this->poolReadObject<TrigInDetTrackCollection>();
   }  
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BjetContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BjetContainerCnv.cxx
index 1cd956c56dc1368192dd11920f738c7a602f19c3..6f19ca22eb5a8fe34a29fb493882015dbca19d95 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BjetContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BjetContainerCnv.cxx
@@ -16,9 +16,9 @@ static TrigL2BjetContainerCnv_p3     TPconverter;
 //* createPersistent *// 
 TrigL2BjetContainer_PERS * TrigL2BjetContainerCnv::createPersistent( TrigL2BjetContainer *transObj) {
 
-  MsgStream mlog(messageService(), "TrigL2BjetContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigL2BjetContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigL2BjetContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigL2BjetContainerCnv::createPersistent called" << endmsg;
 
   TrigL2BjetContainer_PERS * p_L2BjetCont = TPconverter.createPersistent( transObj, mlog );
  
@@ -29,9 +29,9 @@ TrigL2BjetContainer_PERS * TrigL2BjetContainerCnv::createPersistent( TrigL2BjetC
 //* createTransient *//
 TrigL2BjetContainer * TrigL2BjetContainerCnv::createTransient() {
 
-  MsgStream mlog(messageService(), "TrigL2BjetContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigL2BjetContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigL2BjetContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigL2BjetContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p3_guid( "65534D07-EECA-46B1-A6AA-A4DA4DFEAAEF" );
   static pool::Guid tlp2_guid( "67162A5D-CEC3-4D9B-AF43-1858D6F1558E" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BphysContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BphysContainerCnv.cxx
index c0a7ee60075cb563e2c6237d13d6c535bdec7b81..a13bffb12cf5b6504a13db43a6f7d097c804b2e0 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BphysContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigL2BphysContainerCnv.cxx
@@ -34,7 +34,7 @@ TrigL2BphysContainer_PERS * TrigL2BphysContainerCnv::createPersistent( TrigL2Bph
 {
   m_impl->m_log << MSG::DEBUG
                 << "TrigL2BphysContainerCnv::createPersistent called"
-                << endreq;
+                << endmsg;
 
   TrigL2BphysContainer_PERS * p_L2BphysCont =
     m_impl->m_TPConverter.createPersistent( transObj, m_impl->m_log );
@@ -48,7 +48,7 @@ TrigL2BphysContainer_PERS * TrigL2BphysContainerCnv::createPersistent( TrigL2Bph
 TrigL2BphysContainer * TrigL2BphysContainerCnv::createTransient()
 {
   m_impl->m_log << MSG::DEBUG
-                << "TrigL2BphysContainerCnv::createTransient called" << endreq;
+                << "TrigL2BphysContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid tlp2_guid( "2E35788D-BE17-4FE1-9DB5-709E05880CEC" );
   static pool::Guid tlp1_guid( "E8AA6B0A-B057-4058-B5A9-AC0B719626AF" );
@@ -60,7 +60,7 @@ TrigL2BphysContainer * TrigL2BphysContainerCnv::createTransient()
     
     poolReadObject< TrigL2BphysContainer_PERS >(m_impl->m_TPConverter);
     p_collection = m_impl->m_TPConverter.createTransient( m_impl->m_log );
-    m_impl->m_log << MSG::DEBUG<< "TrigL2BphysContainerCnv_tlp2" << endreq;
+    m_impl->m_log << MSG::DEBUG<< "TrigL2BphysContainerCnv_tlp2" << endmsg;
   } else if( compareClassGuid( tlp1_guid ) ) {
     TrigL2BphysContainerCnv_tlp1  tlp1_Converter;
     poolReadObject< TrigL2BphysContainer_tlp1 >(tlp1_Converter);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETCnv.cxx
index 3fd412305d69cb6e10919838d4119c8700e67660..bd41038c168f3599f374fa00cd84f0fa0ec17a7f 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETCnv.cxx
@@ -14,9 +14,9 @@ TrigMissingETCnv::~TrigMissingETCnv(){}
 
 
 TrigMissingET_PERS* TrigMissingETCnv::createPersistent(TrigMissingET* transObj) {
-  MsgStream mlog(messageService(), "TrigMissingETConverter" );
+  MsgStream mlog(msgSvc(), "TrigMissingETConverter" );
 
-  mlog << MSG::DEBUG << "TrigMissingETCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigMissingETCnv::createPersistent" << endmsg;
 
 //   TrigMissingETCnv_p1   converter;
   TrigMissingETCnv_p2   converter;
@@ -28,9 +28,9 @@ TrigMissingET_PERS* TrigMissingETCnv::createPersistent(TrigMissingET* transObj)
 
 
 TrigMissingET* TrigMissingETCnv::createTransient() {
-  MsgStream mlog(messageService(), "TrigMissingETConverter" );
+  MsgStream mlog(msgSvc(), "TrigMissingETConverter" );
 
-  mlog << MSG::DEBUG << "TrigMissingETCnv::createTransient " << endreq;
+  mlog << MSG::DEBUG << "TrigMissingETCnv::createTransient " << endmsg;
 
   static pool::Guid p2_guid("9972F10B-2B6A-42A7-AF71-D8FB60F07C6D");
   static pool::Guid p1_guid("A65F0499-A789-4D66-9930-E8651FE91F8A");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETContainerCnv.cxx
index 389acb9076dcb1560cfc10037316168e91b8ab98..6b635915ba22037039fa19c013e88bf5f0015a9a 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMissingETContainerCnv.cxx
@@ -15,9 +15,9 @@ static TrigMissingETContainerCnv_p3   TPConverter;
 //createPersistent 
 TrigMissingETContainer_PERS * TrigMissingETContainerCnv::createPersistent( TrigMissingETContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigMissingETContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigMissingETContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigMissingETContainerCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigMissingETContainerCnv::createPersistent" << endmsg;
 
   TrigMissingETContainer_PERS* persObj = TPConverter.createPersistent( transObj, mlog );
  
@@ -29,9 +29,9 @@ TrigMissingETContainer_PERS * TrigMissingETContainerCnv::createPersistent( TrigM
 //createTransient
 TrigMissingETContainer* TrigMissingETContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigMissingETContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigMissingETContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigMissingETContainerCnv::createTransient" << endreq;
+  mlog << MSG::DEBUG << "TrigMissingETContainerCnv::createTransient" << endmsg;
 
   static pool::Guid p3_guid( "F5C98A61-4F40-4FE6-A1A9-D5EF00FFFBF0" );
   static pool::Guid tlp1_guid( "23EC84A7-8614-42D6-B82D-B0861D3CE08D" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCnv.cxx
index 625986e20bcfbd12c8929870ffb128d2aacf304c..c41d1e671bdf4ced78f8b56d430a729c1658779e 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCnv.cxx
@@ -9,7 +9,7 @@
 //---------------------------------------------------------------------------------------------
 TrigMonConfigCnv::TrigMonConfigCnv(ISvcLocator* svcloc) :
   T_AthenaPoolCustomCnv<TrigMonConfig, TrigMonConfig_PERS>(svcloc),
-  m_log(new MsgStream(messageService(), "TrigMonConfigCnv")),
+  m_log(new MsgStream(msgSvc(), "TrigMonConfigCnv")),
   m_TPConverter (new TrigMonConfigCnv_p1)
 {
 }
@@ -25,7 +25,7 @@ TrigMonConfigCnv::~TrigMonConfigCnv()
 //create persistent
 TrigMonConfig_PERS* TrigMonConfigCnv::createPersistent(TrigMonConfig* transObj) 
 {
-  (*m_log) << MSG::DEBUG << "TrigMonConfigCnv::createPersistent" << endreq;
+  (*m_log) << MSG::DEBUG << "TrigMonConfigCnv::createPersistent" << endmsg;
 
   TrigMonConfig_PERS *persObj = m_TPConverter->createPersistent(transObj, *m_log);
   return persObj;
@@ -35,14 +35,14 @@ TrigMonConfig_PERS* TrigMonConfigCnv::createPersistent(TrigMonConfig* transObj)
 //createTransient
 TrigMonConfig* TrigMonConfigCnv::createTransient() 
 {
-  (*m_log) << MSG::DEBUG << "TrigMonConfigCnv::createTransient " << endreq;
+  (*m_log) << MSG::DEBUG << "TrigMonConfigCnv::createTransient " << endmsg;
   
   static pool::Guid p1_guid("E841D3CA-AB5A-4955-850A-B368DE66A987");  
   TrigMonConfig *trans_obj(0);
   
   if(compareClassGuid(p1_guid)) {
     
-    (*m_log) << MSG::DEBUG << "TrigMonConfigCnv::reading p1 persistent object" << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonConfigCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigMonConfig_p1 >   col_vect( this->poolReadObject< TrigMonConfig_p1 >() );
     trans_obj = m_TPConverter->createTransient( col_vect.get(), *m_log);
   }
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCollectionCnv.cxx
index 8d25052b0293925d7447077af2cd2779129d15ce..91d9d9e5152744c6217590e701844ea16e5076f1 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonConfigCollectionCnv.cxx
@@ -17,7 +17,7 @@ public:
 //---------------------------------------------------------------------------------------------
 TrigMonConfigCollectionCnv::TrigMonConfigCollectionCnv(ISvcLocator* svcloc) :
   T_AthenaPoolCustomCnv<TrigMonConfigCollection, TrigMonConfigCollection_PERS>(svcloc),
-  m_log(new MsgStream(messageService(), "TrigMonConfigCollectionCnv")),
+  m_log(new MsgStream(msgSvc(), "TrigMonConfigCollectionCnv")),
   m_impl(new TrigMonConfigCollectionCnv_impl)
 {
 }
@@ -33,7 +33,7 @@ TrigMonConfigCollectionCnv::~TrigMonConfigCollectionCnv()
 //create persistent
 TrigMonConfigCollection_PERS* TrigMonConfigCollectionCnv::createPersistent(TrigMonConfigCollection* transObj) 
 {
-  (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::createPersistent" << endreq;
+  (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::createPersistent" << endmsg;
 
   TrigMonConfigCollection_PERS *persObj = m_impl->m_TPConverter_tlp1.createPersistent(transObj, *m_log);
   return persObj;
@@ -43,7 +43,7 @@ TrigMonConfigCollection_PERS* TrigMonConfigCollectionCnv::createPersistent(TrigM
 //createTransient
 TrigMonConfigCollection* TrigMonConfigCollectionCnv::createTransient() 
 {
-  (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::createTransient " << endreq;
+  (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::createTransient " << endmsg;
   
   static pool::Guid tlp1_guid("887A60C5-BD4D-467C-9629-9F0EE818398A");
   static pool::Guid p1_guid("77FAC318-137E-4563-A681-68356299E397");
@@ -52,16 +52,16 @@ TrigMonConfigCollection* TrigMonConfigCollectionCnv::createTransient()
   
   if( compareClassGuid(tlp1_guid) ) {
     
-    (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::reading tlp1 persistent object" << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigMonConfigCollection_tlp1 >   col_vect( this->poolReadObject< TrigMonConfigCollection_tlp1 >() );
-    (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::reading tlp1 persistent object pointer" <<  col_vect.get() << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::reading tlp1 persistent object pointer" <<  col_vect.get() << endmsg;
     trans_obj = m_impl->m_TPConverter_tlp1.createTransient( col_vect.get(), *m_log);
   }
   else if( compareClassGuid(p1_guid) ) {
     
-    (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::reading p1 persistent object" << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigMonConfigCollection_p1 >   col_vect( this->poolReadObject< TrigMonConfigCollection_p1 >() );
-    (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::reading p1 persistent object pointer" <<  col_vect.get() << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonConfigCollectionCnv::reading p1 persistent object pointer" <<  col_vect.get() << endmsg;
     trans_obj = m_impl->m_TPConverter.createTransient( col_vect.get(), *m_log);
   }
   else {    
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCnv.cxx
index 73351fe70b078f21248bc62a7e973b9678db4b70..1a4df682cc2d1970eee9732b07df12d8c16c0ccd 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCnv.cxx
@@ -9,7 +9,7 @@
 //---------------------------------------------------------------------------------------------
 TrigMonEventCnv::TrigMonEventCnv(ISvcLocator* svcloc) :
   T_AthenaPoolCustomCnv<TrigMonEvent, TrigMonEvent_PERS>(svcloc),
-  m_log(new MsgStream(messageService(), "TrigMonEventCnv")),
+  m_log(new MsgStream(msgSvc(), "TrigMonEventCnv")),
   m_TPConverter (new TrigMonEventCnv_p1)
 {
 }
@@ -25,7 +25,7 @@ TrigMonEventCnv::~TrigMonEventCnv()
 //create persistent
 TrigMonEvent_PERS* TrigMonEventCnv::createPersistent(TrigMonEvent* transObj) 
 {
-  (*m_log) << MSG::DEBUG << "TrigMonEventCnv::createPersistent" << endreq;
+  (*m_log) << MSG::DEBUG << "TrigMonEventCnv::createPersistent" << endmsg;
 
   TrigMonEvent_PERS *persObj = m_TPConverter->createPersistent(transObj, *m_log);
   return persObj;
@@ -35,14 +35,14 @@ TrigMonEvent_PERS* TrigMonEventCnv::createPersistent(TrigMonEvent* transObj)
 //createTransient
 TrigMonEvent* TrigMonEventCnv::createTransient() 
 {
-  (*m_log) << MSG::DEBUG << "TrigMonEventCnv::createTransient " << endreq;
+  (*m_log) << MSG::DEBUG << "TrigMonEventCnv::createTransient " << endmsg;
   
   static pool::Guid p1_guid("AECD5837-E8DA-4FF3-8601-44B4C17355ED");  
   TrigMonEvent *trans_obj(0);
   
   if( compareClassGuid(p1_guid) ) {
     
-    (*m_log) << MSG::DEBUG << "TrigMonEventCnv::reading p1 persistent object" << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonEventCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigMonEvent_p1 >   col_vect( this->poolReadObject< TrigMonEvent_p1 >());
     trans_obj = m_TPConverter->createTransient( col_vect.get(), *m_log);
   } 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCollectionCnv.cxx
index 4ae9c113207895f9eb727ec10487c61c87cbb012..31b5f754b86b1e745db7a0b6d0a25d391cb46c82 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMonEventCollectionCnv.cxx
@@ -17,7 +17,7 @@ public:
 //---------------------------------------------------------------------------------------------
 TrigMonEventCollectionCnv::TrigMonEventCollectionCnv(ISvcLocator* svcloc) :
   T_AthenaPoolCustomCnv<TrigMonEventCollection, TrigMonEventCollection_PERS>(svcloc),
-  m_log(new MsgStream(messageService(), "TrigMonEventCollectionCnv")),
+  m_log(new MsgStream(msgSvc(), "TrigMonEventCollectionCnv")),
   m_impl(new TrigMonEventCollectionCnv_impl)
 {
 }
@@ -33,7 +33,7 @@ TrigMonEventCollectionCnv::~TrigMonEventCollectionCnv()
 //create persistent
 TrigMonEventCollection_PERS* TrigMonEventCollectionCnv::createPersistent(TrigMonEventCollection* transObj) 
 {
-  (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::createPersistent" << endreq;
+  (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::createPersistent" << endmsg;
 
   TrigMonEventCollection_PERS *persObj = m_impl->m_TPConverter_tlp1.createPersistent(transObj, *m_log);
   return persObj;
@@ -43,7 +43,7 @@ TrigMonEventCollection_PERS* TrigMonEventCollectionCnv::createPersistent(TrigMon
 //createTransient
 TrigMonEventCollection* TrigMonEventCollectionCnv::createTransient() 
 {
-  (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::createTransient " << endreq;
+  (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::createTransient " << endmsg;
   
   static pool::Guid tlp1_guid("F224B21A-0CE8-40F1-B88B-027DA832A2A5");
   static pool::Guid p1_guid("9A0D41EB-9A40-42A1-8CDA-C80845FC7271");
@@ -52,16 +52,16 @@ TrigMonEventCollection* TrigMonEventCollectionCnv::createTransient()
   
   if( compareClassGuid(tlp1_guid) ) {
     
-    (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::reading tlp1 persistent object" << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigMonEventCollection_tlp1 >   col_vect( this->poolReadObject< TrigMonEventCollection_tlp1 >() );
-    (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::reading tlp1 persistent object pointer" <<  col_vect.get() << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::reading tlp1 persistent object pointer" <<  col_vect.get() << endmsg;
     trans_obj = m_impl->m_TPConverter_tlp1.createTransient(col_vect.get(), *m_log);
   }
   else if( compareClassGuid(p1_guid) ) {
     
-    (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::reading p1 persistent object" << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigMonEventCollection_p1 >   col_vect( this->poolReadObject< TrigMonEventCollection_p1 >() );
-    (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::reading p1 persistent object pointer" <<  col_vect.get() << endreq;
+    (*m_log) << MSG::DEBUG << "TrigMonEventCollectionCnv::reading p1 persistent object pointer" <<  col_vect.get() << endmsg;
     trans_obj = m_impl->m_TPConverter.createTransient(col_vect.get(), *m_log);
   }
   else {
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureCnv.cxx
index f907dad10c876cf2b478824e4a461fc0699ac711..c34dd0cf3600d44c19130ab98194ff48ccd36a54 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureCnv.cxx
@@ -15,9 +15,9 @@ static TrigMuonClusterFeatureCnv_tlp1 TPConverter;
 TrigMuonClusterFeature_PERS *
 TrigMuonClusterFeatureCnv::createPersistent( TrigMuonClusterFeature *transObj)
 {
-  MsgStream mlog(messageService(), "TrigMuonClusterFeatureConverter" );
+  MsgStream mlog(msgSvc(), "TrigMuonClusterFeatureConverter" );
   
-  mlog << MSG::DEBUG << "TrigMuonClusterFeatureCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigMuonClusterFeatureCnv::createPersistent" << endmsg;
 
   TrigMuonClusterFeature_PERS *persObj = TPConverter.createPersistent( transObj, mlog );
   
@@ -29,9 +29,9 @@ TrigMuonClusterFeatureCnv::createPersistent( TrigMuonClusterFeature *transObj)
 //-----------------------------------------------------------------------------
 TrigMuonClusterFeature *TrigMuonClusterFeatureCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigMuonClusterFeatureConverter" );
+  MsgStream mlog(msgSvc(), "TrigMuonClusterFeatureConverter" );
   
-  mlog << MSG::DEBUG << "TrigMuonClusterFeatureCnv::createTransient " << endreq;
+  mlog << MSG::DEBUG << "TrigMuonClusterFeatureCnv::createTransient " << endmsg;
   
   static pool::Guid p1_guid("AE4D5D57-689D-40CB-83B3-CB047884952F");
   static pool::Guid p0_guid("A7B1865B-55D0-49D2-9778-5E0797FB06FE");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureContainerCnv.cxx
index ea5afcd646c3f9104e107ff2bb49f2206e74b6fb..6bde5df819c869274df16c70213a9a13645985d9 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonClusterFeatureContainerCnv.cxx
@@ -21,9 +21,9 @@ TrigMuonClusterFeatureContainerCnv::~TrigMuonClusterFeatureContainerCnv()
 //createPersistent 
 TrigMuonClusterFeatureContainer_PERS * TrigMuonClusterFeatureContainerCnv::createPersistent( TrigMuonClusterFeatureContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigMuonClusterFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigMuonClusterFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigMuonClusterFeatureContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigMuonClusterFeatureContainerCnv::createPersistent called" << endmsg;
   
   TrigMuonClusterFeatureContainer_PERS * p_cont = m_TPConverter->createPersistent( transObj, m_log );
   
@@ -35,9 +35,9 @@ TrigMuonClusterFeatureContainer_PERS * TrigMuonClusterFeatureContainerCnv::creat
 //createTransient
 TrigMuonClusterFeatureContainer * TrigMuonClusterFeatureContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigMuonClusterFeatureContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigMuonClusterFeatureContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigMuonClusterFeatureContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigMuonClusterFeatureContainerCnv::createTransient called" << endmsg;
   
   static pool::Guid tlp1_guid( "036D8CC1-5FBD-4676-9D84-F233567F52D2" );
   static pool::Guid p0_guid( "5B09201A-D1CD-43BA-A1B5-786189444579" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFContainerCnv.cxx
index f6e0dd00814c33099e15b0491c4000b83e26a756..c9dfbe28aaabe65aff534e510bb0f816a2e2acf8 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFContainerCnv.cxx
@@ -15,9 +15,9 @@ static TrigMuonEFContainerCnv_p2   TPConverter;
 //createPersistent 
 TrigMuonEFContainer_PERS * TrigMuonEFContainerCnv::createPersistent( TrigMuonEFContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigMuonEFContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigMuonEFContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigMuonEFContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigMuonEFContainerCnv::createPersistent called" << endmsg;
 
   TrigMuonEFContainer_PERS * p_muEFcont = TPConverter.createPersistent( transObj, mlog ); 
 
@@ -29,9 +29,9 @@ TrigMuonEFContainer_PERS * TrigMuonEFContainerCnv::createPersistent( TrigMuonEFC
 //createTransient
 TrigMuonEFContainer * TrigMuonEFContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigMuonEFContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigMuonEFContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigMuonEFContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigMuonEFContainerCnv::createTransient called" << endmsg;
   
   static pool::Guid p2_guid( "3BB5C107-2975-4F9E-AACC-9FD948C3D2A8" );
   static pool::Guid p1_guid( "567E65A0-23E8-469F-94F7-A03F6E9C1C2E" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFInfoContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFInfoContainerCnv.cxx
index 4ee181f4d041490104e4e1267d5d739da06eacf3..e1af37b26f5c549548970f07ce6f3fddba76584c 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFInfoContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFInfoContainerCnv.cxx
@@ -23,8 +23,8 @@ TrigMuonEFInfoContainerCnv::~TrigMuonEFInfoContainerCnv(){
 
 //createPersistent 
 TrigMuonEFInfoContainer_PERS * TrigMuonEFInfoContainerCnv::createPersistent( TrigMuonEFInfoContainer *transObj) {
-  MsgStream mlog(messageService(), "TrigMuonEFInfoContainerConverter" );
-  mlog << MSG::DEBUG << "TrigMuonEFInfoContainerCnv::createPersistent called" << endreq;
+  MsgStream mlog(msgSvc(), "TrigMuonEFInfoContainerConverter" );
+  mlog << MSG::DEBUG << "TrigMuonEFInfoContainerCnv::createPersistent called" << endmsg;
   
   TrigMuonEFInfoContainer_PERS * p_muEFcont = m_TPConverter2->createPersistent( transObj, m_log );
   
@@ -34,9 +34,9 @@ TrigMuonEFInfoContainer_PERS * TrigMuonEFInfoContainerCnv::createPersistent( Tri
 
 TrigMuonEFInfoContainer * TrigMuonEFInfoContainerCnv::createTransient(){
 
-  MsgStream mlog(messageService(), "TrigMuonEFInfoContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigMuonEFInfoContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigMuonEFInfoContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigMuonEFInfoContainerCnv::createTransient called" << endmsg;
   
   static pool::Guid p1_guid( "B768E99D-9CC3-4368-ADD5-36816D2A0298" );
   static pool::Guid p2_guid( "AF8CBEC0-4BBF-438A-82DE-873F133F4821" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFIsolationContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFIsolationContainerCnv.cxx
index 231758fc2bc34b4612df55099f8e82aa2d4706ae..6d79757e20b8f0c95accdd9b9584e085a6da898c 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFIsolationContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigMuonEFIsolationContainerCnv.cxx
@@ -22,8 +22,8 @@ TrigMuonEFIsolationContainerCnv::TrigMuonEFIsolationContainerCnv(ISvcLocator* sv
 
 /// create persistent
 TrigMuonEFIsolationContainer_PERS* TrigMuonEFIsolationContainerCnv::createPersistent(TrigMuonEFIsolationContainer* transCont) {
-  MsgStream mlog(messageService(), "TrigMuonEFIsolationContainerConverter" );
-  mlog << MSG::DEBUG << "TrigMuonEFIsolationContainerCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigMuonEFIsolationContainerConverter" );
+  mlog << MSG::DEBUG << "TrigMuonEFIsolationContainerCnv::createPersistent" << endmsg;
   
   TrigMuonEFIsolationContainer_PERS *persObj = TPconverter_p2.createPersistent(transCont, mlog);
 
@@ -33,8 +33,8 @@ TrigMuonEFIsolationContainer_PERS* TrigMuonEFIsolationContainerCnv::createPersis
 /// create transient
 TrigMuonEFIsolationContainer* TrigMuonEFIsolationContainerCnv::createTransient() {
 
-  MsgStream mlog(messageService(), "TrigMuonEFIsolationContainerConverter" );
-  mlog << MSG::DEBUG << "TrigMuonEFIsolationContainerCnv::createTransient" << endreq;
+  MsgStream mlog(msgSvc(), "TrigMuonEFIsolationContainerConverter" );
+  mlog << MSG::DEBUG << "TrigMuonEFIsolationContainerCnv::createTransient" << endmsg;
 
   static pool::Guid p1_guid("5C3ECE20-F26F-4811-BA76-B2DC567858BC");
   static pool::Guid p2_guid("B24570F4-BB65-4D5C-A8E2-C44E36E7B0B5");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigPhotonContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigPhotonContainerCnv.cxx
index cbf437a64768bd999fa4a628c4ead3b7d6a4d1f4..d26b28ffaba65277855b2e417858a35ff64e0f11 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigPhotonContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigPhotonContainerCnv.cxx
@@ -18,9 +18,9 @@ static TrigPhotonContainerCnv_p3     TPConverter;
 //createPersistent 
 TrigPhotonContainer_PERS * TrigPhotonContainerCnv::createPersistent( TrigPhotonContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigPhotonContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigPhotonContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigPhotonContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigPhotonContainerCnv::createPersistent called" << endmsg;
 
   TrigPhotonContainer_PERS * p_PhotonCont = TPConverter.createPersistent( transObj, mlog );
  
@@ -32,9 +32,9 @@ TrigPhotonContainer_PERS * TrigPhotonContainerCnv::createPersistent( TrigPhotonC
 //createTransient
 TrigPhotonContainer * TrigPhotonContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigPhotonContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigPhotonContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigPhotonContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigPhotonContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p3_guid( "40192614-E7C5-4BAF-825F-CB9F3E023315" );
   static pool::Guid tlp2_guid( "96487DD7-9CF7-4351-BF33-011E6CA515F0" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputCnv.cxx
index 30f77c2e506235c37484a68ec4a3b5970beb8365..6f07162b0c22e99b8ed6419c6658aa0ee4576eb6 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputCnv.cxx
@@ -22,8 +22,8 @@ TrigRNNOutputCnv::~TrigRNNOutputCnv()
 
 TrigRNNOutput_PERS* TrigRNNOutputCnv::createPersistent(TrigRNNOutput* transCont) 
 {
-  MsgStream mlog(messageService(), "TrigRNNOutputConverter" );
-  mlog << MSG::DEBUG << "TrigRNNOutputCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigRNNOutputConverter" );
+  mlog << MSG::DEBUG << "TrigRNNOutputCnv::createPersistent" << endmsg;
 
   TrigRNNOutput_PERS *persObj = m_impl->m_TPConverter.createPersistent( transCont, mlog );
   
@@ -33,15 +33,15 @@ TrigRNNOutput_PERS* TrigRNNOutputCnv::createPersistent(TrigRNNOutput* transCont)
 
 TrigRNNOutput* TrigRNNOutputCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigRNNOutputConverter" );
-  mlog << MSG::DEBUG << "TrigRNNOutputCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigRNNOutputConverter" );
+  mlog << MSG::DEBUG << "TrigRNNOutputCnv::createTransient " << endmsg;
   
   static pool::Guid tlp1_guid("BA106EC3-F776-DE11-BCB3-000423DD5A1A");
   
   TrigRNNOutput       *trans_cont(0);
   
   if (compareClassGuid(tlp1_guid)) {
-    mlog << MSG::DEBUG << "TrigRNNOutputCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRNNOutputCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigRNNOutput_tlp1 >   col_vect( this->poolReadObject< TrigRNNOutput_tlp1 >() );
     trans_cont = m_impl->m_TPConverter.createTransient( col_vect.get(), mlog );
   }  else {
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputContainerCnv.cxx
index 3a3a4c70a654bb7254bf98c55a6125e4fa71eb0d..9b54761582b1e6dbc059d5c53e2afba1e446b66b 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigRNNOutputContainerCnv.cxx
@@ -13,9 +13,9 @@ static TrigRNNOutputContainerCnv_p2     TPConverter;
 //createPersistent 
 TrigRNNOutputContainer_PERS * TrigRNNOutputContainerCnv::createPersistent( TrigRNNOutputContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigRNNOutputContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigRNNOutputContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigRNNOutputContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigRNNOutputContainerCnv::createPersistent called" << endmsg;
 
   TrigRNNOutputContainer_PERS * p_Cont = TPConverter.createPersistent( transObj, mlog );
  
@@ -27,9 +27,9 @@ TrigRNNOutputContainer_PERS * TrigRNNOutputContainerCnv::createPersistent( TrigR
 //createTransient
 TrigRNNOutputContainer * TrigRNNOutputContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigRNNOutputContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigRNNOutputContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigRNNOutputContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigRNNOutputContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid tr_guid("FED72B55-6275-DE11-8F1B-000423DD5A1A");
   static pool::Guid tlp1_guid("86A89E9D-F776-DE11-B65D-000423DD5A1A");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCnv.cxx
index 106c7f82951b54bee59bf5cbfebff08fc50ea8cd..960145506de121a4927b23a0c9a51842d2a80d7c 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCnv.cxx
@@ -17,9 +17,9 @@ TrigSpacePointCountsCnv::~TrigSpacePointCountsCnv(){}
 
 
 TrigSpacePointCounts_PERS* TrigSpacePointCountsCnv::createPersistent(TrigSpacePointCounts* transObj) {
-  MsgStream mlog(messageService(), "TrigSpacePointCountsConverter" );
+  MsgStream mlog(msgSvc(), "TrigSpacePointCountsConverter" );
 
-  mlog << MSG::DEBUG << "TrigSpacePointCountsCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigSpacePointCountsCnv::createPersistent" << endmsg;
 
   TrigSpacePointCountsCnv_p3 converter;
    
@@ -30,9 +30,9 @@ TrigSpacePointCounts_PERS* TrigSpacePointCountsCnv::createPersistent(TrigSpacePo
 
 
 TrigSpacePointCounts* TrigSpacePointCountsCnv::createTransient() {
-  MsgStream mlog(messageService(), "TrigSpacePointCountsConverter" );
+  MsgStream mlog(msgSvc(), "TrigSpacePointCountsConverter" );
 
-  mlog << MSG::DEBUG << "TrigSpacePointCountsCnv::createTransient " << endreq;
+  mlog << MSG::DEBUG << "TrigSpacePointCountsCnv::createTransient " << endmsg;
 
   static pool::Guid p3_guid("43E61EDF-2902-4F64-8A89-F625DB7DA7CC");
   static pool::Guid p2_guid("3A6CFBCF-E2AE-4E3D-A965-091718A5CB9F");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCollectionCnv.cxx
index b56552260141a3ee1e55375aecccf4c3711d0a6b..e98f266406561e3f003b0cc9d2e075d6540267b3 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigSpacePointCountsCollectionCnv.cxx
@@ -14,9 +14,9 @@ static TrigSpacePointCountsCollectionCnv_p4   TPConverter;
 //createPersistent 
 TrigSpacePointCountsCollection_PERS * TrigSpacePointCountsCollectionCnv::createPersistent( TrigSpacePointCountsCollection *transObj)
 {
-  MsgStream mlog(messageService(), "TrigSpacePointCountsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigSpacePointCountsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigSpacePointCountsCollectionCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigSpacePointCountsCollectionCnv::createPersistent called" << endmsg;
   
   TrigSpacePointCountsCollection_PERS * p_cont = TPConverter.createPersistent( transObj, mlog );
   
@@ -28,9 +28,9 @@ TrigSpacePointCountsCollection_PERS * TrigSpacePointCountsCollectionCnv::createP
 //createTransient
 TrigSpacePointCountsCollection * TrigSpacePointCountsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigSpacePointCountsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigSpacePointCountsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigSpacePointCountsCollectionCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigSpacePointCountsCollectionCnv::createTransient called" << endmsg;
   
   static pool::Guid p4_guid( "ACEDF654-09D7-49F6-9054-8E2CEE767367" );
   static pool::Guid tlp1_guid( "55733D7E-0054-4785-ADA8-3EA70D7477F2" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetCnv.cxx
index 545df9dd526df429afac191a979afe4c615bede7..242aa8a5819002e32caf87bca20322bffa2aa0b8 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetCnv.cxx
@@ -21,9 +21,9 @@ TrigT2JetCnv::~TrigT2JetCnv()
 //createPersistent
 TrigT2Jet_PERS * TrigT2JetCnv::createPersistent( TrigT2Jet *transObj)
 {
-  MsgStream mlog(messageService(), "TrigT2JetConverter" );
+  MsgStream mlog(msgSvc(), "TrigT2JetConverter" );
 
-  mlog << MSG::DEBUG << "TrigT2JetCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigT2JetCnv::createPersistent called" << endmsg;
 
   TrigT2Jet_PERS * p_T2Jet = m_TPConverter->createPersistent( transObj, m_log );
  
@@ -36,9 +36,9 @@ TrigT2Jet_PERS * TrigT2JetCnv::createPersistent( TrigT2Jet *transObj)
 //createTransient
 TrigT2Jet * TrigT2JetCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigT2JetConverter" );
+  MsgStream mlog(msgSvc(), "TrigT2JetConverter" );
   
-  mlog << MSG::DEBUG << "TrigT2JetCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigT2JetCnv::createTransient called" << endmsg;
 
   static pool::Guid tlp1_guid( "EAF10B4D-AD26-4030-AF0C-1060A39D663D" );
   static pool::Guid p0_guid( "242473A8-A320-49F1-A680-136EA26C1FAF" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetContainerCnv.cxx
index 242c327f8223b3031999f618a9ad9b9ff1e0286b..9c59785b10cf6d9bfb20d5792b43c0610d412536 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2JetContainerCnv.cxx
@@ -17,9 +17,9 @@ static TrigT2JetContainerCnv_p3     TPConverter;
 TrigT2JetContainer_PERS * TrigT2JetContainerCnv::createPersistent( TrigT2JetContainer *transObj)
 {
 
-  MsgStream mlog(messageService(), "TrigT2JetContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigT2JetContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigT2JetContainerCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigT2JetContainerCnv::createPersistent" << endmsg;
 
   TrigT2JetContainer_PERS* p_T2JetCont = TPConverter.createPersistent( transObj, mlog );
  
@@ -32,9 +32,9 @@ TrigT2JetContainer_PERS * TrigT2JetContainerCnv::createPersistent( TrigT2JetCont
 TrigT2JetContainer * TrigT2JetContainerCnv::createTransient()
 {
   
-  MsgStream mlog(messageService(), "TrigT2JetContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigT2JetContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigT2JetContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigT2JetContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid tlp1_guid( "3B670168-C5AA-48A1-9813-C94530980EBF" );
   static pool::Guid p3_guid( "6215BEE2-45E7-4681-9089-9BD470CDAF4D" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsCnv.cxx
index 9c7077759be9855aa94f74554d80d2730b162662..78006cdcd3a1f2605b6e7d20bb6ad9c83e89b000 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsCnv.cxx
@@ -12,8 +12,8 @@ TrigT2MbtsBitsCnv::TrigT2MbtsBitsCnv(ISvcLocator* svcloc): TrigT2MbtsBitsCnvBase
 TrigT2MbtsBitsCnv::~TrigT2MbtsBitsCnv(){}
 
 TrigT2MbtsBits_PERS* TrigT2MbtsBitsCnv::createPersistent(TrigT2MbtsBits* transObj)  {
-  MsgStream mlog(messageService(), "TrigT2MbtsBitsConverter" );
-  mlog << MSG::DEBUG << "TrigT2MbtsBitsCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigT2MbtsBitsConverter" );
+  mlog << MSG::DEBUG << "TrigT2MbtsBitsCnv::createPersistent" << endmsg;
   
   TrigT2MbtsBitsCnv_p2  converter;
   TrigT2MbtsBits_PERS *persObj = converter.createPersistent( transObj, mlog );
@@ -22,8 +22,8 @@ TrigT2MbtsBits_PERS* TrigT2MbtsBitsCnv::createPersistent(TrigT2MbtsBits* transOb
 }
 
 TrigT2MbtsBits* TrigT2MbtsBitsCnv::createTransient() {
-  MsgStream mlog(messageService(), "TrigT2MbtsBitsConverter" );
-  mlog << MSG::DEBUG << "TrigT2MbtsBitsCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigT2MbtsBitsConverter" );
+  mlog << MSG::DEBUG << "TrigT2MbtsBitsCnv::createTransient " << endmsg;
   
   static pool::Guid p2_guid("6D130C0D-20A2-4304-8E70-6775892217A6");
   static pool::Guid p1_guid("32E86328-15EB-42F5-A93F-6F891220A626");
@@ -32,13 +32,13 @@ TrigT2MbtsBits* TrigT2MbtsBitsCnv::createTransient() {
   TrigT2MbtsBits *transObj = 0;
 
   if( compareClassGuid(p2_guid) ) {   
-    mlog << MSG::DEBUG << "TrigT2MbtsBitsCnv::reading p2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigT2MbtsBitsCnv::reading p2 persistent object" << endmsg;
     std::auto_ptr< TrigT2MbtsBits_p2 > pers_ptr( poolReadObject< TrigT2MbtsBits_p2 >() );
     TrigT2MbtsBitsCnv_p2 converter;
     transObj = converter.createTransient(pers_ptr.get(), mlog);
   }
   else if( compareClassGuid(p1_guid) ) {   
-    mlog << MSG::DEBUG << "TrigT2MbtsBitsCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigT2MbtsBitsCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigT2MbtsBits_p1 > pers_ptr( poolReadObject< TrigT2MbtsBits_p1 >() );
     TrigT2MbtsBitsCnv_p1 converter;
     transObj = converter.createTransient(pers_ptr.get(), mlog);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsContainerCnv.cxx
index 1969aa8b7ea8fb3e6b721b884bcc7ba09b27ac18..e4a1142826d3abb3a5d2c00179494413afd713c0 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigT2MbtsBitsContainerCnv.cxx
@@ -13,9 +13,9 @@ static TrigT2MbtsBitsContainerCnv_p1   TP1Converter;
 //createPersistent 
 TrigT2MbtsBitsContainer_PERS * TrigT2MbtsBitsContainerCnv::createPersistent( TrigT2MbtsBitsContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigT2MbtsBitsContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigT2MbtsBitsContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigT2MbtsBitsContainerCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigT2MbtsBitsContainerCnv::createPersistent" << endmsg;
 
   TrigT2MbtsBitsContainer_PERS* persObj = TPConverter.createPersistent( transObj, mlog );
  
@@ -27,9 +27,9 @@ TrigT2MbtsBitsContainer_PERS * TrigT2MbtsBitsContainerCnv::createPersistent( Tri
 //createTransient
 TrigT2MbtsBitsContainer* TrigT2MbtsBitsContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigT2MbtsBitsContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigT2MbtsBitsContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigT2MbtsBitsContainerCnv::createTransient" << endreq;
+  mlog << MSG::DEBUG << "TrigT2MbtsBitsContainerCnv::createTransient" << endmsg;
 
   static pool::Guid p3_guid( "60BD805D-F64E-46DF-87CD-0B4443660C97" );
   static pool::Guid tlp1_guid( "82BAAC80-62FC-4E6D-9BD7-1619064FF7AC" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterCnv.cxx
index 17a40a8a4a509fb858f26abc42eebba323fdd971..4628b7ef89b849938d87b8015cc81d12b29e30ab 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterCnv.cxx
@@ -29,8 +29,8 @@ TrigTauClusterCnv::~TrigTauClusterCnv()
 //create persistent
 TrigTauCluster_PERS* TrigTauClusterCnv::createPersistent(TrigTauCluster* transCont) 
 {
-  MsgStream mlog(messageService(), "TrigTauClusterConverter" );
-  mlog << MSG::DEBUG << "TrigTauClusterCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigTauClusterConverter" );
+  mlog << MSG::DEBUG << "TrigTauClusterCnv::createPersistent" << endmsg;
 
   TrigTauCluster_PERS *persObj = m_impl->m_TPConverter2.createPersistent( transCont, mlog );
 
@@ -41,8 +41,8 @@ TrigTauCluster_PERS* TrigTauClusterCnv::createPersistent(TrigTauCluster* transCo
 //create transient
 TrigTauCluster* TrigTauClusterCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigTauClusterConverter" );
-  mlog << MSG::DEBUG << "TrigTauClusterCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigTauClusterConverter" );
+  mlog << MSG::DEBUG << "TrigTauClusterCnv::createTransient " << endmsg;
 
   static pool::Guid tlp2_guid("CEDD0095-1134-4CEC-91CC-61028B214F6C");
   static pool::Guid tlp1_guid("60C9B591-CE4B-473C-9CB9-8C4F99271D76");
@@ -52,21 +52,21 @@ TrigTauCluster* TrigTauClusterCnv::createTransient()
 
   if( compareClassGuid(tlp2_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauClusterCnv::reading tlp2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauClusterCnv::reading tlp2 persistent object" << endmsg;
     std::auto_ptr< TrigTauCluster_tlp2 >   col_vect( this->poolReadObject< TrigTauCluster_tlp2 >() );
     trans_cont = m_impl->m_TPConverter2.createTransient( col_vect.get(), mlog );
 
   }
   else if( compareClassGuid(tlp1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauClusterCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauClusterCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigTauCluster_tlp1 >   col_vect( this->poolReadObject< TrigTauCluster_tlp1 >() );
     trans_cont = m_impl->m_TPConverter1.createTransient( col_vect.get(), mlog );
 
   }
   else if( compareClassGuid(p0_guid) ) {
 
-    mlog << MSG::DEBUG << "TrigTauClusterCnv::reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauClusterCnv::reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     trans_cont = this->poolReadObject<TrigTauCluster>();
 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterContainerCnv.cxx
index efb52ecd59f1ee32559d67090288e1f53efa7ab3..d91fbb25586f9e4be88252ae86fce654d30c0579 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterContainerCnv.cxx
@@ -23,9 +23,9 @@ static TrigTauClusterContainerCnv_p5     TPconverter5;
 //createPersistent 
 TrigTauClusterContainer_PERS* TrigTauClusterContainerCnv::createPersistent(TrigTauClusterContainer *transObj)
 {
-    MsgStream mlog(messageService(), "TrigTauClusterContainerConverter");
+    MsgStream mlog(msgSvc(), "TrigTauClusterContainerConverter");
 
-    mlog << MSG::DEBUG << "TrigTauClusterContainerCnv::createPersistent called" << endreq;
+    mlog << MSG::DEBUG << "TrigTauClusterContainerCnv::createPersistent called" << endmsg;
 
     TrigTauClusterContainer_PERS* p_TauClusterCont = TPconverter5.createPersistent(transObj, mlog);
 
@@ -37,9 +37,9 @@ TrigTauClusterContainer_PERS* TrigTauClusterContainerCnv::createPersistent(TrigT
 //createTransient
 TrigTauClusterContainer* TrigTauClusterContainerCnv::createTransient()
 {
-    MsgStream mlog(messageService(), "TrigTauClusterContainerConverter");
+    MsgStream mlog(msgSvc(), "TrigTauClusterContainerConverter");
 
-    mlog << MSG::DEBUG << "TrigTauClusterContainerCnv::createTransient called" << endreq;
+    mlog << MSG::DEBUG << "TrigTauClusterContainerCnv::createTransient called" << endmsg;
 
     static pool::Guid p5_guid("8384F60B-952E-4DE4-B307-1AC1C405E156");
     static pool::Guid p4_guid("D41E29BA-0FE8-4319-85F4-93EA68AD9195");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsCnv.cxx
index 0e9c9a96e0ca880015e0aa946f053a34be78ff5f..119984fa22f0a1da5f67783859bdddc5435e6a43 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsCnv.cxx
@@ -19,8 +19,8 @@ TrigTauClusterDetailsCnv::~TrigTauClusterDetailsCnv()
 //create persistent
 TrigTauClusterDetails_PERS* TrigTauClusterDetailsCnv::createPersistent(TrigTauClusterDetails* transCont) 
 {
-  MsgStream mlog(messageService(), "TrigTauClusterDetailsConverter" );
-  mlog << MSG::DEBUG << "TrigTauClusterDetailsCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigTauClusterDetailsConverter" );
+  mlog << MSG::DEBUG << "TrigTauClusterDetailsCnv::createPersistent" << endmsg;
 
   TrigTauClusterDetails_PERS *persObj = m_TPConverter->createPersistent( transCont, mlog );
 
@@ -31,8 +31,8 @@ TrigTauClusterDetails_PERS* TrigTauClusterDetailsCnv::createPersistent(TrigTauCl
 //create transient
 TrigTauClusterDetails* TrigTauClusterDetailsCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigTauClusterDetailsConverter" );
-  mlog << MSG::DEBUG << "TrigTauClusterDetailsCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigTauClusterDetailsConverter" );
+  mlog << MSG::DEBUG << "TrigTauClusterDetailsCnv::createTransient " << endmsg;
 
   static pool::Guid tlp1_guid("4F82A265-04F7-4BE9-9DB1-42C00A574778");
   static pool::Guid p0_guid("1C8021CB-F4FB-473A-B379-9BEF3FC7FEB9");
@@ -41,14 +41,14 @@ TrigTauClusterDetails* TrigTauClusterDetailsCnv::createTransient()
 
   if( compareClassGuid(tlp1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauClusterDetailsCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauClusterDetailsCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigTauClusterDetails_tlp1 >   col_vect( this->poolReadObject< TrigTauClusterDetails_tlp1 >() );
     trans_cont = m_TPConverter->createTransient( col_vect.get(), mlog );
 
   }
   else if( compareClassGuid(p0_guid) ) {
 
-    mlog << MSG::DEBUG << "TrigTauClusterDetailsCnv::reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauClusterDetailsCnv::reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     trans_cont = this->poolReadObject<TrigTauClusterDetails>();
 
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsContainerCnv.cxx
index c202762b7889b3d1d9229ba96f80726af9c3b28a..bf7a3b2d874cd4a06d0fe2cbae13f23b1df465a2 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauClusterDetailsContainerCnv.cxx
@@ -13,9 +13,9 @@ static TrigTauClusterDetailsContainerCnv_p2     TPconverter;
 //createPersistent 
 TrigTauClusterDetailsContainer_PERS * TrigTauClusterDetailsContainerCnv::createPersistent( TrigTauClusterDetailsContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigTauClusterDetailsContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigTauClusterDetailsContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigTauClusterDetailsContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigTauClusterDetailsContainerCnv::createPersistent called" << endmsg;
 
   TrigTauClusterDetailsContainer_PERS * p_TauClusterCont = TPconverter.createPersistent( transObj, mlog );
  
@@ -26,9 +26,9 @@ TrigTauClusterDetailsContainer_PERS * TrigTauClusterDetailsContainerCnv::createP
 //createTransient
 TrigTauClusterDetailsContainer * TrigTauClusterDetailsContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigTauClusterDetailsContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigTauClusterDetailsContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigTauClusterDetailsContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigTauClusterDetailsContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p2_guid( "AAEE63E0-BA47-45AD-AC28-E07EC68812C4" );
   static pool::Guid tlp1_guid( "D7DA2036-9F38-4060-A5C9-75C72AF104C4" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauCnv.cxx
index 6aaad13aebfd2f86d6d20f2765082266d7838191..122952edd36cd1b591462fb2d89a336576e4fa4e 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauCnv.cxx
@@ -28,8 +28,8 @@ TrigTauCnv::~TrigTauCnv()
 //create persistent
 TrigTau_PERS* TrigTauCnv::createPersistent(TrigTau* transCont) 
 {
-  MsgStream mlog(messageService(), "TrigTauConverter" );
-  mlog << MSG::DEBUG << "TrigTauCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigTauConverter" );
+  mlog << MSG::DEBUG << "TrigTauCnv::createPersistent" << endmsg;
 
   TrigTau_PERS *persObj = m_impl->m_TPConverter_p2.createPersistent( transCont, mlog );
 
@@ -39,8 +39,8 @@ TrigTau_PERS* TrigTauCnv::createPersistent(TrigTau* transCont)
 //create transient
 TrigTau* TrigTauCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigTauConverter" );
-  mlog << MSG::DEBUG << "TrigTauCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigTauConverter" );
+  mlog << MSG::DEBUG << "TrigTauCnv::createTransient " << endmsg;
   
   static pool::Guid tlp1_guid("82AE3333-5398-4590-A51A-616832332D9B");
   static pool::Guid p0_guid("F95B5B76-13D3-4EB4-94BB-1383B8571ADD");
@@ -51,27 +51,27 @@ TrigTau* TrigTauCnv::createTransient()
   
   if( compareClassGuid(tlp1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigTau_tlp1 >   col_vect( this->poolReadObject< TrigTau_tlp1 >() );
     trans_cont = m_impl->m_TPConverter_p1.createTransient( col_vect.get(), mlog );
     
   }
   else if( compareClassGuid(p0_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauCnv::reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauCnv::reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     trans_cont = this->poolReadObject<TrigTau>();
     
   }else if( compareClassGuid(tlp2_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauCnv::reading tlp2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauCnv::reading tlp2 persistent object" << endmsg;
     std::auto_ptr< TrigTau_tlp2 >   col_vect( this->poolReadObject< TrigTau_tlp2 >() );
     trans_cont = m_impl->m_TPConverter_p2.createTransient( col_vect.get(), mlog );
     
   }
   else if( compareClassGuid(p2_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauCnv::reading p2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauCnv::reading p2 persistent object" << endmsg;
     // old version from before TP separation, just return it
     trans_cont = this->poolReadObject<TrigTau>();
     
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauContainerCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauContainerCnv.cxx
index d8b668bb8f8ca7b78b14b68ab4de87587501b27d..9b9364eae0e345fa9ae5231467d260672e99483a 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauContainerCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauContainerCnv.cxx
@@ -12,9 +12,9 @@ static TrigTauContainerCnv_p3   TPConverter;
 //createPersistent 
 TrigTauContainer_PERS * TrigTauContainerCnv::createPersistent( TrigTauContainer *transObj)
 {
-  MsgStream mlog(messageService(), "TrigTauContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigTauContainerConverter" );
 
-  mlog << MSG::DEBUG << "TrigTauContainerCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigTauContainerCnv::createPersistent called" << endmsg;
 
   TrigTauContainer_PERS * p_TauCont = TPConverter.createPersistent( transObj, mlog );
  
@@ -25,9 +25,9 @@ TrigTauContainer_PERS * TrigTauContainerCnv::createPersistent( TrigTauContainer
 //createTransient
 TrigTauContainer * TrigTauContainerCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigTauContainerConverter" );
+  MsgStream mlog(msgSvc(), "TrigTauContainerConverter" );
   
-  mlog << MSG::DEBUG << "TrigTauContainerCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigTauContainerCnv::createTransient called" << endmsg;
 
   static pool::Guid p3_guid( "32FE95F3-F85E-481E-9DD6-7BBA08ABDBD7" );
   static pool::Guid tlp1_guid( "1551CECC-52C7-4B5B-876C-27005A8DCCC8" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfo.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfo.cxx
index 569beccd3b574656efe0336c25837f380fddfbc2..ee2b7a4061e342c9d8e4fd627bffa3504764f759 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfo.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfo.cxx
@@ -18,8 +18,8 @@ TrigTauTracksInfoCnv::~TrigTauTracksInfoCnv()
 //create persistent
 TrigTauTracksInfo_PERS* TrigTauTracksInfoCnv::createPersistent(TrigTauTracksInfo* transCont) 
 {
-  MsgStream mlog(messageService(), "TrigTauTracksInfoConverter" );
-  mlog << MSG::DEBUG << "TrigTauTracksInfoCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigTauTracksInfoConverter" );
+  mlog << MSG::DEBUG << "TrigTauTracksInfoCnv::createPersistent" << endmsg;
 
   TrigTauTracksInfo_PERS *persObj = m_TPConverter->createPersistent( transCont, mlog );
 
@@ -29,8 +29,8 @@ TrigTauTracksInfo_PERS* TrigTauTracksInfoCnv::createPersistent(TrigTauTracksInfo
 //create transient
 TrigTauTracksInfo* TrigTauTracksInfoCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigTauTracksInfoConverter" );
-  mlog << MSG::DEBUG << "TrigTauTracksInfoCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigTauTracksInfoConverter" );
+  mlog << MSG::DEBUG << "TrigTauTracksInfoCnv::createTransient " << endmsg;
   
   static pool::Guid tlp1_guid("ABF3C91C-A007-440E-8AEE-753FAA453352");
   static pool::Guid p0_guid("630E4944-7EDE-4938-B189-020DBC0436AE");
@@ -39,14 +39,14 @@ TrigTauTracksInfo* TrigTauTracksInfoCnv::createTransient()
   
   if( compareClassGuid(tlp1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauTracksInfoCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauTracksInfoCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigTauTracksInfo_tlp1 >   col_vect( this->poolReadObject< TrigTauTracksInfo_tlp1 >() );
     trans_cont = m_TPConverter->createTransient( col_vect.get(), mlog );
     
   }
   else if( compareClassGuid(p0_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigTauTracksInfoCnv::reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTauTracksInfoCnv::reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     trans_cont = this->poolReadObject<TrigTauTracksInfo>();
     
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfoCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfoCollectionCnv.cxx
index 3ccb58fffeec5f7d9127a7dcaddfe98477436b58..2ff8f3715faafa62dbb1f6391b11d5dcaaf1701c 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfoCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTauTracksInfoCollectionCnv.cxx
@@ -12,9 +12,9 @@ static TrigTauTracksInfoCollectionCnv_p2   TPConverter;
 //createPersistent 
 TrigTauTracksInfoCollection_PERS * TrigTauTracksInfoCollectionCnv::createPersistent( TrigTauTracksInfoCollection *transObj)
 {
-  MsgStream mlog(messageService(), "TrigTauTracksInfoCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigTauTracksInfoCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigTauTracksInfoCollectionCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigTauTracksInfoCollectionCnv::createPersistent called" << endmsg;
   
   TrigTauTracksInfoCollection_PERS * p_cont = TPConverter.createPersistent( transObj, mlog );
   
@@ -26,9 +26,9 @@ TrigTauTracksInfoCollection_PERS * TrigTauTracksInfoCollectionCnv::createPersist
 //createTransient
 TrigTauTracksInfoCollection * TrigTauTracksInfoCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigTauTracksInfoCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigTauTracksInfoCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigTauTracksInfoCollectionCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigTauTracksInfoCollectionCnv::createTransient called" << endmsg;
   
   static pool::Guid p2_guid( "1AF8C4E5-4862-4625-B9B6-D9B53E716B17" );
   static pool::Guid p1_guid( "8A208FA7-C52F-4CD3-AE20-EF1C99FC92A6" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCnv.cxx
index 2573825d0c920f6359f4f76abb6bdfc629e0d1a0..4ebab2533b3bd44a3e936557bdec6947892c0f41 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCnv.cxx
@@ -13,9 +13,9 @@ TrigTrackCountsCnv::~TrigTrackCountsCnv(){}
 
 
 TrigTrackCounts_PERS* TrigTrackCountsCnv::createPersistent(TrigTrackCounts* transObj) {
-  MsgStream mlog(messageService(), "TrigTrackCountsConverter" );
+  MsgStream mlog(msgSvc(), "TrigTrackCountsConverter" );
 
-  mlog << MSG::DEBUG << "TrigTrackCountsCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigTrackCountsCnv::createPersistent" << endmsg;
 
   TrigTrackCountsCnv_p2   converter;
    
@@ -26,9 +26,9 @@ TrigTrackCounts_PERS* TrigTrackCountsCnv::createPersistent(TrigTrackCounts* tran
 
 
 TrigTrackCounts* TrigTrackCountsCnv::createTransient() {
-  MsgStream mlog(messageService(), "TrigTrackCountsConverter" );
+  MsgStream mlog(msgSvc(), "TrigTrackCountsConverter" );
 
-  mlog << MSG::DEBUG << "TrigTrackCountsCnv::createTransient " << endreq;
+  mlog << MSG::DEBUG << "TrigTrackCountsCnv::createTransient " << endmsg;
 
   static pool::Guid p2_guid("BD8BB599-AE38-45CC-93DB-27F67C23DB62");
   static pool::Guid p1_guid("2DCA396C-5CC1-4B6A-8B76-E3EBA4F81A61");
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCollectionCnv.cxx
index 44243cbb11887d21cc007f66f92f7d2e36d94d7d..d1c218728e0ef63f507ab25c832b1078e5966402 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrackCountsCollectionCnv.cxx
@@ -20,9 +20,9 @@ TrigTrackCountsCollectionCnv::~TrigTrackCountsCollectionCnv()
 //createPersistent 
 TrigTrackCountsCollection_PERS * TrigTrackCountsCollectionCnv::createPersistent( TrigTrackCountsCollection *transObj)
 {
-  MsgStream mlog(messageService(), "TrigTrackCountsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigTrackCountsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigTrackCountsCollectionCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigTrackCountsCollectionCnv::createPersistent called" << endmsg;
   
   TrigTrackCountsCollection_PERS * p_cont = m_TPConverter->createPersistent( transObj, m_log );
   
@@ -34,9 +34,9 @@ TrigTrackCountsCollection_PERS * TrigTrackCountsCollectionCnv::createPersistent(
 //createTransient
 TrigTrackCountsCollection * TrigTrackCountsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigTrackCountsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigTrackCountsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigTrackCountsCollectionCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigTrackCountsCollectionCnv::createTransient called" << endmsg;
   
   static pool::Guid tlp1_guid( "FCEB4390-F8FB-4C93-9538-105BCABE487C" );
   static pool::Guid p0_guid( "7A4412AD-C11D-4EFD-AE15-D343D2CB28BC" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCnv.cxx
index 7049b4baf80e863c3babf5049f3bd7316e092b7c..7f23e076a63695484f5f72c41e433bd9a9635de6 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCnv.cxx
@@ -10,8 +10,8 @@ TrigTrtHitCountsCnv::TrigTrtHitCountsCnv(ISvcLocator* svcloc): TrigTrtHitCountsC
 TrigTrtHitCountsCnv::~TrigTrtHitCountsCnv(){}
 
 TrigTrtHitCounts_PERS* TrigTrtHitCountsCnv::createPersistent(TrigTrtHitCounts* transObj)  {
-  MsgStream mlog(messageService(), "TrigTrtHitCountsConverter" );
-  mlog << MSG::DEBUG << "TrigTrtHitCountsCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigTrtHitCountsConverter" );
+  mlog << MSG::DEBUG << "TrigTrtHitCountsCnv::createPersistent" << endmsg;
   
   TrigTrtHitCountsCnv_p1  converter;
   TrigTrtHitCounts_PERS *persObj = converter.createPersistent( transObj, mlog );
@@ -20,15 +20,15 @@ TrigTrtHitCounts_PERS* TrigTrtHitCountsCnv::createPersistent(TrigTrtHitCounts* t
 }
 
 TrigTrtHitCounts* TrigTrtHitCountsCnv::createTransient() {
-  MsgStream mlog(messageService(), "TrigTrtHitCountsConverter" );
-  mlog << MSG::DEBUG << "TrigTrtHitCountsCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigTrtHitCountsConverter" );
+  mlog << MSG::DEBUG << "TrigTrtHitCountsCnv::createTransient " << endmsg;
   
   static pool::Guid p1_guid("FB33CC3C-74B8-43DF-ABDA-E56BEA1D9D61");
   
   TrigTrtHitCounts *transObj = 0;
 
   if( compareClassGuid(p1_guid) ) {   
-    mlog << MSG::DEBUG << "TrigTrtHitCountsCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigTrtHitCountsCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigTrtHitCounts_p1 > pers_ptr( poolReadObject< TrigTrtHitCounts_p1 >() );
     TrigTrtHitCountsCnv_p1 converter;
     transObj = converter.createTransient(pers_ptr.get(), mlog);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCollectionCnv.cxx
index 31d505f67087b6b76b528ea0c0fcee21132aa3b6..67eaa98cc9e7f50acdf49c69c6b41abf7253e11b 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigTrtHitCountsCollectionCnv.cxx
@@ -15,9 +15,9 @@ static TrigTrtHitCountsCollectionCnv_p2   TPConverter;
 //createPersistent 
 TrigTrtHitCountsCollection_PERS * TrigTrtHitCountsCollectionCnv::createPersistent( TrigTrtHitCountsCollection *transObj)
 {
-  MsgStream mlog(messageService(), "TrigTrtHitCountsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigTrtHitCountsCollectionConverter" );
 
-  mlog << MSG::DEBUG << "TrigTrtHitCountsCollectionCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigTrtHitCountsCollectionCnv::createPersistent" << endmsg;
 
   TrigTrtHitCountsCollection_PERS* persObj = TPConverter.createPersistent( transObj, mlog );
  
@@ -28,9 +28,9 @@ TrigTrtHitCountsCollection_PERS * TrigTrtHitCountsCollectionCnv::createPersisten
 //createTransient
 TrigTrtHitCountsCollection* TrigTrtHitCountsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigTrtHitCountsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigTrtHitCountsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigTrtHitCountsCollectionCnv::createTransient" << endreq;
+  mlog << MSG::DEBUG << "TrigTrtHitCountsCollectionCnv::createTransient" << endmsg;
 
   static pool::Guid p2_guid( "47CBB4D9-381C-423E-A560-A7B5C325A5DD" );
   static pool::Guid tlp1_guid( "A0763CCA-553C-4365-8091-04CA2036FD97" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCollectionCnv.cxx
index e39024a7996914a64075a4d43238fed653c42082..8c06b4aed98a2d4845b9b0e9d5365ee03f4da005 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCollectionCnv.cxx
@@ -24,9 +24,9 @@ TrigVertexCollectionCnv::~TrigVertexCollectionCnv()
 //createPersistent 
 TrigVertexCollection_PERS * TrigVertexCollectionCnv::createPersistent( TrigVertexCollection *transObj)
 {
-  MsgStream mlog(messageService(), "TrigVertexCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigVertexCollectionConverter" );
 
-  mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createPersistent called" << endmsg;
 
   TrigVertexCollection_PERS * p_VtxColl = m_TPConverter->createPersistent( transObj, m_log );
 
@@ -38,9 +38,9 @@ TrigVertexCollection_PERS * TrigVertexCollectionCnv::createPersistent( TrigVerte
 //createTransient
 TrigVertexCollection * TrigVertexCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigVertexCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigVertexCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createTransient called" << endmsg;
 
   static pool::Guid tlp2_guid( "438C9232-0F3E-4A8B-A16E-6F6275388DE4" );
   static pool::Guid tlp1_guid( "10E18C4E-9BCA-4F25-993C-EBDF0642C119" );
@@ -50,19 +50,19 @@ TrigVertexCollection * TrigVertexCollectionCnv::createTransient()
   TrigVertexCollection *p_collection = 0;
   if( compareClassGuid( tlp2_guid ) )     
     {
-      mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createPersistent tlp2 called" << endreq;
+      mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createPersistent tlp2 called" << endmsg;
       poolReadObject< TrigVertexCollection_PERS >(*m_TPConverter);
       p_collection = m_TPConverter->createTransient( m_log );
    
     } else if( compareClassGuid( tlp1_guid ) ) {
 
-      mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createPersistent tlp1 called" << endreq;
+      mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createPersistent tlp1 called" << endmsg;
       TrigVertexCollectionCnv_tlp1  tlp1_Converter;
       poolReadObject< TrigVertexCollection_tlp1 >(tlp1_Converter);
       p_collection = tlp1_Converter.createTransient( m_log );
 
     } else if( compareClassGuid( p0_guid ) || compareClassGuid( p0_guid2 ) ){
-      mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createPersistent p0 called" << endreq;
+      mlog << MSG::DEBUG << "TrigVertexCollectionCnv::createPersistent p0 called" << endmsg;
       p_collection = poolReadObject< TrigVertexCollection >();
     
     }else  throw std::runtime_error( "Unsupported persistent version of TrigVertexCollection" );
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCnv.cxx
index a109e262f673764a6e26ee19293736ab7b09ee1b..96deca37965051b6e55ac703e164776e6cfed7f6 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCnv.cxx
@@ -10,8 +10,8 @@ TrigVertexCountsCnv::TrigVertexCountsCnv(ISvcLocator* svcloc): TrigVertexCountsC
 TrigVertexCountsCnv::~TrigVertexCountsCnv(){}
 
 TrigVertexCounts_PERS* TrigVertexCountsCnv::createPersistent(TrigVertexCounts* transObj)  {
-  MsgStream mlog(messageService(), "TrigVertexCountsConverter" );
-  mlog << MSG::DEBUG << "TrigVertexCountsCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigVertexCountsConverter" );
+  mlog << MSG::DEBUG << "TrigVertexCountsCnv::createPersistent" << endmsg;
   
   TrigVertexCountsCnv_p1  converter;
   TrigVertexCounts_PERS *persObj = converter.createPersistent( transObj, mlog );
@@ -20,8 +20,8 @@ TrigVertexCounts_PERS* TrigVertexCountsCnv::createPersistent(TrigVertexCounts* t
 }
 
 TrigVertexCounts* TrigVertexCountsCnv::createTransient() {
-  MsgStream mlog(messageService(), "TrigVertexCountsConverter" );
-  mlog << MSG::DEBUG << "TrigVertexCountsCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigVertexCountsConverter" );
+  mlog << MSG::DEBUG << "TrigVertexCountsCnv::createTransient " << endmsg;
   
   static pool::Guid p1_guid("33E83FBA-83F1-4DC5-87BE-81A09D0FD8F8");
   
@@ -29,7 +29,7 @@ TrigVertexCounts* TrigVertexCountsCnv::createTransient() {
   TrigVertexCounts *transObj = 0;
 
   if( compareClassGuid(p1_guid) ) {   
-    mlog << MSG::DEBUG << "TrigVertexCountsCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigVertexCountsCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigVertexCounts_p1 > pers_ptr( poolReadObject< TrigVertexCounts_p1 >() );
     TrigVertexCountsCnv_p1 converter;
     transObj = converter.createTransient(pers_ptr.get(), mlog);
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCollectionCnv.cxx b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCollectionCnv.cxx
index cfa175071a9d9ea77e6ce7b166fc89e3c69e29c6..d593f16734f8f74466fa3599a67bee1db2cec273 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCollectionCnv.cxx
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/src/TrigVertexCountsCollectionCnv.cxx
@@ -19,9 +19,9 @@ TrigVertexCountsCollectionCnv::~TrigVertexCountsCollectionCnv()
 //createPersistent 
 TrigVertexCountsCollection_PERS * TrigVertexCountsCollectionCnv::createPersistent( TrigVertexCountsCollection *transObj)
 {
-  MsgStream mlog(messageService(), "TrigVertexCountsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigVertexCountsCollectionConverter" );
 
-  mlog << MSG::DEBUG << "TrigVertexCountsCollectionCnv::createPersistent" << endreq;
+  mlog << MSG::DEBUG << "TrigVertexCountsCollectionCnv::createPersistent" << endmsg;
 
   TrigVertexCountsCollection_PERS* persObj = m_TPConverter->createPersistent( transObj, mlog );
  
@@ -33,9 +33,9 @@ TrigVertexCountsCollection_PERS * TrigVertexCountsCollectionCnv::createPersisten
 //createTransient
 TrigVertexCountsCollection* TrigVertexCountsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigVertexCountsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigVertexCountsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigVertexCountsCollectionCnv::createTransient" << endreq;
+  mlog << MSG::DEBUG << "TrigVertexCountsCollectionCnv::createTransient" << endmsg;
 
   static pool::Guid tlp1_guid( "2A1D4A4E-D566-4C71-B051-D5D79A856753" );
   static pool::Guid p1_guid( "232B47D0-65CA-4883-AC51-0D76EAEA3194" );