diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index 52c9600..4399d01 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -104,7 +104,7 @@ public function label();
    * @code
    * links = {
    *   "canonical" = "entity.node.canonical",
-   *   "edit-form" = "entity.node_type.edit_form",
+   *   "edit-form" = "entity.node.edit_form",
    *   "version-history" = "entity.node.version_history"
    * }
    * @endcode
diff --git a/core/modules/book/book.admin.inc b/core/modules/book/book.admin.inc
index 51bf88d..469267c 100644
--- a/core/modules/book/book.admin.inc
+++ b/core/modules/book/book.admin.inc
@@ -50,13 +50,13 @@ function theme_book_admin_table($variables) {
     if ($access) {
       $links['edit'] = array(
         'title' => t('Edit'),
-        'route_name' => 'entity.node_type.edit_form',
+        'route_name' => 'entity.node.edit_form',
         'route_parameters' => array('node' => $nid),
         'query' => $destination,
       );
       $links['delete'] = array(
         'title' => t('Delete'),
-        'route_name' => 'entity.node_type.delete_form',
+        'route_name' => 'entity.node.delete_form',
         'route_parameters' => array('node' => $nid),
         'query' => $destination,
       );
diff --git a/core/modules/book/tests/src/Menu/BookLocalTasksTest.php b/core/modules/book/tests/src/Menu/BookLocalTasksTest.php
index fd40813..8f585fa 100644
--- a/core/modules/book/tests/src/Menu/BookLocalTasksTest.php
+++ b/core/modules/book/tests/src/Menu/BookLocalTasksTest.php
@@ -53,7 +53,7 @@ public function getBookAdminRoutes() {
    */
   public function testBookNodeLocalTasks($route) {
     $this->assertLocalTasks($route, array(
-      0 => array('book.outline', 'entity.node.canonical', 'entity.node_type.edit_form', 'entity.node_type.delete_form', 'entity.node.version_history',),
+      0 => array('book.outline', 'entity.node.canonical', 'entity.node.edit_form', 'entity.node.delete_form', 'entity.node.version_history',),
     ));
   }
 
diff --git a/core/modules/content_translation/tests/src/Menu/ContentTranslationLocalTasksTest.php b/core/modules/content_translation/tests/src/Menu/ContentTranslationLocalTasksTest.php
index 17c69ef..2f13405 100644
--- a/core/modules/content_translation/tests/src/Menu/ContentTranslationLocalTasksTest.php
+++ b/core/modules/content_translation/tests/src/Menu/ContentTranslationLocalTasksTest.php
@@ -56,15 +56,15 @@ public function providerTestBlockAdminDisplay() {
       array('entity.node.canonical', array(array(
         'content_translation.local_tasks:content_translation.translation_overview_node',
         'entity.node.canonical',
-        'entity.node_type.edit_form',
-        'entity.node_type.delete_form',
+        'entity.node.edit_form',
+        'entity.node.delete_form',
         'entity.node.version_history',
       ))),
       array('content_translation.translation_overview_node', array(array(
         'content_translation.local_tasks:content_translation.translation_overview_node',
         'entity.node.canonical',
-        'entity.node_type.edit_form',
-        'entity.node_type.delete_form',
+        'entity.node.edit_form',
+        'entity.node.delete_form',
         'entity.node.version_history',
       ))),
     );
diff --git a/core/modules/node/node.links.contextual.yml b/core/modules/node/node.links.contextual.yml
index 25ca55b..f1d8a9e 100644
--- a/core/modules/node/node.links.contextual.yml
+++ b/core/modules/node/node.links.contextual.yml
@@ -1,10 +1,10 @@
-entity.node_type.edit_form:
-  route_name: entity.node_type.edit_form
+entity.node.edit_form:
+  route_name: entity.node.edit_form
   group: node
   title: Edit
 
-entity.node_type.delete_form:
-  route_name: entity.node_type.delete_form
+entity.node.delete_form:
+  route_name: entity.node.delete_form
   group: node
   title: Delete
   weight: 10
diff --git a/core/modules/node/node.links.task.yml b/core/modules/node/node.links.task.yml
index 7fec9df..88271e8 100644
--- a/core/modules/node/node.links.task.yml
+++ b/core/modules/node/node.links.task.yml
@@ -2,12 +2,12 @@ entity.node.canonical:
   route_name: entity.node.canonical
   base_route: entity.node.canonical
   title: 'View'
-entity.node_type.edit_form:
-  route_name: entity.node_type.edit_form
+entity.node.edit_form:
+  route_name: entity.node.edit_form
   base_route: entity.node.canonical
   title: Edit
-entity.node_type.delete_form:
-  route_name: entity.node_type.delete_form
+entity.node.delete_form:
+  route_name: entity.node.delete_form
   base_route: entity.node.canonical
   title: Delete
   weight: 10
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index e658cc2..6fddacc 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -141,7 +141,7 @@ function node_help($route_name, RouteMatchInterface $route_match) {
     case 'entity.node.version_history':
       return '<p>' . t('Revisions allow you to track differences between multiple versions of your content, and revert back to older versions.') . '</p>';
 
-    case 'entity.node_type.edit_form':
+    case 'entity.node.edit_form':
       $node = $route_match->getParameter('node');
       $type = $node->getType();
       return (!empty($type->help) ? Xss::filterAdmin($type->help) : '');
diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml
index 42357f9..f9523d4 100644
--- a/core/modules/node/node.routing.yml
+++ b/core/modules/node/node.routing.yml
@@ -6,7 +6,7 @@ node.multiple_delete_confirm:
   requirements:
     _permission: 'administer nodes'
 
-entity.node_type.edit_form:
+entity.node.edit_form:
   path: '/node/{node}/edit'
   defaults:
     _entity_form: 'node.edit'
@@ -45,7 +45,7 @@ entity.node.canonical:
   requirements:
     _entity_access: 'node.view'
 
-entity.node_type.delete_form:
+entity.node.delete_form:
   path: '/node/{node}/delete'
   defaults:
     _entity_form: 'node.delete'
@@ -117,7 +117,7 @@ entity.node_type.edit_form:
   requirements:
     _permission: 'administer content types'
 
-node.type_delete_confirm:
+entity.node_type.delete_form:
   path: '/admin/structure/types/manage/{node_type}/delete'
   defaults:
     _entity_form: 'node_type.delete'
diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php
index 1f72b4d..ac7fb13 100644
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -52,8 +52,8 @@
  *   permission_granularity = "bundle",
  *   links = {
  *     "canonical" = "entity.node.canonical",
- *     "delete-form" = "entity.node_type.delete_form",
- *     "edit-form" = "entity.node_type.edit_form",
+ *     "delete-form" = "entity.node.delete_form",
+ *     "edit-form" = "entity.node.edit_form",
  *     "version-history" = "entity.node.version_history",
  *     "admin-form" = "entity.node_type.edit_form"
  *   }
diff --git a/core/modules/node/src/Entity/NodeType.php b/core/modules/node/src/Entity/NodeType.php
index f682549..57fc6f6 100644
--- a/core/modules/node/src/Entity/NodeType.php
+++ b/core/modules/node/src/Entity/NodeType.php
@@ -35,9 +35,8 @@
  *     "label" = "name"
  *   },
  *   links = {
- *     "add-form" = "node.add",
  *     "edit-form" = "entity.node_type.edit_form",
- *     "delete-form" = "node.type_delete_confirm"
+ *     "delete-form" = "entity.node_type.delete_form"
  *   }
  * )
  */