diff --git a/core/modules/config/lib/Drupal/config/Controller/ConfigController.php b/core/modules/config/lib/Drupal/config/Controller/ConfigController.php
index 7a1c58a..e465a19 100644
--- a/core/modules/config/lib/Drupal/config/Controller/ConfigController.php
+++ b/core/modules/config/lib/Drupal/config/Controller/ConfigController.php
@@ -10,10 +10,8 @@
 use Drupal\Core\Controller\ControllerInterface;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Component\Archiver\ArchiveTar;
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\OpenModalDialogCommand;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\system\FileController;
+use Drupal\system\FileService;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -82,7 +80,7 @@ public function downloadExport() {
     }
     $archiver->createModify($config_files, '', config_get_config_directory());
 
-    $file_controller = new FileController($this->moduleHandler);
+    $file_controller = new FileService($this->moduleHandler);
     $request = new Request(array('file' => 'config.tar.gz'));
     return $file_controller->fileDownload($request, 'temporary');
   }
diff --git a/core/modules/image/lib/Drupal/image/Controller/ImageStyleFileService.php b/core/modules/image/lib/Drupal/image/Controller/ImageStyleFileService.php
index 3ce7582..538a899 100644
--- a/core/modules/image/lib/Drupal/image/Controller/ImageStyleFileService.php
+++ b/core/modules/image/lib/Drupal/image/Controller/ImageStyleFileService.php
@@ -47,7 +47,7 @@ class ImageStyleFileService extends FileService implements ControllerInterface {
   protected $lock;
 
   /**
-   * Constructs a ImageStyleDeliver object.
+   * Constructs a ImageStyleFileService object.
    *
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The config factory.
diff --git a/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php b/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php
index b7ea84c..37f7047 100644
--- a/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php
+++ b/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php
@@ -43,7 +43,7 @@ public function dynamicRoutes(RouteBuildEvent $event) {
 
     $route = new Route('/' . $directory_path . '/styles/{image_style}/{scheme}',
       array(
-      '_controller' => 'Drupal\image\Controller\ImageStyleDeliver::deliver',
+      '_controller' => 'Drupal\image\Controller\ImageStyleFileService::deliver',
       ),
       array(
         '_access' => 'TRUE',
diff --git a/core/modules/system/lib/Drupal/system/FileService.php b/core/modules/system/lib/Drupal/system/FileService.php
index d97274e..5789765 100644
--- a/core/modules/system/lib/Drupal/system/FileService.php
+++ b/core/modules/system/lib/Drupal/system/FileService.php
@@ -28,7 +28,7 @@ class FileService implements ControllerInterface {
   protected $moduleHandler;
 
   /**
-   * Constructs a FileController object.
+   * Constructs a FileService object.
    *
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.