diff --git a/Digi/Boole/tests/refs/boole-Calo.ref b/Digi/Boole/tests/refs/boole-Calo.ref
index d706930cc4aa6f6c0a486630391e8f0fea69529e..40052e975b7206bcf61ca40d78b22de421c27c42 100644
--- a/Digi/Boole/tests/refs/boole-Calo.ref
+++ b/Digi/Boole/tests/refs/boole-Calo.ref
@@ -41,7 +41,7 @@ HcalDigit            INFO ----- Digitization parameters (from CaloDigitAlg confi
 HcalDigit            INFO Additional  0.0% of the cells as dead (gain=0).
 HcalDigit            INFO Additional gain error  1.0%
 Link                 INFO Member list: GaudiSequencer/LinkCaloSeq
-LinkCaloSeq          INFO Member list: CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
+LinkCaloSeq          INFO Member list: LHCb::UnpackRawEvent/UnpackRawEventCalo, LHCb::UnpackRawEvent/UnpackRawEventCaloError, CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
 Moni                 INFO Member list: GaudiSequencer/MoniCaloSeq
 MoniCaloSeq          INFO Member list: CaloDigitChecker/EcalCheck, CaloDigitChecker/HcalCheck
 EcalCheck            INFO Monitoring Hits MC/Ecal/Hits   MC Digit   MC/Ecal/Digits   Digit   Raw/Ecal/Digits, Histograms booked
diff --git a/Digi/Boole/tests/refs/boole-Rich.ref b/Digi/Boole/tests/refs/boole-Rich.ref
index 235c72a4316ce16256fba78a42e10776452ec4ba..7f97e17ea101f6430cf2bbaa689544a3beca4953 100644
--- a/Digi/Boole/tests/refs/boole-Rich.ref
+++ b/Digi/Boole/tests/refs/boole-Rich.ref
@@ -18,7 +18,7 @@ HistogramPersis...   INFO Added successfully Conversion service:RootHistSvc
 SpilloverHandler     INFO Member list: TESCheck/SpilloverLoader, EventNodeKiller/SpilloverKiller
 InitDataSeq          INFO Member list:
 Digi                 INFO Member list: GaudiSequencer/DigiRichSeq
-DigiRichSeq          INFO Member list: Rich::MC::Digi::Signal/RichPDSignal, Rich::MC::Digi::SummedDeposits/RichSummedDeposits, Rich::MC::Digi::DetailedFrontEndResponsePMT/RichPDResponse, Rich::MC::Digi::MCRichDigitsToRawBufferAlg/RichFillRawBuffer, Rich::Future::RawBankDecoder/RichDecodeTest
+DigiRichSeq          INFO Member list: Rich::MC::Digi::Signal/RichPDSignal, Rich::MC::Digi::SummedDeposits/RichSummedDeposits, Rich::MC::Digi::DetailedFrontEndResponsePMT/RichPDResponse, Rich::MC::Digi::MCRichDigitsToRawBufferAlg/RichFillRawBuffer, LHCb::UnpackRawEvent/UnpackRawEvent, Rich::Future::RawBankDecoder/RichDecodeTest
 Link                 INFO Member list: GaudiSequencer/LinkRichSeq
 LinkRichSeq          INFO Member list: Rich::MC::MCRichDigitSummaryAlg
 Rich::MC::MCRic...   INFO Will only store MCParticle references for main event
diff --git a/Digi/Boole/tests/refs/boole-reprocess-xdigi.ref b/Digi/Boole/tests/refs/boole-reprocess-xdigi.ref
index ab11e7303be52292c139727d61723e34ad72a0dc..f700ebd385c4079f5c3c35ecdf27da509b027538 100644
--- a/Digi/Boole/tests/refs/boole-reprocess-xdigi.ref
+++ b/Digi/Boole/tests/refs/boole-reprocess-xdigi.ref
@@ -60,7 +60,7 @@ LinkFTSeq            INFO Member list:
 LinkTrSeq            INFO Member list: BuildMCTrackInfo
 LinkRichSeq          INFO Member list: Rich::MC::MCRichDigitSummaryAlg
 Rich::MC::MCRic...   INFO Will only store MCParticle references for main event
-LinkCaloSeq          INFO Member list: CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
+LinkCaloSeq          INFO Member list: LHCb::UnpackRawEvent/UnpackRawEventCalo, LHCb::UnpackRawEvent/UnpackRawEventCaloError, CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
 LinkMuonSeq          INFO Member list: MuonDigit2MCParticleAlg, MuonTileDigitInfo
 Moni                 INFO Member list: GaudiSequencer/MoniVPSeq, GaudiSequencer/MoniUTSeq, GaudiSequencer/MoniFTSeq, GaudiSequencer/MoniRichSeq, GaudiSequencer/MoniCaloSeq, GaudiSequencer/MoniMuonSeq, GaudiSequencer/MoniMCSeq
 MoniVPSeq            INFO Member list:
diff --git a/Digi/Boole/tests/refs/boole-spillover.ref b/Digi/Boole/tests/refs/boole-spillover.ref
index 9c1a5c4aafac75ecfc0fe7dbb703a3f480620b1f..85afe3e300ef4cbe1b6ab17cd9477af5cd22d728 100644
--- a/Digi/Boole/tests/refs/boole-spillover.ref
+++ b/Digi/Boole/tests/refs/boole-spillover.ref
@@ -59,7 +59,7 @@ LinkFTSeq            INFO Member list:
 LinkTrSeq            INFO Member list: BuildMCTrackInfo
 LinkRichSeq          INFO Member list: Rich::MC::MCRichDigitSummaryAlg
 Rich::MC::MCRic...   INFO Will only store MCParticle references for main event
-LinkCaloSeq          INFO Member list: CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
+LinkCaloSeq          INFO Member list: LHCb::UnpackRawEvent/UnpackRawEventCalo, LHCb::UnpackRawEvent/UnpackRawEventCaloError, CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
 LinkMuonSeq          INFO Member list: MuonDigit2MCParticleAlg, MuonTileDigitInfo
 Moni                 INFO Member list: GaudiSequencer/MoniVPSeq, GaudiSequencer/MoniUTSeq, GaudiSequencer/MoniFTSeq, GaudiSequencer/MoniRichSeq, GaudiSequencer/MoniCaloSeq, GaudiSequencer/MoniMuonSeq, GaudiSequencer/MoniMCSeq
 MoniVPSeq            INFO Member list:
diff --git a/Digi/Boole/tests/refs/boole-upgrade-baseline.ref b/Digi/Boole/tests/refs/boole-upgrade-baseline.ref
index 696e06a067c31f1e0524dc2b9c576997486b0743..28f2bc957af9b1d241e226924b387634cfbbf90f 100644
--- a/Digi/Boole/tests/refs/boole-upgrade-baseline.ref
+++ b/Digi/Boole/tests/refs/boole-upgrade-baseline.ref
@@ -59,7 +59,7 @@ LinkFTSeq            INFO Member list:
 LinkTrSeq            INFO Member list: BuildMCTrackInfo
 LinkRichSeq          INFO Member list: Rich::MC::MCRichDigitSummaryAlg
 Rich::MC::MCRic...   INFO Will only store MCParticle references for main event
-LinkCaloSeq          INFO Member list: CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
+LinkCaloSeq          INFO Member list: LHCb::UnpackRawEvent/UnpackRawEventCalo, LHCb::UnpackRawEvent/UnpackRawEventCaloError, CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
 LinkMuonSeq          INFO Member list: MuonDigit2MCParticleAlg, MuonTileDigitInfo
 Moni                 INFO Member list: GaudiSequencer/MoniVPSeq, GaudiSequencer/MoniUTSeq, GaudiSequencer/MoniFTSeq, GaudiSequencer/MoniRichSeq, GaudiSequencer/MoniCaloSeq, GaudiSequencer/MoniMuonSeq, GaudiSequencer/MoniMCSeq
 MoniVPSeq            INFO Member list:
diff --git a/Digi/Boole/tests/refs/boole-write-xdigi.ref b/Digi/Boole/tests/refs/boole-write-xdigi.ref
index a45ddbfc3c77e9855e9e6552598fcf6317a04d58..dab693ba93fb94122d4c1de6462099d7e9797929 100644
--- a/Digi/Boole/tests/refs/boole-write-xdigi.ref
+++ b/Digi/Boole/tests/refs/boole-write-xdigi.ref
@@ -59,7 +59,7 @@ LinkFTSeq            INFO Member list:
 LinkTrSeq            INFO Member list: BuildMCTrackInfo
 LinkRichSeq          INFO Member list: Rich::MC::MCRichDigitSummaryAlg
 Rich::MC::MCRic...   INFO Will only store MCParticle references for main event
-LinkCaloSeq          INFO Member list: CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
+LinkCaloSeq          INFO Member list: LHCb::UnpackRawEvent/UnpackRawEventCalo, LHCb::UnpackRawEvent/UnpackRawEventCaloError, CaloFutureRawToDigits/FutureEcalZSup, CaloFutureRawToDigits/FutureHcalZSup, CaloDigitLinker/FutureEcalDigitLinker, CaloDigitLinker/FutureHcalDigitLinker
 LinkMuonSeq          INFO Member list: MuonDigit2MCParticleAlg, MuonTileDigitInfo
 Moni                 INFO Member list: GaudiSequencer/MoniVPSeq, GaudiSequencer/MoniUTSeq, GaudiSequencer/MoniFTSeq, GaudiSequencer/MoniRichSeq, GaudiSequencer/MoniCaloSeq, GaudiSequencer/MoniMuonSeq, GaudiSequencer/MoniMCSeq
 MoniVPSeq            INFO Member list: