diff --git a/Framework/Core/include/Framework/CompletionPolicyHelpers.h b/Framework/Core/include/Framework/CompletionPolicyHelpers.h
index a0aae63dd3d8f..29d406dae00a3 100644
--- a/Framework/Core/include/Framework/CompletionPolicyHelpers.h
+++ b/Framework/Core/include/Framework/CompletionPolicyHelpers.h
@@ -33,7 +33,7 @@ struct CompletionPolicyHelpers {
     return consumeWhenAll("consume-all", matcher);
   }
 
-  /// as consumeWhenAll, but ensures that records are processed with incremental DataHeader::tfCounter
+  /// as consumeWhenAll, but ensures that records are processed with incremental timeSlice (DataHeader::startTime)
   static CompletionPolicy consumeWhenAllOrdered(const char* name, CompletionPolicy::Matcher matcher);
   /// Default matcher applies for all devices
   static CompletionPolicy consumeWhenAllOrdered(CompletionPolicy::Matcher matcher = [](auto const&) -> bool { return true; })
diff --git a/Framework/Core/src/CompletionPolicyHelpers.cxx b/Framework/Core/src/CompletionPolicyHelpers.cxx
index 67498a139f78f..d1a6f5d1c2a54 100644
--- a/Framework/Core/src/CompletionPolicyHelpers.cxx
+++ b/Framework/Core/src/CompletionPolicyHelpers.cxx
@@ -116,17 +116,17 @@ CompletionPolicy CompletionPolicyHelpers::consumeWhenAll(const char* name, Compl
 
 CompletionPolicy CompletionPolicyHelpers::consumeWhenAllOrdered(const char* name, CompletionPolicy::Matcher matcher)
 {
-  auto nextTfCounter = std::make_shared<long int>(0);
-  auto callback = [nextTfCounter](InputSpan const& inputs) -> CompletionPolicy::CompletionOp {
+  auto nextTimeSlice = std::make_shared<long int>(0);
+  auto callback = [nextTimeSlice](InputSpan const& inputs) -> CompletionPolicy::CompletionOp {
     for (auto& input : inputs) {
       if (input.header == nullptr) {
         return CompletionPolicy::CompletionOp::Wait;
       }
-      if (framework::DataRefUtils::isValid(input) && framework::DataRefUtils::getHeader<o2::header::DataHeader*>(input)->tfCounter != *nextTfCounter) {
+      if (framework::DataRefUtils::isValid(input) && framework::DataRefUtils::getHeader<o2::framework::DataProcessingHeader*>(input)->startTime != *nextTimeSlice) {
         return CompletionPolicy::CompletionOp::Wait;
       }
     }
-    (*nextTfCounter)++;
+    (*nextTimeSlice)++;
     return CompletionPolicy::CompletionOp::ConsumeAndRescan;
   };
   return CompletionPolicy{name, matcher, callback};