diff --git a/pylint/checkers/classes/special_methods_checker.py b/pylint/checkers/classes/special_methods_checker.py
index e06854b0ee..92282b3d25 100644
--- a/pylint/checkers/classes/special_methods_checker.py
+++ b/pylint/checkers/classes/special_methods_checker.py
@@ -290,7 +290,7 @@ def _is_iterator(node):
             # Generators can be iterated.
             return True
         # pylint: disable-next=fixme
-        # TODO: Should be covered by https://github.com/PyCQA/astroid/pull/1475
+        # TODO: 2.14: Should be covered by https://github.com/PyCQA/astroid/pull/1475
         if isinstance(node, nodes.ComprehensionScope):
             # Comprehensions can be iterated.
             return True
diff --git a/pylint/checkers/similar.py b/pylint/checkers/similar.py
index d873e272db..7fb89b22c1 100644
--- a/pylint/checkers/similar.py
+++ b/pylint/checkers/similar.py
@@ -798,7 +798,7 @@ def set_option(self, optname, value, action=None, optdict=None):
         Overridden to report options setting to Similar
         """
         # pylint: disable-next=fixme
-        # TODO: Deprecate the non required arguments
+        # TODO: Optparse: Deprecate the non required arguments
         self.linter.set_option(optname, value)
         if optname == "min-similarity-lines":
             self.min_lines = self.linter.config.min_similarity_lines
diff --git a/pylint/checkers/utils.py b/pylint/checkers/utils.py
index a150394a2b..96ae533f53 100644
--- a/pylint/checkers/utils.py
+++ b/pylint/checkers/utils.py
@@ -1127,7 +1127,7 @@ def _supports_protocol(
             return True
 
     # pylint: disable-next=fixme
-    # TODO: Should be covered by https://github.com/PyCQA/astroid/pull/1475
+    # TODO: 2.14: Should be covered by https://github.com/PyCQA/astroid/pull/1475
     if isinstance(value, nodes.ComprehensionScope):
         return True
 
diff --git a/pylint/config/arguments_manager.py b/pylint/config/arguments_manager.py
index 43a289a6d6..0fbc7b6526 100644
--- a/pylint/config/arguments_manager.py
+++ b/pylint/config/arguments_manager.py
@@ -228,7 +228,7 @@ def _load_default_argument_values(self) -> None:
     def _parse_configuration_file(self, arguments: list[str]) -> None:
         """Parse the arguments found in a configuration file into the namespace."""
         # pylint: disable-next=fixme
-        # TODO: This should parse_args instead of parse_known_args
+        # TODO: Optparse: This should parse_args instead of parse_known_args
         self.config = self._arg_parser.parse_known_args(arguments, self.config)[0]
 
     def _parse_command_line_configuration(
@@ -509,7 +509,7 @@ def read_config_file(
     def _parse_toml(config_file: Path, parser: configparser.ConfigParser) -> None:
         """DEPRECATED: Parse and handle errors of a toml configuration file.
 
-        TODO: Remove after read_config_file has been removed.
+        TODO: 3.0: Remove depreacted method.
         """
         with open(config_file, mode="rb") as fp:
             content = tomllib.load(fp)
diff --git a/pylint/config/utils.py b/pylint/config/utils.py
index f2db71608d..75b62938e1 100644
--- a/pylint/config/utils.py
+++ b/pylint/config/utils.py
@@ -54,7 +54,7 @@ def _convert_option_to_argument(
     action = optdict.get("action", "store")
 
     # pylint: disable-next=fixme
-    # TODO: Remove this handling after we have deprecated multiple-choice arguments
+    # TODO: Optparse: Remove this handling after we have deprecated multiple-choice arguments
     choices = optdict.get("choices", None)
     if opt == "confidence":
         choices = None
diff --git a/pylint/constants.py b/pylint/constants.py
index ade139bfbf..0dbb479b38 100644
--- a/pylint/constants.py
+++ b/pylint/constants.py
@@ -49,7 +49,7 @@
 
 USER_HOME = os.path.expanduser("~")
 # pylint: disable-next=fixme
-# TODO Remove in 3.0 with all the surrounding code
+# TODO: 3.0: Remove in 3.0 with all the surrounding code
 OLD_DEFAULT_PYLINT_HOME = ".pylint.d"
 DEFAULT_PYLINT_HOME = platformdirs.user_cache_dir("pylint")
 
diff --git a/pylint/lint/pylinter.py b/pylint/lint/pylinter.py
index 5a63b117a5..6ba685cef2 100644
--- a/pylint/lint/pylinter.py
+++ b/pylint/lint/pylinter.py
@@ -838,7 +838,7 @@ def _parse_error_mode(self) -> None:
         )
 
         # pylint: disable-next=fixme
-        # TODO: Potentially remove after 'set_option' has been refactored
+        # TODO: Optparse: Potentially remove after 'set_option' has been refactored
         self.set_option("reports", False)
         self.set_option("persistent", False)
         self.set_option("score", False)
@@ -1052,7 +1052,7 @@ def check(self, files_or_modules: Sequence[str] | str) -> None:
         self.initialize()
         if not isinstance(files_or_modules, (list, tuple)):
             # pylint: disable-next=fixme
-            # TODO: Update typing and docstring for 'files_or_modules' when removing the deprecation
+            # TODO: 3.0: Remove deprecated typing and update docstring
             warnings.warn(
                 "In pylint 3.0, the checkers check function will only accept sequence of string",
                 DeprecationWarning,
diff --git a/pylint/lint/run.py b/pylint/lint/run.py
index 508ce52818..e687c5fc5d 100644
--- a/pylint/lint/run.py
+++ b/pylint/lint/run.py
@@ -65,7 +65,7 @@ class Run:
     @staticmethod
     def _not_implemented_callback(*args, **kwargs):
         # pylint: disable-next=fixme
-        # TODO: Remove after optparse has been deprecated
+        # TODO: Optparse: Remove after optparse has been deprecated
         raise NotImplementedError
 
     def __init__(
diff --git a/pylint/reporters/base_reporter.py b/pylint/reporters/base_reporter.py
index dc71643e13..d39cdad000 100644
--- a/pylint/reporters/base_reporter.py
+++ b/pylint/reporters/base_reporter.py
@@ -44,7 +44,7 @@ def handle_message(self, msg: Message) -> None:
     def set_output(self, output: TextIO | None = None) -> None:
         """Set output stream."""
         # pylint: disable-next=fixme
-        # TODO: Remove this method after depreciation
+        # TODO: 3.0: Remove deprecated method
         warn(
             "'set_output' will be removed in 3.0, please use 'reporter.out = stream' instead",
             DeprecationWarning,
diff --git a/pylint/reporters/text.py b/pylint/reporters/text.py
index 13769f973d..347f4d6d27 100644
--- a/pylint/reporters/text.py
+++ b/pylint/reporters/text.py
@@ -128,7 +128,7 @@ def colorize_ansi(
     :return: the ansi escaped string
     """
     # pylint: disable-next=fixme
-    # TODO: Remove DeprecationWarning and only accept MessageStyle as parameter
+    # TODO: 3.0: Remove deprecated typing and only accept MessageStyle as parameter
     if not isinstance(msg_style, MessageStyle):
         warnings.warn(
             "In pylint 3.0, the colorize_ansi function of Text reporters will only accept a MessageStyle parameter",
@@ -273,7 +273,7 @@ def __init__(
     ) -> None:
         super().__init__(output)
         # pylint: disable-next=fixme
-        # TODO: Remove DeprecationWarning and only accept ColorMappingDict as color_mapping parameter
+        # TODO: 3.0: Remove deprecated typing and only accept ColorMappingDict as color_mapping parameter
         if color_mapping and not isinstance(
             list(color_mapping.values())[0], MessageStyle
         ):
diff --git a/pylint/testutils/checker_test_case.py b/pylint/testutils/checker_test_case.py
index f0fc12492b..a8dbaca83c 100644
--- a/pylint/testutils/checker_test_case.py
+++ b/pylint/testutils/checker_test_case.py
@@ -27,9 +27,6 @@ def setup_method(self):
         self.checker = self.CHECKER_CLASS(self.linter)
         for key, value in self.CONFIG.items():
             setattr(self.checker.linter.config, key, value)
-            # pylint: disable-next=fixme
-            # TODO: Remove after deprecation of the config attribute
-            setattr(self.checker.config, key, value)
         self.checker.open()
 
     @contextlib.contextmanager
@@ -78,7 +75,7 @@ def assertAddsMessages(
             assert expected_msg.col_offset == gotten_msg.col_offset, msg
             if PY38_PLUS:
                 # pylint: disable=fixme
-                # TODO: Require end_line and end_col_offset and remove the warning
+                # TODO: 3.0: Remove deprecated missing arguments and remove the warning
                 if not expected_msg.end_line == gotten_msg.end_line:
                     warnings.warn(  # pragma: no cover
                         f"The end_line attribute of {gotten_msg} does not match "
diff --git a/pylint/testutils/decorator.py b/pylint/testutils/decorator.py
index bb3fb90b3e..00ddbeec0c 100644
--- a/pylint/testutils/decorator.py
+++ b/pylint/testutils/decorator.py
@@ -20,7 +20,7 @@ def _wrapper(fun):
         def _forward(self, *args, **test_function_kwargs):
             """Set option via argparse."""
             # pylint: disable-next=fixme
-            # TODO: Revisit this decorator after all checkers have switched
+            # TODO: Optparse: Revisit this decorator after all checkers have switched
             options = []
             for key, value in kwargs.items():
                 options += [f"--{key.replace('_', '-')}", _parse_rich_type_value(value)]
diff --git a/pylint/utils/utils.py b/pylint/utils/utils.py
index b53f762cec..11c82cd581 100644
--- a/pylint/utils/utils.py
+++ b/pylint/utils/utils.py
@@ -342,7 +342,7 @@ def _comment(string: str) -> str:
 def _format_option_value(optdict, value):
     """Return the user input's value from a 'compiled' value.
 
-    TODO: Remove in pylint 3.0.
+    TODO: 3.0: Remove deprecated function
     """
     if optdict.get("type", None) == "py_version":
         value = ".".join(str(item) for item in value)