diff --git a/core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php b/core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php
index 8ce63df..3aac975 100644
--- a/core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php
+++ b/core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Config\TypedConfigInterface.
+ * Contains \Drupal\Core\Config\Schema\TypedConfigInterface.
  */
 
 namespace Drupal\Core\Config\Schema;
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManager.php b/core/lib/Drupal/Core/Config/TypedConfigManager.php
index 2380ec6..5f71e6b 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -10,9 +10,9 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\String;
 use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Config\Schema\ArrayElement;
 use Drupal\Core\Config\Schema\ConfigSchemaAlterException;
 use Drupal\Core\Config\Schema\ConfigSchemaDiscovery;
-use Drupal\Core\Config\Schema\Element;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\TypedData\TypedDataManager;
 
@@ -67,7 +67,7 @@ public function __construct(StorageInterface $configStorage, StorageInterface $s
    * @param string $name
    *   Configuration object name.
    *
-   * @return \Drupal\Core\Config\TypedConfigInterface
+   * @return \Drupal\Core\Config\Schema\TypedConfigInterface
    *   Typed configuration data.
    */
   public function get($name) {
@@ -335,7 +335,7 @@ public function createInstance($data_type, array $configuration = array()) {
     $instance = parent::createInstance($data_type, $configuration);
     // Enable elements to construct their own definitions using the typed config
     // manager.
-    if ($instance instanceof Element) {
+    if ($instance instanceof ArrayElement) {
       $instance->setTypedConfig($this);
     }
     return $instance;