diff --git a/algo/test/_GTestEventBuilder.cxx b/algo/test/_GTestEventBuilder.cxx
index 5a3ab80f0f787215354e52f1e6088275500be29a..e856ac9c633bf8b9005e39982bc2210294e1fa52 100644
--- a/algo/test/_GTestEventBuilder.cxx
+++ b/algo/test/_GTestEventBuilder.cxx
@@ -32,7 +32,7 @@ TEST(_GTestEventBuilder, CheckEventBuilderAlgorithmSimple)
     //tsIn.fData.fTrd.fDigis.push_back(CbmTrdDigi(0, 1.0, 1.0, i * inputSpacing));
     tsIn.fData.fRich.fDigis.push_back(CbmRichDigi(1111, i * inputSpacing, 1.0));
     tsIn.fData.fPsd.fDigis.push_back(CbmPsdDigi(1111, i * inputSpacing, 1.0));
-    tsIn.fData.fT0.fDigis.push_back(CbmTofDigi(1111, i * inputSpacing, 1.0));
+    tsIn.fData.fT0.fDigis.push_back(CbmTzdDigi(1111, i * inputSpacing, 1.0));
   }
 
   std::vector<double> triggerIn;
diff --git a/reco/tasks/CbmTaskBuildEvents.cxx b/reco/tasks/CbmTaskBuildEvents.cxx
index ddb366c3c1f1fdc891f4204a2fa9a0020aaacdd4..1610d1a5691f2b642f8415913221e379fb0d39af 100644
--- a/reco/tasks/CbmTaskBuildEvents.cxx
+++ b/reco/tasks/CbmTaskBuildEvents.cxx
@@ -83,8 +83,8 @@ CbmDigiTimeslice CbmTaskBuildEvents::FillTimeSlice()
         break;
       }
       case ECbmModuleId::kT0: {  //T0 has Tof digis
-        const vector<CbmTofDigi>* digiVec =
-          boost::any_cast<const vector<CbmTofDigi>*>(digiBranch->GetBranchContainer());
+        const vector<CbmTzdDigi>* digiVec =
+          boost::any_cast<const vector<CbmTzdDigi>*>(digiBranch->GetBranchContainer());
         assert(digiVec);
         ts.fData.fT0.fDigis = *digiVec;
         break;
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.cxx b/reco/tasks/CbmTaskMakeRecoEvents.cxx
index aeadc0e6c8aaa0c0f2097271ed6d902210c52956..9fa7784ad18b9422e3e65ff4104911df436d1a53 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.cxx
+++ b/reco/tasks/CbmTaskMakeRecoEvents.cxx
@@ -64,7 +64,7 @@ void CbmTaskMakeRecoEvents::Exec(Option_t*)
     CbmEvent* recoEvent = new ((*fRecoEvents)[eventNr]) CbmEvent(eventNr);
 
     // --- Copy T0 digis
-    FillTree<CbmTofDigi>(digiEvent.fData.fT0.fDigis, fT0Digis, recoEvent, ECbmDataType::kT0Digi);
+    FillTree<CbmTzdDigi>(digiEvent.fData.fT0.fDigis, fT0Digis, recoEvent, ECbmDataType::kT0Digi);
 
     // --- Copy STS digis
     FillTree<CbmStsDigi>(digiEvent.fData.fSts.fDigis, fStsDigis, recoEvent, ECbmDataType::kStsDigi);
@@ -150,7 +150,7 @@ InitStatus CbmTaskMakeRecoEvents::Init()
     }
 
     // --- T0 digis
-    fT0Digis = new std::vector<CbmTofDigi>;
+    fT0Digis = new std::vector<CbmTzdDigi>;
     frm->RegisterAny("T0Digi", fT0Digis, kFALSE);
 
     // --- STS digis
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.h b/reco/tasks/CbmTaskMakeRecoEvents.h
index 5b19a7dd738378c134ef3cdd5e2a8a43dff18ebf..9c020891f9cd775c2c6a0cd2eff2a00298ae0abc 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.h
+++ b/reco/tasks/CbmTaskMakeRecoEvents.h
@@ -92,7 +92,7 @@ private:  // methods
 private:  // members
   const std::vector<CbmDigiEvent>* fDigiEvents = nullptr;
   TClonesArray* fRecoEvents                    = nullptr;
-  std::vector<CbmTofDigi>* fT0Digis            = nullptr;
+  std::vector<CbmTzdDigi>* fT0Digis            = nullptr;
   std::vector<CbmStsDigi>* fStsDigis           = nullptr;
   std::vector<CbmRichDigi>* fRichDigis         = nullptr;
   std::vector<CbmMuchDigi>* fMuchDigis         = nullptr;