diff --git a/core/lib/Drupal/Core/Archiver/Tar.php b/core/lib/Drupal/Core/Archiver/Tar.php
index 91c7027..600d991 100644
--- a/core/lib/Drupal/Core/Archiver/Tar.php
+++ b/core/lib/Drupal/Core/Archiver/Tar.php
@@ -15,7 +15,7 @@ class Tar implements ArchiverInterface {
   /**
    * The underlying ArchiveTar instance that does the heavy lifting.
    *
-   * @var \Drupal\Core\Archiver\Archive_Tar
+   * @var \Drupal\Core\Archiver\ArchiveTar
    */
   protected $tar;
 
@@ -30,7 +30,7 @@ class Tar implements ArchiverInterface {
    * @throws \Drupal\Core\Archiver\ArchiverException
    */
   public function __construct($file_path) {
-    $this->tar = new Archive_Tar($file_path);
+    $this->tar = new ArchiveTar($file_path);
   }
 
   /**
diff --git a/core/modules/config/src/Controller/ConfigController.php b/core/modules/config/src/Controller/ConfigController.php
index f824f75..dc56910 100644
--- a/core/modules/config/src/Controller/ConfigController.php
+++ b/core/modules/config/src/Controller/ConfigController.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\config\Controller;
 
-use Drupal\Core\Archiver\Archive_Tar;
+use Drupal\Core\Archiver\ArchiveTar;
 use Drupal\Component\Serialization\Yaml;
 use Drupal\Core\Config\ConfigManagerInterface;
 use Drupal\Core\Config\StorageInterface;
@@ -95,7 +95,7 @@ public function __construct(StorageInterface $target_storage, StorageInterface $
   public function downloadExport() {
     file_unmanaged_delete(file_directory_temp() . '/config.tar.gz');
 
-    $archiver = new Archive_Tar(file_directory_temp() . '/config.tar.gz', 'gz');
+    $archiver = new ArchiveTar(file_directory_temp() . '/config.tar.gz', 'gz');
     // Get raw configuration data without overrides.
     foreach ($this->configManager->getConfigFactory()->listAll() as $name) {
       $archiver->addString("$name.yml", Yaml::encode($this->configManager->getConfigFactory()->get($name)->getRawData()));
diff --git a/core/modules/config/src/Form/ConfigImportForm.php b/core/modules/config/src/Form/ConfigImportForm.php
index 53b1d82..9ed9b83 100644
--- a/core/modules/config/src/Form/ConfigImportForm.php
+++ b/core/modules/config/src/Form/ConfigImportForm.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\config\Form;
 
-use Drupal\Core\Archiver\Archive_Tar;
+use Drupal\Core\Archiver\ArchiveTar;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -91,7 +91,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     if ($path = $form_state->getValue('import_tarball')) {
       $this->configStorage->deleteAll();
       try {
-        $archiver = new Archive_Tar($path, 'gz');
+        $archiver = new ArchiveTar($path, 'gz');
         $files = array();
         foreach ($archiver->listContent() as $file) {
           $files[] = $file['filename'];
diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/src/Tests/ConfigExportImportUITest.php
index 425fcca..0c35736 100644
--- a/core/modules/config/src/Tests/ConfigExportImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php
@@ -8,7 +8,7 @@
 namespace Drupal\config\Tests;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Archiver\Archive_Tar;
+use Drupal\Core\Archiver\ArchiveTar;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
 
@@ -178,7 +178,7 @@ public function testExportImportCollections() {
     $this->assertFalse($test2_snapshot->read('config_test.another_create'), 'The config_test.another_create in collection.test2 does not exist in the snapshot storage.');
 
     // Create the tar contains the expected contect for the collections.
-    $tar = new Archive_Tar($filename, 'gz');
+    $tar = new ArchiveTar($filename, 'gz');
     $content_list = $tar->listContent();
     // Convert the list of files into something easy to search.
     $files = array();