diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref.detdesc b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref.detdesc
index 559a66dcfc557631518ce2c130cbc822149867b7..9eecb8cedaac4bc17abc87856a1895fe13399824 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref.detdesc
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref.detdesc
@@ -42,7 +42,7 @@ ApplicationMgr                         INFO Application Manager Terminated succe
 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"|         7 |
-HltPackedBufferDecoder                 INFO Number of counters : 1
+HltPackedBufferDecoder#1               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " DstData raw bank  has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want"|         7 |
 Myfilter                               INFO Number of counters : 1
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref.detdesc b/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref.detdesc
index db5a57cc0f8d97ee86d26bc8b6a021b45ca464e9..126e9cab8aa4af39f6c281488953edcf5c4b072c 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref.detdesc
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref.detdesc
@@ -47,17 +47,17 @@ MCTruthAndBkgCatAlg#1                  INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Events"                                        |         7 |
  | "Particles"                                     |        21 |          0 |      0.0000 |      0.0000 |  4.2950e+09 |       0.0000 |
-PP2MCPRelationUnpacker                 INFO Number of counters : 1
+PP2MCPRelationUnpacker#2               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# PackedData"                                  |         7 |         15 |     2.1429 |
-PP2MCPRelationUnpacker#1               INFO Number of counters : 1
+PP2MCPRelationUnpacker#3               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# AbsentBuffer"                                |         7 |          0 |      0.0000 |
 ParticleUnpacker                       INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# Linked BufferData"                           |        56 |      30992 |     553.43 |
  | "# UnpackedData"                                |        14 |       1659 |     118.50 |
-ProtoParticleUnpacker#1                INFO Number of counters : 1
+ProtoParticleUnpacker#3                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# AbsentBuffer"                                |         7 |          0 |      0.0000 |
 RecVertexUnpacker                      INFO Number of counters : 1
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref.detdesc b/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref.detdesc
index 3983f48074cd886e36e00bab5e7a5a72e766be00..ecfa59a93b65b3e19d84ff8f76c761e3104a1c99 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref.detdesc
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref.detdesc
@@ -49,7 +49,7 @@ HDRFilter_Bs2JpsiPhi                   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
+HltPackedBufferDecoder#1               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " DstData raw bank  has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want"|       298 |
 ParticleUnpacker                       INFO Number of counters : 2
diff --git a/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref.detdesc b/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref.detdesc
index 97585831440005969b65dc02d2665e9a06f9b862..437c5894ca3fe1810d0a3d05eb95029a499a72ae 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref.detdesc
+++ b/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref.detdesc
@@ -140,7 +140,7 @@ HDRFilter_SeeNoEvil                    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
+HltPackedBufferDecoder#1               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " DstData raw bank  has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want"|        12 |
 ParticleUnpacker                       INFO Number of counters : 2
diff --git a/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref.detdesc b/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref.detdesc
index c83570680a11d8ee6bb4efe97da005ec0566a755..8ce95f31aea1575871ef818f99155f2bdb73fbfb 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref.detdesc
+++ b/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref.detdesc
@@ -138,7 +138,7 @@ HDRFilter_SeeNoEvil                    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
+HltPackedBufferDecoder#1               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " DstData raw bank  has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want"|        12 |
 ParticleUnpacker                       INFO Number of counters : 2
diff --git a/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref.detdesc b/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref.detdesc
index 7fea3a36f3cb77168e340965d06ba93b25d23ada..24a07f98a2f6b1e5ed5b488a5b5a831edf6c9c3a 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref.detdesc
+++ b/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref.detdesc
@@ -138,7 +138,7 @@ HDRFilter_SeeNoEvil                    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
+HltPackedBufferDecoder#1               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " DstData raw bank  has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want"|        12 |
 ParticleUnpacker                       INFO Number of counters : 2
diff --git a/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref.detdesc b/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref.detdesc
index 58088bd675ced213d1fd49d64c22296b170ae7e5..a83b1130c9e054c15361c591a1caad79b0eaf8a6 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref.detdesc
+++ b/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref.detdesc
@@ -141,7 +141,7 @@ HDRFilter_SeeNoEvil                    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
+HltPackedBufferDecoder#1               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " DstData raw bank  has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want"|        12 |
 MCTruthAndBkgCatAlg#1                  INFO Number of counters : 3
@@ -149,10 +149,10 @@ MCTruthAndBkgCatAlg#1                  INFO Number of counters : 3
  | "Events"                                        |        12 |
  | "Ghosts"                                        |       107 |          0 |      0.0000 |      0.0000 |  4.2950e+09 |       0.0000 |
  | "Particles"                                     |       210 |          0 |      0.0000 |      0.0000 |  4.2950e+09 |       0.0000 |
-PP2MCPRelationUnpacker                 INFO Number of counters : 1
+PP2MCPRelationUnpacker#2               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# PackedData"                                  |        12 |         75 |     6.2500 |
-PP2MCPRelationUnpacker#1               INFO Number of counters : 2
+PP2MCPRelationUnpacker#3               INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# AbsentBuffer"                                |         3 |          0 |      0.0000 |
  | "# PackedData"                                  |         9 |       1504 |     167.11 |
@@ -160,7 +160,7 @@ ParticleUnpacker                       INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# Linked BufferData"                           |       132 |     136208 |     1031.9 |
  | "# UnpackedData"                                |        24 |       6282 |     261.75 |
-ProtoParticleUnpacker#1                INFO Number of counters : 3
+ProtoParticleUnpacker#3                INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# AbsentBuffer"                                |         3 |          0 |      0.0000 |
  | "# Linked BufferData"                           |         9 |       3882 |     431.33 |
diff --git a/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref.detdesc b/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref.detdesc
index 3727f16fac6413d57793deb19ea5371483474374..9cadda084ea1174108f347ca0914f17aacd09db4 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref.detdesc
+++ b/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref.detdesc
@@ -150,7 +150,7 @@ HDRFilter_SeeNoEvil                    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
+HltPackedBufferDecoder#1               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " DstData raw bank  has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want"|        12 |
 ParticleUnpacker                       INFO Number of counters : 2
diff --git a/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref.detdesc b/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref.detdesc
index 1f1fbc0b281098481d1f823e1b9a1e064c037397..5a3446824e6d3e91f1b75b643ac30495222a41dc 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref.detdesc
+++ b/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref.detdesc
@@ -148,7 +148,7 @@ HDRFilter_SeeNoEvil2                   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
+HltPackedBufferDecoder#1               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | " DstData raw bank  has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want"|        14 |
 ParticleUnpacker                       INFO Number of counters : 2