diff --git a/core/lib/Drupal/Component/Reflection/MockFileFinder.php b/core/lib/Drupal/Component/Reflection/MockFileFinder.php
index 6d0c4ea..dfae4cb 100644
--- a/core/lib/Drupal/Component/Reflection/MockFileFinder.php
+++ b/core/lib/Drupal/Component/Reflection/MockFileFinder.php
@@ -23,19 +23,18 @@ class MockFileFinder implements ClassFinderInterface {
   protected $filename;
 
   /**
-   * Implements \Doctrine\Common\Reflection\ClassFinderInterface::__construct().
+   * Constructs a MockFileFinder object.
    */
   public function __construct($prefixes) {
   }
 
   /**
-   * Implements \Doctrine\Common\Reflection\ClassFinderInterface::findFile().
+   * Implements Doctrine\Common\Reflection\ClassFinderInterface::findFile().
    */
   public function findFile($class) {
     return $this->filename;
   }
 
-
   /**
    * Factory for the mock file finder.
    */
@@ -44,4 +43,5 @@ class MockFileFinder implements ClassFinderInterface {
     $object->filename = $filename;
     return $object;
   }
+
 }
diff --git a/core/lib/Drupal/Core/Annotation/AnnotationInterface.php b/core/lib/Drupal/Core/Annotation/AnnotationInterface.php
index 7bf9e85..f6dda6e 100644
--- a/core/lib/Drupal/Core/Annotation/AnnotationInterface.php
+++ b/core/lib/Drupal/Core/Annotation/AnnotationInterface.php
@@ -7,9 +7,14 @@
 
 namespace Drupal\Core\Annotation;
 
+/**
+ * Defines a common interface for @todo.
+ */
 interface AnnotationInterface {
+
   /**
    * Returns the value of an annotation.
    */
   public function get();
+
 }
diff --git a/core/lib/Drupal/Core/Annotation/DirectoryIterator.php b/core/lib/Drupal/Core/Annotation/DirectoryIterator.php
index 73f72ed..b0291c2 100644
--- a/core/lib/Drupal/Core/Annotation/DirectoryIterator.php
+++ b/core/lib/Drupal/Core/Annotation/DirectoryIterator.php
@@ -15,8 +15,13 @@ use DirectoryIterator as PHPDirectoryIterator;
  * be removed.
  */
 class DirectoryIterator extends PHPDirectoryIterator {
+
+  /**
+   * @todo.
+   */
   public function getExtension() {
     $parts = explode('.', $this->getFilename());
     return array_pop($parts);
   }
+
 }
diff --git a/core/lib/Drupal/Core/Annotation/Plugin.php b/core/lib/Drupal/Core/Annotation/Plugin.php
index 80e6135..4a53825 100644
--- a/core/lib/Drupal/Core/Annotation/Plugin.php
+++ b/core/lib/Drupal/Core/Annotation/Plugin.php
@@ -13,6 +13,10 @@ use Drupal\Core\Annotation\AnnotationInterface;
  * @Annotation
  */
 class Plugin implements AnnotationInterface {
+
+  /**
+   * @todo.
+   */
   protected $definition;
 
   /**
@@ -31,7 +35,7 @@ class Plugin implements AnnotationInterface {
   }
 
   /**
-   * Implements AnnotationInterface::get().
+   * Implements Drupal\Core\Annotation\AnnotationInterface::get().
    */
   public function get() {
     return $this->definition;
diff --git a/core/lib/Drupal/Core/Annotation/Translation.php b/core/lib/Drupal/Core/Annotation/Translation.php
index 2457b92..899f71e 100644
--- a/core/lib/Drupal/Core/Annotation/Translation.php
+++ b/core/lib/Drupal/Core/Annotation/Translation.php
@@ -13,6 +13,10 @@ use Drupal\Core\Annotation\AnnotationInterface;
  * @Annotation
  */
 class Translation implements AnnotationInterface {
+
+  /**
+   * @todo.
+   */
   protected $translation;
 
   /**
@@ -31,7 +35,7 @@ class Translation implements AnnotationInterface {
   }
 
   /**
-   * Implements AnnotationInterface::get().
+   * Implements Drupal\Core\Annotation\AnnotationInterface::get().
    */
   public function get() {
     return $this->translation;
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
index 1a707b2..1866fe0 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -19,13 +19,17 @@ use Doctrine\Common\Reflection\StaticReflectionParser;
  * A discovery mechanism finds annotated plugins in PSR-0 namespaces.
  */
 class AnnotatedClassDiscovery implements DiscoveryInterface {
+
+  /**
+   * @todo.
+   */
   function __construct($owner, $type) {
     $this->owner = $owner;
     $this->type = $type;
   }
 
   /**
-   * Implements DiscoveryInterface::getDefinition().
+   * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinition().
    */
   public function getDefinition($plugin_id) {
     $plugins = $this->getDefinitions();
@@ -33,7 +37,7 @@ class AnnotatedClassDiscovery implements DiscoveryInterface {
   }
 
   /**
-   * Implements DiscoveryInterface::getDefinitions().
+   * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinitions().
    */
   public function getDefinitions() {
     $definitions = array();
@@ -71,4 +75,5 @@ class AnnotatedClassDiscovery implements DiscoveryInterface {
     }
     return $definitions;
   }
+
 }