diff --git a/DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref b/DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref
index 5a1fcaaeb4ac093c60b17b72423a9662917ec69d..e566ee05930cb2274f9c316bce6672fa276948b4 100644
--- a/DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref
@@ -155,7 +155,7 @@ Tuple_B0Dspi                           INFO Number of counters : 4
  | "# non-empty events for field Ds"               |         1 |
  | "# non-empty events for field pip"              |         1 |
  | "# processed events"                            |         1 |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          1 |     1.0000 |
  | "Buffer size"                                   |         1 |        236 |     236.00 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
index 504532f510da2a0fce5650c0a135f478d63e0cfc..927e556dfb0e0f6b03b4b33cab8c2522c30ad0ce 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
@@ -58,12 +58,12 @@ ParticleRangeFilter_f3832794           INFO Number of counters : 2
  |*"Cut selection efficiency"                      |       626 |         19 |( 3.035144 +- 0.6856613)% |
 ToolSvc.HybridFactory                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
-Unpack_Hlt2__Event_HLT2_Rec_Prot...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        10 |        626 |     62.600 |
  | "Buffer size"                                   |        10 |      49940 |     4994.0 |
  |*"Target data already present"                   |        10 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Vert...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        10 |         45 |     4.5000 |
  | "Buffer size"                                   |        10 |      18860 |     1886.0 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_FunTupleEvent.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_FunTupleEvent.ref
index 6472e64ce33cf5ff70046170161a6a85bdfb2c6c..b618d3a65abbeb8c6be0143eed8ebc17b5120739 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_FunTupleEvent.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_FunTupleEvent.ref
@@ -39,7 +39,7 @@ PackedBufferDecoder_Hlt2               INFO Number of counters : 1
 Tuple                                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# processed events"                            |         7 |
-Unpack_Hlt2__Event_HLT2_Rec_Summary    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         7 |         21 |     3.0000 |
  | "Buffer size"                                   |         7 |        322 |     46.000 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
index 07684264f21d38f052a11c6610c52337c2976a5d..4be5d9145fc4f487927789e702500aa595bca905 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
@@ -71,24 +71,24 @@ ParticleTaggerAlg_f3455be5             INFO Number of counters : 3
  | "Events"                                        |        12 |
  | "Input Particles"                               |        12 |         15 |     1.2500 |    0.43301 |      1.0000 |      2.0000 |
  | "Output Particles"                              |        12 |         50 |     4.1667 |    0.37268 |      4.0000 |      5.0000 |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 1
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"Target data already present"                   |        12 |         12 |( 100.0000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 3
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        12 |         76 |     6.3333 |
  | "Buffer size"                                   |        12 |       4816 |     401.33 |
  |*"Target data already present"                   |        12 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 3
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        12 |         49 |     4.0833 |
  | "Buffer size"                                   |        12 |       1724 |     143.67 |
  |*"Target data already present"                   |        12 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 2
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "DstData buffer for configured output not available - unable to unpack"|        12 |
  |*"Target data already present"                   |        12 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        12 |         15 |     1.2500 |
  | "Buffer size"                                   |        12 |       3402 |     283.50 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
index d162fff4fc90e8a1d7634410dbacabb095078a3e..241be2cec891ed48457d6cdb1c2174881ba78623 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
@@ -52,12 +52,12 @@ Tuple                                  INFO Number of counters : 3
  | "# events with multiple candidates for field Lb"|         1 |
  | "# non-empty events for field Lb"               |         7 |
  | "# processed events"                            |         7 |
-Unpack_Hlt2__Event_HLT2_Hlt2SLB_...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         7 |          8 |     1.1429 |
  | "Buffer size"                                   |         7 |       1842 |     263.14 |
  |*"Target data already present"                   |         7 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Summary    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         7 |         21 |     3.0000 |
  | "Buffer size"                                   |         7 |        322 |     46.000 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref
index fe424e83558d14dda022538928994c1e47197643..080e4be885ef79c8b0e8db650444c8398b85b978 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref
@@ -51,22 +51,22 @@ Tuple                                  INFO Number of counters : 4
  | "# non-empty events for field Kminus"           |         7 |
  | "# non-empty events for field piplus"           |         7 |
  | "# processed events"                            |         7 |
-Unpack_Hlt2__Event_HLT2_Hlt2Char...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         7 |          7 |     1.0000 |
  | "Buffer size"                                   |         7 |       1652 |     236.00 |
  |*"Target data already present"                   |         7 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Vert...    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         7 |         34 |     4.8571 |
  | "Buffer size"                                   |         7 |       2210 |     315.71 |
  |*"Target data already present"                   |         7 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Relation...    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         7 |         15 |     2.1429 |
  | "Buffer size"                                   |         7 |        734 |     104.86 |
  |*"Target data already present"                   |         7 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Relation...    INFO Number of counters : 2
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "DstData buffer for configured output not available - unable to unpack"|         7 |
  |*"Target data already present"                   |         7 |          0 |( 0.000000 +- 0.000000)% |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
index 8346f048591c649271c459338f18732416522485..3b14ab9bf971ab2da9154ce8a9c39665b92cda2d 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
@@ -44,7 +44,7 @@ HDRFilter_Bs2JpsiPhi                   INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       775 |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |       147 |        152 |     1.0340 |
  | "Buffer size"                                   |       147 |       5479 |     37.272 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref
index 08950c45e44be1bf9be22dbb74fe37f82f937871..d88a8b0d13566a87168a71708cdbda1228faa53e 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref
@@ -184,12 +184,12 @@ Hlt2TopoLineFilter                     INFO Number of counters : 1
  |*"Cut selection efficiency"                      |       113 |         70 |( 61.94690 +- 4.567364)% |
 ToolSvc.HybridFactory                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        48 |        249 |     5.1875 |
  | "Buffer size"                                   |        48 |      49518 |     1031.6 |
  |*"Target data already present"                   |        48 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          1 |     1.0000 |
  | "Buffer size"                                   |         1 |        236 |     236.00 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce_data.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce_data.ref
index ef6a97cbc8971aaeab0705190fb77482fb4dd6c3..9b67a67685ba68ada4df037edd3b9718bcb0e32a 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce_data.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce_data.ref
@@ -43,12 +43,12 @@ HDRFilter_B0Dspi                       INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |         3 |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 3
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          1 |     1.0000 |
  | "Buffer size"                                   |         1 |         92 |     92.000 |
  |*"Target data already present"                   |         1 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          1 |     1.0000 |
  | "Buffer size"                                   |         1 |        236 |     236.00 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruced_turbo.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruced_turbo.ref
index 09bfd591b2ff6080a074001d1d89fce2829783f3..c1a96860bd80848bb32074fb53626457ff1c86f4 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruced_turbo.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruced_turbo.ref
@@ -51,12 +51,12 @@ Hlt2QEE_JpsiToMuMu_Detached            INFO Number of counters : 4
 PreFilter_Hlt2QEE_JpsiToMuMu_Det...    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"Cut selection efficiency"                      |      1000 |          1 |(0.1000000 +- 0.09994999)% |
-Unpack_Hlt2__Event_HLT2_Hlt2QEE_...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          1 |     1.0000 |
  | "Buffer size"                                   |         1 |        232 |     232.00 |
  |*"Target data already present"                   |         1 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Vert...    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          2 |     2.0000 |
  | "Buffer size"                                   |         1 |        150 |     150.00 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruced_turbo_with_refitting.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruced_turbo_with_refitting.ref
index 2ea483c51c8bfd96c70e8aa0dcf78b8239219159..f57d09c16e9418f06781d9e2a19838db71cce732 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruced_turbo_with_refitting.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruced_turbo_with_refitting.ref
@@ -380,15 +380,15 @@ LHCbIDOverlapRelationTablePartic...    INFO Number of counters : 4
  | "Non-matches considered"                        |        76 |         76 |     1.0000 |
 PrStoreSciFiHits_a49297a7              INFO Number of counters : 25
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Average X in T1U"                              |        35 |   310.5108 |     8.8717 |     495.71 |     -1210.5 |      937.26 |
+ | "Average X in T1U"                              |        35 |   310.5107 |     8.8717 |     495.71 |     -1210.5 |      937.26 |
  | "Average X in T1V"                              |        33 |  -815.8795 |    -24.724 |     470.19 |     -1011.7 |      911.35 |
- | "Average X in T1X1"                             |        36 |   137.7813 |     3.8273 |     472.86 |     -1086.8 |      897.12 |
+ | "Average X in T1X1"                             |        36 |   137.7814 |     3.8273 |     472.86 |     -1086.8 |      897.12 |
  | "Average X in T1X2"                             |        35 |   572.9947 |     16.371 |     504.69 |     -1136.1 |      951.73 |
  | "Average X in T2U"                              |        32 |   2665.183 |     83.287 |     554.42 |     -911.55 |      1119.9 |
  | "Average X in T2V"                              |        36 |   688.6412 |     19.129 |     580.00 |     -1164.3 |      1151.2 |
- | "Average X in T2X1"                             |        34 |   568.7847 |     16.729 |     553.29 |     -1247.8 |      1077.6 |
+ | "Average X in T2X1"                             |        34 |   568.7848 |     16.729 |     553.29 |     -1247.8 |      1077.6 |
  | "Average X in T2X2"                             |        35 |   969.7161 |     27.706 |     600.28 |     -1298.1 |      1134.4 |
- | "Average X in T3U"                              |        31 |  -171.0116 |    -5.5165 |     661.91 |     -1554.2 |      1307.8 |
+ | "Average X in T3U"                              |        31 |  -171.0117 |    -5.5165 |     661.91 |     -1554.2 |      1307.8 |
  | "Average X in T3V"                              |        34 |   458.6883 |     13.491 |     672.59 |     -1318.8 |      1431.5 |
  | "Average X in T3X1"                             |        34 |   2659.664 |     78.225 |     645.26 |     -1412.1 |      1316.5 |
  | "Average X in T3X2"                             |        37 |   2258.985 |     61.054 |     693.58 |     -1462.6 |      1402.2 |
@@ -427,17 +427,17 @@ SelectVPMicroClustersFromTracks_...    INFO Number of counters : 1
 UTHitClustersToPrUTHitsConverter...    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# Converted Clusters"                          |        12 |        121 |     10.083 |
-Unpack_Hlt2__Event_HLT2_Hlt2Char...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        12 |         13 |     1.0833 |
  | "Buffer size"                                   |        12 |        452 |     37.667 |
  |*"Target data already present"                   |        12 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Summary    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        12 |        228 |     19.000 |
  | "Buffer size"                                   |        12 |       2088 |     174.00 |
  |*"Target data already present"                   |        12 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Vert...    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        12 |         61 |     5.0833 |
  | "Buffer size"                                   |        12 |       3946 |     328.83 |
diff --git a/DaVinciTests/tests/refs/test_davinci-issue-198_duplicate_trigger_lines.ref b/DaVinciTests/tests/refs/test_davinci-issue-198_duplicate_trigger_lines.ref
index 0f289b6f264016a4fc0223699d2d0b605c4c9f8e..8ced5420fed1b9b059413d3b85744d174d50ae04 100644
--- a/DaVinciTests/tests/refs/test_davinci-issue-198_duplicate_trigger_lines.ref
+++ b/DaVinciTests/tests/refs/test_davinci-issue-198_duplicate_trigger_lines.ref
@@ -564,17 +564,17 @@ Tuple                                  INFO Number of counters : 3
  | "# events with multiple candidates for field Jpsi"|         1 |
  | "# non-empty events for field Jpsi"             |        28 |
  | "# processed events"                            |        28 |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        28 |          2 |   0.071429 |
  | "Buffer size"                                   |        28 |       1244 |     44.429 |
  |*"Target data already present"                   |        28 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        28 |          2 |   0.071429 |
  | "Buffer size"                                   |        28 |       1236 |     44.143 |
  |*"Target data already present"                   |        28 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        28 |         29 |     1.0357 |
  | "Buffer size"                                   |        28 |       6686 |     238.79 |
diff --git a/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref b/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
index 33cdba0dabef930883b656c7e8e7d963008dc0c6..6a79527588de3cebeae0bc480b2cc07efeb4679b 100644
--- a/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
+++ b/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
@@ -57,15 +57,15 @@ ParticleTaggerAlg_9e538803             INFO Number of counters : 3
  | "Events"                                        |        66 |
  | "Input Particles"                               |        66 |        388 |     5.8788 |     7.2916 |      1.0000 |      50.000 |
  | "Output Particles"                              |        66 |       1007 |     15.258 |     21.335 |      4.0000 |      98.000 |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 1
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"Target data already present"                   |        66 |         66 |( 100.0000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 3
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        66 |        451 |     6.8333 |
  | "Buffer size"                                   |        66 |      28402 |     430.33 |
  |*"Target data already present"                   |        66 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        66 |        388 |     5.8788 |
  | "Buffer size"                                   |        66 |      76756 |     1163.0 |
diff --git a/DaVinciTests/tests/refs/test_davinci_recVertices.ref b/DaVinciTests/tests/refs/test_davinci_recVertices.ref
index 32795e2513c56132b7f758e8f4761e75b52ff672..4253a1510a8a77dad581a50296ebe0feebecbe65 100644
--- a/DaVinciTests/tests/refs/test_davinci_recVertices.ref
+++ b/DaVinciTests/tests/refs/test_davinci_recVertices.ref
@@ -152,12 +152,12 @@ HDRFilter_B0DsK                        INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       113 |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 3
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        75 |        519 |     6.9200 |
  | "Buffer size"                                   |        75 |      32652 |     435.36 |
  |*"Target data already present"                   |        75 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        75 |        459 |     6.1200 |
  | "Buffer size"                                   |        75 |      90660 |     1208.8 |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_from_turbo_hlt_sel_reports.ref b/DaVinciTests/tests/refs/test_davinci_tupling_from_turbo_hlt_sel_reports.ref
index cb7e29923b62cbe23780984a7b6a17c9876f4839..1ab0989d40254d9e6e0ff7fdb457b0e421329af4 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_from_turbo_hlt_sel_reports.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_from_turbo_hlt_sel_reports.ref
@@ -43,7 +43,7 @@ Hlt2_JpsiToMuMu                        INFO Number of counters : 3
 HltSelReportsDecoder_307a4bc2          INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "HltSelRepRBHits fails integrity check"         |         1 |
-Unpack_Hlt2__Event_HLT2_Hlt2_Jps...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |       259 |        272 |     1.0502 |
  | "Buffer size"                                   |       259 |       9687 |     37.402 |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_from_turbo_reco_location.ref b/DaVinciTests/tests/refs/test_davinci_tupling_from_turbo_reco_location.ref
index eba2f0d9c70d4db4b97c431985d708941e1dfb99..312be4e1c1a21481b11decf8aecc2baa5b9637e7 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_from_turbo_reco_location.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_from_turbo_reco_location.ref
@@ -90,12 +90,12 @@ TupleKst                               INFO Number of counters : 7
  | "# non-empty events for field Kp"               |        33 |
  | "# non-empty events for field Kst"              |        33 |
  | "# processed events"                            |        88 |
-Unpack_Hlt2__Event_HLT2_Rec_Prot...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        88 |       1791 |     20.352 |
  | "Buffer size"                                   |        88 |     783400 |     8902.3 |
  |*"Target data already present"                   |        88 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Vert...    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        88 |        171 |     1.9432 |
  | "Buffer size"                                   |        88 |      12910 |     146.70 |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_with_flavour_tagging.ref b/DaVinciTests/tests/refs/test_davinci_tupling_with_flavour_tagging.ref
index 734b013b793ac847c86d8f85bcc05e3aacf1f558..dbceeed35f59fe963bc46a7cfad617215951e3ae 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_with_flavour_tagging.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_with_flavour_tagging.ref
@@ -246,19 +246,19 @@ Run2SSProtonTagger_f218580e.Tagg...    INFO Number of counters : 7
  | "Seed:case(3)"                                  |         1 |
  | "_iterate_opt: No convergency has been reached" |         1 |
  | "fit(): failure from _iterate()"                |         1 |
-Unpack_Hlt2__Event_HLT2_Hlt2B2OC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        80 |         81 |     1.0125 |
  | "Buffer size"                                   |        80 |       2968 |     37.100 |
  |*"Target data already present"                   |        80 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Prot...    INFO Number of counters : 1
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"Target data already present"                   |        80 |         80 |( 100.0000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Prot...    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        80 |          0 |     0.0000 |
  | "Buffer size"                                   |        80 |       2400 |     30.000 |
  |*"Target data already present"                   |        80 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Vert...    INFO Number of counters : 1
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"Target data already present"                   |        80 |         80 |( 100.0000 +- 0.000000)% |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce.ref b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce.ref
index d273eb67b7112610150a740d66746b4e26227781..ed5c8ee26fcd42b1c3d5c9e771b109c9fcfa0d15 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce.ref
@@ -49,7 +49,7 @@ HDRFilter_B0Dspi                       INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |         3 |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          1 |     1.0000 |
  | "Buffer size"                                   |         1 |        236 |     236.00 |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_mergedDst.ref b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_mergedDst.ref
index 1d02c1703947fc3c54bf2dd114c233a60e8d90a0..c262d3e7ffe7f1baef794ab9a6839443f81d6d35 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_mergedDst.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_mergedDst.ref
@@ -54,7 +54,7 @@ HDRFilter_B0Dspi                       INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |         8 |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          1 |     1.0000 |
  | "Buffer size"                                   |         1 |        236 |     236.00 |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDst.ref b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDst.ref
index 33a65ce7efa55223f6e432bdbf6eac6a78e102af..6fdac2297811c46034ad90f49d0b3ed53980d39d 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDst.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDst.ref
@@ -55,7 +55,7 @@ HDRFilter_B0Dspi                       INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |         8 |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         1 |          1 |     1.0000 |
  | "Buffer size"                                   |         1 |        236 |     236.00 |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDstMerged.ref b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDstMerged.ref
index 9a94c8764312ee7f61f5edcd64c76708fc51557a..442c3bfef50e6f9a2bbb2c196e43347dabc27f48 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDstMerged.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDstMerged.ref
@@ -64,7 +64,7 @@ HDRFilter_B0Dspi                       INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |        16 |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         2 |          2 |     1.0000 |
  | "Buffer size"                                   |         2 |        472 |     236.00 |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDstRuns.ref b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDstRuns.ref
index 602ab17e2ec70379fa6ba17c8aa3fac08d9d12ff..b53f77aca8da757748230dc1619f85b966a2582a 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDstRuns.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreDstRuns.ref
@@ -186,7 +186,7 @@ HDRFilter_B0Dspi                       INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       136 |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         3 |          4 |     1.3333 |
  | "Buffer size"                                   |         3 |        898 |     299.33 |
diff --git a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreRuns.ref b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreRuns.ref
index c53209f2dd984f8e4b60c5008158cd16895be87c..62543af134291431032c49c47a4df7e2410094ca 100644
--- a/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreRuns.ref
+++ b/DaVinciTests/tests/refs/test_davinci_tupling_with_lumi_from_spruce_moreRuns.ref
@@ -185,7 +185,7 @@ HDRFilter_B0Dspi                       INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       136 |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         3 |          4 |     1.3333 |
  | "Buffer size"                                   |         3 |        898 |     299.33 |
diff --git a/DaVinciTests/tests/refs/test_dv_run_large_job.ref b/DaVinciTests/tests/refs/test_dv_run_large_job.ref
index 8bbbfb3aeef29ff45767641c49dc7e39d1d06c35..2d74df05b1c14d8d278a2bec9d88226d8e031f3a 100644
--- a/DaVinciTests/tests/refs/test_dv_run_large_job.ref
+++ b/DaVinciTests/tests/refs/test_dv_run_large_job.ref
@@ -78,17 +78,17 @@ HDRFilter_B2Xmumu                      INFO Number of counters : 1
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       100 |
-Unpack_Spruce__Event_Spruce_HLT2...    INFO Number of counters : 3
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         2 |         10 |     5.0000 |
  | "Buffer size"                                   |         2 |        648 |     324.00 |
  |*"Target data already present"                   |         2 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 4
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         2 |          7 |     3.5000 |
  | "Buffer size"                                   |         2 |        114 |     57.000 |
  |*"Target data already present"                   |         2 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Spruce__Event_Spruce_Spru...    INFO Number of counters : 2
+Unpack_HltSourceID.Spruce__Event...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "DstData buffer for configured output not available - unable to unpack"|         2 |
  |*"Target data already present"                   |         2 |          0 |( 0.000000 +- 0.000000)% |
diff --git a/DaVinciTutorials/tests/refs/test_tutorial0_basic_DVjob.ref b/DaVinciTutorials/tests/refs/test_tutorial0_basic_DVjob.ref
index 5a5567cc4158ddf88fa8716596ebde9f84fdc88d..67977e4e440cc018efb1225bb2ac76c75f5b0b56 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial0_basic_DVjob.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial0_basic_DVjob.ref
@@ -926,7 +926,7 @@ PrintBsToJpsiPhi                       INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Candidates"                                    |        40 |         41 |     1.0250 |    0.15612 |      1.0000 |      2.0000 |
  | "Events"                                        |        40 |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        40 |         41 |     1.0250 |
  | "Buffer size"                                   |        40 |       9630 |     240.75 |
diff --git a/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref b/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
index cf9273537eaa26eba19663f4d84a4dad5c851584..758a8464e2ea0d2e69478d843e61bf431bbc8f69 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
@@ -172,7 +172,7 @@ TDirectoryName                         INFO Number of counters : 15
  | "# non-empty events for field Mup"              |        40 |
  | "# non-empty events for field Phi"              |        40 |
  | "# processed events"                            |        40 |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        40 |         41 |     1.0250 |
  | "Buffer size"                                   |        40 |       9630 |     240.75 |
diff --git a/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref b/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
index 4412f4ac1634b2526a1b570af6068cd82b99a567..aedd4e7858b926304a7e211cb628bf81cf300198 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
@@ -172,7 +172,7 @@ TDirectoryName                         INFO Number of counters : 15
  | "# processed events"                            |        40 |
 ToolSvc.HybridFactory                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        40 |         41 |     1.0250 |
  | "Buffer size"                                   |        40 |       9630 |     240.75 |
diff --git a/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref b/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
index 25079165b9607904c9789f642b551f8d8041481c..839f22f5db7089c38cbe610e8186253c48917325 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
@@ -164,12 +164,12 @@ TDirectoryName                         INFO Number of counters : 9
  | "# non-empty events for field Kp"               |        40 |
  | "# non-empty events for field Phi"              |        40 |
  | "# processed events"                            |        40 |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        40 |         41 |     1.0250 |
  | "Buffer size"                                   |        40 |       9630 |     240.75 |
  |*"Target data already present"                   |        40 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Vert...    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        40 |        238 |     5.9500 |
  | "Buffer size"                                   |        40 |      15164 |     379.10 |
diff --git a/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref b/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
index 46ca387c1e8d4edbd3888769c6d733d0e84588c8..acbd8e6c192c1c6417a265ac65c3ae00cea8c410 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
@@ -168,17 +168,17 @@ TDirectoryName                         INFO Number of counters : 8
  | "# non-empty events for field Mup"              |        15 |
  | "# non-empty events for field Phi"              |        15 |
  | "# processed events"                            |        15 |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        15 |         15 |     1.0000 |
  | "Buffer size"                                   |        15 |        555 |     37.000 |
  |*"Target data already present"                   |        15 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Relation...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        15 |       1714 |     114.27 |
  | "Buffer size"                                   |        15 |      35406 |     2360.4 |
  |*"Target data already present"                   |        15 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Relation...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        15 |      42580 |     2838.7 |
  | "Buffer size"                                   |        15 |     852530 |     56835. |
diff --git a/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref b/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
index f10f0f627394e17e3185ece7d4ddc80c1bd57d9b..2824ac8cf64df6c704cdfc4d880093ebe8d3809a 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
@@ -176,12 +176,12 @@ TDirectoryName                         INFO Number of counters : 8
  | "# non-empty events for field Jpsi"             |        40 |
  | "# non-empty events for field Phi"              |        40 |
  | "# processed events"                            |        40 |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        40 |         41 |     1.0250 |
  | "Buffer size"                                   |        40 |       9630 |     240.75 |
  |*"Target data already present"                   |        40 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Rec_Vert...    INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        40 |        238 |     5.9500 |
  | "Buffer size"                                   |        40 |      15164 |     379.10 |
diff --git a/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref b/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
index 7cd2bcca0e7e4c9dc7e9dd33f471833e205045f7..a734f7927e9b072d2a0ecb90438bee4bcaee7c12 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
@@ -186,12 +186,12 @@ TDirectoryName2                        INFO Number of counters : 7
  | "# non-empty events for field Jpsi"             |        20 |
  | "# non-empty events for field Kp"               |        20 |
  | "# processed events"                            |        20 |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        40 |         41 |     1.0250 |
  | "Buffer size"                                   |        40 |       9630 |     240.75 |
  |*"Target data already present"                   |        40 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Hlt2B2CC...    INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_H...    INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |        20 |         26 |     1.3000 |
  | "Buffer size"                                   |        20 |       5860 |     293.00 |