diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
index e648184..a04a928 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
@@ -159,22 +159,23 @@ function testNameValidation() {
     }
 
     // Verify an exception is thrown when importing configuration with an
-    // invalid name.
+    // invalid name (missing a namespace).
     $message = 'Expected ConfigNameException was thrown when attempting to install invalid configuration.';
     try {
-      $this->enableModules(array('config_test_invalid'));
+      $this->enableModules(array('config_test_invalid_name'));
       $this->fail($message);
     }
     catch (ConfigNameException $e) {
       $this->pass($message);
     }
 
-    // Write configuraiton with an invalid name to staging.
+    // Write configuration with an invalid name (missing a namespace) to
+    // staging.
     $storage = $this->container->get('config.storage');
     $staging = $this->container->get('config.storage.staging');
-    $manifest_data = config('manifest.invalid')->get();
+    $manifest_data = config('manifest.invalid_object_name')->get();
     $manifest_data['new']['name'] = 'invalid';
-    $staging->write('manifest.invalid', $manifest_data);
+    $staging->write('manifest.invalid_object_name', $manifest_data);
 
     // Verify that an exception is thrown when synchronizing.
     $message = 'Expected ConfigNameException was thrown when attempting to sync invalid configuration.';
diff --git a/core/modules/config/tests/config_test_invalid/config_test_invalid.module b/core/modules/config/tests/config_test_invalid/config_test_invalid.module
deleted file mode 100644
index 81cdae6..0000000
--- a/core/modules/config/tests/config_test_invalid/config_test_invalid.module
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Test module containing invalid configuration.
- */
diff --git a/core/modules/config/tests/config_test_invalid/config/invalid.yml b/core/modules/config/tests/config_test_invalid_name/config/invalid_object_name.yml
similarity index 100%
rename from core/modules/config/tests/config_test_invalid/config/invalid.yml
rename to core/modules/config/tests/config_test_invalid_name/config/invalid_object_name.yml
diff --git a/core/modules/config/tests/config_test_invalid/config_test_invalid.info b/core/modules/config/tests/config_test_invalid_name/config_test_invalid_name.info
similarity index 55%
rename from core/modules/config/tests/config_test_invalid/config_test_invalid.info
rename to core/modules/config/tests/config_test_invalid_name/config_test_invalid_name.info
index 560a772..8532cdb 100644
--- a/core/modules/config/tests/config_test_invalid/config_test_invalid.info
+++ b/core/modules/config/tests/config_test_invalid_name/config_test_invalid_name.info
@@ -1,4 +1,4 @@
-name = Test module with invalid configuration
+name = Invalid configuration name
 package = Core
 version = VERSION
 core = 8.x
diff --git a/core/modules/config/tests/config_test_invalid_name/config_test_invalid_name.module b/core/modules/config/tests/config_test_invalid_name/config_test_invalid_name.module
new file mode 100644
index 0000000..890776d
--- /dev/null
+++ b/core/modules/config/tests/config_test_invalid_name/config_test_invalid_name.module
@@ -0,0 +1,6 @@
+<?php
+
+/**
+ * @file
+ * Test module containing a configuration file with an invalid name.
+ */