diff --git a/core/core.services.yml b/core/core.services.yml
index 2cd6077..41fd423 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -445,7 +445,7 @@ services:
     class: Drupal\Core\Utility\Token
     arguments: ['@module_handler']
   batch.storage:
-    class: Drupal\Core\Utility\BatchStorage
+    class: Drupal\Core\Batch\BatchStorage
     arguments: ['@database']
   slave_database_ignore__subscriber:
     class: Drupal\Core\EventSubscriber\SlaveDatabaseIgnoreSubscriber
diff --git a/core/lib/Drupal/Core/Batch/BatchStorage.php b/core/lib/Drupal/Core/Batch/BatchStorage.php
index b5cb9b4..1de8819 100644
--- a/core/lib/Drupal/Core/Batch/BatchStorage.php
+++ b/core/lib/Drupal/Core/Batch/BatchStorage.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Utility\BatchStorage.
+ * Contains \Drupal\Core\Batch\BatchStorage.
  */
 
-namespace Drupal\Core\Utility;
+namespace Drupal\Core\Batch;
 
 use Drupal\Core\Database\Connection;
 
diff --git a/core/lib/Drupal/Core/Batch/BatchStorageInterface.php b/core/lib/Drupal/Core/Batch/BatchStorageInterface.php
index 5d310df..fca9f01 100644
--- a/core/lib/Drupal/Core/Batch/BatchStorageInterface.php
+++ b/core/lib/Drupal/Core/Batch/BatchStorageInterface.php
@@ -2,11 +2,10 @@
 
 /**
  * @file
- * Definition of \Drupal\Core\Utility\BatchStorageInterface.
+ * Contains \Drupal\Core\Batch\BatchStorageInterface.
  */
 
-namespace Drupal\Core\Utility;
-
+namespace Drupal\Core\Batch;
 
 interface BatchStorageInterface {