diff -u b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
--- b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -55,11 +55,11 @@
             if ($fileinfo->getExtension() == 'php') {
               $className = str_replace(DIRECTORY_SEPARATOR, '\\', "$prefix/". $fileinfo->getBasename('.php'));
               $finder = new Psr0HintedFindFile($namespaces);
-              $finder->hint($className, $fileInfo->getPathName());
+              $finder->hint($className, $fileinfo->getPathName());
               $staticReflectionParser = new StaticReflectionParser($className, $finder);
               if ($annotation = $reader->getClassAnnotation($staticReflectionParser->getReflectionClass(), 'Drupal\Core\Annotation\Plugin')) {
                 $definition = $annotation->get();
-                $definition['class'] = $reflectionClass->name;
+                $definition['class'] = $className;
                 $definitions[$definition['plugin_id']] = $definition;
               }
             }
@@ -73 +72,0 @@
-
diff -u b/core/lib/Drupal/Core/Plugin/Discovery/Psr0HintedFindFile.php b/core/lib/Drupal/Core/Plugin/Discovery/Psr0HintedFindFile.php
--- b/core/lib/Drupal/Core/Plugin/Discovery/Psr0HintedFindFile.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/Psr0HintedFindFile.php
@@ -4,10 +4,10 @@
  * Definition of Drupal\Component\Plugin\Discovery\Psr0HintedFindFile.
  */
 
-use Doctrine\Common\Reflection\Psr0FindFile;
-
 namespace Drupal\Core\Plugin\Discovery;
 
+use Doctrine\Common\Reflection\Psr0FindFile;
+
 class Psr0HintedFindFile extends Psr0FindFile {
 
   /**