diff --git a/DaVinciTests/tests/refs/test_davinci-issue-97_bkgcat_mc-truth.ref b/DaVinciTests/tests/refs/test_davinci-issue-97_bkgcat_mc-truth.ref
index fd5bded8079749681af354198e1178897146f1c5..a66494004ee62d17670b0a81140ae03acd69f79a 100644
--- a/DaVinciTests/tests/refs/test_davinci-issue-97_bkgcat_mc-truth.ref
+++ b/DaVinciTests/tests/refs/test_davinci-issue-97_bkgcat_mc-truth.ref
@@ -12,15 +12,15 @@ Hlt2Lb2JpsiLambdaTuple
 ApplicationMgr                                                                      INFO Application Manager Initialized successfully
 ApplicationMgr                                                                      INFO Application Manager Started successfully
 RootIOAlg                                                                        SUCCESS Reading Event record 1 within root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/test_davinci-issue-97_bkgcat_mc-truth.dst
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                  WARNING failed to fetch 121 keys from /Event/HLT2/Rec/ProtoP/Charged
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                  WARNING failed to fetch 61 keys from /Event/HLT2/FunctionalChargedProtoParticleMaker#2/Output
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                      WARNING failed to fetch 121 keys from /Event/HLT2/Rec/ProtoP/Charged
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                      WARNING failed to fetch 61 keys from /Event/HLT2/FunctionalChargedProtoParticleMaker#2/Output
 RCWNTupleCnv                                                                        INFO Booked TTree with ID: Tuple "Tuple" in directory davinci-issue-97_bkgcat_mc-truth_ntuple.root:/Hlt2Lb2JpsiLambdaTuple
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                  WARNING failed to fetch 118 keys from /Event/HLT2/Rec/ProtoP/Charged
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                  WARNING failed to fetch 65 keys from /Event/HLT2/FunctionalChargedProtoParticleMaker#2/Output
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                  WARNING failed to fetch 95 keys from /Event/HLT2/Rec/ProtoP/Charged
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                  WARNING failed to fetch 63 keys from /Event/HLT2/FunctionalChargedProtoParticleMaker#2/Output
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                  WARNING failed to fetch 107 keys from /Event/HLT2/Rec/ProtoP/Charged
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                  WARNING failed to fetch 53 keys from /Event/HLT2/FunctionalChargedProtoParticleMaker#2/Output
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                      WARNING failed to fetch 118 keys from /Event/HLT2/Rec/ProtoP/Charged
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                      WARNING failed to fetch 65 keys from /Event/HLT2/FunctionalChargedProtoParticleMaker#2/Output
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                      WARNING failed to fetch 95 keys from /Event/HLT2/Rec/ProtoP/Charged
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                      WARNING failed to fetch 63 keys from /Event/HLT2/FunctionalChargedProtoParticleMaker#2/Output
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                      WARNING failed to fetch 107 keys from /Event/HLT2/Rec/ProtoP/Charged
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                      WARNING failed to fetch 53 keys from /Event/HLT2/FunctionalChargedProtoParticleMaker#2/Output
 ApplicationMgr                                                                      INFO Application Manager Stopped successfully
 Hlt2Lb2JpsiLambdaTuple                                                           SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
 Hlt2Lb2JpsiLambdaTuple                                                           SUCCESS List of booked N-Tuples in directory "FILE1/Hlt2Lb2JpsiLambdaTuple"
@@ -36,7 +36,7 @@ ApplicationMgr
 ApplicationMgr                                                                      INFO Application Manager Terminated successfully
 FilterDstDataSize                                                                   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- |*"Number of too small raw banks size"            |         4 |          4 |( 100.0000 +- 0.000000)% |
+ |*"Number of too small raw banks size"            |         4 |          0 |( 0.000000 +- 0.000000)% |
 HLTControlFlowMgr                                                                   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |         4 |
@@ -65,17 +65,17 @@ MCTruthAndBkgCat_bkg
  | "Events"                                        |         4 |
  | "Ghosts"                                        |        10 |          0 |     0.0000 |     0.0000 |  4.2950e+09 |      0.0000 |
  | "Particles"                                     |        49 |          0 |     0.0000 |     0.0000 |  4.2950e+09 |      0.0000 |
-Unpack_Hlt2__Event_HLT2_Hlt2Lb2JpsiLambda_Particles                                 INFO Number of counters : 4
+Unpack_HltSourceID.Hlt2__Event_HLT2_Hlt2Lb2JpsiLambda_Particles                     INFO Number of counters : 4
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         4 |          7 |     1.7500 |
  | "Buffer size"                                   |         4 |       1514 |     378.50 |
  |*"Target data already present"                   |         4 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Relations_ChargedPP2MCP                                     INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_ChargedPP2MCP                         INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         4 |         22 |     5.5000 |
  | "Buffer size"                                   |         4 |      14364 |     3591.0 |
  |*"Target data already present"                   |         4 |          0 |( 0.000000 +- 0.000000)% |
-Unpack_Hlt2__Event_HLT2_Relations_NeutralPP2MCP                                     INFO Number of counters : 3
+Unpack_HltSourceID.Hlt2__Event_HLT2_Relations_NeutralPP2MCP                         INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnpackedData"                                |         4 |          0 |     0.0000 |
  | "Buffer size"                                   |         4 |        216 |     54.000 |