diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index c16372969befdef2b430f4769b87be26b5994b96..858bc3066f09c66bb451090a576c9c9c55581b4e 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -214,7 +214,7 @@ StatusCode AthenaOutputStream::initialize() {
       ATH_MSG_FATAL("Could not locate default store");
       return(status);
    } else {
-      ATH_MSG_DEBUG("Found " << m_dataStore.type() << " store.");
+      ATH_MSG_DEBUG("Found " << m_dataStore.typeAndName() << " store.");
    }
    assert(static_cast<bool>(m_dataStore));
    if (!m_metadataItemList.value().empty()) {
@@ -223,7 +223,7 @@ StatusCode AthenaOutputStream::initialize() {
          ATH_MSG_FATAL("Could not locate metadata store");
          return(status);
       } else {
-         ATH_MSG_DEBUG("Found " << m_metadataStore.type() << " store.");
+         ATH_MSG_DEBUG("Found " << m_metadataStore.typeAndName() << " store.");
       }
       assert(static_cast<bool>(m_metadataStore));
    }
@@ -258,7 +258,7 @@ StatusCode AthenaOutputStream::initialize() {
       ATH_MSG_FATAL("Cannot find " << m_streamer);
       return(status);
    }
-   status = m_streamer->connectServices(m_dataStore.type(), m_persName, m_extendProvenanceRecord);
+   status = m_streamer->connectServices(m_dataStore.typeAndName(), m_persName, m_extendProvenanceRecord);
    if (status.isFailure()) {
       ATH_MSG_FATAL("Unable to connect services");
       return(status);
@@ -460,7 +460,7 @@ void AthenaOutputStream::writeMetaData(const std::string outputFN)
    ATH_MSG_DEBUG("metadataItemList: " << m_metadataItemList.value() );
    if (!m_metadataItemList.value().empty()) {
       m_currentStore = &m_metadataStore;
-      StatusCode status = streamer->connectServices(m_metadataStore.type(), m_persName, false);
+      StatusCode status = streamer->connectServices(m_metadataStore.typeAndName(), m_persName, false);
       if (status.isFailure()) {
          throw GaudiException("Unable to connect metadata services", name(), StatusCode::FAILURE);
       }
@@ -478,7 +478,7 @@ void AthenaOutputStream::writeMetaData(const std::string outputFN)
       }
       m_outputAttributes.clear();
       m_currentStore = &m_dataStore;
-      status = streamer->connectServices(m_dataStore.type(), m_persName, m_extendProvenanceRecord);
+      status = streamer->connectServices(m_dataStore.typeAndName(), m_persName, m_extendProvenanceRecord);
       if (status.isFailure()) {
          throw GaudiException("Unable to re-connect services", name(), StatusCode::FAILURE);
       }
@@ -486,7 +486,7 @@ void AthenaOutputStream::writeMetaData(const std::string outputFN)
       if ((pAsIProp->setProperty(m_itemList)).isFailure()) {
          throw GaudiException("Folder property [itemList] not found", name(), StatusCode::FAILURE);
       }
-      ATH_MSG_INFO("Records written: " << m_events);
+      ATH_MSG_INFO("Metadata records written: " << m_events);
    }
 }
 
@@ -562,7 +562,7 @@ StatusCode AthenaOutputStream::write() {
          st->addRef();
          streamer = dynamic_cast<IAthenaOutputStreamTool*>( st );
          if( streamer->initialize().isFailure()
-             || streamer->connectServices(m_dataStore.type(), m_persName, m_extendProvenanceRecord).isFailure() ) {
+             || streamer->connectServices(m_dataStore.typeAndName(), m_persName, m_extendProvenanceRecord).isFailure() ) {
             ATH_MSG_FATAL("Unable to initialize OutputStreamTool for " << outputFN );
             return StatusCode::FAILURE;
          }
diff --git a/Control/AthenaServices/src/AthenaOutputStreamTool.cxx b/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
index 372fbd78089c464006e76fd0313975f7da135af7..67cdc026a2887d12538ee3ca84c67c77c1dbaa48 100644
--- a/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
@@ -122,7 +122,7 @@ StatusCode AthenaOutputStreamTool::connectServices(const std::string& dataStore,
    // Release old data store
    if (m_store.isValid()) {
       if (m_store.release().isFailure()) {
-         ATH_MSG_ERROR("Could not release " << m_store.type() << " store");
+         ATH_MSG_ERROR("Could not release " << m_store.typeAndName() << " store");
       }
    }
    m_store = ServiceHandle<StoreGateSvc>(dataStore, this->name());
@@ -143,7 +143,7 @@ StatusCode AthenaOutputStreamTool::connectServices(const std::string& dataStore,
 StatusCode AthenaOutputStreamTool::connectServices() {
    // Find the data store
    if (m_store.retrieve().isFailure() || m_store == 0) {
-      ATH_MSG_ERROR("Could not locate " << m_store.type() << " store");
+      ATH_MSG_ERROR("Could not locate " << m_store.typeAndName() << " store");
       return(StatusCode::FAILURE);
    }
    return(StatusCode::SUCCESS);