diff --git a/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php b/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
index 0c514a4fa7e28e0c83bb239df8e7b69faafcc894..b08c762050d988584f1b41bfb3f31d99e2ed4e6f 100644
--- a/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
+++ b/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
@@ -56,16 +56,16 @@ public function setUp() {
     $this->routeProvider
       ->expects($this->any())
       ->method('getRouteByName')
-      ->with('language.edit')
+      ->with('entity.language_entity.edit_form')
       ->will($this->returnValue(new Route('/admin/config/regional/language/edit/{language_entity}')));
 
     $definition = array(
       'class' => '\Drupal\config_translation\ConfigEntityMapper',
-      'base_route_name' => 'language.edit',
+      'base_route_name' => 'entity.language_entity.edit_form',
       'title' => '!label language',
       'names' => array(),
       'entity_type' => 'language_entity',
-      'route_name' => 'config_translation.item.overview.language.edit',
+      'route_name' => 'config_translation.item.overview.entity.language_entity.edit_form',
     );
 
     $typed_config_manager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface');
diff --git a/core/modules/language/language.links.task.yml b/core/modules/language/language.links.task.yml
index da3a945b1bd0910a32d63f0210186c41fde3518c..8f36a89abd962ee6ca6146a8f329c014845b6b59 100644
--- a/core/modules/language/language.links.task.yml
+++ b/core/modules/language/language.links.task.yml
@@ -7,7 +7,7 @@ language.negotiation:
   route_name: language.negotiation
   base_route: language.admin_overview
 
-language.edit:
+entity.language_entity.edit_form:
   title: 'Edit'
-  route_name: language.edit
-  base_route: language.edit
+  route_name: entity.language_entity.edit_form
+  base_route: entity.language_entity.edit_form
diff --git a/core/modules/language/language.routing.yml b/core/modules/language/language.routing.yml
index 75ca759d7eaf812a59059e3a9346712d1f97adce..44c80c064e85b4f5eb57b7a91efccc6f4e83abdc 100644
--- a/core/modules/language/language.routing.yml
+++ b/core/modules/language/language.routing.yml
@@ -30,7 +30,7 @@ language.add:
   requirements:
     _entity_create_access: 'language_entity'
 
-language.edit:
+entity.language_entity.edit_form:
   path: '/admin/config/regional/language/edit/{language_entity}'
   defaults:
     _entity_form: 'language_entity.edit'
@@ -46,7 +46,7 @@ language.admin_overview:
   requirements:
     _permission: 'administer languages'
 
-language.delete:
+entity.language_entity.delete_form:
   path: '/admin/config/regional/language/delete/{language_entity}'
   defaults:
     _entity_form: 'language_entity.delete'
diff --git a/core/modules/language/src/Entity/Language.php b/core/modules/language/src/Entity/Language.php
index bdb3d786451202b4be65896c0abad59bfc18d195..123fb7c48552e81e1e797b4ca4dfbc7e931e6297 100644
--- a/core/modules/language/src/Entity/Language.php
+++ b/core/modules/language/src/Entity/Language.php
@@ -37,8 +37,8 @@
  *     "weight" = "weight"
  *   },
  *   links = {
- *     "delete-form" = "language.delete",
- *     "edit-form" = "language.edit"
+ *     "delete-form" = "entity.language_entity.delete_form",
+ *     "edit-form" = "entity.language_entity.edit_form"
  *   }
  * )
  */
diff --git a/core/modules/language/tests/src/Menu/LanguageLocalTasksTest.php b/core/modules/language/tests/src/Menu/LanguageLocalTasksTest.php
index c7aa1f874c0d05842a9e23ad00f829d9d56557aa..c20fe8a0e2376e0aced7bc0b5060efa26317ce02 100644
--- a/core/modules/language/tests/src/Menu/LanguageLocalTasksTest.php
+++ b/core/modules/language/tests/src/Menu/LanguageLocalTasksTest.php
@@ -46,8 +46,8 @@ public function getLanguageAdminOverviewRoutes() {
    * Tests language edit local tasks existence.
    */
   public function testLanguageEditLocalTasks() {
-    $this->assertLocalTasks('language.edit', array(
-      0 => array('language.edit'),
+    $this->assertLocalTasks('entity.language_entity.edit_form', array(
+      0 => array('entity.language_entity.edit_form'),
     ));
   }