diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
index c9fe040..cb90cf3 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
@@ -26,7 +26,7 @@ class AggregatorCategoryBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     // By default, the block will contain 10 feed items.
     return array(
       'block_count' => 10,
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
index 4b002a2..8bd0987 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
@@ -26,7 +26,7 @@ class AggregatorFeedBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     // By default, the block will contain 10 feed items.
     return array(
       'block_count' => 10,
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
index 0d17fa1..73c7995 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
@@ -26,7 +26,7 @@ class CustomBlockBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'status' => TRUE,
       'info' => '',
diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
index 4319878..810881e 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
@@ -66,7 +66,7 @@ protected function defineOptions() {
    *   An array of block-specific settings to override the defaults provided in
    *   \Drupal\views\Plugin\Block\ViewsBlock::settings().
    *
-   * @see \Drupal\views\Plugin\Block\ViewsBlock::settings().
+   * @see \Drupal\views\Plugin\Block\ViewsBlock::getDefaultConfiguration()
    */
   public function blockSettings(array $settings) {
     $settings['items_per_page'] = 'none';
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
index 4c28638..7ad9524 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
@@ -25,7 +25,7 @@ class TestBlockInstantiation extends BlockBase {
   /**
    * {@inheritdoc}
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'display_message' => 'no message set',
     );
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
index c83d668..c6c8c6b 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
@@ -27,7 +27,7 @@ class TestCacheBlock extends BlockBase {
    *
    * Sets a different caching strategy for testing purposes.
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'cache' => DRUPAL_CACHE_PER_ROLE,
     );
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
index ea134df..1492820 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
@@ -25,7 +25,7 @@ class TestXSSTitleBlock extends TestCacheBlock {
    *
    * Sets a different caching strategy for testing purposes.
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'cache' => DRUPAL_NO_CACHE,
     );
diff --git a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php b/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
index 8cacc04..147c78d 100644
--- a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
+++ b/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
@@ -25,7 +25,7 @@ class BookNavigationBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'cache' => DRUPAL_CACHE_PER_PAGE | DRUPAL_CACHE_PER_ROLE,
       'block_mode' => "all pages",
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php b/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
index cf442db..44adf51 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
@@ -25,7 +25,7 @@ class RecentCommentsBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'block_count' => 10,
     );
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ForumBlockBase.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ForumBlockBase.php
index cbdfc79..f23e4a7 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ForumBlockBase.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ForumBlockBase.php
@@ -17,7 +17,7 @@
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'cache' => DRUPAL_CACHE_CUSTOM,
       'properties' => array(
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php b/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
index 8144161..5e48183 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
@@ -25,7 +25,7 @@ class RecentContentBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'block_count' => 10,
     );
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php b/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
index 1440a48..f9be999 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
@@ -25,7 +25,7 @@ class SyndicateBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'block_count' => 10,
     );
diff --git a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
index d11412e..fbef6ae 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
@@ -46,7 +46,7 @@ class StatisticsPopularBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'top_day_num' => 0,
       'top_all_num' => 0,
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
index 26be5ba..23f3c8b 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
@@ -25,7 +25,7 @@ class UserNewBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'properties' => array(
         'administrative' => TRUE
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
index 3f5b0b2..6a6eb05 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
@@ -28,7 +28,7 @@ class UserOnlineBlock extends BlockBase {
   /**
    * Overrides \Drupal\block\BlockBase::settings().
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     return array(
       'properties' => array(
         'administrative' => TRUE
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
index d3cada4..0d485b8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
@@ -46,7 +46,7 @@ public function build() {
   /**
    * {@inheritdoc}
    */
-  public function settings() {
+  public function getDefaultConfiguration() {
     $settings = array();
 
     if ($this->displaySet) {