diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 90b7f29e7743e7d0bfdc36bb72a821e14818899b..46957aa9f21da7947455d51ddf8abb9468baf905 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -178,7 +178,7 @@ function aggregator_filter_xss($value) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function aggregator_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'aggregator') {
+  if ($variables['configuration']['provider'] == 'aggregator') {
     $variables['attributes']['role'] = 'complementary';
   }
 }
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 73514c22bfa3b9a66b867e9502b387014e6005fe..2d4b811a26747c52d34e04ffda87d87a67ee1ad8 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -330,7 +330,7 @@ function block_rebuild() {
 function block_theme_suggestions_block(array $variables) {
   $suggestions = array();
 
-  $suggestions[] = 'block__' . $variables['elements']['#configuration']['module'];
+  $suggestions[] = 'block__' . $variables['elements']['#configuration']['provider'];
   // Hyphens (-) and underscores (_) play a special role in theme suggestions.
   // Theme suggestions should only contain underscores, because within
   // drupal_find_theme_templates(), underscores are converted to hyphens to
@@ -392,7 +392,7 @@ function template_preprocess_block(&$variables) {
   }
 
   $variables['attributes']['class'][] = 'block';
-  $variables['attributes']['class'][] = drupal_html_class('block-' . $variables['configuration']['module']);
+  $variables['attributes']['class'][] = drupal_html_class('block-' . $variables['configuration']['provider']);
 
   // Add default class for block content.
   $variables['content_attributes']['class'][] = 'content';
diff --git a/core/modules/block/config/schema/block.schema.yml b/core/modules/block/config/schema/block.schema.yml
index a8b1a01afbafb0bbe007e494b56732eb0fb213f6..2e89fe7ac9f52a7f16a10f6deddff4fcbae14d80 100644
--- a/core/modules/block/config/schema/block.schema.yml
+++ b/core/modules/block/config/schema/block.schema.yml
@@ -19,9 +19,9 @@ block.block.*:
     weight:
       type: integer
       label: 'Weight'
-    module:
+    provider:
       type: string
-      label: 'Module'
+      label: 'Provider'
     status:
       type: boolean
       label: 'Status'
@@ -94,9 +94,9 @@ block.block.*:
         view_mode:
           type: string
           label: 'View mode'
-        module:
+        provider:
           type: string
-          label: 'Module'
+          label: 'Provider'
     langcode:
       type: string
       label: 'Default language'
diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/Drupal/block/BlockBase.php
index a014bb7e5e95d3103fb4f3c55333b190ec1c92b4..adedc4817a593fe86634c3479376980d426e80ac 100644
--- a/core/modules/block/lib/Drupal/block/BlockBase.php
+++ b/core/modules/block/lib/Drupal/block/BlockBase.php
@@ -61,7 +61,7 @@ public function setConfiguration(array $configuration) {
   protected function baseConfigurationDefaults() {
     return array(
       'label' => '',
-      'module' => $this->pluginDefinition['module'],
+      'provider' => $this->pluginDefinition['provider'],
       'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
       'cache' => array(
         'max_age' => 0,
@@ -105,9 +105,9 @@ public function access(AccountInterface $account) {
    */
   public function buildConfigurationForm(array $form, array &$form_state) {
     $definition = $this->getPluginDefinition();
-    $form['module'] = array(
+    $form['provider'] = array(
       '#type' => 'value',
-      '#value' => $definition['module'],
+      '#value' => $definition['provider'],
     );
 
     $form['admin_label'] = array(
@@ -218,7 +218,7 @@ public function submitConfigurationForm(array &$form, array &$form_state) {
     if (!form_get_errors($form_state)) {
       $this->configuration['label'] = $form_state['values']['label'];
       $this->configuration['label_display'] = $form_state['values']['label_display'];
-      $this->configuration['module'] = $form_state['values']['module'];
+      $this->configuration['provider'] = $form_state['values']['provider'];
       $this->configuration['cache'] = $form_state['values']['cache'];
       $this->blockSubmit($form, $form_state);
     }
diff --git a/core/modules/block/lib/Drupal/block/BlockPluginBag.php b/core/modules/block/lib/Drupal/block/BlockPluginBag.php
index d1f4fbb95e26c356ba368c47d3a54e1a7c2037ff..5693281c8d4aeec510467fd55ce733cccf8e6c7e 100644
--- a/core/modules/block/lib/Drupal/block/BlockPluginBag.php
+++ b/core/modules/block/lib/Drupal/block/BlockPluginBag.php
@@ -63,7 +63,7 @@ protected function initializePlugin($instance_id) {
       parent::initializePlugin($instance_id);
     }
     catch (PluginException $e) {
-      $module = $this->configuration['module'];
+      $module = $this->configuration['provider'];
       // Ignore blocks belonging to disabled modules, but re-throw valid
       // exceptions when the module is enabled and the plugin is misconfigured.
       if (!$module || \Drupal::moduleHandler()->moduleExists($module)) {
diff --git a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php b/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php
index 980a59f0178b6f8a713410af16dc9759300e9977..482ac75150fc832f058b901ba24ebd26e987d367 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php
@@ -69,10 +69,6 @@ public function processDefinition(&$definition, $plugin_id) {
     if (!isset($definition['category'])) {
       $definition['category'] = $this->getModuleName($definition['provider']);
     }
-    // @todo Remove any usage of 'module' from block code.
-    if (!isset($definition['module'])) {
-      $definition['module'] = $definition['provider'];
-    }
   }
 
   /**
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php
index 5e7d9d047ad260c1f99c62ed67714d8b57c29efb..6214e0c405fc22377cb2a9108315a8583d15574d 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php
@@ -45,7 +45,7 @@ public function testBlockInterface() {
     );
     $expected_configuration = array(
       'label' => 'Custom Display Message',
-      'module' => 'block_test',
+      'provider' => 'block_test',
       'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
       'cache' => array(
         'max_age' => 0,
@@ -70,7 +70,7 @@ public function testBlockInterface() {
     $contexts = \Drupal::service("cache_contexts")->getLabels();
     unset($contexts['cache_context.theme']);
     $expected_form = array(
-      'module' => array(
+      'provider' => array(
         '#type' => 'value',
         '#value' => 'block_test',
       ),
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
index 55ad332e164741bf376e2c4ae5fbf2309137907a..a84bdc4d46ad485878458ca60ed41193561fe68b 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
@@ -100,7 +100,7 @@ protected function createTests() {
       'plugin' => 'test_html',
       'settings' => array(
         'label' => '',
-        'module' => 'block_test',
+        'provider' => 'block_test',
         'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
         'cache' => array(
           'max_age' => 0,
diff --git a/core/modules/block/tests/Drupal/block/Tests/BlockBaseTest.php b/core/modules/block/tests/Drupal/block/Tests/BlockBaseTest.php
index 8d96c33da80bfdce7275ad875ec98e39b898ef12..913130b96bdd305752697fb02b2ce173b300e018 100644
--- a/core/modules/block/tests/Drupal/block/Tests/BlockBaseTest.php
+++ b/core/modules/block/tests/Drupal/block/Tests/BlockBaseTest.php
@@ -43,12 +43,12 @@ public function testGetMachineNameSuggestion() {
     \Drupal::setContainer($container);
 
     $config = array();
-    $definition = array('admin_label' => 'Admin label', 'module' => 'block_test');
+    $definition = array('admin_label' => 'Admin label', 'provider' => 'block_test');
     $block_base = new TestBlockInstantiation($config, 'test_block_instantiation', $definition);
     $this->assertEquals('adminlabel', $block_base->getMachineNameSuggestion());
 
     // Test with more unicodes.
-    $definition = array('admin_label' =>'über åwesome', 'module' => 'block_test');
+    $definition = array('admin_label' =>'über åwesome', 'provider' => 'block_test');
     $block_base = new TestBlockInstantiation($config, 'test_block_instantiation', $definition);
     $this->assertEquals('uberawesome', $block_base->getMachineNameSuggestion());
   }
diff --git a/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml b/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml
index 2b8951930e3d46bc9029500ecba470a85bd12e12..232c64a024ca67dcd1d00f522daa3aa8c42da622 100644
--- a/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml
+++ b/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml
@@ -7,7 +7,7 @@ region: '-1'
 plugin: test_html
 settings:
   label: 'Test HTML block'
-  module: block_test
+  provider: block_test
   label_display: 'hidden'
 visibility:
   path:
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index bb86b2938eacb4c0611401dec2b8980a7b504a03..8c5222158b0942cf8d571e057a2d5e08aa2f96bc 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -362,7 +362,7 @@ function book_form_node_delete_confirm_alter(&$form, $form_state) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function book_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'book') {
+  if ($variables['configuration']['provider'] == 'book') {
     $variables['attributes']['role'] = 'navigation';
   }
 }
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 3add1d1198baf0004b50810a83050be92e4c4c0c..c3b4981c9513110feba2647d6c748364946052c8 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1260,7 +1260,7 @@ function comment_preview(CommentInterface $comment, array &$form_state) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function comment_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'comment') {
+  if ($variables['configuration']['provider'] == 'comment') {
     $variables['attributes']['role'] = 'navigation';
   }
 }
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 4e3cd527d3c430528e81c4a76508770496226b4c..f01509b9244be9e930959539c1c516c815465eb1 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -524,7 +524,7 @@ function forum_form_node_form_alter(&$form, &$form_state, $form_id) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function forum_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'forum') {
+  if ($variables['configuration']['provider'] == 'forum') {
     $variables['attributes']['role'] = 'navigation';
   }
 }
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index e70b2b9163a66f50f22aa0bd53c24cea66c00e9c..3cb07b37a745e42b2c838ed6c01f58c143c6245a 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -641,7 +641,7 @@ function language_language_entity_delete(LanguageEntity $language) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function language_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'language') {
+  if ($variables['configuration']['provider'] == 'language') {
     $variables['attributes']['role'] = 'navigation';
   }
 }
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuCacheTagsTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuCacheTagsTest.php
index e8f00a36dbd5b5f2cd147dc346d15ac1d19e9db0..089c2ada55755d532ff7c1a53fc79efd1eb6a775 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuCacheTagsTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuCacheTagsTest.php
@@ -52,7 +52,7 @@ public function testMenuBlock() {
       'menu_name' => 'llama',
     ));
     $menu_link->save();
-    $block = $this->drupalPlaceBlock('system_menu_block:llama', array('label' => 'Llama', 'module' => 'system', 'region' => 'footer'));
+    $block = $this->drupalPlaceBlock('system_menu_block:llama', array('label' => 'Llama', 'provider' => 'system', 'region' => 'footer'));
 
     // Prime the page cache.
     $this->verifyPageCache($path, 'MISS');
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index a95f25f1a421d397d78b7caef4d649349cc1e82a..f984aa74c2991150067888b77b0501419dde5471 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -464,7 +464,7 @@ function testUnpublishedNodeMenuItem() {
   public function testBlockContextualLinks() {
     $this->drupalLogin($this->drupalCreateUser(array('administer menu', 'access contextual links', 'administer blocks')));
     $this->addMenuLink();
-    $block = $this->drupalPlaceBlock('system_menu_block:tools', array('label' => 'Tools', 'module' => 'system'));
+    $block = $this->drupalPlaceBlock('system_menu_block:tools', array('label' => 'Tools', 'provider' => 'system'));
     $this->drupalGet('test-page');
 
     $id = 'block:block=' . $block->id() . ':|menu:menu=tools:';
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 55cd4a854c7c8b05c0394994705055a2cbc60574..76da041650eb94cf424422c3aa84791d62518027 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -655,7 +655,7 @@ function menu_get_menus($all = TRUE) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function menu_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'menu') {
+  if ($variables['configuration']['provider'] == 'menu') {
     $variables['attributes']['role'] = 'navigation';
   }
 }
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index a5f0b008257913f6044ddf0a6965c5664891707e..b05fc2c2586cb2d6a178ebe2b213ee5b73df3b4a 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -592,7 +592,7 @@ function node_preprocess_html(&$variables) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function node_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'node') {
+  if ($variables['configuration']['provider'] == 'node') {
     switch ($variables['elements']['#plugin_id']) {
       case 'node_syndicate_block':
         $variables['attributes']['role'] = 'complementary';
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 5f8444041b4f7f022c6763aa911ec4a2fdf0e029..b6e055b095a71f222c931f63a650bf0b505313dc 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -323,7 +323,7 @@ function shortcut_renderable_links($shortcut_set = NULL) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function shortcut_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'shortcut') {
+  if ($variables['configuration']['provider'] == 'shortcut') {
     $variables['attributes']['role'] = 'navigation';
   }
 }
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index 13c96446b865a745d53781c64aea9b8a83b735c2..887718160563ef7b35e97d4e6b376efa12d2655a 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -231,7 +231,7 @@ function statistics_ranking() {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function statistics_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'statistics') {
+  if ($variables['configuration']['provider'] == 'statistics') {
     $variables['attributes']['role'] = 'navigation';
   }
 }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 9d3514d0e798b2e7d320bf3a73c32aeb5310dc6a..91a6f25ab7755b58d8ea195af5cfe9ac3b957a1b 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -552,7 +552,7 @@ function user_validate_current_pass(&$form, &$form_state) {
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function user_preprocess_block(&$variables) {
-  if ($variables['configuration']['module'] == 'user') {
+  if ($variables['configuration']['provider'] == 'user') {
     switch ($variables['elements']['#plugin_id']) {
       case 'user_login_block':
         $variables['attributes']['role'] = 'form';
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ViewsBlockTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ViewsBlockTest.php
index bd5f2525c9a4ed076f6885e2d2373a66c0476a59..23083ce159979a90fae494ed8bf2154552e2c1b4 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ViewsBlockTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ViewsBlockTest.php
@@ -55,7 +55,7 @@ protected function setUp() {
    */
   public function testMachineNameSuggestion() {
     $plugin_definition = array(
-      'module' => 'views',
+      'provider' => 'views',
     );
     $plugin_id = 'views_block:test_view_block-block_1';
     $views_block = ViewsBlock::create($this->container, array(), $plugin_id, $plugin_definition);
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php
index 55b1826434bd331f91be8fb4632c7e2de16dd74e..eb46cb3425ed336f47d989d7aa88f616d5606294 100644
--- a/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php
@@ -125,7 +125,8 @@ public function testBuild() {
     $block_id = 'views_block:test_view-block_1';
     $config = array();
     $definition = array();
-    $definition['module'] = 'views';
+
+    $definition['provider'] = 'views';
     $plugin = new ViewsBlock($config, $block_id, $definition, $this->executableFactory, $this->storage, $this->account);
 
     $this->assertEquals($build, $plugin->build());
@@ -146,7 +147,8 @@ public function testBuildFailed() {
     $block_id = 'views_block:test_view-block_1';
     $config = array();
     $definition = array();
-    $definition['module'] = 'views';
+
+    $definition['provider'] = 'views';
     $plugin = new ViewsBlock($config, $block_id, $definition, $this->executableFactory, $this->storage, $this->account);
 
     $this->assertEquals(array(), $plugin->build());
diff --git a/core/profiles/minimal/config/block.block.stark_admin.yml b/core/profiles/minimal/config/block.block.stark_admin.yml
index 942d59ceecbad7498a3b08d9132e6ec0899f5706..0895e7eb7a5bd11b56ea6390b8ad391d18236e9c 100644
--- a/core/profiles/minimal/config/block.block.stark_admin.yml
+++ b/core/profiles/minimal/config/block.block.stark_admin.yml
@@ -7,7 +7,7 @@ region: sidebar_first
 plugin: 'system_menu_block:admin'
 settings:
   label: Administration
-  module: system
+  provider: system
   label_display: visible
 visibility:
   path:
diff --git a/core/profiles/minimal/config/block.block.stark_login.yml b/core/profiles/minimal/config/block.block.stark_login.yml
index 94f2477d436b535c3f2722cfeb46b1f5b984284e..91ba3e08d68f3569699c522dd088ce7d63e06d67 100644
--- a/core/profiles/minimal/config/block.block.stark_login.yml
+++ b/core/profiles/minimal/config/block.block.stark_login.yml
@@ -7,7 +7,7 @@ region: sidebar_first
 plugin: user_login_block
 settings:
   label: 'User login'
-  module: user
+  provider: user
   label_display: visible
 visibility:
   path:
diff --git a/core/profiles/minimal/config/block.block.stark_tools.yml b/core/profiles/minimal/config/block.block.stark_tools.yml
index fb88b0e71443d69e783fa2bac6d7e05e70c546e7..c9ff31be687763d49bda8df5cdb81b6466cb5009 100644
--- a/core/profiles/minimal/config/block.block.stark_tools.yml
+++ b/core/profiles/minimal/config/block.block.stark_tools.yml
@@ -7,7 +7,7 @@ region: sidebar_first
 plugin: 'system_menu_block:tools'
 settings:
   label: Tools
-  module: system
+  provider: system
   label_display: visible
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml b/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml
index 355a3f91aa00ebd5f912aeeaf36f6883cecf94b3..23cc5d0507b69b03497c7c225c920241ce592e0e 100644
--- a/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml
+++ b/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml
@@ -7,7 +7,7 @@ region: '-1'
 plugin: system_breadcrumb_block
 settings:
   label: Breadcrumbs
-  module: system
+  provider: system
   label_display: '0'
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.bartik_content.yml b/core/profiles/standard/config/block.block.bartik_content.yml
index 6666594f05973566d952c094935c4557419ae69d..dd89d12fb0a5f0b8fa6562baa4ae2df84154fe77 100644
--- a/core/profiles/standard/config/block.block.bartik_content.yml
+++ b/core/profiles/standard/config/block.block.bartik_content.yml
@@ -7,7 +7,7 @@ region: content
 plugin: system_main_block
 settings:
   label: 'Main page content'
-  module: system
+  provider: system
   label_display: '0'
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.bartik_footer.yml b/core/profiles/standard/config/block.block.bartik_footer.yml
index 133ba67a8ce20de462edc2b204e0be2739358d82..85451c77799a622c27d6f55bad7e5b88cfd89720 100644
--- a/core/profiles/standard/config/block.block.bartik_footer.yml
+++ b/core/profiles/standard/config/block.block.bartik_footer.yml
@@ -7,7 +7,7 @@ region: footer
 plugin: 'system_menu_block:footer'
 settings:
   label: 'Footer menu'
-  module: system
+  provider: system
   label_display: visible
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.bartik_help.yml b/core/profiles/standard/config/block.block.bartik_help.yml
index 076ee327ecc30287663e71ef94163ad803826bc7..3e139c69ac6831cc2c864b501501b297ee7d41fe 100644
--- a/core/profiles/standard/config/block.block.bartik_help.yml
+++ b/core/profiles/standard/config/block.block.bartik_help.yml
@@ -7,7 +7,7 @@ region: help
 plugin: system_help_block
 settings:
   label: 'System Help'
-  module: system
+  provider: system
   label_display: '0'
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.bartik_login.yml b/core/profiles/standard/config/block.block.bartik_login.yml
index f654e06a69cbf977a133a92ed622716d5731c4b8..1465ce8885bcc340a69f32423d5aaa3ceac61b8b 100644
--- a/core/profiles/standard/config/block.block.bartik_login.yml
+++ b/core/profiles/standard/config/block.block.bartik_login.yml
@@ -7,7 +7,7 @@ region: sidebar_first
 plugin: user_login_block
 settings:
   label: 'User login'
-  module: user
+  provider: user
   label_display: visible
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.bartik_powered.yml b/core/profiles/standard/config/block.block.bartik_powered.yml
index a2c6959ab10bcb664730a78e24a7f15dce227903..c72223122326fe95103199cfd597f68efa27f254 100644
--- a/core/profiles/standard/config/block.block.bartik_powered.yml
+++ b/core/profiles/standard/config/block.block.bartik_powered.yml
@@ -7,7 +7,7 @@ region: footer
 plugin: system_powered_by_block
 settings:
   label: 'Powered by Drupal'
-  module: system
+  provider: system
   label_display: '0'
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.bartik_search.yml b/core/profiles/standard/config/block.block.bartik_search.yml
index aab8a8528b6a4ecabcedd4538c4c5e7c9a5e2439..7b00a703524026b4f472c7cb49daf0d387c81675 100644
--- a/core/profiles/standard/config/block.block.bartik_search.yml
+++ b/core/profiles/standard/config/block.block.bartik_search.yml
@@ -7,7 +7,7 @@ region: sidebar_first
 plugin: search_form_block
 settings:
   label: Search
-  module: search
+  provider: search
   label_display: visible
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.bartik_tools.yml b/core/profiles/standard/config/block.block.bartik_tools.yml
index 23cb6d957f62e9d35032e90c0e52dbb5e5a0e441..6300b791b43ea9f4ab3fad792530a4fe8223c663 100644
--- a/core/profiles/standard/config/block.block.bartik_tools.yml
+++ b/core/profiles/standard/config/block.block.bartik_tools.yml
@@ -7,7 +7,7 @@ region: sidebar_first
 plugin: 'system_menu_block:tools'
 settings:
   label: Tools
-  module: system
+  provider: system
   label_display: visible
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.seven_breadcrumbs.yml b/core/profiles/standard/config/block.block.seven_breadcrumbs.yml
index 0a89ca3caf5d539d96369d385d75bd7308ec4f97..844a5464258999fa10e413f6f0eb7b6798678c4a 100644
--- a/core/profiles/standard/config/block.block.seven_breadcrumbs.yml
+++ b/core/profiles/standard/config/block.block.seven_breadcrumbs.yml
@@ -7,7 +7,7 @@ region: '-1'
 plugin: system_breadcrumb_block
 settings:
   label: Breadcrumbs
-  module: system
+  provider: system
   label_display: '0'
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.seven_content.yml b/core/profiles/standard/config/block.block.seven_content.yml
index eb2fafa497aa322cd05b5e389cd7c2df221d1c63..ec7a43209680053b916aec48872a22d39c8f7961 100644
--- a/core/profiles/standard/config/block.block.seven_content.yml
+++ b/core/profiles/standard/config/block.block.seven_content.yml
@@ -7,7 +7,7 @@ region: content
 plugin: system_main_block
 settings:
   label: 'Main page content'
-  module: system
+  provider: system
   label_display: '0'
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.seven_help.yml b/core/profiles/standard/config/block.block.seven_help.yml
index 98f56c345329faff5ab2485c0086f325d46c14c4..f54a908e7ba703493ad8d2719293eb1eb9aef013 100644
--- a/core/profiles/standard/config/block.block.seven_help.yml
+++ b/core/profiles/standard/config/block.block.seven_help.yml
@@ -7,7 +7,7 @@ region: help
 plugin: system_help_block
 settings:
   label: 'System Help'
-  module: system
+  provider: system
   label_display: '0'
 visibility:
   path:
diff --git a/core/profiles/standard/config/block.block.seven_login.yml b/core/profiles/standard/config/block.block.seven_login.yml
index 5bbfbf9117f979442bff98a91e07b265ae6fd154..9f4578c0e70699055fb2e30764fd4643b019d0bc 100644
--- a/core/profiles/standard/config/block.block.seven_login.yml
+++ b/core/profiles/standard/config/block.block.seven_login.yml
@@ -7,7 +7,7 @@ region: content
 plugin: user_login_block
 settings:
   label: 'User login'
-  module: user
+  provider: user
   label_display: visible
 visibility:
   path: