diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawChannelBSReadConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
similarity index 83%
rename from LArCalorimeter/LArCnv/LArByteStream/python/LArRawChannelBSReadConfig.py
rename to LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
index 29ada223dad27b1a3af45c8b669a73e5922d1662..1a4021543506a9b50463110fc7599e01fa451627 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawChannelBSReadConfig.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
@@ -1,13 +1,13 @@
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
-from LArByteStream.LArByteStreamConf import LArRawChannelBSReadAlg
+from LArByteStream.LArByteStreamConf import LArRawDataReadingAlg
 from LArGeoAlgsNV.LArGMConfig import LArGMCfg
 
-def LArRawChannelBRReadCfg(configFlags):
+def LArRawDataReadingCfg(configFlags):
     acc=ComponentAccumulator()
     acc.merge(LArGMCfg(configFlags)) #Needed for identifier helpers
     acc.merge(ByteStreamReadCfg(configFlags))    
-    acc.addEventAlgo(LArRawChannelBSReadAlg())
+    acc.addEventAlgo(LArRawDataReadingAlg())
     return acc
 
 
@@ -25,7 +25,7 @@ if __name__=="__main__":
     ConfigFlags.Input.Files = defaultTestFiles.RAW
     ConfigFlags.lock()
 
-    acc=LArRawChannelBRReadCfg(ConfigFlags)
+    acc=LArRawDataReadingCfg(ConfigFlags)
     
     from LArEventTest.LArEventTestConf import DumpLArRawChannels
     from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg 
@@ -34,6 +34,6 @@ if __name__=="__main__":
 
     #acc.getService("IOVDbSvc").OutputLevel=VERBOSE
 
-    f=open("LArRawChannelBSRead.pkl","w")
+    f=open("LArRawDataReading.pkl","w")
     acc.store(f)
     f.close()
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelBSReadAlg.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx
similarity index 94%
rename from LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelBSReadAlg.cxx
rename to LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx
index 00bd16297a5e5b53902ae204d4d0e9afb2243a17..7377e8f4c6ae15704ad2ac25f9fee4f5bf93684b 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelBSReadAlg.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.cxx
@@ -1,4 +1,4 @@
-#include "LArRawChannelBSReadAlg.h"
+#include "LArRawDataReadingAlg.h"
 #include "LArIdentifier/LArOnlineID.h"
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h" 
 #include "LArRawEvent/LArRawChannelContainer.h"
@@ -13,12 +13,12 @@
 #include "LArByteStream/LArRodBlockPhysicsV6.h"
 
 
-LArRawChannelBSReadAlg::LArRawChannelBSReadAlg(const std::string& name, ISvcLocator* pSvcLocator) :  
+LArRawDataReadingAlg::LArRawDataReadingAlg(const std::string& name, ISvcLocator* pSvcLocator) :  
   AthReentrantAlgorithm(name, pSvcLocator) {}
 
   
 
-StatusCode LArRawChannelBSReadAlg::initialize() {
+StatusCode LArRawDataReadingAlg::initialize() {
   if (m_rawChannelKey.key().size()>0) {
     ATH_CHECK(m_rawChannelKey.initialize());
   }
@@ -46,11 +46,11 @@ StatusCode LArRawChannelBSReadAlg::initialize() {
   return StatusCode::SUCCESS;
 }     
   
-StatusCode LArRawChannelBSReadAlg::finalize() {
+StatusCode LArRawDataReadingAlg::finalize() {
   return StatusCode::SUCCESS;
 } 
 
-StatusCode LArRawChannelBSReadAlg::execute(const EventContext& ctx) const {
+StatusCode LArRawDataReadingAlg::execute(const EventContext& ctx) const {
 
   //Write output via write handle
   SG::WriteHandle<LArRawChannelContainer>outputContainer(m_rawChannelKey,ctx);
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelBSReadAlg.h b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.h
similarity index 87%
rename from LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelBSReadAlg.h
rename to LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.h
index 26b0fae446e0a0b64b559859686fbc8c782e2530..ac616f81f67327782052f622fc0d7d969f0c47af 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawChannelBSReadAlg.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawDataReadingAlg.h
@@ -3,8 +3,8 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef LARBYSTREAM_LARRAWCHANNELBSREADALG_H
-#define LARBYSTREAM_LARRAWCHANNELBSREADALG_H
+#ifndef LARBYSTREAM_LARRAWDATAREADINDINGALG_H
+#define LARBYSTREAM_LARRAWDATAREADINDINGALG_H
 
 
 #include "AthenaBaseComps/AthReentrantAlgorithm.h"
@@ -22,9 +22,9 @@ class LArFebHeaderContainer;
 class LArOnlineID;
 class IROBDataProviderSvc;
 
-class LArRawChannelBSReadAlg : public  AthReentrantAlgorithm {
+class LArRawDataReadingAlg : public  AthReentrantAlgorithm {
  public:
-  LArRawChannelBSReadAlg(const std::string& name, ISvcLocator* pSvcLocator);
+  LArRawDataReadingAlg(const std::string& name, ISvcLocator* pSvcLocator);
 
   StatusCode initialize() override;
   StatusCode execute(const EventContext& ctx) const override;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
index c6ab45ef84308b3a633383c008694a779fba6793..a60b8cb93d279e55322e9ea24f799b6fa5ce4cc2 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
@@ -8,14 +8,14 @@
 #include "LArByteStream/LArRodDecoder.h"
 #include "LArByteStream/LArABBADecoder.h"
 #include "ByteStreamCnvSvcBase/CollectionByteStreamCnv.h"
-#include "../LArRawChannelBSReadAlg.h"
+#include "../LArRawDataReadingAlg.h"
 //#include "LArByteStream/LArRawChannelCollByteStreamTool.h"
 
 // Containers 
 DECLARE_COMPONENT( LArRawDataContByteStreamTool )
 DECLARE_COMPONENT( LArRodDecoder )
 DECLARE_COMPONENT( LArABBADecoder )
-DECLARE_COMPONENT( LArRawChannelBSReadAlg )
+DECLARE_COMPONENT( LArRawDataReadingAlg )
 
 DECLARE_CONVERTER( LArRawChannelContByteStreamCnv )
 DECLARE_CONVERTER( LArDigitContByteStreamCnv )