diff --git a/core/modules/system/lib/Drupal/system/Controller/LanguageController.php b/core/modules/system/lib/Drupal/system/Controller/DateFormatLanguageController.php
similarity index 82%
rename from core/modules/system/lib/Drupal/system/Controller/LanguageController.php
rename to core/modules/system/lib/Drupal/system/Controller/DateFormatLanguageController.php
index 5dc1843..1f97951 100644
--- a/core/modules/system/lib/Drupal/system/Controller/LanguageController.php
+++ b/core/modules/system/lib/Drupal/system/Controller/DateFormatLanguageController.php
@@ -10,7 +10,7 @@
 /**
  * Controller for Language Date Format handling.
  */
-class LanguageDateFormatController {
+class DateFormatLanguageController {
 
   /**
    * Displays edit date format links for each language.
@@ -29,11 +29,11 @@ public function overviewPage() {
       $links = array();
       $links['edit'] = array(
         'title' => t('Edit'),
-        'href' => 'admin/config/regional/date-time/' . $langcode . '/edit',
+        'href' => 'admin/config/regional/date-time/locale/' . $langcode . '/edit',
       );
       $links['reset'] = array(
         'title' => t('Reset'),
-        'href' => 'admin/config/regional/date-time/' . $langcode . '/reset',
+        'href' => 'admin/config/regional/date-time/locale/' . $langcode . '/reset',
       );
       $row[] = array(
         'data' => array(
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index 1f9e1f7..0bd635f 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -111,7 +111,7 @@ date_format_edit:
 date_format_language_overview:
   pattern: '/admin/config/regional/date-time/locale'
   defaults:
-    _controller: '\Drupal\system\Controller\LanguageDateFormatController::overviewPage'
+    _controller: '\Drupal\system\Controller\DateFormatLanguageController::overviewPage'
   requirements:
     _permission: 'administer site configuration'