diff --git a/TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.cxx
index c636f89190934c99a7e30af55f04b528d945bbe5..a38b468bd3d791a077f83f6b5ce1be35649f9667 100755
--- a/TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBADCRawContCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBADCRawContCnv.h"
 
 TBADCRawCont_PERS* TBADCRawContCnv::createPersistent(TBADCRawCont* transCont) {
-    MsgStream log(messageService(), "TBADCRawContConverter" );
+    MsgStream log(msgSvc(), "TBADCRawContConverter" );
     TBADCRawCont_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBADCRawCont* TBADCRawContCnv::createTransient() {
-   MsgStream log(messageService(), "TBADCRawContConverter" );
+   MsgStream log(msgSvc(), "TBADCRawContConverter" );
    static pool::Guid   p1_guid("4D0407FD-A534-4595-B5BD-4A8DB797A094");  // GUID of the persistent object
    static pool::Guid   p0_guid("5D407302-FD4E-42BC-A6E5-F5C9ECCDCBF1");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBBPCContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBBPCContCnv.cxx
index fcaad76fc0604eda327063591536a7a348b85ec2..6a709c37a5fd152a5b86db5cee24e5968f9e7e71 100755
--- a/TestBeam/TBEventAthenaPool/src/TBBPCContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBBPCContCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBBPCContCnv.h"
 
 TBBPCCont_PERS* TBBPCContCnv::createPersistent(TBBPCCont* transCont) {
-    MsgStream log(messageService(), "TBBPCContConverter" );
+    MsgStream log(msgSvc(), "TBBPCContConverter" );
     TBBPCCont_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBBPCCont* TBBPCContCnv::createTransient() {
-   MsgStream log(messageService(), "TBBPCContConverter" );
+   MsgStream log(msgSvc(), "TBBPCContConverter" );
    static pool::Guid   p1_guid("89A09260-F284-4694-8687-3C6C72989A96");  // GUID of the persistent object
    static pool::Guid   p0_guid("05E6C927-F43C-4C2A-B654-C671BF8FDB67");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx
index 455c0ee2834eba163c77ebd8bd3fd456e2394bcc..dcb91d120d4f233cd4499e4403336b3e01d46178 100755
--- a/TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx
@@ -29,7 +29,7 @@ StatusCode TBBPCRawContCnv::initialize()
 
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "TBBPCRawContCnv");
-  log << MSG::INFO << "initialize()" << endreq;
+  log << MSG::INFO << "initialize()" << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -40,21 +40,21 @@ StatusCode TBBPCRawContCnv::PoolToDataObject(DataObject*& pObj, const Token* tok
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate
 
-  MsgStream log(messageService(), "TBBPCRawContCnv::PoolToDataObject" );
+  MsgStream log(msgSvc(), "TBBPCRawContCnv::PoolToDataObject" );
    
   StatusCode sc = TBBPCRawContCnvBase::PoolToDataObject(pObj, token);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Unable to get object from pool" << endreq;
+    log << MSG::FATAL << "Unable to get object from pool" << endmsg;
     return StatusCode::FAILURE;
   } else {
-    log << MSG::DEBUG << " Found DataObject " << endreq;
+    log << MSG::DEBUG << " Found DataObject " << endmsg;
   }
     
   // Convert DataObject pointer to TBBPCRawCont*
   TBBPCRawCont* obj=0;
   SG::fromStorable(pObj, obj );
   if(!obj) {
-    log << MSG::ERROR << "  failed to cast to TBBPCRawCont " << endreq ; 
+    log << MSG::ERROR << "  failed to cast to TBBPCRawCont " << endmsg ; 
     return StatusCode::FAILURE; 
   }
 
@@ -63,7 +63,7 @@ StatusCode TBBPCRawContCnv::PoolToDataObject(DataObject*& pObj, const Token* tok
 
 StatusCode TBBPCRawContCnv::DataObjectToPool(DataObject* pObj, const std::string &tname) 
 {
-  MsgStream log(messageService(),"TBBPCRawContCnv::DataObjectToPool" );
+  MsgStream log(msgSvc(),"TBBPCRawContCnv::DataObjectToPool" );
   
   return TBBPCRawContCnvBase::DataObjectToPool( pObj, tname) ;
 }
diff --git a/TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.cxx
index 87bc1bae784d589ccea6f5fdbed7160aad0eac6a..f49755ed61f40b60e4a668e829fe7e9f1c3238de 100755
--- a/TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBEventInfoCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBEventInfoCnv.h"
 
 TBEventInfo_PERS* TBEventInfoCnv::createPersistent(TBEventInfo* transCont) {
-    MsgStream log(messageService(), "TBEventInfoConverter" );
+    MsgStream log(msgSvc(), "TBEventInfoConverter" );
     TBEventInfo_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBEventInfo* TBEventInfoCnv::createTransient() {
-   MsgStream log(messageService(), "TBEventInfoConverter" );
+   MsgStream log(msgSvc(), "TBEventInfoConverter" );
    static pool::Guid   p1_guid("1E398439-74B3-457E-BC0B-DD69201AE463");  // GUID of the persistent object
    static pool::Guid   p0_guid("1295BE02-D698-43A8-A2BB-76E5ADCBD228");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx
index 16718e1251b1f2aa9120b36847e667346f88a9d9..c9991093a3e73a2ec89e7e770cc88c45770e2cea 100755
--- a/TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx
@@ -29,7 +29,7 @@ StatusCode TBHitContCnv::initialize()
 
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "TBHitContCnv");
-  log << MSG::INFO << "initialize()" << endreq;
+  log << MSG::INFO << "initialize()" << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -40,21 +40,21 @@ StatusCode TBHitContCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate
 
-  MsgStream log(messageService(), "TBHitContCnv::PoolToDataObject" );
+  MsgStream log(msgSvc(), "TBHitContCnv::PoolToDataObject" );
    
   StatusCode sc = TBHitContCnvBase::PoolToDataObject(pObj, token);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Unable to get object from pool" << endreq;
+    log << MSG::FATAL << "Unable to get object from pool" << endmsg;
     return StatusCode::FAILURE;
   } else {
-    log << MSG::DEBUG << " Found DataObject " << endreq;
+    log << MSG::DEBUG << " Found DataObject " << endmsg;
   }
     
   // Convert DataObject pointer to TBHitCont*
   TBHitCont* obj=0;
   SG::fromStorable(pObj, obj );
   if(!obj) {
-    log << MSG::ERROR << "  failed to cast to TBHitCont " << endreq ; 
+    log << MSG::ERROR << "  failed to cast to TBHitCont " << endmsg ; 
     return StatusCode::FAILURE; 
   }
 
@@ -63,7 +63,7 @@ StatusCode TBHitContCnv::PoolToDataObject(DataObject*& pObj, const Token* token)
 
 StatusCode TBHitContCnv::DataObjectToPool(DataObject* pObj, const std::string &tname) 
 {
-  MsgStream log(messageService(),"TBHitContCnv::DataObjectToPool" );
+  MsgStream log(msgSvc(),"TBHitContCnv::DataObjectToPool" );
   
   return TBHitContCnvBase::DataObjectToPool( pObj, tname) ;
 }
diff --git a/TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx
index b20933495802c31b4320fd07400b5d8574967b30..f4986d0237c9aa28849d767a9e4f5d3f01e79d1e 100755
--- a/TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx
@@ -29,7 +29,7 @@ StatusCode TBHitPlaneContCnv::initialize()
 
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "TBHitPlaneContCnv");
-  log << MSG::INFO << "initialize()" << endreq;
+  log << MSG::INFO << "initialize()" << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -40,21 +40,21 @@ StatusCode TBHitPlaneContCnv::PoolToDataObject(DataObject*& pObj, const Token* t
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate
 
-  MsgStream log(messageService(), "TBHitPlaneContCnv::PoolToDataObject" );
+  MsgStream log(msgSvc(), "TBHitPlaneContCnv::PoolToDataObject" );
    
   StatusCode sc = TBHitPlaneContCnvBase::PoolToDataObject(pObj, token);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Unable to get object from pool" << endreq;
+    log << MSG::FATAL << "Unable to get object from pool" << endmsg;
     return StatusCode::FAILURE;
   } else {
-    log << MSG::DEBUG << " Found DataObject " << endreq;
+    log << MSG::DEBUG << " Found DataObject " << endmsg;
   }
     
   // Convert DataObject pointer to TBHitPlaneCont*
   TBHitPlaneCont* obj=0;
   SG::fromStorable(pObj, obj );
   if(!obj) {
-    log << MSG::ERROR << "  failed to cast to TBHitPlaneCont " << endreq ; 
+    log << MSG::ERROR << "  failed to cast to TBHitPlaneCont " << endmsg ; 
     return StatusCode::FAILURE; 
   }
 
@@ -63,7 +63,7 @@ StatusCode TBHitPlaneContCnv::PoolToDataObject(DataObject*& pObj, const Token* t
 
 StatusCode TBHitPlaneContCnv::DataObjectToPool(DataObject* pObj, const std::string &tname) 
 {
-  MsgStream log(messageService(),"TBHitPlaneContCnv::DataObjectToPool" );
+  MsgStream log(msgSvc(),"TBHitPlaneContCnv::DataObjectToPool" );
   
   return TBHitPlaneContCnvBase::DataObjectToPool( pObj, tname) ;
 }
diff --git a/TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx
index ddf7d1f049cced08536c9f9dd731ff8619733745..f344f29129624fdd3355de4cedbfa3ed2861f5db 100755
--- a/TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx
@@ -29,7 +29,7 @@ StatusCode TBIdentifiedParticleCnv::initialize()
 
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "TBIdentifiedParticleCnv");
-  log << MSG::INFO << "initialize()" << endreq;
+  log << MSG::INFO << "initialize()" << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -40,21 +40,21 @@ StatusCode TBIdentifiedParticleCnv::PoolToDataObject(DataObject*& pObj, const To
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate
 
-  MsgStream log(messageService(), "TBIdentifiedParticleCnv::PoolToDataObject" );
+  MsgStream log(msgSvc(), "TBIdentifiedParticleCnv::PoolToDataObject" );
    
   StatusCode sc = TBIdentifiedParticleCnvBase::PoolToDataObject(pObj, token);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Unable to get object from pool" << endreq;
+    log << MSG::FATAL << "Unable to get object from pool" << endmsg;
     return StatusCode::FAILURE;
   } else {
-    log << MSG::DEBUG << " Found DataObject " << endreq;
+    log << MSG::DEBUG << " Found DataObject " << endmsg;
   }
     
   // Convert DataObject pointer to TBIdentifiedParticle*
   TBIdentifiedParticle* obj=0;
   SG::fromStorable(pObj, obj );
   if(!obj) {
-    log << MSG::ERROR << "  failed to cast to TBIdentifiedParticle " << endreq ; 
+    log << MSG::ERROR << "  failed to cast to TBIdentifiedParticle " << endmsg ; 
     return StatusCode::FAILURE; 
   }
 
@@ -63,7 +63,7 @@ StatusCode TBIdentifiedParticleCnv::PoolToDataObject(DataObject*& pObj, const To
 
 StatusCode TBIdentifiedParticleCnv::DataObjectToPool(DataObject* pObj, const std::string &tname) 
 {
-  MsgStream log(messageService(),"TBIdentifiedParticleCnv::DataObjectToPool" );
+  MsgStream log(msgSvc(),"TBIdentifiedParticleCnv::DataObjectToPool" );
   
   return TBIdentifiedParticleCnvBase::DataObjectToPool( pObj, tname) ;
 }
diff --git a/TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx
index 73fb3abfdf928cff542273a28cdc9ba1da1fcc7f..38c4daf054e8b41a69c24a4dd690b50a4acc9b41 100755
--- a/TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx
@@ -29,7 +29,7 @@ StatusCode TBLArCalibDigitContainerCnv::initialize()
 
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "TBLArCalibDigitContainerCnv");
-  log << MSG::INFO << "initialize()" << endreq;
+  log << MSG::INFO << "initialize()" << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -40,21 +40,21 @@ StatusCode TBLArCalibDigitContainerCnv::PoolToDataObject(DataObject*& pObj, cons
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate
 
-  MsgStream log(messageService(), "TBLArCalibDigitContainerCnv::PoolToDataObject" );
+  MsgStream log(msgSvc(), "TBLArCalibDigitContainerCnv::PoolToDataObject" );
    
   StatusCode sc = TBLArCalibDigitContainerCnvBase::PoolToDataObject(pObj, token);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Unable to get object from pool" << endreq;
+    log << MSG::FATAL << "Unable to get object from pool" << endmsg;
     return StatusCode::FAILURE;
   } else {
-    log << MSG::DEBUG << " Found DataObject " << endreq;
+    log << MSG::DEBUG << " Found DataObject " << endmsg;
   }
     
   // Convert DataObject pointer to TBLArCalibDigitContainer*
   TBLArCalibDigitContainer* obj=0;
   SG::fromStorable(pObj, obj );
   if(!obj) {
-    log << MSG::ERROR << "  failed to cast to TBLArCalibDigitContainer " << endreq ; 
+    log << MSG::ERROR << "  failed to cast to TBLArCalibDigitContainer " << endmsg ; 
     return StatusCode::FAILURE; 
   }
 
@@ -63,7 +63,7 @@ StatusCode TBLArCalibDigitContainerCnv::PoolToDataObject(DataObject*& pObj, cons
 
 StatusCode TBLArCalibDigitContainerCnv::DataObjectToPool(DataObject* pObj, const std::string &tname) 
 {
-  MsgStream log(messageService(),"TBLArCalibDigitContainerCnv::DataObjectToPool" );
+  MsgStream log(msgSvc(),"TBLArCalibDigitContainerCnv::DataObjectToPool" );
   
   return TBLArCalibDigitContainerCnvBase::DataObjectToPool( pObj, tname) ;
 }
diff --git a/TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.cxx
index 8efc755c4a0d4921c05d554e1db42b63718db359..73125d6e0820d4593983fef5768fc423ba8955c0 100755
--- a/TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBLArDigitContainerCnv.cxx
@@ -16,8 +16,8 @@ TBLArDigitContainerCnv::TBLArDigitContainerCnv(ISvcLocator* svcLoc) :
 
 
 TBLArDigitContainerPERS* TBLArDigitContainerCnv::createPersistent(TBLArDigitContainer* trans) {
-    MsgStream log(messageService(), "TBLArDigitContainerCnv");
-    log << MSG::DEBUG << "Writing TBLArDigitContainer_p2" << endreq;
+    MsgStream log(msgSvc(), "TBLArDigitContainerCnv");
+    log << MSG::DEBUG << "Writing TBLArDigitContainer_p2" << endmsg;
     TBLArDigitContainerPERS* pers=new TBLArDigitContainerPERS();
     m_converter.transToPers(trans,pers,log); 
     return pers;
@@ -26,16 +26,16 @@ TBLArDigitContainerPERS* TBLArDigitContainerCnv::createPersistent(TBLArDigitCont
 
 
 TBLArDigitContainer* TBLArDigitContainerCnv::createTransient() {
-   MsgStream log(messageService(), "TBLArDigitContainerCnv" );
+   MsgStream log(msgSvc(), "TBLArDigitContainerCnv" );
    TBLArDigitContainer* trans=new TBLArDigitContainer();
    if (compareClassGuid(p0_guid)) {
      log << MSG::DEBUG << "Read version p0 of TBLArDigitContainer. GUID=" 
-         << m_classID.toString() << endreq;
+         << m_classID.toString() << endmsg;
      return poolReadObject<TBLArDigitContainer>();
    }
    else if (compareClassGuid(p1_guid)) {
      log << MSG::DEBUG << "Reading TBLArDigitContainer_p1. GUID=" 
-         << m_classID.toString() << endreq;
+         << m_classID.toString() << endmsg;
      TBLArDigitContainer_p1* pers=poolReadObject<TBLArDigitContainer_p1>();
      m_converter.persToTrans(pers,trans, log);
      delete pers;
@@ -43,7 +43,7 @@ TBLArDigitContainer* TBLArDigitContainerCnv::createTransient() {
    }
    else {
      log << MSG::ERROR << "Unsupported persistent version of TBLArDigitContainer. GUID="
-     << m_classID.toString() << endreq;
+     << m_classID.toString() << endmsg;
      throw std::runtime_error("Unsupported persistent version of Data Collection");
    }
    return trans;
diff --git a/TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.cxx
index 71d30f7c1684c11072f84534e8be4071a1b74307..659018ba6078253e9a0276f72eaf11d5c288b006 100755
--- a/TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBMWPCContCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBMWPCContCnv.h"
 
 TBMWPCCont_PERS* TBMWPCContCnv::createPersistent(TBMWPCCont* transCont) {
-    MsgStream log(messageService(), "TBMWPCContConverter" );
+    MsgStream log(msgSvc(), "TBMWPCContConverter" );
     TBMWPCCont_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBMWPCCont* TBMWPCContCnv::createTransient() {
-   MsgStream log(messageService(), "TBMWPCContConverter" );
+   MsgStream log(msgSvc(), "TBMWPCContConverter" );
    static pool::Guid   p1_guid("E1F16B8A-9D8B-4906-83EE-E38EBE63768A");  // GUID of the persistent object
    static pool::Guid   p0_guid("05F6DFD7-EB63-49DB-AA5B-F03BE66365AC");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx
index 571f3223b6b4afa6d9b0a33cda46adb824d9f9b7..0b7f66ad15be58153ef4dd5d9639b3565f5ecf2d 100755
--- a/TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx
@@ -29,7 +29,7 @@ StatusCode TBMWPCRawContCnv::initialize()
 
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "TBMWPCRawContCnv");
-  log << MSG::INFO << "initialize()" << endreq;
+  log << MSG::INFO << "initialize()" << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -40,21 +40,21 @@ StatusCode TBMWPCRawContCnv::PoolToDataObject(DataObject*& pObj, const Token* to
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate
 
-  MsgStream log(messageService(), "TBMWPCRawContCnv::PoolToDataObject" );
+  MsgStream log(msgSvc(), "TBMWPCRawContCnv::PoolToDataObject" );
    
   StatusCode sc = TBMWPCRawContCnvBase::PoolToDataObject(pObj, token);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Unable to get object from pool" << endreq;
+    log << MSG::FATAL << "Unable to get object from pool" << endmsg;
     return StatusCode::FAILURE;
   } else {
-    log << MSG::DEBUG << " Found DataObject " << endreq;
+    log << MSG::DEBUG << " Found DataObject " << endmsg;
   }
     
   // Convert DataObject pointer to TBMWPCRawCont*
   TBMWPCRawCont* obj=0;
   SG::fromStorable(pObj, obj );
   if(!obj) {
-    log << MSG::ERROR << "  failed to cast to TBMWPCRawCont " << endreq ; 
+    log << MSG::ERROR << "  failed to cast to TBMWPCRawCont " << endmsg ; 
     return StatusCode::FAILURE; 
   }
 
@@ -63,7 +63,7 @@ StatusCode TBMWPCRawContCnv::PoolToDataObject(DataObject*& pObj, const Token* to
 
 StatusCode TBMWPCRawContCnv::DataObjectToPool(DataObject* pObj, const std::string &tname) 
 {
-  MsgStream log(messageService(),"TBMWPCRawContCnv::DataObjectToPool" );
+  MsgStream log(msgSvc(),"TBMWPCRawContCnv::DataObjectToPool" );
   
   return TBMWPCRawContCnvBase::DataObjectToPool( pObj, tname) ;
 }
diff --git a/TestBeam/TBEventAthenaPool/src/TBPhaseCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBPhaseCnv.cxx
index fa5efbc9475f7aa3c1d23a55573a4546d432f001..527ba39c248bb929eb5cd3fe616dde864c29db51 100755
--- a/TestBeam/TBEventAthenaPool/src/TBPhaseCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBPhaseCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBPhaseCnv.h"
 
 TBPhase_PERS* TBPhaseCnv::createPersistent(TBPhase* transCont) {
-    MsgStream log(messageService(), "TBPhaseConverter" );
+    MsgStream log(msgSvc(), "TBPhaseConverter" );
     TBPhase_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBPhase* TBPhaseCnv::createTransient() {
-   MsgStream log(messageService(), "TBPhaseConverter" );
+   MsgStream log(msgSvc(), "TBPhaseConverter" );
    static pool::Guid   p1_guid("40443E91-053F-41C1-84F8-0A7F03F1DEC4");  // GUID of the persistent object
    static pool::Guid   p0_guid("C044C9BE-E371-4AC3-95ED-CCA05984EDE4");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.cxx
index 40ea0b9468735a4b2584e4a20e374bded66cefcf..950fec265f9ba8635df8876b9d21a33b7625fba5 100755
--- a/TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBScintillatorContCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBScintillatorContCnv.h"
 
 TBScintillatorCont_PERS* TBScintillatorContCnv::createPersistent(TBScintillatorCont* transCont) {
-    MsgStream log(messageService(), "TBScintillatorContConverter" );
+    MsgStream log(msgSvc(), "TBScintillatorContConverter" );
     TBScintillatorCont_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBScintillatorCont* TBScintillatorContCnv::createTransient() {
-   MsgStream log(messageService(), "TBScintillatorContConverter" );
+   MsgStream log(msgSvc(), "TBScintillatorContConverter" );
    static pool::Guid   p1_guid("5887098D-DBFE-4634-92AB-CC9968CCB09A");  // GUID of the persistent object
    static pool::Guid   p0_guid("AE688514-B192-426D-A971-5CD072593272");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx
index a7ac3bdf57c0d9e4f31e4d52700adcfee4d92125..2f927a8cbfd7f020902a6ddde7296e6c90e691d0 100755
--- a/TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx
@@ -29,7 +29,7 @@ StatusCode TBScintillatorRawContCnv::initialize()
 
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "TBScintillatorRawContCnv");
-  log << MSG::INFO << "initialize()" << endreq;
+  log << MSG::INFO << "initialize()" << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -40,21 +40,21 @@ StatusCode TBScintillatorRawContCnv::PoolToDataObject(DataObject*& pObj, const T
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate
 
-  MsgStream log(messageService(), "TBScintillatorRawContCnv::PoolToDataObject" );
+  MsgStream log(msgSvc(), "TBScintillatorRawContCnv::PoolToDataObject" );
    
   StatusCode sc = TBScintillatorRawContCnvBase::PoolToDataObject(pObj, token);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Unable to get object from pool" << endreq;
+    log << MSG::FATAL << "Unable to get object from pool" << endmsg;
     return StatusCode::FAILURE;
   } else {
-    log << MSG::DEBUG << " Found DataObject " << endreq;
+    log << MSG::DEBUG << " Found DataObject " << endmsg;
   }
     
   // Convert DataObject pointer to TBScintillatorRawCont*
   TBScintillatorRawCont* obj=0;
   SG::fromStorable(pObj, obj );
   if(!obj) {
-    log << MSG::ERROR << "  failed to cast to TBScintillatorRawCont " << endreq ; 
+    log << MSG::ERROR << "  failed to cast to TBScintillatorRawCont " << endmsg ; 
     return StatusCode::FAILURE; 
   }
 
@@ -63,7 +63,7 @@ StatusCode TBScintillatorRawContCnv::PoolToDataObject(DataObject*& pObj, const T
 
 StatusCode TBScintillatorRawContCnv::DataObjectToPool(DataObject* pObj, const std::string &tname) 
 {
-  MsgStream log(messageService(),"TBScintillatorRawContCnv::DataObjectToPool" );
+  MsgStream log(msgSvc(),"TBScintillatorRawContCnv::DataObjectToPool" );
   
   return TBScintillatorRawContCnvBase::DataObjectToPool( pObj, tname) ;
 }
diff --git a/TestBeam/TBEventAthenaPool/src/TBTDCCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBTDCCnv.cxx
index ff316d091f98a73919532248f720548b1be78a53..916520c323c165bfa8e79453e96c006736d8e6f5 100755
--- a/TestBeam/TBEventAthenaPool/src/TBTDCCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBTDCCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBTDCCnv.h"
 
 TBTDC_PERS* TBTDCCnv::createPersistent(TBTDC* transCont) {
-    MsgStream log(messageService(), "TBTDCConverter" );
+    MsgStream log(msgSvc(), "TBTDCConverter" );
     TBTDC_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBTDC* TBTDCCnv::createTransient() {
-   MsgStream log(messageService(), "TBTDCConverter" );
+   MsgStream log(msgSvc(), "TBTDCConverter" );
    static pool::Guid   p1_guid("D909CCF6-CE91-4401-98FC-C1C41BD06513");  // GUID of the persistent object
    static pool::Guid   p0_guid("51CEFACC-47E5-4BF1-8BF5-FA48FCA15B43");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.cxx
index 1b80c5d63ea24489e2fb5f1b17f3ac66a781b124..53c6b1637a2013d0f3b4fbf720fab6521f6a688d 100755
--- a/TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBTDCRawContCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBTDCRawContCnv.h"
 
 TBTDCRawCont_PERS* TBTDCRawContCnv::createPersistent(TBTDCRawCont* transCont) {
-    MsgStream log(messageService(), "TBTDCRawContConverter" );
+    MsgStream log(msgSvc(), "TBTDCRawContConverter" );
     TBTDCRawCont_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBTDCRawCont* TBTDCRawContCnv::createTransient() {
-   MsgStream log(messageService(), "TBTDCRawContConverter" );
+   MsgStream log(msgSvc(), "TBTDCRawContConverter" );
    static pool::Guid   p1_guid("C05FD0A4-E5AD-41C8-9EA5-2A71378BB247");  // GUID of the persistent object
    static pool::Guid   p0_guid("82D6D14E-49FE-4841-9B39-08D66B9DC7CE");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.cxx
index 3215aafdbc4fdd27ec0ac2814c4fcb9fc133c57f..0dea7357368da5b27ec1a99d1ebdac62bb38db1e 100755
--- a/TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBTailCatcherCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBTailCatcherCnv.h"
 
 TBTailCatcher_PERS* TBTailCatcherCnv::createPersistent(TBTailCatcher* transCont) {
-    MsgStream log(messageService(), "TBTailCatcherConverter" );
+    MsgStream log(msgSvc(), "TBTailCatcherConverter" );
     TBTailCatcher_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBTailCatcher* TBTailCatcherCnv::createTransient() {
-   MsgStream log(messageService(), "TBTailCatcherConverter" );
+   MsgStream log(msgSvc(), "TBTailCatcherConverter" );
    static pool::Guid   p1_guid("B304A3B8-5FC1-415D-AE97-E3E7B6769213");  // GUID of the persistent object
    static pool::Guid   p0_guid("7AA6F3C3-3FF2-4732-B0CB-4ECC32FEF06D");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx
index d474b6083543fce2fbb0c5ee8777e074cbc901a1..e87b38e848d932e49afa2e254ab736c8f5c8631a 100755
--- a/TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx
@@ -29,7 +29,7 @@ StatusCode TBTailCatcherRawCnv::initialize()
 
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), "TBTailCatcherRawCnv");
-  log << MSG::INFO << "initialize()" << endreq;
+  log << MSG::INFO << "initialize()" << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -40,21 +40,21 @@ StatusCode TBTailCatcherRawCnv::PoolToDataObject(DataObject*& pObj, const Token*
   // First call base class converter to get DataObject from
   // pool. Then modify as appropriate
 
-  MsgStream log(messageService(), "TBTailCatcherRawCnv::PoolToDataObject" );
+  MsgStream log(msgSvc(), "TBTailCatcherRawCnv::PoolToDataObject" );
    
   StatusCode sc = TBTailCatcherRawCnvBase::PoolToDataObject(pObj, token);
   if (sc.isFailure()) {
-    log << MSG::FATAL << "Unable to get object from pool" << endreq;
+    log << MSG::FATAL << "Unable to get object from pool" << endmsg;
     return StatusCode::FAILURE;
   } else {
-    log << MSG::DEBUG << " Found DataObject " << endreq;
+    log << MSG::DEBUG << " Found DataObject " << endmsg;
   }
     
   // Convert DataObject pointer to TBTailCatcherRaw*
   TBTailCatcherRaw* obj=0;
   SG::fromStorable(pObj, obj );
   if(!obj) {
-    log << MSG::ERROR << "  failed to cast to TBTailCatcherRaw " << endreq ; 
+    log << MSG::ERROR << "  failed to cast to TBTailCatcherRaw " << endmsg ; 
     return StatusCode::FAILURE; 
   }
 
@@ -63,7 +63,7 @@ StatusCode TBTailCatcherRawCnv::PoolToDataObject(DataObject*& pObj, const Token*
 
 StatusCode TBTailCatcherRawCnv::DataObjectToPool(DataObject* pObj, const std::string &tname) 
 {
-  MsgStream log(messageService(),"TBTailCatcherRawCnv::DataObjectToPool" );
+  MsgStream log(msgSvc(),"TBTailCatcherRawCnv::DataObjectToPool" );
   
   return TBTailCatcherRawCnvBase::DataObjectToPool( pObj, tname) ;
 }
diff --git a/TestBeam/TBEventAthenaPool/src/TBTrackCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBTrackCnv.cxx
index 18d5ad82fcb30f72a94698853a9b83e130a51b9d..cf83e65bba50b3e7359216433d13f22f6070b64f 100755
--- a/TestBeam/TBEventAthenaPool/src/TBTrackCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBTrackCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBTrackCnv.h"
 
 TBTrack_PERS* TBTrackCnv::createPersistent(TBTrack* transCont) {
-    MsgStream log(messageService(), "TBTrackConverter" );
+    MsgStream log(msgSvc(), "TBTrackConverter" );
     TBTrack_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBTrack* TBTrackCnv::createTransient() {
-   MsgStream log(messageService(), "TBTrackConverter" );
+   MsgStream log(msgSvc(), "TBTrackConverter" );
    static pool::Guid   p1_guid("9E50CAA3-CCDF-4BB9-96E9-E376B16963E8");  // GUID of the persistent object
    static pool::Guid   p0_guid("37E880D7-EBCB-4F53-8B14-490A4CEB71BD");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.cxx
index 5ac9bfc6aa4b74cd72fc4e30258af414f4e54e9f..6ff06e4294010fb9146afcdde35eaf49cb9e6f7b 100755
--- a/TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBTrackInfoCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBTrackInfoCnv.h"
 
 TBTrackInfo_PERS* TBTrackInfoCnv::createPersistent(TBTrackInfo* transCont) {
-    MsgStream log(messageService(), "TBTrackInfoConverter" );
+    MsgStream log(msgSvc(), "TBTrackInfoConverter" );
     TBTrackInfo_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBTrackInfo* TBTrackInfoCnv::createTransient() {
-   MsgStream log(messageService(), "TBTrackInfoConverter" );
+   MsgStream log(msgSvc(), "TBTrackInfoConverter" );
    static pool::Guid   p1_guid("A49F674F-25AD-496B-BEBE-DE1EBEAFE990");  // GUID of the persistent object
    static pool::Guid   p0_guid("5780AB02-D5D1-4537-B682-56CA95927BFB");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {
diff --git a/TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.cxx b/TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.cxx
index 04c441f7ce0a4802f4fe0058c7b48e18a0f3067b..09098afe4f65e8dccf16526b97ada2de1f703ff4 100755
--- a/TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.cxx
+++ b/TestBeam/TBEventAthenaPool/src/TBTriggerPatternUnitCnv.cxx
@@ -5,14 +5,14 @@
 #include "TBTriggerPatternUnitCnv.h"
 
 TBTriggerPatternUnit_PERS* TBTriggerPatternUnitCnv::createPersistent(TBTriggerPatternUnit* transCont) {
-    MsgStream log(messageService(), "TBTriggerPatternUnitConverter" );
+    MsgStream log(msgSvc(), "TBTriggerPatternUnitConverter" );
     TBTriggerPatternUnit_PERS *persObj = m_TPConverter.createPersistent( transCont, log );
-    log << MSG::DEBUG << "Success" << endreq;
+    log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
 TBTriggerPatternUnit* TBTriggerPatternUnitCnv::createTransient() {
-   MsgStream log(messageService(), "TBTriggerPatternUnitConverter" );
+   MsgStream log(msgSvc(), "TBTriggerPatternUnitConverter" );
    static pool::Guid   p1_guid("7630C108-3B5F-4ED3-97C8-F3148AF1B84F");  // GUID of the persistent object
    static pool::Guid   p0_guid("0B82A5B3-0808-4B78-B47B-BFE9388EEEEB");  // GUID of the transient object
    if( compareClassGuid(p1_guid) ) {