diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index ff63c75..dfa34fc 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -60,7 +60,7 @@ public function build(ContainerBuilder $container) {
     $container->register('user.tempstore', 'Drupal\user\TempStoreFactory')
       ->addArgument(new Reference('database'))
       ->addArgument(new Reference('lock'));
-    $container->register('file.usage', 'Drupal\Core\FileUsage\DatabaseFileUsageBackend')
+    $container->register('file.usage', 'Drupal\file\FileUsage\DatabaseFileUsageBackend')
       ->addArgument(new Reference('database'));
 
     $container->register('router.dumper', '\Drupal\Core\Routing\MatcherDumper')
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index cefc165..c008cb3 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -9,8 +9,8 @@
 use Drupal\file\File;
 use Drupal\Core\Template\Attribute;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Drupal\Core\FileUsage\DatabaseFileUsageBackend;
-use Drupal\Core\FileUsage\FileUsageInterface;
+use Drupal\file\FileUsage\DatabaseFileUsageBackend;
+use Drupal\file\FileUsage\FileUsageInterface;
 
 // Load all Field module hooks for File.
 require_once DRUPAL_ROOT . '/core/modules/file/file.field.inc';
@@ -144,7 +144,7 @@ function file_load($fid) {
 /**
  * Returns the file usage service.
  *
- * @return Drupal\Core\FileUsage\FileUsageInterface.
+ * @return Drupal\file\FileUsage\FileUsageInterface.
  */
 function file_usage() {
   return drupal_container()->get('file.usage');
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php b/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php
index 4c81abf..ff3b0ae 100644
--- a/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php
+++ b/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileUsage\DatabaseFileUsageBackend.
+ * Definition of Drupal\file\FileUsage\DatabaseFileUsageBackend.
  */
 
-namespace Drupal\Core\FileUsage;
+namespace Drupal\file\FileUsage;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
-use Drupal\file\File as File;
+use Drupal\file\File;
 
 /**
  * Defines the database file usage backend. This is the default Drupal backend.
@@ -46,7 +46,7 @@ public function __construct(Connection $connection, $table = 'file_usage') {
   }
 
   /**
-   * Implements Drupal\Core\FileUsage\FileUsageInterface::add().
+   * Implements Drupal\file\FileUsage\FileUsageInterface::add().
    */
   public function add(File $file, $module, $type, $id, $count = 1) {
     $this->connection->merge($this->tableName)
@@ -64,7 +64,7 @@ public function add(File $file, $module, $type, $id, $count = 1) {
   }
 
   /**
-   * Implements Drupal\Core\FileUsage\FileUsageInterface::delete().
+   * Implements Drupal\file\FileUsage\FileUsageInterface::delete().
    */
   public function delete(File $file, $module, $type = NULL, $id = NULL, $count = 1) {
     // Delete rows that have a exact or less value to prevent empty rows.
@@ -99,7 +99,7 @@ public function delete(File $file, $module, $type = NULL, $id = NULL, $count = 1
   }
 
   /**
-   * Implements Drupal\Core\FileUsage\FileUsageInterface::listUsage().
+   * Implements Drupal\file\FileUsage\FileUsageInterface::listUsage().
    */
   public function listUsage(File $file) {
     $result = $this->connection->select($this->tableName, 'f')
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php
index a684cdb..ae2c670 100644
--- a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php
+++ b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileUsage\FileUsageBase.
+ * Definition of Drupal\file\FileUsage\FileUsageBase.
  */
 
-namespace Drupal\Core\FileUsage;
+namespace Drupal\file\FileUsage;
 
-use Drupal\file\File as File;
+use Drupal\file\File;
 
 /**
  * Defines the base class for database file usage backend.
@@ -15,7 +15,7 @@
 abstract class FileUsageBase implements FileUsageInterface {
 
   /**
-   * Implements Drupal\Core\FileUsage\FileUsageInterface::add().
+   * Implements Drupal\file\FileUsage\FileUsageInterface::add().
    */
   public function add(File $file, $module, $type, $id, $count = 1) {
     // Make sure that a used file is permament.
@@ -26,7 +26,7 @@ public function add(File $file, $module, $type, $id, $count = 1) {
   }
 
   /**
-   * Implements Drupal\Core\FileUsage\FileUsageInterface::delete().
+   * Implements Drupal\file\FileUsage\FileUsageInterface::delete().
    */
   public function delete(File $file, $module, $type = NULL, $id = NULL, $count = 1) {
     // If there are no more remaining usages of this file, mark it as temporary,
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php
index 7f54f8b..4a4b231 100644
--- a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php
+++ b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileUsage\FileUsageInterface.
+ * Definition of Drupal\file\FileUsage\FileUsageInterface.
  */
 
-namespace Drupal\Core\FileUsage;
+namespace Drupal\file\FileUsage;
 
-use Drupal\file\File as File;
+use Drupal\file\File;
 
 /**
  * File usage backend interface.
diff --git a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/TestFileUsage.php b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/TestFileUsage.php
index ee5ef0f..12cc137 100644
--- a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/TestFileUsage.php
+++ b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/TestFileUsage.php
@@ -7,24 +7,24 @@
 
 namespace Drupal\bundle_test;
 
-use Drupal\file\File as File;
+use Drupal\file\File;
 
 class TestFileUsage extends FileUsageBase {
 
   /**
-   * Implements Drupal\Core\FileUsage\FileUsageInterface::add().
+   * Implements Drupal\file\FileUsage\FileUsageInterface::add().
    */
   public function add(File $file, $module, $type, $id, $count = 1) {
   }
 
   /**
-   * Implements Drupal\Core\FileUsage\FileUsageInterface::delete().
+   * Implements Drupal\file\FileUsage\FileUsageInterface::delete().
    */
   public function delete(File $file, $module, $type = NULL, $id = NULL, $count = 1) {
   }
 
   /**
-   * Implements Drupal\Core\FileUsage\FileUsageInterface::listUsage().
+   * Implements Drupal\file\FileUsage\FileUsageInterface::listUsage().
    */
   public function listUsage(File $file) {
   }