diff --git a/core/modules/block/block.api.php b/core/modules/block/block.api.php
index 3d3c4d1..59d272b 100644
--- a/core/modules/block/block.api.php
+++ b/core/modules/block/block.api.php
@@ -140,7 +140,7 @@ function hook_block_view_NAME_alter(array &$build, \Drupal\block\BlockInterface
  * @see \Drupal\block\BlockBase::access()
  * @see \Drupal\block\BlockBase::blockAccess()
  */
-function hook_block_access(\Drupal\block\Plugin\Core\Entity\Block $block, $operation, \Drupal\user\Plugin\Core\Entity\User $account, $langcode) {
+function hook_block_wrapper_access(\Drupal\block\Plugin\Core\Entity\Block $block, $operation, \Drupal\user\Plugin\Core\Entity\User $account, $langcode) {
   // Example code that would prevent displaying the 'Powered by Drupal' block in
   // a region different than the footer.
   if ($block->get('plugin') == 'system_powered_by_block' && $block->get('region') != 'footer') {
@@ -157,7 +157,7 @@ function hook_block_access(\Drupal\block\Plugin\Core\Entity\Block $block, $opera
  * @return bool
  *   TRUE will allow access whereas FALSE will deny access to the block.
  */
-function hook_block_plugin_access(\Drupal\block\BlockInterface $block) {
+function hook_block_access(\Drupal\block\BlockInterface $block) {
   if ($block->getPluginID() == 'my_plugin_id') {
     return FALSE;
   }
diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/Drupal/block/BlockBase.php
index f1c41cb..53cc736 100644
--- a/core/modules/block/lib/Drupal/block/BlockBase.php
+++ b/core/modules/block/lib/Drupal/block/BlockBase.php
@@ -187,8 +187,8 @@ public function access() {
     }
 
     // Check other modules for block access rules.
-    foreach (module_implements('block_plugin_access') as $module) {
-      if (module_invoke($module, 'block_plugin_access', $this) === FALSE) {
+    foreach (module_implements('block_access') as $module) {
+      if (module_invoke($module, 'block_access', $this) === FALSE) {
         return FALSE;
       }
     }
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index c321f66..bcae32a 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -19,6 +19,7 @@
 use Drupal\Core\Template\Attribute;
 use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
 use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\block\Plugin\Core\Entity\Block;
 use Drupal\user\Plugin\Core\Entity\User;
 
 /**
@@ -2014,12 +2015,12 @@ function node_form_block_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_block_access().
+ * Implements hook_block_wrapper_access().
  *
  * Checks the content type specific visibility settings and removes the block
  * if the visibility conditions are not met.
  */
-function node_block_access($block) {
+function node_block_wrapper_access(Block $block, $operation, User $account, $langcode) {
   $settings = $block->get('settings');
   $visibility = $settings['visibility'];
   if (!empty($visibility)) {
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index 0a9e5ae..a8794b0 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -479,9 +479,9 @@ function theme_overlay_disable_message($variables) {
 }
 
 /**
- * Implements hook_block_access().
+ * Implements hook_block_wrapper_access().
  */
-function overlay_block_access(Block $block, $operation, User $account, $langcode) {
+function overlay_block_wrapper_access(Block $block, $operation, User $account, $langcode) {
   // If we are limiting rendering to a subset of page regions, hide all blocks
   // which appear in regions not on that list. Note that overlay_page_alter()
   // does a more comprehensive job of preventing unwanted regions from being
@@ -854,7 +854,7 @@ function _overlay_region_list($type) {
  *   and all regions of the page will be rendered.
  *
  * @see overlay_page_alter()
- * @see overlay_block_access()
+ * @see overlay_block_wrapper_access()
  * @see overlay_set_regions_to_render()
  */
 function overlay_get_regions_to_render() {
@@ -876,7 +876,7 @@ function overlay_get_regions_to_render() {
  *   are not being limited.
  *
  * @see overlay_page_alter()
- * @see overlay_block_access()
+ * @see overlay_block_wrapper_access()
  * @see overlay_get_regions_to_render()
  */
 function overlay_set_regions_to_render($regions = NULL) {
@@ -906,7 +906,7 @@ function overlay_set_regions_to_render($regions = NULL) {
  */
 function overlay_render_region($region) {
   // Indicate the region that we will be rendering, so that other regions will
-  // be hidden by overlay_page_alter() and overlay_block_access().
+  // be hidden by overlay_page_alter() and overlay_block_wrapper_access().
   overlay_set_regions_to_render(array($region));
   // Do what is necessary to force drupal_render_page() to only display HTML
   // from the requested region. Specifically, declare that the main page