diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
index 1701d1a..361c962 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -69,27 +69,27 @@ public function getDefinitions() {
     $definitions = parent::getDefinitions();
     foreach ($definitions as &$definition) {
       // Extract the module name from the class namespace if it's not set.
-      if (!isset($definition['owner'])) {
-        $definition['owner'] = $this->getOwnerFromNamespace($definition['class']);
+      if (!isset($definition['provider'])) {
+        $definition['provider'] = $this->getProviderFromNamespace($definition['class']);
       }
     }
     return $definitions;
   }
 
   /**
-   * Extracts the owner name from a Drupal namespace.
+   * Extracts the provider name from a Drupal namespace.
    *
    * @param string $namespace
    *   The namespace to extract the owner from.
    *
    * @return string|null
-   *   The matching owner name, or NULL otherwise.
+   *   The matching provider name, or NULL otherwise.
    */
-  protected function getOwnerFromNamespace($namespace) {
-    preg_match('|^Drupal\\\\(?<owner>[\w]+)\\\\|', $namespace, $matches);
+  protected function getProviderFromNamespace($namespace) {
+    preg_match('|^Drupal\\\\(?<provider>[\w]+)\\\\|', $namespace, $matches);
 
-    if (isset($matches['owner'])) {
-      return $matches['owner'];
+    if (isset($matches['provider'])) {
+      return $matches['provider'];
     }
 
     return NULL;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php b/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
index b247a83..5f8ee2d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
@@ -30,7 +30,7 @@ public function setUp() {
         'label' => 'Apple',
         'color' => 'green',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple',
-        'owner' => 'plugin_test',
+        'provider' => 'plugin_test',
       ),
       'banana' => array(
         'id' => 'banana',
@@ -40,21 +40,21 @@ public function setUp() {
           'bread' => t('Banana bread'),
         ),
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Banana',
-        'owner' => 'plugin_test',
+        'provider' => 'plugin_test',
       ),
       'cherry' => array(
         'id' => 'cherry',
         'label' => 'Cherry',
         'color' => 'red',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry',
-        'owner' => 'plugin_test',
+        'provider' => 'plugin_test',
       ),
       'orange' => array(
         'id' => 'orange',
         'label' => 'Orange',
         'color' => 'orange',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange',
-        'owner' => 'plugin_test',
+        'provider' => 'plugin_test',
       ),
     );
     $namespaces = new \ArrayObject(array('Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib'));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php b/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
index 68cd364..cbf2a16 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
@@ -32,13 +32,13 @@ protected function setUp() {
         'id' => 'example_1',
         'custom' => 'John',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\custom_annotation\Example1',
-        'owner' => 'plugin_test',
+        'provider' => 'plugin_test',
       ),
       'example_2' => array(
         'id' => 'example_2',
         'custom' => 'Paul',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\custom_annotation\Example2',
-        'owner' => 'plugin_test',
+        'provider' => 'plugin_test',
       ),
     );
     $root_namespaces = new \ArrayObject(array('Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib'));