diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php
index fe77bad..1a5acab 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Core\Config;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
 /**
  * Defines the configuration object factory.
  *
@@ -22,12 +20,12 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
  * @see Drupal\Core\Config\Config
  */
 class ConfigFactory {
-  protected $containerClass;
+  protected $configClass;
 
   protected $storageDispatcher;
 
-  public function __construct($container_class, StorageDispatcher $storage_dispatcher) {
-    $this->containerClass = $container_class;
+  public function __construct($config_class, StorageDispatcher $storage_dispatcher) {
+    $this->configClass = $config_class;
     $this->storageDispatcher = $storage_dispatcher;
   }
 
@@ -59,7 +57,7 @@ class ConfigFactory {
     // @todo The decrease of CPU time is interesting, since that means that
     //   ContainerBuilder involves plenty of function calls (which are known to
     //   be slow in PHP).
-    $config = new $this->containerClass($this->storageDispatcher);
+    $config = new $this->configClass($this->storageDispatcher);
     return $config->setName($name);
   }
 }
diff --git a/core/lib/Drupal/Core/Config/StorageException.php b/core/lib/Drupal/Core/Config/StorageException.php
index a956fea..b1e99a1 100644
--- a/core/lib/Drupal/Core/Config/StorageException.php
+++ b/core/lib/Drupal/Core/Config/StorageException.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Core\Config;
 
-use Drupal\Core\Config\ConfigException;
-
 /**
  * An exception thrown in case of storage controller operation errors.
  */