diff --git a/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py b/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
index d0ee9f370eb05fd187a8e80a04e5e57d4e354532..45ab4ceee83a8736e1a6f10c5e8fb6ceeabe4639 100644
--- a/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
@@ -288,18 +288,18 @@ def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
                                          merge='weightedAverage'
     )
     
-    #FCAL0
-    group_name_ending="FCAL0"
-    larAffectedRegAlg.FCAL0name=group_name_ending
-    affectedRegGroupFCAL0 = helper.addGroup(
+    #FCal0
+    group_name_ending="FCal0"
+    larAffectedRegAlg.FCal0name=group_name_ending
+    affectedRegGroupFCal0 = helper.addGroup(
         larAffectedRegAlg,
         affectedRegGroupName+group_name_ending,
         '/LAr/',
         'run'
     )
     
-    affectedRegGroupFCAL0.defineHistogram('etaPOS,phi;RAW_LArAffectedRegionsFCALA0',
-                                          title='HV Affected Regions - FCALA - Layer 1;#eta;#phi',
+    affectedRegGroupFCal0.defineHistogram('etaPOS,phi;RAW_LArAffectedRegionsFCalA0',
+                                          title='HV Affected Regions - FCalA - Layer 1;#eta;#phi',
                                           type='TH2F',
                                           path=larAffReg_hist_path,
                                           weight='problem',
@@ -307,8 +307,8 @@ def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
                                           ybins=lArDQGlobals.HVphi_HECFcal["FCalA"][0],ymin=lArDQGlobals.HVphi_HECFcal["FCalA"][1],ymax=lArDQGlobals.HVphi_HECFcal["FCalA"][2],
                                           merge='weightedAverage'
     )
-    affectedRegGroupFCAL0.defineHistogram('etaNEG,phi;RAW_LArAffectedRegionsFCALC0',
-                                          title='HV Affected Regions - FCALC - Layer 1;#eta;#phi',
+    affectedRegGroupFCal0.defineHistogram('etaNEG,phi;RAW_LArAffectedRegionsFCalC0',
+                                          title='HV Affected Regions - FCalC - Layer 1;#eta;#phi',
                                           type='TH2F',
                                           path=larAffReg_hist_path,
                                           weight='problem',
@@ -317,18 +317,18 @@ def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
                                           merge='weightedAverage'
     )
 
-    #FCAL1
-    group_name_ending="FCAL1"
-    larAffectedRegAlg.FCAL1name=group_name_ending
-    affectedRegGroupFCAL1 = helper.addGroup(
+    #FCal1
+    group_name_ending="FCal1"
+    larAffectedRegAlg.FCal1name=group_name_ending
+    affectedRegGroupFCal1 = helper.addGroup(
         larAffectedRegAlg,
         affectedRegGroupName+group_name_ending,
         '/LAr/',
         'run'
     )
     
-    affectedRegGroupFCAL1.defineHistogram('etaPOS,phi;RAW_LArAffectedRegionsFCALA1',
-                                          title='HV Affected Regions - FCALA - Layer 2;#eta;#phi',
+    affectedRegGroupFCal1.defineHistogram('etaPOS,phi;RAW_LArAffectedRegionsFCalA1',
+                                          title='HV Affected Regions - FCalA - Layer 2;#eta;#phi',
                                           type='TH2F',
                                           path=larAffReg_hist_path,
                                           weight='problem',
@@ -336,8 +336,8 @@ def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
                                           ybins=lArDQGlobals.HVphi_HECFcal["FCalA"][0],ymin=lArDQGlobals.HVphi_HECFcal["FCalA"][1],ymax=lArDQGlobals.HVphi_HECFcal["FCalA"][2],
                                           merge='weightedAverage'
     )
-    affectedRegGroupFCAL1.defineHistogram('etaNEG,phi;RAW_LArAffectedRegionsFCALC1',
-                                          title='HV Affected Regions - FCALC - Layer 2;#eta;#phi',
+    affectedRegGroupFCal1.defineHistogram('etaNEG,phi;RAW_LArAffectedRegionsFCalC1',
+                                          title='HV Affected Regions - FCalC - Layer 2;#eta;#phi',
                                           type='TH2F',
                                           path=larAffReg_hist_path,
                                           weight='problem',
@@ -346,18 +346,18 @@ def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
                                           merge='weightedAverage'
     )
 
-    #FCAL2
-    group_name_ending="FCAL2"
-    larAffectedRegAlg.FCAL2name=group_name_ending
-    affectedRegGroupFCAL2 = helper.addGroup(
+    #FCal2
+    group_name_ending="FCal2"
+    larAffectedRegAlg.FCal2name=group_name_ending
+    affectedRegGroupFCal2 = helper.addGroup(
         larAffectedRegAlg,
         affectedRegGroupName+group_name_ending,
         '/LAr/',
         'run'
     )
         
-    affectedRegGroupFCAL2.defineHistogram('etaPOS,phi;RAW_LArAffectedRegionsFCALA2',
-                                          title='HV Affected Regions - FCALA - Layer 3;#eta;#phi',
+    affectedRegGroupFCal2.defineHistogram('etaPOS,phi;RAW_LArAffectedRegionsFCalA2',
+                                          title='HV Affected Regions - FCalA - Layer 3;#eta;#phi',
                                           type='TH2F',
                                           path=larAffReg_hist_path,
                                           weight='problem',
@@ -365,8 +365,8 @@ def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
                                           ybins=lArDQGlobals.HVphi_HECFcal["FCalA"][0],ymin=lArDQGlobals.HVphi_HECFcal["FCalA"][1],ymax=lArDQGlobals.HVphi_HECFcal["FCalA"][2],
                                           merge='weightedAverage'
     )
-    affectedRegGroupFCAL2.defineHistogram('etaNEG,phi;RAW_LArAffectedRegionsFCALC2',
-                                          title='HV Affected Regions - FCALC - Layer 3;#eta;#phi',
+    affectedRegGroupFCal2.defineHistogram('etaNEG,phi;RAW_LArAffectedRegionsFCalC2',
+                                          title='HV Affected Regions - FCalC - Layer 3;#eta;#phi',
                                           type='TH2F',
                                           path=larAffReg_hist_path,
                                           weight='problem',
diff --git a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
index a7d2baa6475b90ad71670947e1b659bf262daac5..659684f13d3298331c2f2e85d690780266f6635d 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
@@ -82,7 +82,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
     #-- caloNoise groups --
     caloNoiseToolArrayEM = helper.addArray([nLayers],larCoverageAlg,caloNoiseToolGroupName+"EM")
     caloNoiseToolArrayHEC = helper.addArray([nLayers],larCoverageAlg,caloNoiseToolGroupName+"HEC")
-    caloNoiseToolArrayFCAL = helper.addArray([nLayers],larCoverageAlg,caloNoiseToolGroupName+"FCAL")
+    caloNoiseToolArrayFCal = helper.addArray([nLayers],larCoverageAlg,caloNoiseToolGroupName+"FCal")
     caloNoiseToolGroup = helper.addGroup( #for the LB histogram
         larCoverageAlg,
         caloNoiseToolGroupName,
@@ -134,10 +134,10 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
                                          path='LAr/'+caloNoiseTool_path,
                                          title='DBNoise in HEC',
                                          xbins=lArDQGlobals.etaCaloNoise_Bins,xmax=lArDQGlobals.etaCaloNoise_Max,xmin=lArDQGlobals.etaCaloNoise_Min)
-    caloNoiseToolArrayFCAL.defineHistogram('etaChan,noise;CaloNoiseFCAL_Sampling',
+    caloNoiseToolArrayFCal.defineHistogram('etaChan,noise;CaloNoiseFCal_Sampling',
                                          type='TProfile',
                                          path='LAr/'+caloNoiseTool_path,
-                                         title='DBNoise in FCAL',
+                                         title='DBNoise in FCal',
                                          xbins=lArDQGlobals.etaCaloNoise_FcalBins,xmax=lArDQGlobals.etaCaloNoise_FcalMax,xmin=lArDQGlobals.etaCaloNoise_FcalMin)
 
 
@@ -173,7 +173,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
 
     #--coverageHW histograms
     coverage_path=coveragePath+'perPartition/'
-    coverageToolArrayEMBA.defineHistogram('mon_ChanFtSlot,mon_Channels;RAW_CoverageHW_EMBA_statusCode',
+    coverageToolArrayEMBA.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_EMBA_statusCode',
                                             type='TH2I',
                                             path=coverage_path,
                                             title='Coverage - EMBA - statusCode={0};Feedthrough(+Slot increasing);Channel',
@@ -185,7 +185,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
                                             ymax=lArDQGlobals.FEB_N_channels-0.5,
                                             xlabels=lArDQGlobals.Feedthrough_Slot_labels_Barrel)
 
-    coverageToolArrayEMBC.defineHistogram('mon_ChanFtSlot,mon_Channels;RAW_CoverageHW_EMBC_statusCode',
+    coverageToolArrayEMBC.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_EMBC_statusCode',
                                             type='TH2I',
                                             path=coverage_path,
                                             title='Coverage - EMBC - statusCode={0};Feedthrough(+Slot increasing);Channel',
@@ -197,7 +197,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
                                             ymax=lArDQGlobals.FEB_N_channels-0.5,
                                             xlabels=lArDQGlobals.Feedthrough_Slot_labels_Barrel)
     
-    coverageToolArrayEMECA.defineHistogram('mon_ChanFtSlot,mon_Channels;RAW_CoverageHW_EMECA_statusCode',
+    coverageToolArrayEMECA.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_EMECA_statusCode',
                                            type='TH2I',
                                            path=coverage_path,
                                            title='Coverage - EMECA - statusCode={0};Feedthrough(+Slot increasing);Channel',
@@ -209,7 +209,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
                                            ymax=lArDQGlobals.FEB_N_channels-0.5,
                                            xlabels=lArDQGlobals.Feedthrough_Slot_labels_Endcap)
 
-    coverageToolArrayEMECC.defineHistogram('mon_ChanFtSlot,mon_Channels;RAW_CoverageHW_EMECA_statusCode',
+    coverageToolArrayEMECC.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_EMECA_statusCode',
                                            type='TH2I',
                                            path=coverage_path,
                                            title='Coverage - EMECC - statusCode={0};Feedthrough(+Slot increasing);Channel',
@@ -221,7 +221,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
                                            ymax=lArDQGlobals.FEB_N_channels-0.5,
                                            xlabels=lArDQGlobals.Feedthrough_Slot_labels_Endcap)
 
-    coverageToolArrayHECA.defineHistogram('mon_ChanFtSlot,mon_Channels;RAW_CoverageHW_HECA_statusCode',
+    coverageToolArrayHECA.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_HECA_statusCode',
                                            type='TH2I',
                                            path=coverage_path,
                                            title='Coverage - HECA - statusCode={0};Feedthrough(+Slot increasing);Channel',
@@ -233,7 +233,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
                                            ymax=lArDQGlobals.FEB_N_channels-0.5,
                                            xlabels=lArDQGlobals.Feedthrough_Slot_labels_Endcap)
 
-    coverageToolArrayHECC.defineHistogram('mon_ChanFtSlot,mon_Channels;RAW_CoverageHW_HECA_statusCode',
+    coverageToolArrayHECC.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_HECA_statusCode',
                                            type='TH2I',
                                            path=coverage_path,
                                            title='Coverage - HECC - statusCode={0};Feedthrough(+Slot increasing);Channel',
@@ -245,7 +245,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
                                            ymax=lArDQGlobals.FEB_N_channels-0.5,
                                            xlabels=lArDQGlobals.Feedthrough_Slot_labels_Endcap)
 
-    coverageToolArrayFCalA.defineHistogram('mon_ChanFtSlot,mon_Channels;RAW_CoverageHW_FCalA_statusCode',
+    coverageToolArrayFCalA.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_FCalA_statusCode',
                                            type='TH2I',
                                            path=coverage_path,
                                            title='Coverage - FCalA - statusCode={0};Feedthrough(+Slot increasing);Channel',
@@ -257,7 +257,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
                                            ymax=lArDQGlobals.FEB_N_channels-0.5,
                                            xlabels=lArDQGlobals.Feedthrough_Slot_labels_Endcap)
 
-    coverageToolArrayFCalC.defineHistogram('mon_ChanFtSlot,mon_Channels;RAW_CoverageHW_FCalC_statusCode',
+    coverageToolArrayFCalC.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_FCalC_statusCode',
                                            type='TH2I',
                                            path=coverage_path,
                                            title='Coverage - FCalC - statusCode={0};Feedthrough(+Slot increasing);Channel',
diff --git a/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
index 0d63962c795192ac05a0f04d9bb766c9614fab4a..290f2d42095ff3e226f16c0df19cc1b643e7164c 100644
--- a/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
@@ -95,7 +95,7 @@ def LArFEBMonConfigCore(helper,algoinstance,inputFlags, cellDebug=False, dspDebu
     summary_hist_path='Summary/'
     
     #-- TTree for corrupted events timestamp
-    Group.defineTree('timestamp,time_ns,febHwId,febError;LArCorrupted', 
+    Group.defineTree('timestamp,time_ns,febHwId,febErrorType;LArCorrupted', 
                      path=summary_hist_path,
                      title='Timestamps of corrupted LAr events',
                      treedef='timestamp/i:time_ns/i:febHwId/vector<int>:febErrorType/vector<int>')
@@ -152,7 +152,7 @@ def LArFEBMonConfigCore(helper,algoinstance,inputFlags, cellDebug=False, dspDebu
                                   path=summary_hist_path,
                                   xbins=lArDQGlobals.EvtRej_Bins, xmin=lArDQGlobals.EvtRej_Min, xmax=lArDQGlobals.EvtRej_Max,
                                   xlabels=lArDQGlobals.EvtRej_labels)
-    Group.defineHistogram('EvtRej,EvtRejYield1D;RAW_EventsRejectedYield', 
+    Group.defineHistogram('EvtRej,EvtRejYield1D;EventsRejectedYield', 
                                   title='Data corruption yield:Corruption type:Yield(%)',
                                   type='TProfile',
                                   path=summary_hist_path,
diff --git a/LArCalorimeter/LArMonitoring/python/LArMonPostProc.yaml b/LArCalorimeter/LArMonitoring/python/LArMonPostProc.yaml
index 831cbc5846f3b5b21e558fb3ab9cd68cda281474..2fd1e21e9a3fe1c841c6f60427a40da68b488aef 100644
--- a/LArCalorimeter/LArMonitoring/python/LArMonPostProc.yaml
+++ b/LArCalorimeter/LArMonitoring/python/LArMonPostProc.yaml
@@ -31,7 +31,7 @@ Parameters: { isFtSlotPlot : False }
 Description: LAr_Coverage_FillWithMax
 
 ---
-Input: [ 'LAr/Coverage/perPartition/RAW_CoverageHW(?P<sampling>[0123])(?P<part>\S+)_StatusCode_(?P<sc>\d+)' ]
+Input: [ 'LAr/Coverage/perPartition/CoverageHW(?P<sampling>[0123])(?P<part>\S+)_StatusCode_(?P<sc>\d+)' ]
 Output: [ 'LAr/Coverage/perPartition/CoverSampling{sampling}{part}' ]
 Function: LArMonTransforms.fillWithMaxCoverage
 Parameters: { isFtSlotPlot : True }
diff --git a/LArCalorimeter/LArMonitoring/share/LArMonitoring_jobOption.py b/LArCalorimeter/LArMonitoring/share/LArMonitoring_jobOption.py
index 42712ce8b2352657d6adaab2b1a799570bb4560f..771885ca3a893d9a013b1c24677e7757f766ae75 100644
--- a/LArCalorimeter/LArMonitoring/share/LArMonitoring_jobOption.py
+++ b/LArCalorimeter/LArMonitoring/share/LArMonitoring_jobOption.py
@@ -28,9 +28,9 @@ if 'ESD' not in DQMonFlags.monManEnvironment() and globalflags.DataSource == 'da
     from LArMonitoring.LArDigitMonAlg import LArDigitMonConfigOld
     topSequence +=LArDigitMonConfigOld(DQMonFlags)
 
-    if not DQMonFlags.doLArMon():
-        from LArMonitoring.LArRODMonAlg import LArRODMonConfigOld
-        topSequence +=LArRODMonConfigOld(DQMonFlags)
+#    if not DQMonFlags.doLArMon():
+    from LArMonitoring.LArRODMonAlg import LArRODMonConfigOld
+    topSequence +=LArRODMonConfigOld(DQMonFlags)
 
     from LArMonitoring.LArFEBMonAlg import LArFEBMonConfigOld
     topSequence +=LArFEBMonConfigOld(DQMonFlags)
diff --git a/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.h b/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.h
index 4b19bdb08b0a02f45f6579d118b90087daf03eb5..b3c687ce5e026b415ea2ab25984df2a78a5f97d3 100644
--- a/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.h
+++ b/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.h
@@ -53,9 +53,9 @@ class LArAffectedRegionsAlg: public AthMonitorAlgorithm
   Gaudi::Property<std::string> m_hec1Name {this,"HEC1name","HEC1"};
   Gaudi::Property<std::string> m_hec2Name {this,"HEC2name","HEC2"};
   Gaudi::Property<std::string> m_hec3Name {this,"HEC3name","HEC3"};
-  Gaudi::Property<std::string> m_fcal0Name {this,"FCAL0name","FCAL0"};
-  Gaudi::Property<std::string> m_fcal1Name {this,"FCAL1name","FCAL1"};
-  Gaudi::Property<std::string> m_fcal2Name {this,"FCAL2name","FCAL2"};
+  Gaudi::Property<std::string> m_fcal0Name {this,"FCal0name","FCAL0"};
+  Gaudi::Property<std::string> m_fcal1Name {this,"FCal1name","FCAL1"};
+  Gaudi::Property<std::string> m_fcal2Name {this,"FCal2name","FCAL2"};
 
   //Other properties
   Gaudi::Property<bool> m_IsOnline {this,"IsOnline",false};
diff --git a/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.cxx b/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.cxx
index 1279e5f28ba466ddf75c5ea9d7104793e72b4491..b22e8030686c1402166e0c40d64cbae1388b932a 100755
--- a/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.cxx
+++ b/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.cxx
@@ -97,7 +97,7 @@ LArCoverageAlg::initialize()
   /** tool maps (arrays of histograms) */
   m_CaloNoiseGroupArrEM = Monitored::buildToolMap<int>(m_tools,m_CaloNoiseToolGroupName+"EM",m_Nsample);
   m_CaloNoiseGroupArrHEC = Monitored::buildToolMap<int>(m_tools,m_CaloNoiseToolGroupName+"HEC",m_Nsample);
-  m_CaloNoiseGroupArrFCAL = Monitored::buildToolMap<int>(m_tools,m_CaloNoiseToolGroupName+"FCAL",m_Nsample);
+  m_CaloNoiseGroupArrFCAL = Monitored::buildToolMap<int>(m_tools,m_CaloNoiseToolGroupName+"FCal",m_Nsample);
 
   m_CoverageToolArrayEMBA = Monitored::buildToolMap<int>(m_tools,m_CoverageHWGroupName+"EMBA",m_availableErrorCodes);
   m_CoverageToolArrayEMECA = Monitored::buildToolMap<int>(m_tools,m_CoverageHWGroupName+"EMECA",m_availableErrorCodes);
diff --git a/LArCalorimeter/LArMonitoring/src/LArNoisyROMonAlg.cxx b/LArCalorimeter/LArMonitoring/src/LArNoisyROMonAlg.cxx
index 0d4b74c0ffa6b21397bd8d931be9799df90159ff..7dce1412fb4072a099cdbea5c3c996fb83ecadb2 100644
--- a/LArCalorimeter/LArMonitoring/src/LArNoisyROMonAlg.cxx
+++ b/LArCalorimeter/LArMonitoring/src/LArNoisyROMonAlg.cxx
@@ -307,15 +307,15 @@ StatusCode LArNoisyROMonAlg::fillHistograms(const EventContext& ctx) const
   // Event found noisy by Std method
   uint8_t BadFEBPartitions = noisyRO->BadFEBFlaggedPartitions();
   if ( BadFEBPartitions != 0) {
+    auto LBStd = Monitored::Scalar<unsigned>("LBStd",LBN);
+    auto LBStdV = Monitored::Scalar<unsigned>("LBStd_Veto",LBN);
     for (size_t i= 0;i<m_partitions.size();i++){
       if ( (BadFEBPartitions & partMask[i]) != 0 ) {
-        auto LBStd = Monitored::Scalar<unsigned>("LBNStd",LBN);
         fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBStd);
 	if ( m_doTrigger ) {
            fillTriggerHisto(i,trigbits,L1trigbits);
         }
 	if ( ! burstveto ) {
-           auto LBStdV = Monitored::Scalar<unsigned>("LBNStd_Veto",LBN);
            fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBStdV);
         }
       }
@@ -325,12 +325,12 @@ StatusCode LArNoisyROMonAlg::fillHistograms(const EventContext& ctx) const
   // event flagged by # of saturated quality cells
   uint8_t SatTightPartitions = noisyRO->SatTightFlaggedPartitions();
   if ( eventInfo->isEventFlagBitSet(xAOD::EventInfo::LAr,LArEventBitInfo::TIGHTSATURATEDQ) ) {
+    auto LBSat = Monitored::Scalar<unsigned>("LBSat",LBN);
+    auto LBSatV = Monitored::Scalar<unsigned>("LBSat_Veto",LBN);
     for (size_t i= 0;i<m_partitions.size();i++){
       if ( (SatTightPartitions & partMask[i]) != 0 ) {
-        auto LBSat = Monitored::Scalar<unsigned>("LBNSat",LBN);
         fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBSat);
 	if ( ! burstveto ) {
-           auto LBSatV = Monitored::Scalar<unsigned>("LBNSat_Veto",LBN);
            fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBSatV);
         }
       }
@@ -341,12 +341,12 @@ StatusCode LArNoisyROMonAlg::fillHistograms(const EventContext& ctx) const
   // event flagged by tight-MNB
   uint8_t MNBTightPartitions = noisyRO->MNBTightFlaggedPartitions();
   if ( MNBTightPartitions != 0) {
+    auto LBMTight = Monitored::Scalar<unsigned>("LBMNBTight",LBN);
+    auto LBMTightV = Monitored::Scalar<unsigned>("LBMNBTight_Veto",LBN);
     for (size_t i= 0;i<m_partitions.size();i++){
       if ( (MNBTightPartitions & partMask[i]) != 0 ) {
-         auto LBMTight = Monitored::Scalar<unsigned>("LBNMNBTight",LBN);
          fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBMTight);
 	 if ( ! burstveto ) {
-            auto LBMTightV = Monitored::Scalar<unsigned>("LBNMNBTight_Veto",LBN);
             fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBMTightV);
          }
       }
@@ -356,12 +356,12 @@ StatusCode LArNoisyROMonAlg::fillHistograms(const EventContext& ctx) const
   // event flagged by tight-MNB-PsVeto
   uint8_t MNBTight_PsVetoPartitions = noisyRO->MNBTight_PsVetoFlaggedPartitions();
   if ( MNBTight_PsVetoPartitions != 0) {
+    auto LBMTight_PsVeto = Monitored::Scalar<unsigned>("LBMNBTight_PsVeto",LBN);
+    auto LBMTight_PsVetoV = Monitored::Scalar<unsigned>("LBMNBTight_PsVeto_Veto",LBN);
     for (size_t i= 0;i<m_partitions.size();i++){
       if ( (MNBTight_PsVetoPartitions & partMask[i]) != 0 ) {
-         auto LBMTight_PsVeto = Monitored::Scalar<unsigned>("LBNMNBTight_PsVeto",LBN);
          fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBMTight_PsVeto);
          if ( ! burstveto ) {
-            auto LBMTight_PsVetoV = Monitored::Scalar<unsigned>("LBNMNBTight_PsVeto_Veto",LBN);
             fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBMTight_PsVetoV);
          }
       }
@@ -371,12 +371,12 @@ StatusCode LArNoisyROMonAlg::fillHistograms(const EventContext& ctx) const
   // event flagged by loose-MNB
   uint8_t MNBLoosePartitions = noisyRO->MNBLooseFlaggedPartitions();
   if ( MNBLoosePartitions != 0) {
+    auto LBMLoose = Monitored::Scalar<unsigned>("LBMNBLoose",LBN);
+    auto LBMLooseV = Monitored::Scalar<unsigned>("LBMNBLoose_Veto",LBN);
     for (size_t i= 0;i<m_partitions.size();i++){
       if ( (MNBLoosePartitions & partMask[i]) != 0 ) {
-         auto LBMLoose = Monitored::Scalar<unsigned>("LBNMNBLoose",LBN);
          fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBMLoose);
 	 if ( ! burstveto ) {
-            auto LBMLooseV = Monitored::Scalar<unsigned>("LBNMNBLoose_Veto",LBN);
             fill(m_tools[m_histoGroups.at(i/2).at(m_partitions[i])],LBMLooseV);
          }
       }