diff --git a/esrally/driver/runner.py b/esrally/driver/runner.py
index e1fbb11be..dfd973597 100644
--- a/esrally/driver/runner.py
+++ b/esrally/driver/runner.py
@@ -808,7 +808,7 @@ def __repr__(self, *args, **kwargs):
         return "retryable %s" % repr(self.delegate)
 
 
-# TODO #370: Remove this registration and replace with a new Index runner.
+# TODO #435: Remove this registration
 # Old (deprecated) name
 register_runner(track.OperationType.Index.name, BulkIndex())
 # New name
diff --git a/esrally/track/loader.py b/esrally/track/loader.py
index d04de55ea..013a9875b 100644
--- a/esrally/track/loader.py
+++ b/esrally/track/loader.py
@@ -1146,7 +1146,7 @@ def parse_operation(self, op_spec, error_ctx="operations"):
             params = op_spec
 
         try:
-            # TODO #370: Remove this warning.
+            # TODO #435: Remove this warning.
             # Add a deprecation warning but not for built-in tracks (they need to keep the name for backwards compatibility in the meantime)
             if op_type_name == "index" and \
                     self.name not in DEFAULT_TRACKS and \
diff --git a/esrally/track/params.py b/esrally/track/params.py
index 0fad845bc..65257f386 100644
--- a/esrally/track/params.py
+++ b/esrally/track/params.py
@@ -825,7 +825,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         return False
 
 
-# TODO #370: Remove this registration.
+# TODO #435: Remove this registration.
 # Old name - deprecated
 register_param_source_for_operation(track.OperationType.Index, BulkIndexParamSource)
 # New name