diff --git a/benchmarks/far_forward/options/zdc_reconstruction.py b/benchmarks/far_forward/options/zdc_reconstruction.py
index ba8cc39365276f2ce7c36b97b4514f8ed79fa12f..cae2dfaed2a678970d86d8565da9b7227be0e1fd 100644
--- a/benchmarks/far_forward/options/zdc_reconstruction.py
+++ b/benchmarks/far_forward/options/zdc_reconstruction.py
@@ -31,10 +31,10 @@ podioevent = EICDataSvc('EventDataSvc', inputs=kwargs['input'].split(','), Outpu
 
 sim_colls = [
     'MCParticles',
-    'ZDCEcalHits',
-    'ZDCEcalHitsContributions',
-    'ZDCHcalHits',
-    'ZDCHcalHitsContributions',
+    'EcalFarForwardZDCHits',
+    'EcalFarForwardZDCHitsContributions',
+    'HcalFarForwardZDCHits',
+    'HcalFarForwardZDCHitsContributions',
 ]
 
 podin = PodioInput('PodioReader', collections=sim_colls, OutputLevel=DEBUG)
@@ -42,30 +42,30 @@ podout = PodioOutput('out', filename=kwargs['output'])
 
 # Digitization
 WSciFi_digi = CalHitDigi('WSciFi_digi',
-        inputHitCollection='ZDCEcalHits',
-        outputHitCollection='ZDCEcalRawHits')
+        inputHitCollection='EcalFarForwardZDCHits',
+        outputHitCollection='EcalFarForwardZDCRawHits')
 
 PbSci_digi = CalHitDigi('PbSci_digi',
-        inputHitCollection='ZDCHcalHits',
-        outputHitCollection='ZDCHcalRawHits')
+        inputHitCollection='HcalFarForwardZDCHits',
+        outputHitCollection='HcalFarForwardZDCRawHits')
 
 # Reconstruction
 WSciFi_reco = CalHitReco('WSciFi_reco',
         inputHitCollection=WSciFi_digi.outputHitCollection,
-        outputHitCollection='ZDCEcalRecHits',
-        readoutClass='ZDCEcalHits',
+        outputHitCollection='EcalFarForwardZDCRecHits',
+        readoutClass='EcalFarForwardZDCHits',
         localDetFields=['system'])
 
 PbSci_reco = CalHitReco('PbSci_reco',
         inputHitCollection=PbSci_digi.outputHitCollection,
-        outputHitCollection='ZDCHcalRecHits',
-        readoutClass='ZDCHcalHits',
+        outputHitCollection='HcalFarForwardZDCRecHits',
+        readoutClass='HcalFarForwardZDCHits',
         localDetFields=['system'])
 
 # Clustering
 WSciFi_cl = IslandCluster('WSciFi_cl',
         inputHitCollection=WSciFi_reco.outputHitCollection,
-        outputProtoClusterCollection='ZDCEcalProtoClusters',
+        outputProtoClusterCollection='EcalFarForwardZDCProtoClusters',
         minClusterCenterEdep=3.*MeV,
         minClusterHitEdep=0.1*MeV,
         localDistXY=[50*mm, 50*mm],
@@ -73,12 +73,12 @@ WSciFi_cl = IslandCluster('WSciFi_cl',
 
 WSciFi_clreco = RecoCoG('WSciFi_clreco',
         inputProtoClusterCollection = WSciFi_cl.outputProtoClusterCollection,
-        outputClusterCollection='ZDCEcalClusters',
+        outputClusterCollection='EcalFarForwardZDCClusters',
         logWeightBase=3.6)
 
 PbSci_cl = IslandCluster('PbSci_cl',
         inputHitCollection=PbSci_reco.outputHitCollection,
-        outputProtoClusterCollection='ZDCHcalProtoClusters',
+        outputProtoClusterCollection='HcalFarForwardZDCProtoClusters',
         minClusterCenterEdep=1.*MeV,
         minClusterHitEdep=0.1*MeV,
         localDistXY=[200*mm, 200*mm],
@@ -86,7 +86,7 @@ PbSci_cl = IslandCluster('PbSci_cl',
 
 PbSci_clreco = RecoCoG('PbSci_clreco',
         inputProtoClusterCollection = PbSci_cl.outputProtoClusterCollection,
-        outputClusterCollection='ZDCHcalClusters',
+        outputClusterCollection='HcalFarForwardZDCClusters',
         logWeightBase=3.6,
         samplingFraction=kwargs['PbSci_sf'])