diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index b8eb7e6..29b9cc3 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -844,7 +844,7 @@ function node_page_top(array &$page) {
       ],
     ];
 
-    $form = \Drupal::formBuilder()->getForm('\Drupal\node\Form\NodePreviewForm', $route_match->getParameter('node_preview'));
+    $form = \Drupal::formBuilder()->getForm('\Drupal\node\Form\NodePreviewForm', $route_match->getParameter('node'));
     $page['page_top']['node_preview']['view_mode'] = $form;
   }
 }
diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml
index a016e3a..56d0dba 100644
--- a/core/modules/node/node.routing.yml
+++ b/core/modules/node/node.routing.yml
@@ -29,15 +29,15 @@ node.add:
         with_config_overrides: TRUE
 
 entity.node.preview:
-  path: '/node/preview/{node_preview}/{view_mode_id}'
+  path: '/node/preview/{node}/{view_mode_id}'
   defaults:
     _controller: '\Drupal\node\Controller\NodePreviewController::view'
     _title_callback: '\Drupal\node\Controller\NodePreviewController::title'
   requirements:
-    _node_preview_access: '{node_preview}'
+    _node_preview_access: '{node}'
   options:
     parameters:
-      node_preview:
+      node:
         type: 'node_preview'
 
 entity.node.version_history:
diff --git a/core/modules/node/src/Access/NodePreviewAccessCheck.php b/core/modules/node/src/Access/NodePreviewAccessCheck.php
index 831bc65..2fad437 100644
--- a/core/modules/node/src/Access/NodePreviewAccessCheck.php
+++ b/core/modules/node/src/Access/NodePreviewAccessCheck.php
@@ -36,19 +36,19 @@ public function __construct(EntityManagerInterface $entity_manager) {
    *
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
-   * @param \Drupal\node\NodeInterface $node_preview
+   * @param \Drupal\node\NodeInterface $node
    *   The node that is being previewed.
    *
    * @return string
    *   A \Drupal\Core\Access\AccessInterface constant value.
    */
-  public function access(AccountInterface $account, NodeInterface $node_preview) {
-    if ($node_preview->isNew()) {
+  public function access(AccountInterface $account, NodeInterface $node) {
+    if ($node->isNew()) {
       $access_controller = $this->entityManager->getAccessControlHandler('node');
-      return $access_controller->createAccess($node_preview->bundle(), $account, [], TRUE);
+      return $access_controller->createAccess($node->bundle(), $account, [], TRUE);
     }
     else {
-      return $node_preview->access('update', $account, TRUE);
+      return $node->access('update', $account, TRUE);
     }
   }
 
diff --git a/core/modules/node/src/Controller/NodePreviewController.php b/core/modules/node/src/Controller/NodePreviewController.php
index 1a1c3ca..24e7315 100644
--- a/core/modules/node/src/Controller/NodePreviewController.php
+++ b/core/modules/node/src/Controller/NodePreviewController.php
@@ -13,9 +13,9 @@ class NodePreviewController extends EntityViewController {
   /**
    * {@inheritdoc}
    */
-  public function view(EntityInterface $node_preview, $view_mode_id = 'full', $langcode = NULL) {
-    $node_preview->preview_view_mode = $view_mode_id;
-    $build = parent::view($node_preview, $view_mode_id);
+  public function view(EntityInterface $node, $view_mode_id = 'full', $langcode = NULL) {
+    $node->preview_view_mode = $view_mode_id;
+    $build = parent::view($node, $view_mode_id);
 
     $build['#attached']['library'][] = 'node/drupal.node.preview';
 
@@ -34,8 +34,8 @@ public function view(EntityInterface $node_preview, $view_mode_id = 'full', $lan
    * @return string
    *   The page title.
    */
-  public function title(EntityInterface $node_preview) {
-    return $this->entityManager->getTranslationFromContext($node_preview)->label();
+  public function title(EntityInterface $node) {
+    return $this->entityManager->getTranslationFromContext($node)->label();
   }
 
 }
diff --git a/core/modules/node/src/Form/NodePreviewForm.php b/core/modules/node/src/Form/NodePreviewForm.php
index 8b6125b..362ad61 100644
--- a/core/modules/node/src/Form/NodePreviewForm.php
+++ b/core/modules/node/src/Form/NodePreviewForm.php
@@ -124,7 +124,7 @@ public function buildForm(array $form, FormStateInterface $form_state, EntityInt
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $route_parameters = [
-      'node_preview' => $form_state->getValue('uuid'),
+      'node' => $form_state->getValue('uuid'),
       'view_mode_id' => $form_state->getValue('view_mode'),
     ];
 
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 4c9bbac..1f2cd47 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -264,7 +264,7 @@ public function preview(array $form, FormStateInterface $form_state) {
     $store->set($this->entity->uuid(), $form_state);
 
     $route_parameters = [
-      'node_preview' => $this->entity->uuid(),
+      'node' => $this->entity->uuid(),
       'view_mode_id' => 'full',
     ];