diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
index 1eeb391e3d40be9a6c5a724eaab6812c5ac97466..c64e85dcadd16b37eaf9e7cf8ddd53f6729b0d1d 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
@@ -96,7 +96,7 @@ ProtoParticleUnpacker                  INFO Number of counters : 2
 ProtoParticleUnpacker#1                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# AbsentBuffer"                                |        14 |          0 |      0.0000 |
-Spruce                                 INFO Number of counters : 1
+SpruceDecReportsDecoder                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|        14 |
 ToolSvc.HltFactory                     INFO Number of counters : 1
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
index 653be98e1eb981a963fe50a682964c19cc765ffb..228d1d63e2477762977a9cc5245444df8da4a50d 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
@@ -39,7 +39,7 @@ TFile: name=tuple_LbToLcmunu.root, title=Gaudi Trees, option=CREATE
 NTupleSvc                              INFO NTuples saved successfully
 ApplicationMgr                         INFO Application Manager Finalized successfully
 ApplicationMgr                         INFO Application Manager Terminated successfully
-Hlt2                                   INFO Number of counters : 1
+Hlt2DecReportsDecoder                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|         7 |
 HltPackedBufferDecoder                 INFO Number of counters : 1
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
index f5ec604539df4681cd763fb6b23ed67d10fb722a..5ca366903538218755888e2973a4319cb217705f 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
@@ -46,7 +46,7 @@ Bs2JpsiPhi_Tuple                       INFO Number of counters : 7
 HDRFilter_Bs2JpsiPhi                   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"#passed"                                       |      1978 |        298 |( 15.06572 +- 0.8043098)% |
-Hlt2#1                                 INFO Number of counters : 1
+Hlt2DecReportsDecoder#1                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|      1978 |
 HltPackedBufferDecoder                 INFO Number of counters : 1
diff --git a/DaVinciTutorials/tests/refs/test_tutorial0_basic_DVjob.ref b/DaVinciTutorials/tests/refs/test_tutorial0_basic_DVjob.ref
index fbedafdbc6d899aa149c69bde2b2ac8027a33f90..1c4dee005b6b369c826698731ea00699c19ed6b5 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial0_basic_DVjob.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial0_basic_DVjob.ref
@@ -694,7 +694,7 @@ ApplicationMgr                         INFO Application Manager Terminated succe
 HDRFilter_SeeNoEvil                    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"#passed"                                       |       100 |         12 |( 12.00000 +- 3.249615)% |
-Hlt2                                   INFO Number of counters : 1
+Hlt2DecReportsDecoder                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|       100 |
 HltPackedBufferDecoder                 INFO Number of counters : 1
diff --git a/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref b/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
index 1c977c641029bddc712a3b8cb3a7bfc302cbf4e2..53fc927e74422f57fb9f14adddaf58ce92328734 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
@@ -137,7 +137,7 @@ ApplicationMgr                         INFO Application Manager Terminated succe
 HDRFilter_SeeNoEvil                    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"#passed"                                       |       100 |         12 |( 12.00000 +- 3.249615)% |
-Hlt2#1                                 INFO Number of counters : 1
+Hlt2DecReportsDecoder#1                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|       100 |
 HltPackedBufferDecoder                 INFO Number of counters : 1
diff --git a/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref b/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
index 002063470f072ad278c5e72208666c0ab2aaa4e4..945c1bf432cde1338f785c3ba12364b7022bed15 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
@@ -135,7 +135,7 @@ ApplicationMgr                         INFO Application Manager Terminated succe
 HDRFilter_SeeNoEvil                    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"#passed"                                       |       100 |         12 |( 12.00000 +- 3.249615)% |
-Hlt2#1                                 INFO Number of counters : 1
+Hlt2DecReportsDecoder#1                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|       100 |
 HltPackedBufferDecoder                 INFO Number of counters : 1
diff --git a/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref b/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
index 22886e592b9b64f6d8a1d1f6cffae2d553dda360..1d28db30fbd07c19ddcd1f2edbf52732e217620d 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
@@ -135,7 +135,7 @@ ApplicationMgr                         INFO Application Manager Terminated succe
 HDRFilter_SeeNoEvil                    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"#passed"                                       |       100 |         12 |( 12.00000 +- 3.249615)% |
-Hlt2#1                                 INFO Number of counters : 1
+Hlt2DecReportsDecoder#1                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|       100 |
 HltPackedBufferDecoder                 INFO Number of counters : 1
diff --git a/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref b/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
index 3727ae6c98cf88daa9205b302e964257c623cc2a..84894839e5816d2b05475bdb2b99776070f4403d 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
@@ -138,7 +138,7 @@ ApplicationMgr                         INFO Application Manager Terminated succe
 HDRFilter_SeeNoEvil                    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"#passed"                                       |       100 |         12 |( 12.00000 +- 3.249615)% |
-Hlt2#1                                 INFO Number of counters : 1
+Hlt2DecReportsDecoder#1                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|       100 |
 HltPackedBufferDecoder                 INFO Number of counters : 1
diff --git a/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref b/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
index 354701bb6f3965b946db86e249df5f9ee9733af4..6ddb7507cd58d71dd9d050503c82d37815fc936b 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
@@ -147,7 +147,7 @@ DecayTreeFitterAlgWithPV               INFO Number of counters : 4
 HDRFilter_SeeNoEvil                    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"#passed"                                       |       100 |         12 |( 12.00000 +- 3.249615)% |
-Hlt2#1                                 INFO Number of counters : 1
+Hlt2DecReportsDecoder#1                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|       100 |
 HltPackedBufferDecoder                 INFO Number of counters : 1
diff --git a/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref b/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
index 72a1dc1669edf569c0e777004a1fbe9a01de0d4d..ae53358945afbae76f0da6117358a5d40851cb7b 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
@@ -145,7 +145,7 @@ HDRFilter_SeeNoEvil1                   INFO Number of counters : 1
 HDRFilter_SeeNoEvil2                   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"#passed"                                       |       100 |          7 |( 7.000000 +- 2.551470)% |
-Hlt2#1                                 INFO Number of counters : 1
+Hlt2DecReportsDecoder#1                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"|       100 |
 HltPackedBufferDecoder                 INFO Number of counters : 1