diff --git a/reco/tasks/CbmTaskBuildEvents.cxx b/reco/tasks/CbmTaskBuildEvents.cxx
index 02c516fafeb97cebb42ae5cb1dd154934a783670..9088dbb930df097f2d4d63609c4fb76d076ce95c 100644
--- a/reco/tasks/CbmTaskBuildEvents.cxx
+++ b/reco/tasks/CbmTaskBuildEvents.cxx
@@ -7,7 +7,6 @@
 #include "CbmDigiBranchBase.h"
 #include "CbmDigiManager.h"
 #include "CbmDigiTimeslice.h"
-#include "CbmModuleList.h"
 
 #include <FairRootManager.h>
 #include <Logger.h>
@@ -171,7 +170,7 @@ void CbmTaskBuildEvents::Exec(Option_t*)
 
   for (const auto& entry : fEventWindows) {
     auto system = entry.first;
-    logOut << ", frac " << CbmModuleList::GetModuleNameCaps(system) << " digis "
+    logOut << ", frac " << ToString(system) << " digis "
            << 100. * double(numDigisEv[system]) / double(numDigisTs[system]) << " %";
   }
 
@@ -201,11 +200,9 @@ void CbmTaskBuildEvents::Finish()
   LOG(info) << "Events               : " << fNumEvents;
   for (const auto& entry : fEventWindows) {
     auto system = entry.first;
-    LOG(info) << setw(4) << left << CbmModuleList::GetModuleNameCaps(system)
-              << " digis in TS     : " << fNumDigisTs[system];
-    LOG(info) << setw(4) << left << CbmModuleList::GetModuleNameCaps(system)
-              << " digis in events : " << fNumDigisEv[system] << " = " << fixed << setprecision(2)
-              << 100. * double(fNumDigisEv[system]) / double(fNumDigisTs[system]) << " %";
+    LOG(info) << setw(4) << left << ToString(system) << " digis in TS     : " << fNumDigisTs[system];
+    LOG(info) << setw(4) << left << ToString(system) << " digis in events : " << fNumDigisEv[system] << " = " << fixed
+              << setprecision(2) << 100. * double(fNumDigisEv[system]) / double(fNumDigisTs[system]) << " %";
   }
   LOG(info) << "Time  / TS           : " << fixed << setprecision(2) << 1000. * fTimeTot / double(fNumTs) << " ms";
   LOG(info) << "Time fill TS         : " << fixed << setprecision(2) << 1000. * fTimeFillTs / double(fNumTs)
@@ -260,10 +257,10 @@ InitStatus CbmTaskBuildEvents::Init()
     for (const auto& entry : fEventWindows) {
       auto system = entry.first;
       if (!fDigiMan->IsPresent(system)) {
-        LOG(fatal) << GetName() << ": No digi branch for " << CbmModuleList::GetModuleNameCaps(system);
+        LOG(fatal) << GetName() << ": No digi branch for " << ToString(system);
         return kFATAL;
       }
-      LOG(info) << "--- Found digi branch for " << CbmModuleList::GetModuleNameCaps(system);
+      LOG(info) << "--- Found digi branch for " << ToString(system);
     }
   }
 
@@ -302,7 +299,7 @@ InitStatus CbmTaskBuildEvents::Init()
     const double tMax = entry.second.second;
     fAlgo.SetEventWindow(system, tMin, tMax);
     LOG(info) << "--- Use algo EventBuilder with event window [" << tMin << ", " << tMax << "] ns for "
-              << CbmModuleList::GetModuleNameCaps(system);
+              << ToString(system);
   }
 
   LOG(info) << "==================================================";
diff --git a/reco/tasks/CbmTaskBuildEvents.h b/reco/tasks/CbmTaskBuildEvents.h
index 89e3b8730effa23058257d40ed8377d0e89297b8..056d3d10065715d31b50d1f16513e9cb5b1a5ae9 100644
--- a/reco/tasks/CbmTaskBuildEvents.h
+++ b/reco/tasks/CbmTaskBuildEvents.h
@@ -120,7 +120,7 @@ private:                                                    // members
   double fTimeSelectorEvt = 0.;
   double fTimeTot         = 0.;
 
-  ClassDef(CbmTaskBuildEvents, 2);
+  ClassDef(CbmTaskBuildEvents, 1);
 };
 
 #endif /* CBMTASKBUILDEVENTS_H */