diff --git a/core/lib/Drupal/Component/Plugin/Context/ContextDefinitionInterface.php b/core/lib/Drupal/Component/Plugin/Context/ContextDefinitionInterface.php
index 316be6f..16fdc8b 100644
--- a/core/lib/Drupal/Component/Plugin/Context/ContextDefinitionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Context/ContextDefinitionInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface for context definitions.
  *
- * WARNING: This interface is going to receive some additions as part of
+ * @todo WARNING: This interface is going to receive some additions as part of
  * https://www.drupal.org/node/2346999.
  */
 interface ContextDefinitionInterface {
diff --git a/core/lib/Drupal/Core/Action/ActionInterface.php b/core/lib/Drupal/Core/Action/ActionInterface.php
index a500f10..fe04acb 100644
--- a/core/lib/Drupal/Core/Action/ActionInterface.php
+++ b/core/lib/Drupal/Core/Action/ActionInterface.php
@@ -13,8 +13,8 @@
 /**
  * Provides an interface for an Action plugin.
  *
- * WARNING: The action API is going to receive some additions before release.
- * The following additions are likely to happen:
+ * @todo WARNING: The action API is going to receive some additions before
+ * release. The following additions are likely to happen:
  *  - The way configuration is handled and configuration forms are built is
  *    likely to change in order for the plugin to be of use for Rules.
  *  - Actions are going to become context-aware in
diff --git a/core/lib/Drupal/Core/Condition/ConditionInterface.php b/core/lib/Drupal/Core/Condition/ConditionInterface.php
index 40c36d3..da29ce2 100644
--- a/core/lib/Drupal/Core/Condition/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Condition/ConditionInterface.php
@@ -27,12 +27,11 @@
  *
  * @todo Replace the dependency on \Drupal\Core\Form\FormInterface with a new
  *   interface from https://drupal.org/node/2006248.
- *
- * WARNING: The condition API is going to receive some additions before release.
+ * @todo WARNING: The condition API is going to receive some additions before release.
  * The following additions are likely to happen:
  *  - The way configuration is handled and configuration forms are built is
  *    likely to change in order for the plugin to be of use for Rules.
- *  - Condition will receive a data processing API that allows for token
+ *  - Conditions will receive a data processing API that allows for token
  *    replacements to happen outside of the plugin implementations,
  *    see https://www.drupal.org/node/2347023.
  *  - Conditions will have to implement access control for checking who is