diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Type/DisplayComponentHandlerPluginManager.php b/core/modules/entity/lib/Drupal/entity/Plugin/Type/DisplayComponentHandlerPluginManager.php
index de99ec7..29d1330 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/Type/DisplayComponentHandlerPluginManager.php
+++ b/core/modules/entity/lib/Drupal/entity/Plugin/Type/DisplayComponentHandlerPluginManager.php
@@ -38,7 +38,7 @@ class DisplayComponentHandlerPluginManager extends PluginManagerBase {
   public function __construct(\Traversable $namespaces) {
     // @todo document the aletr hook.
     // @todo cache key / bin ?
-    $this->discovery = new AnnotatedClassDiscovery('display_component_handler', $namespaces);
+    $this->discovery = new AnnotatedClassDiscovery('entity/display_component_handler', $namespaces);
     $this->discovery = new AlterDecorator($this->discovery, 'display_component_handler_info');
     $this->discovery = new CacheDecorator($this->discovery, 'plugin_display_component_handler');
 
diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/entity/display_component_handler/ExtraFieldDisplayComponentHandler.php b/core/modules/entity/lib/Drupal/entity/Plugin/entity/display_component_handler/ExtraFieldDisplayComponentHandler.php
index 01ebb01..b4909b3 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/entity/display_component_handler/ExtraFieldDisplayComponentHandler.php
+++ b/core/modules/entity/lib/Drupal/entity/Plugin/entity/display_component_handler/ExtraFieldDisplayComponentHandler.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\entity\Plugin\entity\display_component_handler;
 
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\entity\Plugin\Type\DisplayComponentHandlerBase;
 
 /**
@@ -36,7 +36,8 @@ public function prepareDisplayComponents(array &$components) {
             'visible' => FALSE,
           );
         }
-        $components[$name]['handler_type'] = $this->plugin_id;
+
+        $components[$name]['handler_type'] = $this->pluginId;
       }
     }
     // @todo : we could add a custom $display->hiddenExtraFields property on the display, and merge them back on save.
diff --git a/core/modules/field/lib/Drupal/field/Plugin/entity/display_component_handler/FieldDisplayComponentHandler.php b/core/modules/field/lib/Drupal/field/Plugin/entity/display_component_handler/FieldDisplayComponentHandler.php
index fee0f4d..8a32f1c 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/entity/display_component_handler/FieldDisplayComponentHandler.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/entity/display_component_handler/FieldDisplayComponentHandler.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\field\Plugin\entity\display_component_handler;;
 
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\entity\Plugin\Type\DisplayComponentHandlerBase;
 
 /**