diff --git a/core/modules/block/src/EventSubscriber/BlockContextSubscriberBase.php b/core/modules/block/src/EventSubscriber/BlockContextSubscriberBase.php
index 9707edc..a161c52 100644
--- a/core/modules/block/src/EventSubscriber/BlockContextSubscriberBase.php
+++ b/core/modules/block/src/EventSubscriber/BlockContextSubscriberBase.php
@@ -38,7 +38,7 @@ public static function getSubscribedEvents() {
    *   // Set that specific node as the value of the 'node' context.
    *   $context = new Context(new ContextDefinition('entity:node'));
    *   $context->setContextValue($node);
-   *   $event->setContext('node', $context);
+   *   $event->setContext('node.node', $context);
    * @endcode
    *
    * @param \Drupal\block\Event\BlockContextEvent $event
@@ -57,12 +57,12 @@ public static function getSubscribedEvents() {
    * For example:
    * @code
    *   // During configuration, there is no specific node to pass as context.
-   *   // However, inform the system that a context named 'node' is available,
+   *   // However, inform the system that a context named 'node.node' is available,
    *   // and provide its definition, so that blocks can be configured to use
    *   // it. When the block is rendered, the value of this context will be
    *   // supplied by onBlockActiveContext().
    *   $context = new Context(new ContextDefinition('entity:node'));
-   *   $event->setContext('node', $context);
+   *   $event->setContext('node.node', $context);
    * @endcode
    *
    * @param \Drupal\block\Event\BlockContextEvent $event
diff --git a/core/modules/block/src/EventSubscriber/NodeRouteContext.php b/core/modules/block/src/EventSubscriber/NodeRouteContext.php
index 04eb339..66458c0 100644
--- a/core/modules/block/src/EventSubscriber/NodeRouteContext.php
+++ b/core/modules/block/src/EventSubscriber/NodeRouteContext.php
@@ -59,7 +59,7 @@ public function onBlockActiveContext(BlockContextEvent $event) {
    */
   public function onBlockAdministrativeContext(BlockContextEvent $event) {
     $context = new Context(new ContextDefinition('entity:node'));
-    $event->setContext('node', $context);
+    $event->setContext('node.node', $context);
   }
 
 }
diff --git a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
index 5f241c0..2002a38 100644
--- a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
+++ b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
@@ -120,18 +120,15 @@ public function testRecentNodeBlock() {
     $this->assertText($node4->label(), 'Node found in block.');
 
     // Enable the "Powered by Drupal" block only on article nodes.
-    $block = $this->drupalPlaceBlock('system_powered_by_block', array(
-      'visibility' => array(
-        'node_type' => array(
-          'context_mapping' => array(
-            'node' => 'node.node',
-          ),
-          'bundles' => array(
-            'article' => 'article',
-          ),
-        ),
-      ),
-    ));
+    $edit = [
+      'id' => strtolower($this->randomMachineName()),
+      'region' => 'sidebar_first',
+      'visibility[node_type][bundles][article]' => 'article',
+    ];
+    $theme = $this->config('system.theme')->get('default');
+    $this->drupalPostForm("admin/structure/block/add/system_powered_by_block/$theme", $edit, t('Save block'));
+
+    $block = entity_load('block', $edit['id']);
     $visibility = $block->getVisibility();
     $this->assertTrue(isset($visibility['node_type']['bundles']['article']), 'Visibility settings were saved to configuration');