diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h
index 6b8d4b36f8f6ae27d54dbf7ceee2c51f66727838..5391de25f4c74fd533c316ec6ee1132ceefb6995 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h
@@ -32,7 +32,7 @@ class ISCTRawDataProviderTool : virtual public IAlgTool
                              SCT_ByteStreamFractionContainer* bsFracCont) = 0;
 
   //Replace the incident calls with private calls, more MT friendly
-  virtual void BeginNewEvent() = 0;
+  virtual void beginNewEvent() = 0;
 };
 
 #endif // SCT_RAWDATABYTESTREAMCNV_ISCTRAWDATAPROVIDERTOOL_H
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
index 175222f87b90b413e97bb37cbb16eb742a1fcc73..612fc080710c2dede3047e4cc7804a1aff2daee1 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
@@ -75,7 +75,7 @@ typedef EventContainers::IdentifiableContTemp<InDetRawDataCollection<SCT_RDORawD
 StatusCode SCTRawDataProvider::execute()
 {
 
-  m_rawDataTool->BeginNewEvent();
+  m_rawDataTool->beginNewEvent();
 
   SG::WriteHandle<SCT_RDO_Container> rdoContainer(m_rdoContainerKey);
   bool externalcacheRDO = !m_rdoContainerCacheKey.key().empty();
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
index 8f571a07a95af68c52141a9fbb712d5bc77b97e9..de6956867ca25d9ef8c37e8e9e7a61dfef899750 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
@@ -36,7 +36,7 @@ StatusCode SCTRawDataProviderTool::initialize()
 /// -------------------------------------------------------
 /// convert method
 
-void SCTRawDataProviderTool::BeginNewEvent() {
+void SCTRawDataProviderTool::beginNewEvent() {
    /** reset list of known robIds */
    m_robIdSet.clear(); 
 }
@@ -48,7 +48,7 @@ StatusCode SCTRawDataProviderTool::convert(std::vector<const ROBFragment*>& vecR
 {
   if(vecRobs.empty()) return StatusCode::SUCCESS;
   ATH_MSG_DEBUG("SCTRawDataProviderTool::convert()");
-  static int DecodeErrCount{0};
+  static int decodeErrCount{0};
 
   /**  are we working on a new event ? */
   std::vector<const ROBFragment*>::const_iterator rob_it{vecRobs.begin()};
@@ -68,12 +68,12 @@ StatusCode SCTRawDataProviderTool::convert(std::vector<const ROBFragment*>& vecR
     } else {
       sc = m_decoder->fillCollection(**rob_it, rdoIdc, errs, bsFracCont);
       if (sc==StatusCode::FAILURE) {
-        if (DecodeErrCount < 100) {
+        if (decodeErrCount < 100) {
           ATH_MSG_ERROR("Problem with SCT ByteStream Decoding!");
-          DecodeErrCount++;
-        } else if (100 == DecodeErrCount) {
+          decodeErrCount++;
+        } else if (100 == decodeErrCount) {
           ATH_MSG_ERROR("Too many Problem with SCT Decoding messages, turning message off.  ");
-          DecodeErrCount++;
+          decodeErrCount++;
         }
       }
     }
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.h
index 62532c6c04fac018bfe838c1cbaa0ab108375f18..ced1c8e33957cb19dc1d3afb5b981b3c7c628469 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.h
@@ -39,7 +39,7 @@ class SCTRawDataProviderTool : public extends<AthAlgTool, ISCTRawDataProviderToo
                              InDetBSErrContainer* errs,
                              SCT_ByteStreamFractionContainer* bsFracCont) override;
 
-  virtual void BeginNewEvent() override;
+  virtual void beginNewEvent() override;
 
  private: 
   
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
index 272bfdb1874df746ddf6a384bd55f26a8701be77..0e7a37e0ec2a9e0dcbb28a05e8e70f0319cf658c 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
@@ -126,7 +126,7 @@ namespace InDet {
   void TrigSCTRawDataProvider::handle(const Incident& inc) {
   if (inc.type() == "BeginEvent") {
     m_container->cleanup();
-    m_rawDataTool->BeginNewEvent();
+    m_rawDataTool->beginNewEvent();
   }  
 }