diff --git a/algo/base/Definitions.h b/algo/base/Definitions.h
index 7741095975211faaf827c480cf8e36f38347b68e..3a3cb83e1b166f1f15f575351fedf959be98a319 100644
--- a/algo/base/Definitions.h
+++ b/algo/base/Definitions.h
@@ -40,7 +40,7 @@ CBM_ENUM_DICT(fles::Subsystem,
   // Other detectors (experimental)
   {"ECAL", fles::Subsystem::ECAL},
   {"PSD", fles::Subsystem::PSD},
-  {"T0", fles::Subsystem::T0},
+  {"BMON", fles::Subsystem::BMON},
   {"TRB3", fles::Subsystem::TRB3},
   {"Hodoscope", fles::Subsystem::Hodoscope},
   {"Cherenkov", fles::Subsystem::Cherenkov},
diff --git a/algo/unpack/Unpack.cxx b/algo/unpack/Unpack.cxx
index 74f0462dbe84049b96aced22412ea8202508ef90..0142a298b784202b026d604d7f1fd7e2bd9dd489 100644
--- a/algo/unpack/Unpack.cxx
+++ b/algo/unpack/Unpack.cxx
@@ -63,7 +63,7 @@ namespace cbm::algo
       // if (subsystem == Subsystem::TOF) {
       //   MsLoop(timeslice, fAlgoTof, comp, equipmentId, &digiTs.fData.fTof.fDigis, monitor, &monitor.fTof, 0x00);
       // }
-      if (subsystem == Subsystem::T0) {
+      if (subsystem == Subsystem::BMON) {
         MsLoop(timeslice, fAlgoBmon, comp, equipmentId, &digiTs.fData.fT0.fDigis, monitor, &monitor.fBmon, 0x00);
       }
       if (subsystem == Subsystem::TRD) {
@@ -298,7 +298,7 @@ namespace cbm::algo
       for (size_t elink = 0; elink < numElinks; elink++) {
         UnpackBmonElinkPar elinkPar;
         elinkPar.fChannelUId = fBmonConfig.Map(equip, elink);  // Vector of T0 addresses for this elink
-        elinkPar.fTimeOffset = fSystemTimeOffset[Subsystem::T0];
+        elinkPar.fTimeOffset = fSystemTimeOffset[Subsystem::BMON];
         par->fElinkParams.push_back(elinkPar);
       }
       fAlgoBmon[equip].SetParams(std::move(par));
diff --git a/algo/unpack/Unpack.h b/algo/unpack/Unpack.h
index 8b93ff770b4dc036ea1b76f3380fc0188ae59817..2709977fd527eae98614917a7b643460bd5666aa 100644
--- a/algo/unpack/Unpack.h
+++ b/algo/unpack/Unpack.h
@@ -120,7 +120,7 @@ namespace cbm::algo
                 Subsystem::STS,
                 Subsystem::MUCH,
                 Subsystem::TOF,
-                Subsystem::T0,
+                Subsystem::BMON,
                 Subsystem::TRD,
                 Subsystem::TRD2D,
                 Subsystem::RICH,
@@ -180,7 +180,7 @@ namespace cbm::algo
     /** @brief System time offsets **/
     std::map<Subsystem, int32_t> fSystemTimeOffset = {
       {Subsystem::STS, -970}, {Subsystem::MUCH, -980}, {Subsystem::RICH, 100},  {Subsystem::TOF, 40},
-      {Subsystem::T0, 0},     {Subsystem::TRD, 1300},  {Subsystem::TRD2D, -510}};
+      {Subsystem::BMON, 0},   {Subsystem::TRD, 1300},  {Subsystem::TRD2D, -510}};
   };
 }  // namespace cbm::algo
 
diff --git a/algo/unpack/UnpackChain.cxx b/algo/unpack/UnpackChain.cxx
index 82fd6f76ad790137464085167919c910c59c1575..3132c5d775dd56feda9ca5313ef11ac7f2090d38 100644
--- a/algo/unpack/UnpackChain.cxx
+++ b/algo/unpack/UnpackChain.cxx
@@ -12,7 +12,7 @@ void UnpackChain::Init()
   fUnpack.Init(std::vector<fles::Subsystem> {
     fles::Subsystem::STS,
     // fles::Subsystem::MUCH,
-    fles::Subsystem::TOF, fles::Subsystem::T0,
+    fles::Subsystem::TOF, fles::Subsystem::BMON,
     // fles::Subsystem::TRD,
     // fles::Subsystem::TRD2D,
   });
diff --git a/external/InstallFlesnet.cmake b/external/InstallFlesnet.cmake
index 02a72d36275ffd6b4b1066cc3e2910fda2672a41..b2bb9d9bdc9092c5e96da91fd7783d02b9c3607f 100644
--- a/external/InstallFlesnet.cmake
+++ b/external/InstallFlesnet.cmake
@@ -3,7 +3,7 @@
 # The included libraries provide the interface to the experiment data in timeslices
 # both online and in timeslice archive (.tsa) files.
 
-set(FLESNET_VERSION 7d8bb6819671e9718da8cce052d9c070fe0c9cfc) # 2023-07-04
+set(FLESNET_VERSION 8a8b7cefd37b18cfd15a3c0c812ff652217e994e) # 2023-07-06
 
 set(FLESNET_SRC_URL "https://github.com/cbm-fles/flesnet")
 
diff --git a/reco/steer/CbmRecoUnpack.cxx b/reco/steer/CbmRecoUnpack.cxx
index 0c724b4c4095e474116594bbd7019017700c6167..c50a56159bb235a0d966ca47130a3b3e409bcc17 100644
--- a/reco/steer/CbmRecoUnpack.cxx
+++ b/reco/steer/CbmRecoUnpack.cxx
@@ -197,7 +197,7 @@ Bool_t CbmRecoUnpack::Init()
     fBmonConfig->LoadParFileName();  /// Needed to change the Parameter file name before it is used!!!
     initParContainers(fBmonConfig->GetParContainerRequest());  /// Framework bound work = kept in this Task
     fBmonConfig->InitAlgo();
-    initPerformanceMaps(Subsystem::T0, "Bmon");
+    initPerformanceMaps(Subsystem::BMON, "Bmon");
   }
 
   if (fDoPerfProfPerTs) {
@@ -549,7 +549,7 @@ void CbmRecoUnpack::Unpack(unique_ptr<Timeslice> ts)
         }
         break;
       }
-      case Subsystem::T0: {
+      case Subsystem::BMON: {
         if (fBmonConfig) {
           fCbmTsEventHeader->AddNDigisBmon(unpack(subsystem, &timeslice, component, fBmonConfig,
                                                   fBmonConfig->GetOptOutAVec(), fBmonConfig->GetOptOutBVec()));