diff --git a/packages/actor-query-operation-group/lib/GroupsIterator.ts b/packages/actor-query-operation-group/lib/GroupsIterator.ts
index 9ddd733..1b8c2c5 100644
--- a/packages/actor-query-operation-group/lib/GroupsIterator.ts
+++ b/packages/actor-query-operation-group/lib/GroupsIterator.ts
@@ -50,7 +50,7 @@ export class GroupIterator extends AsyncIterator<Bindings> {
     this.context = context;
     this.mediatorBindingsAggregatorFactory = mediatorBindingsAggregatorFactory;
 
-    // TODO [2024-11-21]: this is a bit of a hack, we should not be listening to the data event
+    // TODO [2024-06-01]: this is a bit of a hack, we should not be listening to the data event
     let dataCounter = 0;
     inputBindings.on('data', (bindings: Bindings) => {
       dataCounter++;
@@ -90,7 +90,7 @@ export class GroupIterator extends AsyncIterator<Bindings> {
       this.nextBindings = null;
       return bindings;
     }
-    // TODO [2024-11-21]: maybe make sure this is done in round robin fashion
+    // TODO [2024-09-01]: maybe make sure this is done in round robin fashion
     for (const group of this.groups.values()) {
       if (group.groupBuffer) {
         continue;
diff --git a/packages/actor-query-source-identify-stream/lib/StreamQuerySources.ts b/packages/actor-query-source-identify-stream/lib/StreamQuerySources.ts
index e13fb1d..0fc8286 100644
--- a/packages/actor-query-source-identify-stream/lib/StreamQuerySources.ts
+++ b/packages/actor-query-source-identify-stream/lib/StreamQuerySources.ts
@@ -180,12 +180,12 @@ export class StreamQuerySources implements IQuerySource {
     }
 
     const variables = getVariables(<Algebra.Pattern>operation);
-    // TODO [2025-01-01]: how to handle metadata correctly
+    // TODO [2025-04-01]: how to handle metadata correctly
     let accumulatedMetadata: MetadataBindings = {
       state: new MetadataValidationState(),
       cardinality: { type: 'estimate', value: 1 },
       variables: variables.map(variable =>
-        // TODO [2025-01-01]: make sure canBeUndef is set correctly
+        // TODO [2025-04-01]: make sure canBeUndef is set correctly
         ({ variable, canBeUndef: false })),
     };
     let first = true;
diff --git a/packages/actor-query-source-identify-streaming-rdfjs/lib/StreamingQuerySourceRdfJs.ts b/packages/actor-query-source-identify-streaming-rdfjs/lib/StreamingQuerySourceRdfJs.ts
index 13237c3..e566e93 100644
--- a/packages/actor-query-source-identify-streaming-rdfjs/lib/StreamingQuerySourceRdfJs.ts
+++ b/packages/actor-query-source-identify-streaming-rdfjs/lib/StreamingQuerySourceRdfJs.ts
@@ -34,7 +34,6 @@ import { Factory } from 'sparqlalgebrajs';
 import type { Algebra } from 'sparqlalgebrajs';
 
 export class StreamingQuerySourceRdfJs extends StreamingQuerySource {
-  // TODO [2025-01-01]: generalize store type
   public store: StreamingStore<Quad>;
   private registeredQueries: number;
   protected readonly selectorShape: FragmentSelectorShape;
diff --git a/packages/actor-rdf-join-inner-memory-bind/lib/ActorRdfJoinInnerMemoryBind.ts b/packages/actor-rdf-join-inner-memory-bind/lib/ActorRdfJoinInnerMemoryBind.ts
index 4d4f934..d85a353 100644
--- a/packages/actor-rdf-join-inner-memory-bind/lib/ActorRdfJoinInnerMemoryBind.ts
+++ b/packages/actor-rdf-join-inner-memory-bind/lib/ActorRdfJoinInnerMemoryBind.ts
@@ -429,7 +429,7 @@ export class ActorRdfJoinInnerMemoryBind extends ActorRdfJoin {
     const receiveItemCostRemaining = remainingRequestItemTimes
       .reduce((sum, element) => sum + element, 0);
 
-    // TODO [2025-01-01]: persistedItems is not yet implemented
+    // TODO [2025-06-01]: persistedItems is not yet implemented
     return passTestWithSideData({
       iterations: metadatas[0].cardinality.value * cardinalityRemaining,
       persistedItems: 0,
diff --git a/packages/actor-source-watch-polling/lib/ActorSourceWatchPolling.ts b/packages/actor-source-watch-polling/lib/ActorSourceWatchPolling.ts
index ea3e521..5c488ed 100644
--- a/packages/actor-source-watch-polling/lib/ActorSourceWatchPolling.ts
+++ b/packages/actor-source-watch-polling/lib/ActorSourceWatchPolling.ts
@@ -47,7 +47,7 @@ export class ActorSourceWatchPolling extends ActorSourceWatch {
 
     let etag = action.metadata.etag;
     const checkForChanges = (): void => {
-      // TODO [2024-12-19]: what if the source doesn't support HEAD requests, if it's a SPARQL endpoint for example?
+      // TODO [2024-03-01]: what if the source doesn't support HEAD requests, if it's a SPARQL endpoint for example?
       this.mediatorHttp.mediate(
         {
           context: action.context,
@@ -61,7 +61,7 @@ export class ActorSourceWatchPolling extends ActorSourceWatch {
           pollingStartTime = Date.now() + (pollingPeriod - Number.parseInt(action.metadata.age, 10)) * 1000;
         }
 
-        // TODO [2024-12-01]: have more specific error handling for example 304: Not Modified should not emit 'delete'
+        // TODO [2024-08-01]: have more specific error handling for example 304: Not Modified should not emit 'delete'
         if (!responseHead.ok) {
           events.emit('delete');
         }
diff --git a/packages/bus-source-watch/lib/ActorSourceWatch.ts b/packages/bus-source-watch/lib/ActorSourceWatch.ts
index d16713f..93ab590 100644
--- a/packages/bus-source-watch/lib/ActorSourceWatch.ts
+++ b/packages/bus-source-watch/lib/ActorSourceWatch.ts
@@ -6,9 +6,9 @@ import { Actor } from '@comunica/core';
  * An incremunica actor for source-watch events.
  *
  * Actor types:
- * * Input:  IActionSourceWatch:      // TODO: fill in.
+ * * Input:  IActionSourceWatch:      // TODO [2024-12-01]: fill in.
  * * Test:   <none>
- * * Output: IActorSourceWatchOutput: // TODO: fill in.
+ * * Output: IActorSourceWatchOutput: // TODO [2024-12-01]: fill in.
  *
  * @see IActionSourceWatch
  * @see IActorSourceWatchOutput