diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index c8b4171358223b29dfb9c60b95cafa837d018a03..37efb97dbfdc52cb7298799192a534563f53c8f0 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -510,8 +510,8 @@ public function tableExists($table) {
     // the most likely reason is that it does not exist. That is dramatically
     // faster than using information_schema.
     // @link http://bugs.mysql.com/bug.php?id=19588
-    // @todo: This override should be removed once we require a version of MySQL
-    // that has that bug fixed.
+    // @todo This override should be removed once we require a version of MySQL
+    //   that has that bug fixed.
     try {
       $this->connection->queryRange("SELECT 1 FROM {" . $table . "}", 0, 1);
       return TRUE;
@@ -527,8 +527,8 @@ public function fieldExists($table, $column) {
     // fails, the most likely reason is that it does not exist. That is
     // dramatically faster than using information_schema.
     // @link http://bugs.mysql.com/bug.php?id=19588
-    // @todo: This override should be removed once we require a version of MySQL
-    // that has that bug fixed.
+    // @todo This override should be removed once we require a version of MySQL
+    //   that has that bug fixed.
     try {
       $this->connection->queryRange("SELECT $column FROM {" . $table . "}", 0, 1);
       return TRUE;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
index 8866ef22a53d1c38ce6b0c7241b0784e1d69aae4..4f0e16bb7b82ec3723f5877c5d4ba81c161b5272 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
@@ -21,7 +21,7 @@ public function name() {
   /**
    * Minimum engine version.
    *
-   * @todo: consider upping to 3.6.8 in Drupal 8 to get SAVEPOINT support.
+   * @todo Consider upping to 3.6.8 in Drupal 8 to get SAVEPOINT support.
    */
   public function minimumVersion() {
     return '3.3.7';
diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
index 0cd76e0c8c1d2a186d6038ee009f27b030ff0b7a..b6e1dd12e63b431d46dff397f74d82ea85a3b9ce 100644
--- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
@@ -44,7 +44,8 @@ abstract class LocalStream implements StreamWrapperInterface {
 
   /**
    * Gets the path that the wrapper is responsible for.
-   * @TODO: Review this method name in D8 per http://drupal.org/node/701358
+   *
+   * @todo Review this method name in D8 per http://drupal.org/node/701358.
    *
    * @return string
    *   String specifying the path.
diff --git a/core/lib/Drupal/Core/Updater/Updater.php b/core/lib/Drupal/Core/Updater/Updater.php
index 2dca5baa29909521c41ff25cb786648273c0df56..5a484cf2e4c644ee6397e2c37dda611dafc6ac47 100644
--- a/core/lib/Drupal/Core/Updater/Updater.php
+++ b/core/lib/Drupal/Core/Updater/Updater.php
@@ -112,8 +112,8 @@ public static function findInfoFile($directory) {
   /**
    * Gets the name of the project directory (basename).
    *
-   * @todo: It would be nice, if projects contained an info file which could
-   *        provide their canonical name.
+   * @todo It would be nice, if projects contained an info file which could
+   *   provide their canonical name.
    *
    * @param string $directory
    *
@@ -213,7 +213,7 @@ public function update(&$filetransfer, $overrides = array()) {
       $this->makeWorldReadable($filetransfer, $args['install_dir'] . '/' . $this->name);
 
       // Run the updates.
-      // @TODO: decide if we want to implement this.
+      // @todo Decide if we want to implement this.
       $this->postUpdate();
 
       // For now, just return a list of links of things to do.
@@ -252,7 +252,7 @@ public function install(&$filetransfer, $overrides = array()) {
       $this->makeWorldReadable($filetransfer, $args['install_dir'] . '/' . $this->name);
 
       // Potentially enable something?
-      // @TODO: decide if we want to implement this.
+      // @todo Decide if we want to implement this.
       $this->postInstall();
       // For now, just return a list of links of things to do.
       return $this->postInstallTasks();
@@ -286,7 +286,7 @@ public function prepareInstallDirectory(&$filetransfer, $directory) {
         }
         catch (FileTransferException $e) {
           // Probably still not writable. Try to chmod and do it again.
-          // @todo: Make a new exception class so we can catch it differently.
+          // @todo Make a new exception class so we can catch it differently.
           try {
             $old_perms = substr(sprintf('%o', fileperms($parent_dir)), -4);
             $filetransfer->chmod($parent_dir, 0755);
diff --git a/core/lib/Drupal/Core/Updater/UpdaterInterface.php b/core/lib/Drupal/Core/Updater/UpdaterInterface.php
index 6d789ce4caca84776bd359ba6413b5f59ed00a4b..50a1409936d4a3b389a20d0dfe1676ead4131ee8 100644
--- a/core/lib/Drupal/Core/Updater/UpdaterInterface.php
+++ b/core/lib/Drupal/Core/Updater/UpdaterInterface.php
@@ -45,7 +45,7 @@ public function getInstallDirectory();
   /**
    * Determines if the Updater can handle the project provided in $directory.
    *
-   * @todo: Provide something more rational here, like a project spec file.
+   * @todo Provide something more rational here, like a project spec file.
    *
    * @param string $directory
    *