diff --git a/core/lib/Drupal/Core/Action/ActionBag.php b/core/lib/Drupal/Core/Action/ActionBag.php
index 51c9fd7..b7ccdb5 100644
--- a/core/lib/Drupal/Core/Action/ActionBag.php
+++ b/core/lib/Drupal/Core/Action/ActionBag.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Action;
 
-use Drupal\Component\Plugin\DefaultSinglePluginBag;
+use Drupal\Core\Plugin\DefaultSinglePluginBag;
 
 /**
  * Provides a container for lazily loading Action plugins.
diff --git a/core/lib/Drupal/Component/Plugin/DefaultPluginBag.php b/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
similarity index 95%
rename from core/lib/Drupal/Component/Plugin/DefaultPluginBag.php
rename to core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
index 48a860f..ff6d922 100644
--- a/core/lib/Drupal/Component/Plugin/DefaultPluginBag.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
@@ -2,12 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\Component\Plugin\DefaultPluginBag.
+ * Contains \Drupal\Core\Plugin\DefaultPluginBag.
  */
 
-namespace Drupal\Component\Plugin;
+namespace Drupal\Core\Plugin;
 
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\Component\Plugin\PluginBag;
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Component\Plugin\ConfigurablePluginInterface;
 
 /**
  * Provides a default plugin bag for a plugin type.
diff --git a/core/lib/Drupal/Component/Plugin/DefaultSinglePluginBag.php b/core/lib/Drupal/Core/Plugin/DefaultSinglePluginBag.php
similarity index 90%
rename from core/lib/Drupal/Component/Plugin/DefaultSinglePluginBag.php
rename to core/lib/Drupal/Core/Plugin/DefaultSinglePluginBag.php
index 469b567..7b1c816 100644
--- a/core/lib/Drupal/Component/Plugin/DefaultSinglePluginBag.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultSinglePluginBag.php
@@ -2,10 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\Component\Plugin\DefaultSinglePluginBag.
+ * Contains \Drupal\Core\Plugin\DefaultSinglePluginBag.
  */
 
-namespace Drupal\Component\Plugin;
+namespace Drupal\Core\Plugin;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Component\Plugin\PluginBag;
+use Drupal\Component\Plugin\ConfigurablePluginInterface;
 
 /**
  * Provides a default plugin bag for a plugin type.
diff --git a/core/modules/block/lib/Drupal/block/BlockPluginBag.php b/core/modules/block/lib/Drupal/block/BlockPluginBag.php
index 51f927a..d1f4fbb 100644
--- a/core/modules/block/lib/Drupal/block/BlockPluginBag.php
+++ b/core/modules/block/lib/Drupal/block/BlockPluginBag.php
@@ -10,7 +10,7 @@
 use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Component\Utility\String;
-use Drupal\Component\Plugin\DefaultSinglePluginBag;
+use Drupal\Core\Plugin\DefaultSinglePluginBag;
 
 /**
  * Provides a collection of block plugins.
diff --git a/core/modules/filter/lib/Drupal/filter/FilterBag.php b/core/modules/filter/lib/Drupal/filter/FilterBag.php
index 2885641..970e7e8 100644
--- a/core/modules/filter/lib/Drupal/filter/FilterBag.php
+++ b/core/modules/filter/lib/Drupal/filter/FilterBag.php
@@ -8,7 +8,7 @@
 namespace Drupal\filter;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Plugin\DefaultPluginBag;
+use Drupal\Core\Plugin\DefaultPluginBag;
 
 /**
  * A collection of filters.
diff --git a/core/modules/image/lib/Drupal/image/ImageEffectBag.php b/core/modules/image/lib/Drupal/image/ImageEffectBag.php
index 97201ec..2dc76a3 100644
--- a/core/modules/image/lib/Drupal/image/ImageEffectBag.php
+++ b/core/modules/image/lib/Drupal/image/ImageEffectBag.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\image;
 
-use Drupal\Component\Plugin\DefaultPluginBag;
+use Drupal\Core\Plugin\DefaultPluginBag;
 
 /**
  * A collection of image effects.
diff --git a/core/modules/search/lib/Drupal/search/Plugin/SearchPluginBag.php b/core/modules/search/lib/Drupal/search/Plugin/SearchPluginBag.php
index 7bcfa5f..fc4612c 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/SearchPluginBag.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/SearchPluginBag.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\search\Plugin;
 
-use Drupal\Component\Plugin\DefaultSinglePluginBag;
+use Drupal\Core\Plugin\DefaultSinglePluginBag;
 use Drupal\Component\Plugin\PluginManagerInterface;
 
 /**
diff --git a/core/modules/tour/lib/Drupal/tour/TipsBag.php b/core/modules/tour/lib/Drupal/tour/TipsBag.php
index 753169a..337d3dc 100644
--- a/core/modules/tour/lib/Drupal/tour/TipsBag.php
+++ b/core/modules/tour/lib/Drupal/tour/TipsBag.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\tour;
 
-use Drupal\Component\Plugin\DefaultPluginBag;
+use Drupal\Core\Plugin\DefaultPluginBag;
 
 /**
  * A collection of tips.
diff --git a/core/modules/views/lib/Drupal/views/DisplayBag.php b/core/modules/views/lib/Drupal/views/DisplayBag.php
index fc0d75c..a724745 100644
--- a/core/modules/views/lib/Drupal/views/DisplayBag.php
+++ b/core/modules/views/lib/Drupal/views/DisplayBag.php
@@ -9,7 +9,7 @@
 
 use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Plugin\DefaultPluginBag;
+use Drupal\Core\Plugin\DefaultPluginBag;
 
 /**
  * A class which wraps the displays of a view so you can lazy-initialize them.
diff --git a/core/tests/Drupal/Tests/Component/Plugin/ConfigurablePluginBagTest.php b/core/tests/Drupal/Tests/Component/Plugin/ConfigurablePluginBagTest.php
index 735dd7b..721f3c5 100644
--- a/core/tests/Drupal/Tests/Component/Plugin/ConfigurablePluginBagTest.php
+++ b/core/tests/Drupal/Tests/Component/Plugin/ConfigurablePluginBagTest.php
@@ -14,7 +14,7 @@
  * Tests the default plugin bag with configurable plugins.
  *
  * @see \Drupal\Component\Plugin\ConfigurablePluginInterface
- * @see \Drupal\Component\Plugin\DefaultPluginBag
+ * @see \Drupal\Core\Plugin\DefaultPluginBag
  *
  * @group Drupal
  * @group Drupal_Plugin
diff --git a/core/tests/Drupal/Tests/Component/Plugin/DefaultPluginBagTest.php b/core/tests/Drupal/Tests/Component/Plugin/DefaultPluginBagTest.php
index 1dc33d9..cf2c9b5 100644
--- a/core/tests/Drupal/Tests/Component/Plugin/DefaultPluginBagTest.php
+++ b/core/tests/Drupal/Tests/Component/Plugin/DefaultPluginBagTest.php
@@ -10,7 +10,7 @@
 /**
  * Tests the default plugin bag.
  *
- * @see \Drupal\Component\Plugin\DefaultPluginBag
+ * @see \Drupal\Core\Plugin\DefaultPluginBag
  *
  * @group Drupal
  * @group Drupal_Plugin
@@ -31,7 +31,7 @@ public static function getInfo() {
   /**
    * Tests the has method.
    *
-   * @see \Drupal\Component\Plugin\DefaultPluginBag::has()
+   * @see \Drupal\Core\Plugin\DefaultPluginBag::has()
    */
   public function testHas() {
     $this->setupPluginBag();
@@ -47,7 +47,7 @@ public function testHas() {
   /**
    * Tests the get method.
    *
-   * @see \Drupal\Component\Plugin\DefaultPluginBag::get()
+   * @see \Drupal\Core\Plugin\DefaultPluginBag::get()
    */
   public function testGet() {
     $this->setupPluginBag($this->once());
@@ -105,7 +105,7 @@ public function testSortHelper($plugin_id_1, $plugin_id_2, $expected) {
   /**
    * Tests the configuration getter method.
    *
-   * @see \Drupal\Component\Plugin\DefaultPluginBag::getConfiguration()
+   * @see \Drupal\Core\Plugin\DefaultPluginBag::getConfiguration()
    */
   public function testGetConfiguration() {
     $this->setupPluginBag($this->exactly(3));
@@ -130,7 +130,7 @@ public function testGetConfiguration() {
   /**
    * Tests the removeInstanceId() method.
    *
-   * @see \Drupal\Component\Plugin\DefaultPluginBag::removeInstanceId()
+   * @see \Drupal\Core\Plugin\DefaultPluginBag::removeInstanceId()
    */
   public function testRemoveInstanceId() {
     $this->setupPluginBag($this->exactly(2));
@@ -142,7 +142,7 @@ public function testRemoveInstanceId() {
   /**
    * Tests the setInstanceConfiguration() method.
    *
-   * @see \Drupal\Component\Plugin\DefaultPluginBag::setInstanceConfiguration()
+   * @see \Drupal\Core\Plugin\DefaultPluginBag::setInstanceConfiguration()
    */
   public function testSetInstanceConfiguration() {
     $this->setupPluginBag($this->exactly(3));
diff --git a/core/tests/Drupal/Tests/Component/Plugin/DefaultSinglePluginBagTest.php b/core/tests/Drupal/Tests/Component/Plugin/DefaultSinglePluginBagTest.php
index 65bba15..fa0d367 100644
--- a/core/tests/Drupal/Tests/Component/Plugin/DefaultSinglePluginBagTest.php
+++ b/core/tests/Drupal/Tests/Component/Plugin/DefaultSinglePluginBagTest.php
@@ -7,12 +7,12 @@
 
 namespace Drupal\Tests\Component\Plugin;
 
-use Drupal\Component\Plugin\DefaultSinglePluginBag;
+use Drupal\Core\Plugin\DefaultSinglePluginBag;
 
 /**
  * Tests the default single plugin bag.
  *
- * @see \Drupal\Component\Plugin\DefaultSinglePluginBag
+ * @see \Drupal\Core\Plugin\DefaultSinglePluginBag
  *
  * @group Drupal
  * @group Drupal_Plugin
diff --git a/core/tests/Drupal/Tests/Component/Plugin/PluginBagTestBase.php b/core/tests/Drupal/Tests/Component/Plugin/PluginBagTestBase.php
index 461321d..8bdcdb9 100644
--- a/core/tests/Drupal/Tests/Component/Plugin/PluginBagTestBase.php
+++ b/core/tests/Drupal/Tests/Component/Plugin/PluginBagTestBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Tests\Component\Plugin;
 
-use Drupal\Component\Plugin\DefaultPluginBag;
+use Drupal\Core\Plugin\DefaultPluginBag;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -25,7 +25,7 @@
   /**
    * The tested plugin bag.
    *
-   * @var \Drupal\Component\Plugin\DefaultPluginBag|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\Plugin\DefaultPluginBag|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $defaultPluginBag;