diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx
index 42c01e864d7a09d7d958b38b5cd7bf3d7425a470..91d022aae97ce4e47fbd8d88c8dee915ee0abc43 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CMMCPHitsCollection_PERS * CMMCPHitsCollectionCnv::createPersistent( CMMCPHitsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMMCPHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMMCPHitsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CMMCPHitsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CMMCPHitsCollection_PERS * CMMCPHitsCollectionCnv::createPersistent( CMMCPHitsCo
 //createTransient
 CMMCPHitsCollection * CMMCPHitsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMMCPHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMMCPHitsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CMMCPHitsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx
index c60818958eaa7f880cf5ce11f39ee4c1d69e08fc..5b36222804b19a75b781d1a065d3b645b6b4df01 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CMMEtSumsCollection_PERS * CMMEtSumsCollectionCnv::createPersistent( CMMEtSumsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMMEtSumsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMMEtSumsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CMMEtSumsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CMMEtSumsCollection_PERS * CMMEtSumsCollectionCnv::createPersistent( CMMEtSumsCo
 //createTransient
 CMMEtSumsCollection * CMMEtSumsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMMEtSumsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMMEtSumsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CMMEtSumsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx
index 06fd2625b2295b3bef52a4ee50ec7610d25f832c..a43ff0616cf75202ba3c756dcacd8def9f83b700 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CMMJetHitsCollection_PERS * CMMJetHitsCollectionCnv::createPersistent( CMMJetHitsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMMJetHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMMJetHitsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CMMJetHitsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CMMJetHitsCollection_PERS * CMMJetHitsCollectionCnv::createPersistent( CMMJetHit
 //createTransient
 CMMJetHitsCollection * CMMJetHitsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMMJetHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMMJetHitsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CMMJetHitsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx
index 9ddb6a86be2af1db35d472293fee613aacceead7..e003fb1abcafc7b0720af06549696d423d89e970 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx
@@ -16,7 +16,7 @@ using namespace LVL1;
 CMMRoI_PERS * CMMRoICnv::createPersistent( CMMRoI *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMMRoIConverter" );
+  MsgStream mlog(msgSvc(), "CMMRoIConverter" );
 
   //mlog << MSG::DEBUG << "CMMRoICnv::createPersistent called" << endreq;
 
@@ -30,7 +30,7 @@ CMMRoI_PERS * CMMRoICnv::createPersistent( CMMRoI *transObj)
 //createTransient
 CMMRoI * CMMRoICnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMMRoIConverter" );
+  MsgStream mlog(msgSvc(), "CMMRoIConverter" );
   
   //mlog << MSG::DEBUG << "CMMRoICnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx
index 6cce73b8b285f76ce8fac2844350f8bab2167b7f..49d3bc89bf9eeb90e74e750a98a5cac1c5de9494 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CMXCPHitsCollection_PERS * CMXCPHitsCollectionCnv::createPersistent( CMXCPHitsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMXCPHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXCPHitsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CMXCPHitsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CMXCPHitsCollection_PERS * CMXCPHitsCollectionCnv::createPersistent( CMXCPHitsCo
 //createTransient
 CMXCPHitsCollection * CMXCPHitsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMXCPHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXCPHitsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CMXCPHitsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx
index f34a3c7753142712c09b7967ff3a63e0258b3744..121a32493cb055c305a4c4b5775c1feb858dc29a 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CMXCPTobCollection_PERS * CMXCPTobCollectionCnv::createPersistent( CMXCPTobCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMXCPTobCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXCPTobCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CMXCPTobCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CMXCPTobCollection_PERS * CMXCPTobCollectionCnv::createPersistent( CMXCPTobColle
 //createTransient
 CMXCPTobCollection * CMXCPTobCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMXCPTobCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXCPTobCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CMXCPTobCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx
index dac9be8b3db7b9d6ded91cee53d78e19dacce556..67247f58675df32561ac3fd125b09ecfb202a55e 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CMXEtSumsCollection_PERS * CMXEtSumsCollectionCnv::createPersistent( CMXEtSumsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMXEtSumsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXEtSumsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CMXEtSumsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CMXEtSumsCollection_PERS * CMXEtSumsCollectionCnv::createPersistent( CMXEtSumsCo
 //createTransient
 CMXEtSumsCollection * CMXEtSumsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMXEtSumsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXEtSumsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CMXEtSumsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx
index f45b6ce6efa800becc8e175a3465392ac249b5e6..0be3d0994eecb3a7f11d53fcb4c3ba83d5808552 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CMXJetHitsCollection_PERS * CMXJetHitsCollectionCnv::createPersistent( CMXJetHitsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMXJetHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXJetHitsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CMXJetHitsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CMXJetHitsCollection_PERS * CMXJetHitsCollectionCnv::createPersistent( CMXJetHit
 //createTransient
 CMXJetHitsCollection * CMXJetHitsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMXJetHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXJetHitsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CMXJetHitsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx
index 1ce4221c11e4e5b9f83c1212ec2cc9fe86f76faa..f1c54b57a6da6ecf8829cf5a7f40d04041808b34 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CMXJetTobCollection_PERS * CMXJetTobCollectionCnv::createPersistent( CMXJetTobCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMXJetTobCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXJetTobCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CMXJetTobCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CMXJetTobCollection_PERS * CMXJetTobCollectionCnv::createPersistent( CMXJetTobCo
 //createTransient
 CMXJetTobCollection * CMXJetTobCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMXJetTobCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CMXJetTobCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CMXJetTobCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx
index ae5534189b809c01913bb09e39e67aba9cb13a72..6450a27bb6e7a14c97c8ccc214339470d8beb607 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx
@@ -18,7 +18,7 @@ using namespace LVL1;
 CMXRoI_PERS * CMXRoICnv::createPersistent( CMXRoI *transObj)
 {
   
-  MsgStream mlog(messageService(), "CMXRoIConverter" );
+  MsgStream mlog(msgSvc(), "CMXRoIConverter" );
 
   //mlog << MSG::DEBUG << "CMXRoICnv::createPersistent called" << endreq;
 
@@ -32,7 +32,7 @@ CMXRoI_PERS * CMXRoICnv::createPersistent( CMXRoI *transObj)
 //createTransient
 CMXRoI * CMXRoICnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CMXRoIConverter" );
+  MsgStream mlog(msgSvc(), "CMXRoIConverter" );
   
   //mlog << MSG::DEBUG << "CMXRoICnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx
index 86964360e7be08720d98ad69d4920f490c156e51..fa583a741d4ef20eddcaf1024dd76a9d1f0e3f18 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CPMHitsCollection_PERS * CPMHitsCollectionCnv::createPersistent( CPMHitsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CPMHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CPMHitsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CPMHitsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CPMHitsCollection_PERS * CPMHitsCollectionCnv::createPersistent( CPMHitsCollecti
 //createTransient
 CPMHitsCollection * CPMHitsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CPMHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CPMHitsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CPMHitsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx
index 61423ffa57e1eaff8edcd5887a421710af9a208d..164131945d7598ffaa9400bc30a36aecfffb626a 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx
@@ -14,7 +14,7 @@
 CPMRoICollection_PERS * CPMRoICollectionCnv::createPersistent( CPMRoICollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CPMRoICollectionConverter" );
+  MsgStream mlog(msgSvc(), "CPMRoICollectionConverter" );
 
   //mlog << MSG::DEBUG << "CPMRoICollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CPMRoICollection_PERS * CPMRoICollectionCnv::createPersistent( CPMRoICollection
 //createTransient
 CPMRoICollection * CPMRoICollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CPMRoICollectionConverter" );
+  MsgStream mlog(msgSvc(), "CPMRoICollectionConverter" );
   
   //mlog << MSG::DEBUG << "CPMRoICollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx
index 7f850a38ef4e6a2b27be38aa4bda9368e2cb5cea..32e076781eb49b699b6b4c42e7ee4b1d470ce03d 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx
@@ -14,7 +14,7 @@
 CPMTobRoICollection_PERS * CPMTobRoICollectionCnv::createPersistent( CPMTobRoICollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CPMTobRoICollectionConverter" );
+  MsgStream mlog(msgSvc(), "CPMTobRoICollectionConverter" );
 
   //mlog << MSG::DEBUG << "CPMTobRoICollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CPMTobRoICollection_PERS * CPMTobRoICollectionCnv::createPersistent( CPMTobRoICo
 //createTransient
 CPMTobRoICollection * CPMTobRoICollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CPMTobRoICollectionConverter" );
+  MsgStream mlog(msgSvc(), "CPMTobRoICollectionConverter" );
   
   //mlog << MSG::DEBUG << "CPMTobRoICollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx
index f04f1e4541e157d2412d277406548827a63fff5a..4a6f63b9d503f7fd9a5e651aa0e09dd79fcb7509 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx
@@ -14,7 +14,7 @@
 CPMTowerCollection_PERS * CPMTowerCollectionCnv::createPersistent( CPMTowerCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "CPMTowerCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CPMTowerCollectionConverter" );
 
   //mlog << MSG::DEBUG << "CPMTowerCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ CPMTowerCollection_PERS * CPMTowerCollectionCnv::createPersistent( CPMTowerColle
 //createTransient
 CPMTowerCollection * CPMTowerCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "CPMTowerCollectionConverter" );
+  MsgStream mlog(msgSvc(), "CPMTowerCollectionConverter" );
   
   //mlog << MSG::DEBUG << "CPMTowerCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.cxx
index b0bd430bccd6f41ee0f3165c61e37551effb801e..9e336d3065240af5c6c73603f1bf27a3f73c90c6 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CTP_RDOCnv.cxx
@@ -24,7 +24,7 @@ static CTP_RDOCnv_p1 TPConverter_p1;
  */
 CTP_RDO_PERS* CTP_RDOCnv::createPersistent( CTP_RDO* transObj ) {
 
-   MsgStream log( this->messageService(), "CTP_RDOCnv" );
+   MsgStream log( this->msgSvc(), "CTP_RDOCnv" );
    return TPConverter.createPersistent( transObj, log );
 
 }
@@ -42,13 +42,13 @@ CTP_RDO* CTP_RDOCnv::createTransient() {
    if( this->compareClassGuid( p2_guid ) ) {
 
       std::auto_ptr< CTP_RDO_p2 > pers_ref( this->poolReadObject< CTP_RDO_p2 >() );
-      MsgStream log( this->messageService(), "CTP_RDOCnv" );
+      MsgStream log( this->msgSvc(), "CTP_RDOCnv" );
       return TPConverter.createTransient( pers_ref.get(), log );
 
    } else if( this->compareClassGuid( p1_guid ) ) {
 
       std::auto_ptr< CTP_RDO_p1 > pers_ref( this->poolReadObject< CTP_RDO_p1 >() );
-      MsgStream log( this->messageService(), "CTP_RDOCnv" );
+      MsgStream log( this->msgSvc(), "CTP_RDOCnv" );
       return TPConverter_p1.createTransient( pers_ref.get(), log );
 
    } else if( this->compareClassGuid( p0_guid ) ) {
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx
index ae52bf858cd07b4ca0b6ebef66b8321fb65e797d..dc56a3be26c4ac7630568b812f8b9026469df924 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 JEMEtSumsCollection_PERS * JEMEtSumsCollectionCnv::createPersistent( JEMEtSumsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "JEMEtSumsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "JEMEtSumsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "JEMEtSumsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ JEMEtSumsCollection_PERS * JEMEtSumsCollectionCnv::createPersistent( JEMEtSumsCo
 //createTransient
 JEMEtSumsCollection * JEMEtSumsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "JEMEtSumsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "JEMEtSumsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "JEMEtSumsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx
index f04e3422938ebaec35de105fb8fd707dcbbff542..6f43db47a4f9b3d8a1da431470957d6f51c73a14 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx
@@ -14,7 +14,7 @@
 JEMHitsCollection_PERS * JEMHitsCollectionCnv::createPersistent( JEMHitsCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "JEMHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "JEMHitsCollectionConverter" );
 
   //mlog << MSG::DEBUG << "JEMHitsCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ JEMHitsCollection_PERS * JEMHitsCollectionCnv::createPersistent( JEMHitsCollecti
 //createTransient
 JEMHitsCollection * JEMHitsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "JEMHitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "JEMHitsCollectionConverter" );
   
   //mlog << MSG::DEBUG << "JEMHitsCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx
index 7c7c582f30fcd3b47bdb8450792e7512b0dd8c39..49188b4e0cb1b69119de40b1e4c6beb9af7fa10a 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx
@@ -14,7 +14,7 @@
 JEMRoICollection_PERS * JEMRoICollectionCnv::createPersistent( JEMRoICollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "JEMRoICollectionConverter" );
+  MsgStream mlog(msgSvc(), "JEMRoICollectionConverter" );
 
   //mlog << MSG::DEBUG << "JEMRoICollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ JEMRoICollection_PERS * JEMRoICollectionCnv::createPersistent( JEMRoICollection
 //createTransient
 JEMRoICollection * JEMRoICollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "JEMRoICollectionConverter" );
+  MsgStream mlog(msgSvc(), "JEMRoICollectionConverter" );
   
   //mlog << MSG::DEBUG << "JEMRoICollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx
index 059fd56c7079adef8bd201752501d83fb233bc09..af6bd69b90f09d26ab559979381900b53d28f41f 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx
@@ -14,7 +14,7 @@
 JEMTobRoICollection_PERS * JEMTobRoICollectionCnv::createPersistent( JEMTobRoICollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "JEMTobRoICollectionConverter" );
+  MsgStream mlog(msgSvc(), "JEMTobRoICollectionConverter" );
 
   //mlog << MSG::DEBUG << "JEMTobRoICollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ JEMTobRoICollection_PERS * JEMTobRoICollectionCnv::createPersistent( JEMTobRoICo
 //createTransient
 JEMTobRoICollection * JEMTobRoICollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "JEMTobRoICollectionConverter" );
+  MsgStream mlog(msgSvc(), "JEMTobRoICollectionConverter" );
   
   //mlog << MSG::DEBUG << "JEMTobRoICollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx
index 0538ccdaf6d4101d88ad22e003d3a557d204170d..e5f9b220356d5e20b6ef0185b5d53aa083264b8c 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx
@@ -14,7 +14,7 @@
 JetElementCollection_PERS * JetElementCollectionCnv::createPersistent( JetElementCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "JetElementCollectionConverter" );
+  MsgStream mlog(msgSvc(), "JetElementCollectionConverter" );
 
   //mlog << MSG::DEBUG << "JetElementCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ JetElementCollection_PERS * JetElementCollectionCnv::createPersistent( JetElemen
 //createTransient
 JetElementCollection * JetElementCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "JetElementCollectionConverter" );
+  MsgStream mlog(msgSvc(), "JetElementCollectionConverter" );
   
   //mlog << MSG::DEBUG << "JetElementCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.cxx
index 51d6c724c10147f4fd14dce853c00f93e6e118e5..97ad8333c4b3f4109b7e0c0c326337dfba7716cc 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/MuCTPI_RDOCnv.cxx
@@ -22,7 +22,7 @@ static MuCTPI_RDOCnv_p1 TPConverter;
  */
 MuCTPI_RDO_PERS* MuCTPI_RDOCnv::createPersistent( MuCTPI_RDO* transObj ) {
 
-   MsgStream log( this->messageService(), "MuCTPI_RDOCnv" );
+   MsgStream log( this->msgSvc(), "MuCTPI_RDOCnv" );
    return TPConverter.createPersistent( transObj, log );
 
 }
@@ -39,7 +39,7 @@ MuCTPI_RDO* MuCTPI_RDOCnv::createTransient() {
    if( this->compareClassGuid( p1_guid ) ) {
 
       std::auto_ptr< MuCTPI_RDO_p1 > pers_ref( this->poolReadObject< MuCTPI_RDO_p1 >() );
-      MsgStream log( this->messageService(), "MuCTPI_RDOCnv" );
+      MsgStream log( this->msgSvc(), "MuCTPI_RDOCnv" );
       return TPConverter.createTransient( pers_ref.get(), log );
 
    } else if( this->compareClassGuid( p0_guid ) ) {
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx
index 19bcb3aff3872ec61ca0e29b94729221944425af..69d465535488c597bc9e3b12ee9a2c27a272603c 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx
@@ -14,7 +14,7 @@
 RODHeaderCollection_PERS * RODHeaderCollectionCnv::createPersistent( RODHeaderCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "RODHeaderCollectionConverter" );
+  MsgStream mlog(msgSvc(), "RODHeaderCollectionConverter" );
 
   //mlog << MSG::DEBUG << "RODHeaderCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ RODHeaderCollection_PERS * RODHeaderCollectionCnv::createPersistent( RODHeaderCo
 //createTransient
 RODHeaderCollection * RODHeaderCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "RODHeaderCollectionConverter" );
+  MsgStream mlog(msgSvc(), "RODHeaderCollectionConverter" );
   
   //mlog << MSG::DEBUG << "RODHeaderCollectionCnv::createTransient called" << endreq;
 
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.cxx
index ca31c9cc1c3a9c3ea619de313e4a5101760ffa65..15a67492c2d92f79f211eeab608ca9c3fdf02adf 100755
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RoIBResultCnv.cxx
@@ -22,7 +22,7 @@ static RoIBResultCnv_p1 TPConverter;
  */
 RoIBResult_PERS* RoIBResultCnv::createPersistent( ROIB::RoIBResult* transObj ) {
 
-   MsgStream log( this->messageService(), "RoIBResultCnv" );
+   MsgStream log( this->msgSvc(), "RoIBResultCnv" );
    return TPConverter.createPersistent( transObj, log );
 
 }
@@ -39,7 +39,7 @@ ROIB::RoIBResult* RoIBResultCnv::createTransient() {
    if( this->compareClassGuid( p1_guid ) ) {
 
       std::auto_ptr< RoIBResult_p1 > pers_ref( this->poolReadObject< RoIBResult_p1 >() );
-      MsgStream log( this->messageService(), "RoIBResultCnv" );
+      MsgStream log( this->msgSvc(), "RoIBResultCnv" );
       return TPConverter.createTransient( pers_ref.get(), log );
 
    } else if( this->compareClassGuid( p0_guid ) ) {
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx
index 6a7d07a2f949c3c4fe645935f42f2143772f55cd..14527793915138b3892affb1cb6a2382f80a7894 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx
@@ -14,7 +14,7 @@
 TriggerTowerCollection_PERS * TriggerTowerCollectionCnv::createPersistent( TriggerTowerCollection *transObj)
 {
   
-  MsgStream mlog(messageService(), "TriggerTowerCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TriggerTowerCollectionConverter" );
 
   //mlog << MSG::DEBUG << "TriggerTowerCollectionCnv::createPersistent called" << endreq;
 
@@ -28,7 +28,7 @@ TriggerTowerCollection_PERS * TriggerTowerCollectionCnv::createPersistent( Trigg
 //createTransient
 TriggerTowerCollection * TriggerTowerCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TriggerTowerCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TriggerTowerCollectionConverter" );
   
   //mlog << MSG::DEBUG << "TriggerTowerCollectionCnv::createTransient called" << endreq;