diff --git a/src/Plugin/Plugin/PluginSelector/AdvancedPluginSelectorBase.php b/src/Plugin/Plugin/PluginSelector/AdvancedPluginSelectorBase.php
index aabca16..223718a 100644
--- a/src/Plugin/Plugin/PluginSelector/AdvancedPluginSelectorBase.php
+++ b/src/Plugin/Plugin/PluginSelector/AdvancedPluginSelectorBase.php
@@ -66,9 +66,9 @@ abstract class AdvancedPluginSelectorBase extends PluginSelectorBase implements
     }
 
     $available_plugins = [];
-    foreach ($this->selectablePluginManager->getDefinitions() as $plugin_definition) {
+    foreach ($this->selectablePluginDiscovery->getDefinitions() as $plugin_definition) {
       $plugin_id = $this->selectablePluginType->getPluginDefinitionMapper()->getPluginId($plugin_definition);
-      $available_plugins[] = $this->selectablePluginManager->createInstance($plugin_id);
+      $available_plugins[] = $this->selectablePluginType->getPluginManager()->createInstance($plugin_id);
     }
 
     $plugin_selector_form_state_key = static::setPluginSelector($form_state, $this);
@@ -152,7 +152,7 @@ abstract class AdvancedPluginSelectorBase extends PluginSelectorBase implements
         $this->setSelectedPlugin($this->getPreviouslySelectedPlugins()[$plugin_id]);
       }
       elseif ($plugin_id) {
-        $this->setSelectedPlugin($this->selectablePluginManager->createInstance($plugin_id));
+        $this->setSelectedPlugin($this->selectablePluginType->getPluginManager()->createInstance($plugin_id));
       }
       else {
         $this->resetSelectedPlugin();
diff --git a/src/Plugin/Plugin/PluginSelector/PluginSelectorBase.php b/src/Plugin/Plugin/PluginSelector/PluginSelectorBase.php
index 1c491cc..a6586d9 100644
--- a/src/Plugin/Plugin/PluginSelector/PluginSelectorBase.php
+++ b/src/Plugin/Plugin/PluginSelector/PluginSelectorBase.php
@@ -6,6 +6,7 @@
 
 namespace Drupal\plugin\Plugin\Plugin\PluginSelector;
 
+use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -29,11 +30,11 @@ abstract class PluginSelectorBase extends PluginBase implements PluginSelectorIn
   protected $previouslySelectedPlugins = [];
 
   /**
-   * The plugin manager of which to select plugins.
+   * The selectable plugin discovery.
    *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   * @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface
    */
-  protected $selectablePluginManager;
+  protected $selectablePluginDiscovery;
 
   /**
    * The plugin type of which to select plugins.
@@ -230,8 +231,8 @@ abstract class PluginSelectorBase extends PluginBase implements PluginSelectorIn
   /**
    * {@inheritdoc}
    */
-  public function setSelectablePluginType(PluginTypeInterface $plugin_type, PluginManagerInterface $plugin_manager = NULL) {
-    $this->selectablePluginManager = $plugin_manager ?: $plugin_type->getPluginManager();
+  public function setSelectablePluginType(PluginTypeInterface $plugin_type, DiscoveryInterface $plugin_discovery = NULL) {
+    $this->selectablePluginDiscovery = $plugin_discovery ?: $plugin_type->getPluginManager();
     $this->selectablePluginType = $plugin_type;
 
     return $this;
diff --git a/src/Plugin/Plugin/PluginSelector/PluginSelectorInterface.php b/src/Plugin/Plugin/PluginSelector/PluginSelectorInterface.php
index f69c54a..26933e4 100644
--- a/src/Plugin/Plugin/PluginSelector/PluginSelectorInterface.php
+++ b/src/Plugin/Plugin/PluginSelector/PluginSelectorInterface.php
@@ -7,6 +7,7 @@
 namespace Drupal\plugin\Plugin\Plugin\PluginSelector;
 
 use Drupal\Component\Plugin\ConfigurablePluginInterface;
+use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -148,13 +149,13 @@ interface PluginSelectorInterface extends PluginInspectionInterface, Configurabl
    *
    * @param \Drupal\plugin\PluginTypeInterface $plugin_type
    *   The type of which to select plugins.
-   * @param \Drupal\Component\Plugin\PluginManagerInterface|null $plugin_manager
-   *   The plugin manager used to discover selectable plugins, or NULL to use
+   * @param \Drupal\Component\Plugin\Discovery\DiscoveryInterface|null $plugin_discovery
+   *   The plugin discovery used to discover selectable plugins, or NULL to use
    *   the plugin type's default plugin manager.
    *
    * @return $this
    */
-  public function setSelectablePluginType(PluginTypeInterface $plugin_type, PluginManagerInterface $plugin_manager = NULL);
+  public function setSelectablePluginType(PluginTypeInterface $plugin_type, DiscoveryInterface $plugin_discovery = NULL);
 
   /**
    * Builds the selector form.
diff --git a/src/Plugin/Plugin/PluginSelector/SelectList.php b/src/Plugin/Plugin/PluginSelector/SelectList.php
index 24ca96f..46d0b76 100644
--- a/src/Plugin/Plugin/PluginSelector/SelectList.php
+++ b/src/Plugin/Plugin/PluginSelector/SelectList.php
@@ -56,7 +56,7 @@ class SelectList extends AdvancedPluginSelectorBase {
   protected function buildHierarchy() {
     $parents = [];
     $children = [];
-    $definitions = $this->selectablePluginManager->getDefinitions();
+    $definitions = $this->selectablePluginDiscovery->getDefinitions();
     uasort($definitions, array($this, 'sort'));
     foreach ($definitions as $plugin_id => $definition) {
       $parent_plugin_id = $this->selectablePluginType->getPluginDefinitionMapper()->getParentPluginId($definition);
@@ -105,7 +105,7 @@ class SelectList extends AdvancedPluginSelectorBase {
    *   Keys are plugin IDs.
    */
   protected function buildOptionsLevel(array $hierarchy, $depth = 0) {
-    $definitions = $this->selectablePluginManager->getDefinitions();
+    $definitions = $this->selectablePluginDiscovery->getDefinitions();
     $options = [];
     $prefix = $depth ? str_repeat('-', $depth) . ' ' : '';
     foreach ($hierarchy as $plugin_id => $child_plugin_ids) {