diff --git a/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
index 2e0136b3927b069cd946553c33134f2cb962dc73..6b48ce1db823ca01c0fe18ea242d6059679dd1c0 100644
--- a/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
@@ -250,106 +250,106 @@ output top_level {
 dir Pixel {
   dir Hits {
 
-    hist Occupancy_per_pixel_event_B0 {
+    hist OccupancyPerPixelEvent_B0 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_B1 {
+    hist OccupancyPerPixelEvent_B1 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_B2 {
+    hist OccupancyPerPixelEvent_B2 {
       algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_ECA {
+    hist OccupancyPerPixelEvent_ECA {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECA/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_ECC {
+    hist OccupancyPerPixelEvent_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_IBL {
+    hist OccupancyPerPixelEvent_IBL {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
-    hist AvgOcc_active_per_lumi_B0 {
+    hist AvgOccActivePerLumi_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_B1 {
+    hist AvgOccActivePerLumi_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_B2 {
+    hist AvgOccActivePerLumi_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_ECA {
+    hist AvgOccActivePerLumi_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_ECC {
+    hist AvgOccActivePerLumi_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_IBL {
+    hist AvgOccActivePerLumi_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/Hits
       display = StatBox
     }
 
-    hist AvgOcc_per_BCID_B0 {
+    hist AvgOccPerBCID_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_B1 {
+    hist AvgOccPerBCID_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_B2 {
+    hist AvgOccPerBCID_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_ECA {
+    hist AvgOccPerBCID_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_ECC {
+    hist AvgOccPerBCID_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_IBL {
+    hist AvgOccPerBCID_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
     }
 
-    hist Hits_per_lumi {
+    hist HitsPerLumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/GeneralAllHits
       output = InnerDetector/Pixel/DQShift/LBDependence
@@ -357,37 +357,37 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist Hits_per_lumi_ECA {
+    hist HitsPerLumi_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_ECC {
+    hist HitsPerLumi_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_IBL {
+    hist HitsPerLumi_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_B0 {
+    hist HitsPerLumi_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_B1 {
+    hist HitsPerLumi_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_B2 {
+    hist HitsPerLumi_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/_Experts/HitsLB
       display = StatBox
@@ -398,105 +398,105 @@ dir Pixel {
 
   dir Timing {
 
-    hist Cluster_LVL1A_SizeCut_IBL {
+    hist ClusterLVL1ASizeCut_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_B0 {
+    hist ClusterLVL1ASizeCut_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_B1 {
+    hist ClusterLVL1ASizeCut_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_B2 {
+    hist ClusterLVL1ASizeCut_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_ECA {
+    hist ClusterLVL1ASizeCut_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_ECC {
+    hist ClusterLVL1ASizeCut_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_IBL {
+    hist ClusterLVL1AToTCut_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_B0 {
+    hist ClusterLVL1AToTCut_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_B1 {
+    hist ClusterLVL1AToTCut_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_B2 {
+    hist ClusterLVL1AToTCut_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_ECA {
+    hist ClusterLVL1AToTCut_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_ECC {
+    hist ClusterLVL1AToTCut_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
-    hist Hit_LVL1A_IBL {
+    hist HitLVL1A_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_B0 {
+    hist HitLVL1A_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_B1 {
+    hist HitLVL1A_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_B2 {
+    hist HitLVL1A_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_ECA {
+    hist HitLVL1A_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_ECC {
+    hist HitLVL1A_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
-    hist Cluster_LVL1A {
+    hist ClusterLVL1A {
       algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PixelExpert/TimingAllHits
       display = StatBox
@@ -507,118 +507,118 @@ dir Pixel {
 
   dir TimingOnTrack {
 
-    hist Cluster_LVL1A_Mod_OnTrack_IBL {
+    hist ClusterLVL1AModOnTrack_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_B0 {
+    hist ClusterLVL1AModOnTrack_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_B1 {
+    hist ClusterLVL1AModOnTrack_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_B2 {
+    hist ClusterLVL1AModOnTrack_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_ECA {
+    hist ClusterLVL1AModOnTrack_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_ECC {
+    hist ClusterLVL1AModOnTrack_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
  
-    hist Cluster_LVL1A_SizeCut_OnTrack_IBL {
+    hist ClusterLVL1ASizeCutOnTrack_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_B0 {
+    hist ClusterLVL1ASizeCutOnTrack_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_B1 {
+    hist ClusterLVL1ASizeCutOnTrack_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_B2 {
+    hist ClusterLVL1ASizeCutOnTrack_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_ECA {
+    hist ClusterLVL1ASizeCutOnTrack_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_ECC {
+    hist ClusterLVL1ASizeCutOnTrack_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
-    hist Cluster_LVL1A_ToTCut_OnTrack_IBL {
+    hist ClusterLVL1AToTCutOnTrack_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     } 
-    hist Cluster_LVL1A_ToTCut_OnTrack_B0 {
+    hist ClusterLVL1AToTCutOnTrack_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_OnTrack_B1 {
+    hist ClusterLVL1AToTCutOnTrack_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_OnTrack_B2 {
+    hist ClusterLVL1AToTCutOnTrack_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_OnTrack_ECA {
+    hist ClusterLVL1AToTCutOnTrack_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_OnTrack_ECC {
+    hist ClusterLVL1AToTCutOnTrack_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
-    hist Cluster_LVL1A_OnTrack {
+    hist ClusterLVL1AOnTrack {
       algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PixelExpert/TimingAllHits
       display = StatBox
@@ -630,106 +630,106 @@ dir Pixel {
 
   dir Clusters {
 
-    hist Clus_Occ_SizeCut_IBL {
+    hist ClusOccSizeCut_IBL {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_B0 {
+    hist ClusOccSizeCut_B0 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_B1 {
+    hist ClusOccSizeCut_B1 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_B2 {
+    hist ClusOccSizeCut_B2 {
       algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_ECA {
+    hist ClusOccSizeCut_ECA {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECA/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_ECC {
+    hist ClusOccSizeCut_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
    
-    hist Cluster_Occupancy_IBL {
+    hist ClusterOccupancy_IBL {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_B0 {
+    hist ClusterOccupancy_B0 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_B1 {
+    hist ClusterOccupancy_B1 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_B2 {
+    hist ClusterOccupancy_B2 {
       algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_ECA {
+    hist ClusterOccupancy_ECA {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_ECC {
+    hist ClusterOccupancy_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
-    hist Clusters_per_lumi {
+    hist ClustersPerLumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/GeneralAllHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist Clusters_per_lumi_ECA {
+    hist ClustersPerLumi_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_ECC {
+    hist ClustersPerLumi_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_IBL {
+    hist ClustersPerLumi_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_B0 {
+    hist ClustersPerLumi_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_B1 {
+    hist ClustersPerLumi_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_B2 {
+    hist ClustersPerLumi_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/ClusterHits
       display = StatBox
@@ -740,68 +740,68 @@ dir Pixel {
 
   dir ClustersOnTrack {
  
-    hist Cluster_Occupancy_OnTrack_IBL {
+    hist ClusterOccupancyOnTrack_IBL {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_B0 {
+    hist ClusterOccupancyOnTrack_B0 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_B1 {
+    hist ClusterOccupancyOnTrack_B1 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_B2 {
+    hist ClusterOccupancyOnTrack_B2 {
       algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_ECA {
+    hist ClusterOccupancyOnTrack_ECA {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_ECC {
+    hist ClusterOccupancyOnTrack_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
-    hist Cluster_QxCosAlpha_OnTrack_IBL {
+    hist ClusterQxCosAlphaOnTrack_IBL {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_B0 {
+    hist ClusterQxCosAlphaOnTrack_B0 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_B1 {
+    hist ClusterQxCosAlphaOnTrack_B1 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_B2 {
+    hist ClusterQxCosAlphaOnTrack_B2 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_ECA {
+    hist ClusterQxCosAlphaOnTrack_ECA {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_ECC {
+    hist ClusterQxCosAlphaOnTrack_ECC {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
@@ -809,97 +809,87 @@ dir Pixel {
     }    
 
 
-    hist Cluster_ToTxCosAlpha_OnTrack_IBL {
+    hist ClusterToTxCosAlphaOnTrack_IBL {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_ECA {
+    hist ClusterToTxCosAlphaOnTrack_ECA {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_ECC {
+    hist ClusterToTxCosAlphaOnTrack_ECC {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_B0 {
+    hist ClusterToTxCosAlphaOnTrack_B0 {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_B1 {
+    hist ClusterToTxCosAlphaOnTrack_B1 {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_B2 {
+    hist ClusterToTxCosAlphaOnTrack_B2 {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
     
-    hist num_clusters {
-      algorithm = PixTrack_Noise_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = AxisRange(0.0,50.0,"X"),StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
-    }
+    #hist num_clusters {
+    #  algorithm = PixTrack_Noise_CheckHisto_Mean&GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = AxisRange(0.0,50.0,"X"),StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
+    #}
 
-    hist Cluster_groupsize_OnTrack {
-      algorithm = Histogram_Not_Empty
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
-    }
+    #hist Cluster_groupsize_OnTrack {
+    #  algorithm = Histogram_Not_Empty
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
+    #}
 
-    hist Cluster_Size_Map_OnTrack_B0 {
+    hist ClusterSizeMapOnTrack_B0 {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_B1 {
+    hist ClusterSizeMapOnTrack_B1 {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_B2 {
+    hist ClusterSizeMapOnTrack_B2 {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_ECA {
+    hist ClusterSizeMapOnTrack_ECA {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_ECC {
+    hist ClusterSizeMapOnTrack_ECC {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_IBL {
+    hist ClusterSizeMapOnTrack_IBL {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-   # hist Cluster_Size_Map_IBL2D {
-   #   algorithm =  Pix_Histogram_Not_Empty
-   #   output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-   #   description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-   # }
-   # hist Cluster_Size_Map_IBL3D {
-   #   algorithm = Pix_Histogram_Not_Empty
-   #   output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-   #   description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-   # }
 
     #hist Cluster_groupsize@1 {
     #  algorithm = Pix_Histogram_Not_Empty
@@ -938,239 +928,239 @@ dir Pixel {
     #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     #}
 
-    hist TotalClusters_per_lumi {
-      algorithm = Pix_LB_Bins_Diff_FromAvg
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist TotalClusters_per_lumi {
+    #  algorithm = Pix_LB_Bins_Diff_FromAvg
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist Clusters_per_lumi {
+    hist ClustersPerLumiOnTrack {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist Clusters_per_lumi_OnTrack_ECA {
+    hist ClustersPerLumiOnTrack_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_ECC {
+    hist ClustersPerLumiOnTrack_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_IBL {
+    hist ClustersPerLumiOnTrack_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_B0 {
+    hist ClustersPerLumiOnTrack_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_B1 {
+    hist ClustersPerLumiOnTrack_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_B2 {
+    hist ClustersPerLumiOnTrack_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist num_clusters_per_track_per_lumi_IBL {
+    hist NumClustersPerTrackPerLumi_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
-    hist num_clusters_per_track_per_lumi_B0 {
+    hist NumClustersPerTrackPerLumi_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
-    hist num_clusters_per_track_per_lumi_B1 {
+    hist NumClustersPerTrackPerLumi_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     } 
-    hist num_clusters_per_track_per_lumi_B2 {
+    hist NumClustersPerTrackPerLumi_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     } 
-    hist num_clusters_per_track_per_lumi_ECA {
+    hist NumClustersPerTrackPerLumi_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
-    hist num_clusters_per_track_per_lumi_ECC {
+    hist NumClustersPerTrackPerLumi_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
 
-    hist LargeClusters_per_lumi_OnTrack {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist LargeClusters_per_lumi_OnTrack {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist VeryLargeClusters_per_lumi_OnTrack {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist VeryLargeClusters_per_lumi_OnTrack {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist HighNClusters_per_lumi_OnTrack {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist HighNClusters_per_lumi_OnTrack {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
   }
 
 
   dir Status {
-    hist Map_Of_Modules_Status_IBL {
+    hist MapOfModulesStatus_IBL {
       algorithm = Pix_DisabledMod_B0B1
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist Map_Of_Modules_Status_B0 {
+    hist MapOfModulesStatus_B0 {
       algorithm = Pix_DisabledMod_B0B1
       output = InnerDetector/Pixel/PIX0/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist Map_Of_Modules_Status_B1 {
+    hist MapOfModulesStatus_B1 {
       algorithm = Pix_DisabledMod_B0B1
       output = InnerDetector/Pixel/PIX1/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist Map_Of_Modules_Status_B2 {
+    hist MapOfModulesStatus_B2 {
       algorithm = Pix_DisabledMod_B2
       output = InnerDetector/Pixel/PIX2/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist Map_Of_Modules_Status_ECA {
+    hist MapOfModulesStatus_ECA {
       algorithm = Pix_DisabledMod_Endcap
       output = InnerDetector/Pixel/PIXECA/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist Map_Of_Modules_Status_ECC {
+    hist MapOfModulesStatus_ECC {
       algorithm = Pix_DisabledMod_Endcap
       output = InnerDetector/Pixel/PIXECC/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist DisabledModules_per_lumi {
-      algorithm = Pix_DisabledLB_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist DisabledModules_per_lumi {
+    #  algorithm = Pix_DisabledLB_CheckHisto_Mean&GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/Errors/ALL
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist DisabledModules_per_lumi_ECA {
+    hist DisabledModulesPerLumi_ECA {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_Endcap&GatherData
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_ECC {
+    hist DisabledModulesPerLumi_ECC {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_Endcap&GatherData
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_IBL {
+    hist DisabledModulesPerLumi_IBL {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_IBL2D {
-      algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
-    hist DisabledModules_per_lumi_IBL3D {
-      algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
-    hist DisabledModules_per_lumi_B0 {
+    #hist DisabledModules_per_lumi_IBL2D {
+    #  algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist DisabledModules_per_lumi_IBL3D {
+    #  algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    hist DisabledModulesPerLumi_B0 {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_B1 {
+    hist DisabledModulesPerLumi_B1 {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_B2 {
+    hist DisabledModulesPerLumi_B2 {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_B2&GatherData
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist BadModules_per_lumi {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist BadModules_per_lumi {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/Errors/ALL
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist BadModules_per_lumi_ECA {
+    hist BadModulesPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_ECC {
+    hist BadModulesPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_IBL {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
-    hist BadModules_per_lumi_IBL2D {
+    hist BadModulesPerLumi_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_IBL3D {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
-    hist BadModules_per_lumi_B0 {
+    #hist BadModules_per_lumi_IBL2D {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist BadModules_per_lumi_IBL3D {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    hist BadModulesPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_B1 {
+    hist BadModulesPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_B2 {
+    hist BadModulesPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
@@ -1180,274 +1170,242 @@ dir Pixel {
 
   dir Errors {
 
-    hist SyncErrors_Mod_Frac_per_event_IBL {
+    hist SyncErrorsFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist SyncErrors_Mod_Frac_per_event_B0 {
+    hist SyncErrorsFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Mod_Frac_per_event_B1 {
+    hist SyncErrorsFracPerEvent_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Mod_Frac_per_event_B2 {
+    hist SyncErrorsFracPerEvent_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Mod_Frac_per_event_ECA {
+    hist SyncErrorsFracPerEvent_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Mod_Frac_per_event_ECC {
+    hist SyncErrorsFracPerEvent_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist SyncErrors_ROD_Frac_per_event_IBL {
+    hist SyncErrorsRODFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-
-    hist SyncErrors_ROD_Frac_per_event_B0 {
+    hist SyncErrorsRODFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_ROD_Frac_per_event_B1 {
+    hist SyncErrorsRODFracPerEvent_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_ROD_Frac_per_event_B2 {
+    hist SyncErrorsRODFracPerEvent_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_ROD_Frac_per_event_ECA {
+    hist SyncErrorsRODFracPerEvent_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_ROD_Frac_per_event_ECC {
+    hist SyncErrorsRODFracPerEvent_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist ErrorBit_per_lumi_IBL {
+    hist ErrorStatePerLumi_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_B0 {
+    hist ErrorStatePerLumi_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_B1 {
+    hist ErrorStatePerLumi_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_B2 {
+    hist ErrorStatePerLumi_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_ECA {
+    hist ErrorStatePerLumi_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_ECC {
+    hist ErrorStatePerLumi_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist ErrorBit_per_lumi_IBL {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_B0 {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_B1 {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_B2 {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_ECA {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_ECC {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-
-    hist SEUErrorsFrac_per_event_IBL {
+    hist SEUErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_B0 {
+    hist SEUErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_B1 {
+    hist SEUErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_B2 {
+    hist SEUErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_ECA {
+    hist SEUErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_ECC {
+    hist SEUErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist TimeoutErrorsFrac_per_event_IBL {
+    hist TimeoutErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_B0 {
+    hist TimeoutErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_B1 {
+    hist TimeoutErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_B2 {
+    hist TimeoutErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_ECA {
+    hist TimeoutErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_ECC {
+    hist TimeoutErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist OpticalErrorsFrac_per_event_IBL {
+    hist OpticalErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_B0 {
+    hist OpticalErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_B1 {
+    hist OpticalErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_B2 {
+    hist OpticalErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_ECA {
+    hist OpticalErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_ECC {
+    hist OpticalErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist TruncationErrorsFrac_per_event_IBL {
+    hist TruncationErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_per_event_B0 {
+    hist TruncationErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_B1 {
+    hist TruncationErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_per_event_B2 {
+    hist TruncationErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_per_event_ECA {
+    hist TruncationErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_per_event_ECC {
+    hist TruncationErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
@@ -1455,69 +1413,69 @@ dir Pixel {
     }
 
     ######################################
-    hist SyncErrorsFrac_per_event_IBL {
+    hist SyncErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_B0 {
+    hist SyncErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_B1 {
+    hist SyncErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_B2 {
+    hist SyncErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_ECA {
+    hist SyncErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_ECC {
+    hist SyncErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist errors_per_lumi_ECA {
+    hist ErrorsPerLumi_ECA {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_ECC {
+    hist ErrorsPerLumi_ECC {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_IBL {
+    hist ErrorsPerLumi_IBL {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_B0 {
+    hist ErrorsPerLumi_B0 {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_B1 {
+    hist ErrorsPerLumi_B1 {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_B2 {
+    hist ErrorsPerLumi_B2 {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
@@ -1526,342 +1484,343 @@ dir Pixel {
 
   dir ErrorsExpert {
 
-    hist FE_Warning_per_lumi_PIX {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
-    }
-    hist FE_Warning_per_lumi_ECA {
+    #hist FE_Warning_per_lumi_PIX {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+    #}
+    hist FEWarningPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
-    hist FE_Warning_per_lumi_ECC {
+    hist FEWarningPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
-    hist FE_Warning_per_lumi_B0 {
+    hist FEWarningPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
-    hist FE_Warning_per_lumi_B1 {
+    hist FEWarningPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
-    hist FE_Warning_per_lumi_B2 {
+    hist FEWarningPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
 
-    hist Mod_Sync_BCID1_errors_per_lumi_ECA {
+    hist ModSyncBCID1ErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
-    hist Mod_Sync_BCID1_errors_per_lumi_ECC {
+    hist ModSyncBCID1ErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
-    hist Mod_Sync_BCID1_errors_per_lumi_B0 {
+    hist ModSyncBCID1ErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
-    hist Mod_Sync_BCID1_errors_per_lumi_B1 {
+    hist ModSyncBCID1ErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
-    hist Mod_Sync_BCID1_errors_per_lumi_B2 {
+    hist ModSyncBCID1ErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
 
-    hist Mod_Sync_BCID2_errors_per_lumi_B0 {
+    hist ModSyncBCID2ErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
-    hist Mod_Sync_BCID2_errors_per_lumi_B1 {
+    hist ModSyncBCID2ErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
-    hist Mod_Sync_BCID2_errors_per_lumi_B2 {
+    hist ModSyncBCID2ErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
-    hist Mod_Sync_BCID2_errors_per_lumi_ECA {
+    hist ModSyncBCID2ErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
-    hist Mod_Sync_BCID2_errors_per_lumi_ECC {
+    hist ModSyncBCID2ErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
 
-    hist Mod_Sync_LVL1ID_errors_per_lumi_B0 {
+    hist ModSyncLVL1IDErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
-    hist Mod_Sync_LVL1ID_errors_per_lumi_B1 {
+    hist ModSyncLVL1IDErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
-    hist Mod_Sync_LVL1ID_errors_per_lumi_B2 {
+    hist ModSyncLVL1IDErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
-    hist Mod_Sync_LVL1ID_errors_per_lumi_ECA {
+    hist ModSyncLVL1IDErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
-    hist Mod_Sync_LVL1ID_errors_per_lumi_ECC {
+    hist ModSyncLVL1IDErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
 
-    hist Mod_Trunc_EOC_errors_per_lumi_ECA {
+    hist ModTruncEOCErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
-    hist Mod_Trunc_EOC_errors_per_lumi_ECC {
+    hist ModTruncEOCErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
-    hist Mod_Trunc_EOC_errors_per_lumi_B0 {
+    hist ModTruncEOCErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
-    hist Mod_Trunc_EOC_errors_per_lumi_B1 {
+    hist ModTruncEOCErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
-    hist Mod_Trunc_EOC_errors_per_lumi_B2 {
+    hist ModTruncEOCErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
 
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_B0 {
+    hist ModTruncEoEOverflowErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_B1 {
+    hist ModTruncEoEOverflowErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_B2 {
+    hist ModTruncEoEOverflowErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_ECA {
+    hist ModTruncEoEOverflowErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_ECC {
+    hist ModTruncEoEOverflowErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_B0 {
+
+    hist ModTruncHitOverflowErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_B1 {
+    hist ModTruncHitOverflowErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_B2 {
+    hist ModTruncHitOverflowErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_ECA {
+    hist ModTruncHitOverflowErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_ECC {
+    hist ModTruncHitOverflowErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
 
-    hist Optical_Errors_per_lumi_B0 {
+    hist OpticalErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
-    hist Optical_Errors_per_lumi_B1 {
+    hist OpticalErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
-    hist Optical_Errors_per_lumi_B2 {
+    hist OpticalErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
-    hist Optical_Errors_per_lumi_ECA {
+    hist OpticalErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
-    hist Optical_Errors_per_lumi_ECC {
+    hist OpticalErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
 
-    hist ROD_Sync_BCID_errors_per_lumi_B0 {
+    hist RODSyncBCIDErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
-    hist ROD_Sync_BCID_errors_per_lumi_B1 {
+    hist RODSyncBCIDErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
-    hist ROD_Sync_BCID_errors_per_lumi_B2 {
+    hist RODSyncBCIDErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
-    hist ROD_Sync_BCID_errors_per_lumi_ECA {
+    hist RODSyncBCIDErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
-    hist ROD_Sync_BCID_errors_per_lumi_ECC {
+    hist RODSyncBCIDErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
 
-    hist ROD_Sync_LVL1ID_errors_per_lumi_B0 {
+    hist RODSyncLVL1IDErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
-    hist ROD_Sync_LVL1ID_errors_per_lumi_B1 {
+    hist RODSyncLVL1IDErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
-    hist ROD_Sync_LVL1ID_errors_per_lumi_B2 {
+    hist RODSyncLVL1IDErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
-    hist ROD_Sync_LVL1ID_errors_per_lumi_ECA {
+    hist RODSyncLVL1IDErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
-    hist ROD_Sync_LVL1ID_errors_per_lumi_ECC {
+    hist RODSyncLVL1IDErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
 
-    hist ROD_Timeout_per_lumi_B0 {
+    hist RODTimeoutPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
-    hist ROD_Timeout_per_lumi_B1 {
+    hist RODTimeoutPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
-    hist ROD_Timeout_per_lumi_B2 {
+    hist RODTimeoutPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
-    hist ROD_Timeout_per_lumi_ECA {
+    hist RODTimeoutPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
-    hist ROD_Timeout_per_lumi_ECC {
+    hist RODTimeoutPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
 
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_B0 {
+    hist RODTruncHTLimitErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_B1 {
+    hist RODTruncHTLimitErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_B2 {
+    hist RODTruncHTLimitErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_ECA {
+    hist RODTruncHTLimitErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_ECC {
+    hist RODTruncHTLimitErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
 
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_B0 {
+    hist RODTruncRODOFErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_B1 {
+    hist RODTruncRODOFErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_B2 {
+    hist RODTruncRODOFErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_ECA {
+    hist RODTruncRODOFErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_ECC {
+    hist RODTruncRODOFErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
 
 
-    hist SEU_Hamming_per_lumi_ECA {
+    hist SEUHammingPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
-    hist SEU_Hamming_per_lumi_ECC {
+    hist SEUHammingPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
-    hist SEU_Hamming_per_lumi_B0 {
+    hist SEUHammingPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
-    hist SEU_Hamming_per_lumi_B1 {
+    hist SEUHammingPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
-    hist SEU_Hamming_per_lumi_B2 {
+    hist SEUHammingPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
 
-    hist SEU_Hit_Parity_per_lumi_ECA {
+    hist SEUHitParityPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
-    hist SEU_Hit_Parity_per_lumi_ECC {
+    hist SEUHitParityPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
-    hist SEU_Hit_Parity_per_lumi_B0 {
+    hist SEUHitParityPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
-    hist SEU_Hit_Parity_per_lumi_B1 {
+    hist SEUHitParityPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
-    hist SEU_Hit_Parity_per_lumi_B2 {
+    hist SEUHitParityPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
 
-    hist SEU_Register_Parity_per_lumi_ECA {
+    hist SEURegisterParityPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
-    hist SEU_Register_Parity_per_lumi_ECC {
+    hist SEURegisterParityPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
-    hist SEU_Register_Parity_per_lumi_B0 {
+    hist SEURegisterParityPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
-    hist SEU_Register_Parity_per_lumi_B1 {
+    hist SEURegisterParityPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
-    hist SEU_Register_Parity_per_lumi_B2 {
+    hist SEURegisterParityPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
@@ -1873,7 +1832,7 @@ dir Pixel {
   #Below plot Combined Tracks
   dir TrackOnTrack {
 
-    hist tracksPerEvt_per_lumi {
+    hist tracksPerEvtPerLumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/Tracks
       display = StatBox
@@ -1881,82 +1840,83 @@ dir Pixel {
     }
     
     ### Track State On Surface: Hole
-    hist TSOS_Hole_IBL {
+    hist TSOSHole_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_B0 {
+    hist TSOSHole_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_B1 {
+    hist TSOSHole_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_B2 {
+    hist TSOSHole_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_ECA {
+    hist TSOSHole_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_ECC {
+    hist TSOSHole_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
     ### Track State On Surface: Measurement
-    hist TSOS_Measurement_IBL {
+    hist TSOSMeasurement_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_B0 {
+    hist TSOSMeasurement_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_B1 {
+    hist TSOSMeasurement_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_B2 {
+    hist TSOSMeasurement_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_ECA {
+    hist TSOSMeasurement_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_ECC {
+    hist TSOSMeasurement_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
     ### Track State On Surface: Outlier
-    hist TSOS_Outlier_IBL {
+    hist TSOSOutlier_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_B0 {
+    hist TSOSOutlier_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_B1 {
+    hist TSOSOutlier_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_B2 {
+    hist TSOSOutlier_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_ECA {
+    hist TSOSOutlier_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_ECC {
+    hist TSOSOutlier_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
   }
 }
+
 # now get the pixel relevant plots from InDetGlobal
 dir InDetGlobal {
   dir Pixel {
diff --git a/DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config b/DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config
index 2e0136b3927b069cd946553c33134f2cb962dc73..6b48ce1db823ca01c0fe18ea242d6059679dd1c0 100644
--- a/DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config
@@ -250,106 +250,106 @@ output top_level {
 dir Pixel {
   dir Hits {
 
-    hist Occupancy_per_pixel_event_B0 {
+    hist OccupancyPerPixelEvent_B0 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_B1 {
+    hist OccupancyPerPixelEvent_B1 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_B2 {
+    hist OccupancyPerPixelEvent_B2 {
       algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_ECA {
+    hist OccupancyPerPixelEvent_ECA {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECA/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_ECC {
+    hist OccupancyPerPixelEvent_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Occupancy_per_pixel_event_IBL {
+    hist OccupancyPerPixelEvent_IBL {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
-    hist AvgOcc_active_per_lumi_B0 {
+    hist AvgOccActivePerLumi_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_B1 {
+    hist AvgOccActivePerLumi_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_B2 {
+    hist AvgOccActivePerLumi_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_ECA {
+    hist AvgOccActivePerLumi_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_ECC {
+    hist AvgOccActivePerLumi_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/Hits
       display = StatBox
     }
-    hist AvgOcc_active_per_lumi_IBL {
+    hist AvgOccActivePerLumi_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/Hits
       display = StatBox
     }
 
-    hist AvgOcc_per_BCID_B0 {
+    hist AvgOccPerBCID_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_B1 {
+    hist AvgOccPerBCID_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_B2 {
+    hist AvgOccPerBCID_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_ECA {
+    hist AvgOccPerBCID_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_ECC {
+    hist AvgOccPerBCID_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/_Experts/HitsLB
       display = StatBox
     }
-    hist AvgOcc_per_BCID_IBL {
+    hist AvgOccPerBCID_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
     }
 
-    hist Hits_per_lumi {
+    hist HitsPerLumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/GeneralAllHits
       output = InnerDetector/Pixel/DQShift/LBDependence
@@ -357,37 +357,37 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist Hits_per_lumi_ECA {
+    hist HitsPerLumi_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_ECC {
+    hist HitsPerLumi_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_IBL {
+    hist HitsPerLumi_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_B0 {
+    hist HitsPerLumi_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_B1 {
+    hist HitsPerLumi_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Hits_per_lumi_B2 {
+    hist HitsPerLumi_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/_Experts/HitsLB
       display = StatBox
@@ -398,105 +398,105 @@ dir Pixel {
 
   dir Timing {
 
-    hist Cluster_LVL1A_SizeCut_IBL {
+    hist ClusterLVL1ASizeCut_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_B0 {
+    hist ClusterLVL1ASizeCut_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_B1 {
+    hist ClusterLVL1ASizeCut_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_B2 {
+    hist ClusterLVL1ASizeCut_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_ECA {
+    hist ClusterLVL1ASizeCut_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_ECC {
+    hist ClusterLVL1ASizeCut_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_IBL {
+    hist ClusterLVL1AToTCut_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_B0 {
+    hist ClusterLVL1AToTCut_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_B1 {
+    hist ClusterLVL1AToTCut_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_B2 {
+    hist ClusterLVL1AToTCut_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_ECA {
+    hist ClusterLVL1AToTCut_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_ECC {
+    hist ClusterLVL1AToTCut_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
-    hist Hit_LVL1A_IBL {
+    hist HitLVL1A_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_B0 {
+    hist HitLVL1A_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_B1 {
+    hist HitLVL1A_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_B2 {
+    hist HitLVL1A_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_ECA {
+    hist HitLVL1A_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Hit_LVL1A_ECC {
+    hist HitLVL1A_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
-    hist Cluster_LVL1A {
+    hist ClusterLVL1A {
       algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PixelExpert/TimingAllHits
       display = StatBox
@@ -507,118 +507,118 @@ dir Pixel {
 
   dir TimingOnTrack {
 
-    hist Cluster_LVL1A_Mod_OnTrack_IBL {
+    hist ClusterLVL1AModOnTrack_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_B0 {
+    hist ClusterLVL1AModOnTrack_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_B1 {
+    hist ClusterLVL1AModOnTrack_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_B2 {
+    hist ClusterLVL1AModOnTrack_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_ECA {
+    hist ClusterLVL1AModOnTrack_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_Mod_OnTrack_ECC {
+    hist ClusterLVL1AModOnTrack_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
  
-    hist Cluster_LVL1A_SizeCut_OnTrack_IBL {
+    hist ClusterLVL1ASizeCutOnTrack_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_B0 {
+    hist ClusterLVL1ASizeCutOnTrack_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_B1 {
+    hist ClusterLVL1ASizeCutOnTrack_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_B2 {
+    hist ClusterLVL1ASizeCutOnTrack_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_ECA {
+    hist ClusterLVL1ASizeCutOnTrack_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_SizeCut_OnTrack_ECC {
+    hist ClusterLVL1ASizeCutOnTrack_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
-    hist Cluster_LVL1A_ToTCut_OnTrack_IBL {
+    hist ClusterLVL1AToTCutOnTrack_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     } 
-    hist Cluster_LVL1A_ToTCut_OnTrack_B0 {
+    hist ClusterLVL1AToTCutOnTrack_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_OnTrack_B1 {
+    hist ClusterLVL1AToTCutOnTrack_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_OnTrack_B2 {
+    hist ClusterLVL1AToTCutOnTrack_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_OnTrack_ECA {
+    hist ClusterLVL1AToTCutOnTrack_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
-    hist Cluster_LVL1A_ToTCut_OnTrack_ECC {
+    hist ClusterLVL1AToTCutOnTrack_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
-    hist Cluster_LVL1A_OnTrack {
+    hist ClusterLVL1AOnTrack {
       algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PixelExpert/TimingAllHits
       display = StatBox
@@ -630,106 +630,106 @@ dir Pixel {
 
   dir Clusters {
 
-    hist Clus_Occ_SizeCut_IBL {
+    hist ClusOccSizeCut_IBL {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_B0 {
+    hist ClusOccSizeCut_B0 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_B1 {
+    hist ClusOccSizeCut_B1 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_B2 {
+    hist ClusOccSizeCut_B2 {
       algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_ECA {
+    hist ClusOccSizeCut_ECA {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECA/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clus_Occ_SizeCut_ECC {
+    hist ClusOccSizeCut_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/_Experts/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
    
-    hist Cluster_Occupancy_IBL {
+    hist ClusterOccupancy_IBL {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_B0 {
+    hist ClusterOccupancy_B0 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_B1 {
+    hist ClusterOccupancy_B1 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_B2 {
+    hist ClusterOccupancy_B2 {
       algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_ECA {
+    hist ClusterOccupancy_ECA {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_ECC {
+    hist ClusterOccupancy_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
-    hist Clusters_per_lumi {
+    hist ClustersPerLumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/GeneralAllHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist Clusters_per_lumi_ECA {
+    hist ClustersPerLumi_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_ECC {
+    hist ClustersPerLumi_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_IBL {
+    hist ClustersPerLumi_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_B0 {
+    hist ClustersPerLumi_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_B1 {
+    hist ClustersPerLumi_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/ClusterHits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_B2 {
+    hist ClustersPerLumi_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/ClusterHits
       display = StatBox
@@ -740,68 +740,68 @@ dir Pixel {
 
   dir ClustersOnTrack {
  
-    hist Cluster_Occupancy_OnTrack_IBL {
+    hist ClusterOccupancyOnTrack_IBL {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_B0 {
+    hist ClusterOccupancyOnTrack_B0 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_B1 {
+    hist ClusterOccupancyOnTrack_B1 {
       algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_B2 {
+    hist ClusterOccupancyOnTrack_B2 {
       algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_ECA {
+    hist ClusterOccupancyOnTrack_ECA {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Occupancy_OnTrack_ECC {
+    hist ClusterOccupancyOnTrack_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
-    hist Cluster_QxCosAlpha_OnTrack_IBL {
+    hist ClusterQxCosAlphaOnTrack_IBL {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_B0 {
+    hist ClusterQxCosAlphaOnTrack_B0 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_B1 {
+    hist ClusterQxCosAlphaOnTrack_B1 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_B2 {
+    hist ClusterQxCosAlphaOnTrack_B2 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_ECA {
+    hist ClusterQxCosAlphaOnTrack_ECA {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_OnTrack_ECC {
+    hist ClusterQxCosAlphaOnTrack_ECC {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
@@ -809,97 +809,87 @@ dir Pixel {
     }    
 
 
-    hist Cluster_ToTxCosAlpha_OnTrack_IBL {
+    hist ClusterToTxCosAlphaOnTrack_IBL {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_ECA {
+    hist ClusterToTxCosAlphaOnTrack_ECA {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_ECC {
+    hist ClusterToTxCosAlphaOnTrack_ECC {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_B0 {
+    hist ClusterToTxCosAlphaOnTrack_B0 {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_B1 {
+    hist ClusterToTxCosAlphaOnTrack_B1 {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_ToTxCosAlpha_OnTrack_B2 {
+    hist ClusterToTxCosAlphaOnTrack_B2 {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
     
-    hist num_clusters {
-      algorithm = PixTrack_Noise_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = AxisRange(0.0,50.0,"X"),StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
-    }
+    #hist num_clusters {
+    #  algorithm = PixTrack_Noise_CheckHisto_Mean&GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = AxisRange(0.0,50.0,"X"),StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
+    #}
 
-    hist Cluster_groupsize_OnTrack {
-      algorithm = Histogram_Not_Empty
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
-    }
+    #hist Cluster_groupsize_OnTrack {
+    #  algorithm = Histogram_Not_Empty
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
+    #}
 
-    hist Cluster_Size_Map_OnTrack_B0 {
+    hist ClusterSizeMapOnTrack_B0 {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_B1 {
+    hist ClusterSizeMapOnTrack_B1 {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_B2 {
+    hist ClusterSizeMapOnTrack_B2 {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_ECA {
+    hist ClusterSizeMapOnTrack_ECA {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_ECC {
+    hist ClusterSizeMapOnTrack_ECC {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_OnTrack_IBL {
+    hist ClusterSizeMapOnTrack_IBL {
       algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-   # hist Cluster_Size_Map_IBL2D {
-   #   algorithm =  Pix_Histogram_Not_Empty
-   #   output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-   #   description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-   # }
-   # hist Cluster_Size_Map_IBL3D {
-   #   algorithm = Pix_Histogram_Not_Empty
-   #   output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-   #   description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-   # }
 
     #hist Cluster_groupsize@1 {
     #  algorithm = Pix_Histogram_Not_Empty
@@ -938,239 +928,239 @@ dir Pixel {
     #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     #}
 
-    hist TotalClusters_per_lumi {
-      algorithm = Pix_LB_Bins_Diff_FromAvg
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist TotalClusters_per_lumi {
+    #  algorithm = Pix_LB_Bins_Diff_FromAvg
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist Clusters_per_lumi {
+    hist ClustersPerLumiOnTrack {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist Clusters_per_lumi_OnTrack_ECA {
+    hist ClustersPerLumiOnTrack_ECA {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_ECC {
+    hist ClustersPerLumiOnTrack_ECC {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_IBL {
+    hist ClustersPerLumiOnTrack_IBL {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_B0 {
+    hist ClustersPerLumiOnTrack_B0 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_B1 {
+    hist ClustersPerLumiOnTrack_B1 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist Clusters_per_lumi_OnTrack_B2 {
+    hist ClustersPerLumiOnTrack_B2 {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist num_clusters_per_track_per_lumi_IBL {
+    hist NumClustersPerTrackPerLumi_IBL {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
-    hist num_clusters_per_track_per_lumi_B0 {
+    hist NumClustersPerTrackPerLumi_B0 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
-    hist num_clusters_per_track_per_lumi_B1 {
+    hist NumClustersPerTrackPerLumi_B1 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     } 
-    hist num_clusters_per_track_per_lumi_B2 {
+    hist NumClustersPerTrackPerLumi_B2 {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     } 
-    hist num_clusters_per_track_per_lumi_ECA {
+    hist NumClustersPerTrackPerLumi_ECA {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
-    hist num_clusters_per_track_per_lumi_ECC {
+    hist NumClustersPerTrackPerLumi_ECC {
       algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
 
-    hist LargeClusters_per_lumi_OnTrack {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist LargeClusters_per_lumi_OnTrack {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist VeryLargeClusters_per_lumi_OnTrack {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist VeryLargeClusters_per_lumi_OnTrack {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist HighNClusters_per_lumi_OnTrack {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist HighNClusters_per_lumi_OnTrack {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
+    #  display = StatBox
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
   }
 
 
   dir Status {
-    hist Map_Of_Modules_Status_IBL {
+    hist MapOfModulesStatus_IBL {
       algorithm = Pix_DisabledMod_B0B1
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist Map_Of_Modules_Status_B0 {
+    hist MapOfModulesStatus_B0 {
       algorithm = Pix_DisabledMod_B0B1
       output = InnerDetector/Pixel/PIX0/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist Map_Of_Modules_Status_B1 {
+    hist MapOfModulesStatus_B1 {
       algorithm = Pix_DisabledMod_B0B1
       output = InnerDetector/Pixel/PIX1/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist Map_Of_Modules_Status_B2 {
+    hist MapOfModulesStatus_B2 {
       algorithm = Pix_DisabledMod_B2
       output = InnerDetector/Pixel/PIX2/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist Map_Of_Modules_Status_ECA {
+    hist MapOfModulesStatus_ECA {
       algorithm = Pix_DisabledMod_Endcap
       output = InnerDetector/Pixel/PIXECA/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist Map_Of_Modules_Status_ECC {
+    hist MapOfModulesStatus_ECC {
       algorithm = Pix_DisabledMod_Endcap
       output = InnerDetector/Pixel/PIXECC/DisableAndErrors
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist DisabledModules_per_lumi {
-      algorithm = Pix_DisabledLB_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist DisabledModules_per_lumi {
+    #  algorithm = Pix_DisabledLB_CheckHisto_Mean&GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/Errors/ALL
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist DisabledModules_per_lumi_ECA {
+    hist DisabledModulesPerLumi_ECA {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_Endcap&GatherData
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_ECC {
+    hist DisabledModulesPerLumi_ECC {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_Endcap&GatherData
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_IBL {
+    hist DisabledModulesPerLumi_IBL {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_IBL2D {
-      algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
-    hist DisabledModules_per_lumi_IBL3D {
-      algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
-    hist DisabledModules_per_lumi_B0 {
+    #hist DisabledModules_per_lumi_IBL2D {
+    #  algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist DisabledModules_per_lumi_IBL3D {
+    #  algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    hist DisabledModulesPerLumi_B0 {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_B1 {
+    hist DisabledModulesPerLumi_B1 {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist DisabledModules_per_lumi_B2 {
+    hist DisabledModulesPerLumi_B2 {
       algorithm = Pix_DisabledLB_CheckHisto_Mean_B2&GatherData
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist BadModules_per_lumi {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
+    #hist BadModules_per_lumi {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/Errors/ALL
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
 
-    hist BadModules_per_lumi_ECA {
+    hist BadModulesPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_ECC {
+    hist BadModulesPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_IBL {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
-    hist BadModules_per_lumi_IBL2D {
+    hist BadModulesPerLumi_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_IBL3D {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
-    }
-    hist BadModules_per_lumi_B0 {
+    #hist BadModules_per_lumi_IBL2D {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist BadModules_per_lumi_IBL3D {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    hist BadModulesPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_B1 {
+    hist BadModulesPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist BadModules_per_lumi_B2 {
+    hist BadModulesPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
@@ -1180,274 +1170,242 @@ dir Pixel {
 
   dir Errors {
 
-    hist SyncErrors_Mod_Frac_per_event_IBL {
+    hist SyncErrorsFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist SyncErrors_Mod_Frac_per_event_B0 {
+    hist SyncErrorsFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Mod_Frac_per_event_B1 {
+    hist SyncErrorsFracPerEvent_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Mod_Frac_per_event_B2 {
+    hist SyncErrorsFracPerEvent_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Mod_Frac_per_event_ECA {
+    hist SyncErrorsFracPerEvent_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Mod_Frac_per_event_ECC {
+    hist SyncErrorsFracPerEvent_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist SyncErrors_ROD_Frac_per_event_IBL {
+    hist SyncErrorsRODFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-
-    hist SyncErrors_ROD_Frac_per_event_B0 {
+    hist SyncErrorsRODFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_ROD_Frac_per_event_B1 {
+    hist SyncErrorsRODFracPerEvent_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_ROD_Frac_per_event_B2 {
+    hist SyncErrorsRODFracPerEvent_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_ROD_Frac_per_event_ECA {
+    hist SyncErrorsRODFracPerEvent_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_ROD_Frac_per_event_ECC {
+    hist SyncErrorsRODFracPerEvent_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist ErrorBit_per_lumi_IBL {
+    hist ErrorStatePerLumi_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_B0 {
+    hist ErrorStatePerLumi_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_B1 {
+    hist ErrorStatePerLumi_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_B2 {
+    hist ErrorStatePerLumi_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_ECA {
+    hist ErrorStatePerLumi_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorBit_per_lumi_ECC {
+    hist ErrorStatePerLumi_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist ErrorBit_per_lumi_IBL {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_B0 {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_B1 {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_B2 {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_ECA {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-    hist ErrorBit_per_lumi_ECC {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
-
-    hist SEUErrorsFrac_per_event_IBL {
+    hist SEUErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_B0 {
+    hist SEUErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_B1 {
+    hist SEUErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_B2 {
+    hist SEUErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_ECA {
+    hist SEUErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SEUErrorsFrac_per_event_ECC {
+    hist SEUErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist TimeoutErrorsFrac_per_event_IBL {
+    hist TimeoutErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_B0 {
+    hist TimeoutErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_B1 {
+    hist TimeoutErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_B2 {
+    hist TimeoutErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_ECA {
+    hist TimeoutErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TimeoutErrorsFrac_per_event_ECC {
+    hist TimeoutErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist OpticalErrorsFrac_per_event_IBL {
+    hist OpticalErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_B0 {
+    hist OpticalErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_B1 {
+    hist OpticalErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_B2 {
+    hist OpticalErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_ECA {
+    hist OpticalErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist OpticalErrorsFrac_per_event_ECC {
+    hist OpticalErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist TruncationErrorsFrac_per_event_IBL {
+    hist TruncationErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_per_event_B0 {
+    hist TruncationErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_B1 {
+    hist TruncationErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_per_event_B2 {
+    hist TruncationErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_per_event_ECA {
+    hist TruncationErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist TruncationErrorsFrac_per_event_ECC {
+    hist TruncationErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
@@ -1455,69 +1413,69 @@ dir Pixel {
     }
 
     ######################################
-    hist SyncErrorsFrac_per_event_IBL {
+    hist SyncErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_B0 {
+    hist SyncErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_B1 {
+    hist SyncErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_B2 {
+    hist SyncErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_ECA {
+    hist SyncErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsFrac_per_event_ECC {
+    hist SyncErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist errors_per_lumi_ECA {
+    hist ErrorsPerLumi_ECA {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_ECC {
+    hist ErrorsPerLumi_ECC {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_IBL {
+    hist ErrorsPerLumi_IBL {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_B0 {
+    hist ErrorsPerLumi_B0 {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_B1 {
+    hist ErrorsPerLumi_B1 {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    hist errors_per_lumi_B2 {
+    hist ErrorsPerLumi_B2 {
       algorithm = Pix_ErrorLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
@@ -1526,342 +1484,343 @@ dir Pixel {
 
   dir ErrorsExpert {
 
-    hist FE_Warning_per_lumi_PIX {
-      algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
-    }
-    hist FE_Warning_per_lumi_ECA {
+    #hist FE_Warning_per_lumi_PIX {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+    #}
+    hist FEWarningPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
-    hist FE_Warning_per_lumi_ECC {
+    hist FEWarningPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
-    hist FE_Warning_per_lumi_B0 {
+    hist FEWarningPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
-    hist FE_Warning_per_lumi_B1 {
+    hist FEWarningPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
-    hist FE_Warning_per_lumi_B2 {
+    hist FEWarningPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
     }
 
-    hist Mod_Sync_BCID1_errors_per_lumi_ECA {
+    hist ModSyncBCID1ErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
-    hist Mod_Sync_BCID1_errors_per_lumi_ECC {
+    hist ModSyncBCID1ErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
-    hist Mod_Sync_BCID1_errors_per_lumi_B0 {
+    hist ModSyncBCID1ErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
-    hist Mod_Sync_BCID1_errors_per_lumi_B1 {
+    hist ModSyncBCID1ErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
-    hist Mod_Sync_BCID1_errors_per_lumi_B2 {
+    hist ModSyncBCID1ErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
     }
 
-    hist Mod_Sync_BCID2_errors_per_lumi_B0 {
+    hist ModSyncBCID2ErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
-    hist Mod_Sync_BCID2_errors_per_lumi_B1 {
+    hist ModSyncBCID2ErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
-    hist Mod_Sync_BCID2_errors_per_lumi_B2 {
+    hist ModSyncBCID2ErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
-    hist Mod_Sync_BCID2_errors_per_lumi_ECA {
+    hist ModSyncBCID2ErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
-    hist Mod_Sync_BCID2_errors_per_lumi_ECC {
+    hist ModSyncBCID2ErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
     }
 
-    hist Mod_Sync_LVL1ID_errors_per_lumi_B0 {
+    hist ModSyncLVL1IDErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
-    hist Mod_Sync_LVL1ID_errors_per_lumi_B1 {
+    hist ModSyncLVL1IDErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
-    hist Mod_Sync_LVL1ID_errors_per_lumi_B2 {
+    hist ModSyncLVL1IDErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
-    hist Mod_Sync_LVL1ID_errors_per_lumi_ECA {
+    hist ModSyncLVL1IDErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
-    hist Mod_Sync_LVL1ID_errors_per_lumi_ECC {
+    hist ModSyncLVL1IDErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
     }
 
-    hist Mod_Trunc_EOC_errors_per_lumi_ECA {
+    hist ModTruncEOCErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
-    hist Mod_Trunc_EOC_errors_per_lumi_ECC {
+    hist ModTruncEOCErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
-    hist Mod_Trunc_EOC_errors_per_lumi_B0 {
+    hist ModTruncEOCErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
-    hist Mod_Trunc_EOC_errors_per_lumi_B1 {
+    hist ModTruncEOCErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
-    hist Mod_Trunc_EOC_errors_per_lumi_B2 {
+    hist ModTruncEOCErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
     }
 
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_B0 {
+    hist ModTruncEoEOverflowErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_B1 {
+    hist ModTruncEoEOverflowErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_B2 {
+    hist ModTruncEoEOverflowErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_ECA {
+    hist ModTruncEoEOverflowErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_EoE_Overflow_errors_per_lumi_ECC {
+    hist ModTruncEoEOverflowErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_B0 {
+
+    hist ModTruncHitOverflowErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_B1 {
+    hist ModTruncHitOverflowErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_B2 {
+    hist ModTruncHitOverflowErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_ECA {
+    hist ModTruncHitOverflowErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
-    hist Mod_Trunc_Hit_Overflow_errors_per_lumi_ECC {
+    hist ModTruncHitOverflowErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
     }
 
-    hist Optical_Errors_per_lumi_B0 {
+    hist OpticalErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
-    hist Optical_Errors_per_lumi_B1 {
+    hist OpticalErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
-    hist Optical_Errors_per_lumi_B2 {
+    hist OpticalErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
-    hist Optical_Errors_per_lumi_ECA {
+    hist OpticalErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
-    hist Optical_Errors_per_lumi_ECC {
+    hist OpticalErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
     }
 
-    hist ROD_Sync_BCID_errors_per_lumi_B0 {
+    hist RODSyncBCIDErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
-    hist ROD_Sync_BCID_errors_per_lumi_B1 {
+    hist RODSyncBCIDErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
-    hist ROD_Sync_BCID_errors_per_lumi_B2 {
+    hist RODSyncBCIDErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
-    hist ROD_Sync_BCID_errors_per_lumi_ECA {
+    hist RODSyncBCIDErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
-    hist ROD_Sync_BCID_errors_per_lumi_ECC {
+    hist RODSyncBCIDErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
     }
 
-    hist ROD_Sync_LVL1ID_errors_per_lumi_B0 {
+    hist RODSyncLVL1IDErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
-    hist ROD_Sync_LVL1ID_errors_per_lumi_B1 {
+    hist RODSyncLVL1IDErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
-    hist ROD_Sync_LVL1ID_errors_per_lumi_B2 {
+    hist RODSyncLVL1IDErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
-    hist ROD_Sync_LVL1ID_errors_per_lumi_ECA {
+    hist RODSyncLVL1IDErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
-    hist ROD_Sync_LVL1ID_errors_per_lumi_ECC {
+    hist RODSyncLVL1IDErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
     }
 
-    hist ROD_Timeout_per_lumi_B0 {
+    hist RODTimeoutPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
-    hist ROD_Timeout_per_lumi_B1 {
+    hist RODTimeoutPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
-    hist ROD_Timeout_per_lumi_B2 {
+    hist RODTimeoutPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
-    hist ROD_Timeout_per_lumi_ECA {
+    hist RODTimeoutPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
-    hist ROD_Timeout_per_lumi_ECC {
+    hist RODTimeoutPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
     }
 
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_B0 {
+    hist RODTruncHTLimitErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_B1 {
+    hist RODTruncHTLimitErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_B2 {
+    hist RODTruncHTLimitErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_ECA {
+    hist RODTruncHTLimitErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
-    hist ROD_Trunc_HT_Limit_errors_per_lumi_ECC {
+    hist RODTruncHTLimitErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
     }
 
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_B0 {
+    hist RODTruncRODOFErrorsPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_B1 {
+    hist RODTruncRODOFErrorsPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_B2 {
+    hist RODTruncRODOFErrorsPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_ECA {
+    hist RODTruncRODOFErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
-    hist ROD_Trunc_ROD_OF_errors_per_lumi_ECC {
+    hist RODTruncRODOFErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
     }
 
 
-    hist SEU_Hamming_per_lumi_ECA {
+    hist SEUHammingPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
-    hist SEU_Hamming_per_lumi_ECC {
+    hist SEUHammingPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
-    hist SEU_Hamming_per_lumi_B0 {
+    hist SEUHammingPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
-    hist SEU_Hamming_per_lumi_B1 {
+    hist SEUHammingPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
-    hist SEU_Hamming_per_lumi_B2 {
+    hist SEUHammingPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
     }
 
-    hist SEU_Hit_Parity_per_lumi_ECA {
+    hist SEUHitParityPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
-    hist SEU_Hit_Parity_per_lumi_ECC {
+    hist SEUHitParityPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
-    hist SEU_Hit_Parity_per_lumi_B0 {
+    hist SEUHitParityPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
-    hist SEU_Hit_Parity_per_lumi_B1 {
+    hist SEUHitParityPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
-    hist SEU_Hit_Parity_per_lumi_B2 {
+    hist SEUHitParityPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
     }
 
-    hist SEU_Register_Parity_per_lumi_ECA {
+    hist SEURegisterParityPerLumi_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
-    hist SEU_Register_Parity_per_lumi_ECC {
+    hist SEURegisterParityPerLumi_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
-    hist SEU_Register_Parity_per_lumi_B0 {
+    hist SEURegisterParityPerLumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
-    hist SEU_Register_Parity_per_lumi_B1 {
+    hist SEURegisterParityPerLumi_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
-    hist SEU_Register_Parity_per_lumi_B2 {
+    hist SEURegisterParityPerLumi_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
     }
@@ -1873,7 +1832,7 @@ dir Pixel {
   #Below plot Combined Tracks
   dir TrackOnTrack {
 
-    hist tracksPerEvt_per_lumi {
+    hist tracksPerEvtPerLumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/Tracks
       display = StatBox
@@ -1881,82 +1840,83 @@ dir Pixel {
     }
     
     ### Track State On Surface: Hole
-    hist TSOS_Hole_IBL {
+    hist TSOSHole_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_B0 {
+    hist TSOSHole_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_B1 {
+    hist TSOSHole_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_B2 {
+    hist TSOSHole_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_ECA {
+    hist TSOSHole_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Hole_ECC {
+    hist TSOSHole_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
     ### Track State On Surface: Measurement
-    hist TSOS_Measurement_IBL {
+    hist TSOSMeasurement_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_B0 {
+    hist TSOSMeasurement_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_B1 {
+    hist TSOSMeasurement_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_B2 {
+    hist TSOSMeasurement_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_ECA {
+    hist TSOSMeasurement_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Measurement_ECC {
+    hist TSOSMeasurement_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
     ### Track State On Surface: Outlier
-    hist TSOS_Outlier_IBL {
+    hist TSOSOutlier_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_B0 {
+    hist TSOSOutlier_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_B1 {
+    hist TSOSOutlier_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_B2 {
+    hist TSOSOutlier_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_ECA {
+    hist TSOSOutlier_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
-    hist TSOS_Outlier_ECC {
+    hist TSOSOutlier_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Tracks
     }
   }
 }
+
 # now get the pixel relevant plots from InDetGlobal
 dir InDetGlobal {
   dir Pixel {