diff --git a/Event/ByteStreamCnvSvcLegacy/ByteStreamCnvSvcLegacy/offline_EventStorage/v5_DataWriter.h b/Event/ByteStreamCnvSvcLegacy/ByteStreamCnvSvcLegacy/offline_EventStorage/v5_DataWriter.h
index 2c4d3e64653c41b24835bf68bc72e45aa1dbf07a..705d5240f931832a34eb9734062a2d9aa7bde89a 100644
--- a/Event/ByteStreamCnvSvcLegacy/ByteStreamCnvSvcLegacy/offline_EventStorage/v5_DataWriter.h
+++ b/Event/ByteStreamCnvSvcLegacy/ByteStreamCnvSvcLegacy/offline_EventStorage/v5_DataWriter.h
@@ -334,7 +334,7 @@ public:
 
   int64_t            m_latestPosition; // offset of the latest written event
 
-  EventStorage::DataWriterCallBack *mp_callBack; // pointer to call-back, for reporting file names
+  EventStorage::DataWriterCallBack *m_callBack; // pointer to call-back, for reporting file names
 
   freeMetaDataStrings m_fmdStrings; // optional vector of strings, not written out if empty  
 
diff --git a/Event/ByteStreamCnvSvcLegacy/Changelog b/Event/ByteStreamCnvSvcLegacy/Changelog
deleted file mode 100644
index 5374fcfe2221771288609c2f8e00d9590f416d3a..0000000000000000000000000000000000000000
--- a/Event/ByteStreamCnvSvcLegacy/Changelog
+++ /dev/null
@@ -1,18 +0,0 @@
-2016-06-22 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
-	* Explicitly linking the library against boost_system with
-	  CMake. Since tdaq-common pulls in that dependency.
-	* Tagging as ByteStreamCnvSvcLegacy-00-00-04
-
-2016-03-24 Andy Salnikov <salnikov@slac.stanford.edu>
-	* Fix for compilation warning in v5_Guid.cxx
-	* Tagging as ByteStreamCnvSvcLegacy-00-00-03
-
-2016-03-23 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
-	* Added a hand-written CMakeLists.txt file to the package that builds
-	  it correctly in the CMake nightly.
-	* Removed the executable flag from all files of the package.
-	* Tagging as ByteStreamCnvSvcLegacy-00-00-02
-
-2016-03-16 Jack Cranshaw <cranshaw@anl.gov>
-	* ByteStreamCnvSvcLegacy-00-00-01
-	* First version
diff --git a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.cxx b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.cxx
index fd402a1a8bca37a2e91b5d12014bbf3ec97d52cd..7ca884a85faec7f6aba65da183168cfdd5a7c9ea 100644
--- a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.cxx
+++ b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.cxx
@@ -59,24 +59,24 @@ private:
 };
 
 offline_EventStorage_v5::DataBuffer::DataBuffer():
-  rep(new implementation())
+  m_rep(new implementation())
 {}
 
 offline_EventStorage_v5::DataBuffer::DataBuffer(const uint32_t& size):
-  rep(new implementation(size))
+  m_rep(new implementation(size))
 {}
 
 offline_EventStorage_v5::DataBuffer::~DataBuffer()
-{ delete rep; }
+{ delete m_rep; }
      
 void offline_EventStorage_v5::DataBuffer::realloc(const uint32_t& newsize)
-{ return rep->realloc(newsize); }
+{ return m_rep->realloc(newsize); }
 
 void offline_EventStorage_v5::DataBuffer::grow(const uint32_t& newsize)
-{ return rep->grow(newsize); }
+{ return m_rep->grow(newsize); }
 
 void* offline_EventStorage_v5::DataBuffer::handle()
-{ return rep->handle(); }
+{ return m_rep->handle(); }
     
 uint32_t offline_EventStorage_v5::DataBuffer::buffersize() const
-{ return rep->buffersize(); }
+{ return m_rep->buffersize(); }
diff --git a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.h b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.h
index f0d00f3b9faa7449fcddc739ae5711b36535e609..15f3d7bed0113e4a4406a9ccad46d42213fac73b 100644
--- a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.h
+++ b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.h
@@ -9,7 +9,7 @@
 #define OFFLINE_EVENTSTORAGE_V5_DATABUFFER_H
 
 #include <string>
-#include <v5_ESCompression.h>
+#include "v5_ESCompression.h"
 
 namespace offline_EventStorage_v5 {
   
@@ -30,7 +30,7 @@ namespace offline_EventStorage_v5 {
 
   private:
     class implementation;
-    implementation * rep;
+    implementation * m_rep;
     
     DataBuffer(const DataBuffer& aBuf);
     DataBuffer& operator= (const offline_EventStorage_v5::DataBuffer & aBuf);
diff --git a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataWriter.cxx b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataWriter.cxx
index b9e34de945376f815ca42e2d97ebf18692b315a5..11df5db1b4e67dbbec628d02035077b6e1cc39bc 100644
--- a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataWriter.cxx
+++ b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataWriter.cxx
@@ -174,7 +174,7 @@ initDW(const string writingPath,
   m_cFileOpen=false;
   m_openFailed = false;
   
-  mp_callBack = NULL;
+  m_callBack = NULL;
 
   m_fmdStrings = fmdStrings;
 
@@ -471,9 +471,9 @@ DWError DataWriter::closeFile()
   if(fileExists(nameFile(FINISHED)) && m_cFileOpen) 
     {
       ERS_DEBUG(2,"Finished file "<<nameFile(FINISHED));
-      if(mp_callBack != NULL) {
+      if(m_callBack != NULL) {
 	ERS_DEBUG(3,"Execute callback from DataWriter.");
-	mp_callBack->FileWasClosed(
+	m_callBack->FileWasClosed(
 				   m_filenamecallback->getCurrentFileName(),
 				   nameFile(FINISHED),
 				   m_streamType,
@@ -597,9 +597,9 @@ void DataWriter::openNextFile()
   m_cFileOpen = m_cFile.good();
   m_openFailed = !m_cFile.good();
   
-  if((mp_callBack != NULL) && m_cFileOpen) {
+  if((m_callBack != NULL) && m_cFileOpen) {
     ERS_DEBUG(3,"Execute callback from DataWriter.");
-    mp_callBack->FileWasOpened(
+    m_callBack->FileWasOpened(
 			       m_filenamecallback->getCurrentFileName(),
 			       nameFile(UNFINISHED),
 			       m_streamType,
@@ -730,9 +730,9 @@ void DataWriter::file_record(const offline_EventStorage_v5::freeMetaDataStrings&
 }
 
 void DataWriter::registerCallBack(DataWriterCallBack *pUserCBclass) {
-  mp_callBack = pUserCBclass;
-  if(mp_callBack != NULL) {
-    mp_callBack->FileWasOpened(
+  m_callBack = pUserCBclass;
+  if(m_callBack != NULL) {
+    m_callBack->FileWasOpened(
 			       m_filenamecallback->getCurrentFileName(),
 			       nameFile(UNFINISHED),
 			       m_streamType,