diff --git a/core/lib/Drupal/Core/Test/TestSetupTrait.php b/core/lib/Drupal/Core/Test/TestSetupTrait.php
index 4cdade027bf0ee6bb701871d442a7d242a71be43..287c4ad24bd430ff063b4c6a33f7bbdf4c585567 100644
--- a/core/lib/Drupal/Core/Test/TestSetupTrait.php
+++ b/core/lib/Drupal/Core/Test/TestSetupTrait.php
@@ -17,8 +17,8 @@ trait TestSetupTrait {
   protected static $configSchemaCheckerExclusions = [
     // Following are used to test lack of or partial schema. Where partial
     // schema is provided, that is explicitly tested in specific tests.
-    'config_schema_test.noschema',
-    'config_schema_test.someschema',
+    'config_schema_test.no_schema',
+    'config_schema_test.some_schema',
     'config_schema_test.schema_data_types',
     'config_schema_test.no_schema_data_types',
     // Used to test application of schema to filtering of configuration.
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 650d81410335dca4446e723aa388e6527f510fc4..abddbc163dd400b773c2559ede5252ea8f03a92d 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -35,7 +35,6 @@ arrowthick
 arrowthickstop
 arrr
 assertable
-asterix
 attrval
 attrvals
 authless
@@ -70,7 +69,6 @@ backlink
 backlinks
 backreferences
 bakeware
-bangpow
 barbar
 barchart
 barqux
@@ -242,8 +240,6 @@ defaultable
 defgroup
 delayable
 deletedline
-deletee
-deleter
 delsp
 denormalizable
 denormalization
@@ -658,7 +654,6 @@ nomask
 nonconfigurable
 nonoptional
 noquotes
-noschema
 nosniff
 nostart
 notexisting
@@ -897,8 +892,6 @@ smacss
 smalldatetime
 somecompany
 somelinks
-somemodule
-someschema
 sortablejs
 sourceediting
 spacebar
@@ -1228,7 +1221,6 @@ zartan
 zettabyte
 zettabytes
 zipf's
-zomg
 zoneinfo
 zoomin
 zoomout
diff --git a/core/modules/config/tests/config_override_test/src/ConfigOverrider.php b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
index 8ec572e3aeb55d577c97311eff6eb6fcf194c9bf..0e846f1d4f3bc0c3012e839637fe31ce86c7c4c3 100644
--- a/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
+++ b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
@@ -18,7 +18,7 @@ public function loadOverrides($names) {
     $overrides = [];
     if (!empty($GLOBALS['config_test_run_module_overrides'])) {
       if (in_array('system.site', $names)) {
-        $overrides = $overrides + ['system.site' => ['name' => 'ZOMG overridden site name']];
+        $overrides = $overrides + ['system.site' => ['name' => 'Wow overridden site name']];
       }
       if (in_array('config_override_test.new', $names)) {
         $overrides = $overrides + ['config_override_test.new' => ['module' => 'override']];
diff --git a/core/modules/config/tests/config_schema_test/config/install/config_schema_test.noschema.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.no_schema.yml
similarity index 100%
rename from core/modules/config/tests/config_schema_test/config/install/config_schema_test.noschema.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.no_schema.yml
diff --git a/core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.somemodule.section_one.subsection.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_one.subsection.yml
similarity index 100%
rename from core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.somemodule.section_one.subsection.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_one.subsection.yml
diff --git a/core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.somemodule.section_two.subsection.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_two.subsection.yml
similarity index 100%
rename from core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.somemodule.section_two.subsection.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_two.subsection.yml
diff --git a/core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.with_parents.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.with_parents.yml
similarity index 100%
rename from core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.with_parents.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.with_parents.yml
diff --git a/core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.yml
similarity index 100%
rename from core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.yml
diff --git a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
index 2ef496055139506e9c8c14b6cd74d18f653fccf3..9623ca39ef5d0ca4134c618ab13c0847cf974709 100644
--- a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
+++ b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
@@ -1,6 +1,6 @@
 # Schema for the configuration files of the Configuration Schema Test module.
 
-config_schema_test.someschema:
+config_schema_test.some_schema:
   type: config_object
   label: 'Schema test data'
   mapping:
@@ -9,7 +9,7 @@ config_schema_test.someschema:
     testlist:
       label: 'Test list'
 
-config_schema_test.someschema.with_parents:
+config_schema_test.some_schema.with_parents:
   label: 'Schema test data with parenting'
   type: config_object
   mapping:
@@ -21,7 +21,7 @@ config_schema_test.someschema.with_parents:
           label: 'Key used in parent relation'
           type: string
         testitem:
-          type: config_schema_test.someschema.with_parents.[%parent.target_key]
+          type: config_schema_test.some_schema.with_parents.[%parent.target_key]
     two_levels:
       label: 'Parenting two levels up'
       type: mapping
@@ -34,7 +34,7 @@ config_schema_test.someschema.with_parents:
           type: mapping
           mapping:
             testitem:
-              type: config_schema_test.someschema.with_parents.[%parent.%parent.target_key]
+              type: config_schema_test.some_schema.with_parents.[%parent.%parent.target_key]
     three_levels:
       label: 'Parenting three levels up'
       type: mapping
@@ -51,19 +51,19 @@ config_schema_test.someschema.with_parents:
               type: mapping
               mapping:
                 testitem:
-                  type: config_schema_test.someschema.with_parents.[%parent.%parent.%parent.target_key]
+                  type: config_schema_test.some_schema.with_parents.[%parent.%parent.%parent.target_key]
 
-config_schema_test.someschema.with_parents.key_1:
+config_schema_test.some_schema.with_parents.key_1:
   label: 'Test item nested one level'
   type: string
-config_schema_test.someschema.with_parents.key_2:
+config_schema_test.some_schema.with_parents.key_2:
   label: 'Test item nested two levels'
   type: string
-config_schema_test.someschema.with_parents.key_3:
+config_schema_test.some_schema.with_parents.key_3:
   label: 'Test item nested three levels'
   type: string
 
-config_schema_test.someschema.somemodule.*.*:
+config_schema_test.some_schema.some_module.*.*:
   type: config_object
   label: 'Schema multiple filesystem marker test'
   mapping:
diff --git a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
index f8ceea42193a8c2038c2a2a36cd6d934138e42e8..30a7a3526d0757c55d763faa88825dfb5be4bddb 100644
--- a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
+++ b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
@@ -103,9 +103,9 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
       ]);
       $secondary->save();
     }
-    if ($this->id() == 'deleter') {
-      $deletee = $storage->load('deletee');
-      $deletee->delete();
+    if ($this->id() == 'dependency') {
+      $dependent = $storage->load('dependent');
+      $dependent->delete();
     }
   }
 
@@ -115,9 +115,9 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
   public static function postDelete(EntityStorageInterface $storage, array $entities) {
     parent::postDelete($storage, $entities);
     foreach ($entities as $entity) {
-      if ($entity->id() == 'deleter') {
-        $deletee = $storage->load('deletee');
-        $deletee->delete();
+      if ($entity->id() == 'dependency') {
+        $dependent = $storage->load('dependent');
+        $dependent->delete();
       }
     }
   }
diff --git a/core/modules/config/tests/src/Functional/ConfigImportUITest.php b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
index 35946054d232bff7381aeb7de6f3b050bbd0b340..d12ae23816f5f1ccf53d588ae0f4aa4b94016b3d 100644
--- a/core/modules/config/tests/src/Functional/ConfigImportUITest.php
+++ b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
@@ -288,7 +288,7 @@ public function testImportDiff() {
     $change_key = 'foo';
     $remove_key = '404';
     $add_key = 'biff';
-    $add_data = '<em>bangpow</em>';
+    $add_data = '<em>bangPow</em>';
     $change_data = '<p><em>foobar</em></p>';
     $original_data = [
       'foo' => '<p>foobar</p>',
@@ -321,7 +321,7 @@ public function testImportDiff() {
     // The no change values are escaped.
     $this->assertSession()->pageTextContains("baz: '<strong>no change</strong>'");
     // Added value is escaped.
-    $this->assertSession()->pageTextContains("biff: '<em>bangpow</em>'");
+    $this->assertSession()->pageTextContains("biff: '<em>bangPow</em>'");
     // Deleted value is escaped.
     $this->assertSession()->pageTextContains("404: '<em>herp</em>'");
 
@@ -352,7 +352,7 @@ public function testImportDiff() {
     $this->assertSession()->pageTextContains("baz: '<strong>no change</strong>'");
     $this->assertSession()->pageTextContains("404: '<em>herp</em>'");
     // Added key is escaped.
-    $this->assertSession()->pageTextContains("biff: '<em>bangpow</em>'");
+    $this->assertSession()->pageTextContains("biff: '<em>bangPow</em>'");
   }
 
   /**
diff --git a/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBaseTest.php b/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBaseTest.php
index 59485977c2580f6a53ed97fd8ea83c5203a39fc4..952ac9a52cae5367ce9e2a93fa02c89173c86895 100644
--- a/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBaseTest.php
@@ -216,9 +216,9 @@ public function testModuleListChange() {
    */
   public function testSchemaChecking() {
     // Create some configuration that should be skipped.
-    $this->config('config_schema_test.noschema')->set('foo', 'bar')->save();
+    $this->config('config_schema_test.no_schema')->set('foo', 'bar')->save();
     $this->runUpdates();
-    $this->assertSame('bar', $this->config('config_schema_test.noschema')->get('foo'));
+    $this->assertSame('bar', $this->config('config_schema_test.no_schema')->get('foo'));
 
   }
 
diff --git a/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php b/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
index 0b05694c08b48e659d3b5d391e3fc4a51c697cad..a2956ff5f892c80fe44243f7a859a69e806cc39d 100644
--- a/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
+++ b/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
@@ -101,8 +101,8 @@ public function testTypedDataAPI() {
     $this->assertSame('config_test.validation.llama', $typed_config->get('llama')->getPropertyPath());
 
     $config_test_entity = \Drupal::entityTypeManager()->getStorage('config_test')->create([
-      'id' => 'asterix',
-      'label' => 'Asterix',
+      'id' => 'test',
+      'label' => 'Test',
       'weight' => 11,
       'style' => 'test_style',
     ]);
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
index eabc0d97d817e31f520edd7fa868f4541eb8e361..d54310fe5a1a5ad1b2dbc9c937166875da736281 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
@@ -28,7 +28,7 @@ public function testDiff() {
     $change_key = 'foo';
     $remove_key = '404';
     $add_key = 'biff';
-    $add_data = 'bangpow';
+    $add_data = 'bangPow';
     $change_data = 'foobar';
 
     // Install the default config.
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
index e7f13b762552961e0ecf07b8d79d02009f6ce504..bbdae7a4fb7525a86e2cac840e3c693d83a9c26c 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
@@ -286,36 +286,36 @@ public function testSecondaryWriteSecondaryFirst() {
   /**
    * Tests that secondary updates for deleted files work as expected.
    */
-  public function testSecondaryUpdateDeletedDeleterFirst() {
-    $name_deleter = 'config_test.dynamic.deleter';
-    $name_deletee = 'config_test.dynamic.deletee';
+  public function testSecondaryUpdateDeletedParentFirst() {
+    $name_dependency = 'config_test.dynamic.dependency';
+    $name_dependent = 'config_test.dynamic.dependent';
     $name_other = 'config_test.dynamic.other';
     $storage = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
     $uuid = $this->container->get('uuid');
 
-    $values_deleter = [
-      'id' => 'deleter',
-      'label' => 'Deleter',
+    $values_dependency = [
+      'id' => 'dependency',
+      'label' => 'Dependency',
       'weight' => 0,
       'uuid' => $uuid->generate(),
     ];
-    $storage->write($name_deleter, $values_deleter);
-    $values_deleter['label'] = 'Updated Deleter';
-    $sync->write($name_deleter, $values_deleter);
-    $values_deletee = [
-      'id' => 'deletee',
-      'label' => 'Deletee',
+    $storage->write($name_dependency, $values_dependency);
+    $values_dependency['label'] = 'Updated Dependency';
+    $sync->write($name_dependency, $values_dependency);
+    $values_dependent = [
+      'id' => 'dependent',
+      'label' => 'Dependent',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-      // Add a dependency on deleter, to make sure that is synced first.
+      // Add a dependency on dependency, to make sure that is synced first.
       'dependencies' => [
-        'config' => [$name_deleter],
+        'config' => [$name_dependency],
       ],
     ];
-    $storage->write($name_deletee, $values_deletee);
-    $values_deletee['label'] = 'Updated Deletee';
-    $sync->write($name_deletee, $values_deletee);
+    $storage->write($name_dependent, $values_dependent);
+    $values_dependent['label'] = 'Updated Child';
+    $sync->write($name_dependent, $values_dependent);
 
     // Ensure that import will continue after the error.
     $values_other = [
@@ -323,10 +323,10 @@ public function testSecondaryUpdateDeletedDeleterFirst() {
       'label' => 'Other',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-      // Add a dependency on deleter, to make sure that is synced first. This
-      // will also be synced after the deletee due to alphabetical ordering.
+      // Add a dependency on dependency, to make sure that is synced first. This
+      // will also be synced after the dependent due to alphabetical ordering.
       'dependencies' => [
-        'config' => [$name_deleter],
+        'config' => [$name_dependency],
       ],
     ];
     $storage->write($name_other, $values_other);
@@ -337,8 +337,8 @@ public function testSecondaryUpdateDeletedDeleterFirst() {
     $config_importer = $this->configImporter();
     $updates = $config_importer->getStorageComparer()->getChangelist('update');
     $expected = [
-      $name_deleter,
-      $name_deletee,
+      $name_dependency,
+      $name_dependent,
       $name_other,
     ];
     $this->assertSame($expected, $updates);
@@ -347,14 +347,14 @@ public function testSecondaryUpdateDeletedDeleterFirst() {
     $config_importer->import();
 
     $entity_storage = \Drupal::entityTypeManager()->getStorage('config_test');
-    $deleter = $entity_storage->load('deleter');
-    $this->assertEquals('deleter', $deleter->id());
-    $this->assertEquals($values_deleter['uuid'], $deleter->uuid());
-    $this->assertEquals($values_deleter['label'], $deleter->label());
+    $dependency = $entity_storage->load('dependency');
+    $this->assertEquals('dependency', $dependency->id());
+    $this->assertEquals($values_dependency['uuid'], $dependency->uuid());
+    $this->assertEquals($values_dependency['label'], $dependency->label());
 
-    // The deletee was deleted in
+    // The dependent was deleted in
     // \Drupal\config_test\Entity\ConfigTest::postSave().
-    $this->assertNull($entity_storage->load('deletee'));
+    $this->assertNull($entity_storage->load('dependent'));
 
     $other = $entity_storage->load('other');
     $this->assertEquals('other', $other->id());
@@ -363,7 +363,7 @@ public function testSecondaryUpdateDeletedDeleterFirst() {
 
     $logs = $config_importer->getErrors();
     $this->assertCount(1, $logs);
-    $this->assertEquals(new FormattableMarkup('Update target "@name" is missing.', ['@name' => $name_deletee]), $logs[0]);
+    $this->assertEquals(new FormattableMarkup('Update target "@name" is missing.', ['@name' => $name_dependent]), $logs[0]);
   }
 
   /**
@@ -373,35 +373,35 @@ public function testSecondaryUpdateDeletedDeleterFirst() {
    * configuration tree imports. Therefore, any configuration updates that cause
    * secondary deletes should be reflected already in the staged configuration.
    */
-  public function testSecondaryUpdateDeletedDeleteeFirst() {
-    $name_deleter = 'config_test.dynamic.deleter';
-    $name_deletee = 'config_test.dynamic.deletee';
+  public function testSecondaryUpdateDeletedChildFirst() {
+    $name_dependency = 'config_test.dynamic.dependency';
+    $name_dependent = 'config_test.dynamic.dependent';
     $storage = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
     $uuid = $this->container->get('uuid');
 
-    $values_deleter = [
-      'id' => 'deleter',
-      'label' => 'Deleter',
+    $values_dependency = [
+      'id' => 'dependency',
+      'label' => 'Dependency',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-      // Add a dependency on deletee, to make sure that is synced first.
+      // Add a dependency on dependent, to make sure that is synced first.
       'dependencies' => [
-        'config' => [$name_deletee],
+        'config' => [$name_dependent],
       ],
     ];
-    $storage->write($name_deleter, $values_deleter);
-    $values_deleter['label'] = 'Updated Deleter';
-    $sync->write($name_deleter, $values_deleter);
-    $values_deletee = [
-      'id' => 'deletee',
-      'label' => 'Deletee',
+    $storage->write($name_dependency, $values_dependency);
+    $values_dependency['label'] = 'Updated Dependency';
+    $sync->write($name_dependency, $values_dependency);
+    $values_dependent = [
+      'id' => 'dependent',
+      'label' => 'Dependent',
       'weight' => 0,
       'uuid' => $uuid->generate(),
     ];
-    $storage->write($name_deletee, $values_deletee);
-    $values_deletee['label'] = 'Updated Deletee';
-    $sync->write($name_deletee, $values_deletee);
+    $storage->write($name_dependent, $values_dependent);
+    $values_dependent['label'] = 'Updated Dependent';
+    $sync->write($name_dependent, $values_dependent);
 
     // Import.
     $config_importer = $this->configImporter();
@@ -409,10 +409,10 @@ public function testSecondaryUpdateDeletedDeleteeFirst() {
 
     $entity_storage = \Drupal::entityTypeManager()->getStorage('config_test');
     // Both entities are deleted. ConfigTest::postSave() causes updates of the
-    // deleter entity to delete the deletee entity. Since the deleter depends on
-    // the deletee, removing the deletee causes the deleter to be removed.
-    $this->assertNull($entity_storage->load('deleter'));
-    $this->assertNull($entity_storage->load('deletee'));
+    // dependency entity to delete the dependent entity. Since the dependency depends on
+    // the dependent, removing the dependent causes the dependency to be removed.
+    $this->assertNull($entity_storage->load('dependency'));
+    $this->assertNull($entity_storage->load('dependent'));
     $logs = $config_importer->getErrors();
     $this->assertCount(0, $logs);
   }
@@ -420,40 +420,40 @@ public function testSecondaryUpdateDeletedDeleteeFirst() {
   /**
    * Tests that secondary deletes for deleted files work as expected.
    */
-  public function testSecondaryDeletedDeleteeSecond() {
-    $name_deleter = 'config_test.dynamic.deleter';
-    $name_deletee = 'config_test.dynamic.deletee';
+  public function testSecondaryDeletedChildSecond() {
+    $name_dependency = 'config_test.dynamic.dependency';
+    $name_dependent = 'config_test.dynamic.dependent';
     $storage = $this->container->get('config.storage');
 
     $uuid = $this->container->get('uuid');
 
-    $values_deleter = [
-      'id' => 'deleter',
-      'label' => 'Deleter',
+    $values_dependency = [
+      'id' => 'dependency',
+      'label' => 'Dependency',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-      // Add a dependency on deletee, to make sure this delete is synced first.
+      // Add a dependency on dependent, to make sure this delete is synced first.
       'dependencies' => [
-        'config' => [$name_deletee],
+        'config' => [$name_dependent],
       ],
     ];
-    $storage->write($name_deleter, $values_deleter);
-    $values_deletee = [
-      'id' => 'deletee',
-      'label' => 'Deletee',
+    $storage->write($name_dependency, $values_dependency);
+    $values_dependent = [
+      'id' => 'dependent',
+      'label' => 'Dependent',
       'weight' => 0,
       'uuid' => $uuid->generate(),
     ];
-    $storage->write($name_deletee, $values_deletee);
+    $storage->write($name_dependent, $values_dependent);
 
     // Import.
     $config_importer = $this->configImporter();
     $config_importer->import();
 
     $entity_storage = \Drupal::entityTypeManager()->getStorage('config_test');
-    $this->assertNull($entity_storage->load('deleter'));
-    $this->assertNull($entity_storage->load('deletee'));
-    // The deletee entity does not exist as the delete worked and although the
+    $this->assertNull($entity_storage->load('dependency'));
+    $this->assertNull($entity_storage->load('dependent'));
+    // The dependent entity does not exist as the delete worked and although the
     // delete occurred in \Drupal\config_test\Entity\ConfigTest::postDelete()
     // this does not matter.
     $logs = $config_importer->getErrors();
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
index 8e5f2e81dbb23fda1978062b111156066716a829..604ab1df36bb540d7d2fd5e697cad4b5692a4002 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
@@ -46,7 +46,7 @@ public function testModuleInstallation() {
 
     // Ensure that schema provided by modules that are not installed is not
     // available.
-    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema does not exist.');
+    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.some_schema'), 'Configuration schema for config_schema_test.some_schema does not exist.');
 
     // Install the test module.
     $this->installModules(['config_test']);
@@ -73,12 +73,12 @@ public function testModuleInstallation() {
     $this->installConfig(['config_schema_test']);
 
     // After module installation the new schema should exist.
-    $this->assertTrue(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema exists.');
+    $this->assertTrue(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.some_schema'), 'Configuration schema for config_schema_test.some_schema exists.');
 
     // Test that uninstalling configuration removes configuration schema.
     $this->config('core.extension')->set('module', [])->save();
     \Drupal::service('config.manager')->uninstall('module', 'config_test');
-    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema does not exist.');
+    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.some_schema'), 'Configuration schema for config_schema_test.some_schema does not exist.');
   }
 
   /**
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php
index ffff6ee2463eb564dd66fdf8086c2f1fa5b6da83..8bd25840137883b2e47a58966b02e9a51a34e550 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php
@@ -21,8 +21,8 @@ class ConfigModuleOverridesTest extends KernelTestBase {
   public function testSimpleModuleOverrides() {
     $GLOBALS['config_test_run_module_overrides'] = TRUE;
     $name = 'system.site';
-    $overridden_name = 'ZOMG overridden site name';
-    $non_overridden_name = 'ZOMG this name is on disk mkay';
+    $overridden_name = 'Wow overridden site name';
+    $non_overridden_name = 'Wow this name is on disk mkay';
     $overridden_slogan = 'Yay for overrides!';
     $non_overridden_slogan = 'Yay for defaults!';
     $config_factory = $this->container->get('config.factory');
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
index b5ca02e95613efec16625c99fbe26d5b995b5377..c731e1b986c3f23ff2667cdb6270c4e3483ad498 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
@@ -37,8 +37,8 @@ public function testOverridePriorities() {
     $language_overridden_mail = 'french@example.com';
 
     $language_overridden_name = 'French site name';
-    $module_overridden_name = 'ZOMG overridden site name';
-    $non_overridden_name = 'ZOMG this name is on disk mkay';
+    $module_overridden_name = 'Wow overridden site name';
+    $non_overridden_name = 'Wow this name is on disk mkay';
 
     $module_overridden_slogan = 'Yay for overrides!';
     $non_overridden_slogan = 'Yay for defaults!';
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
index f5f9df5385fe78477943d00a89ac12dc9d912a9a..852a6f6d3d7b6ea601b6cbc057293cb74256acff 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
@@ -58,13 +58,13 @@ public function testSchemaMapping() {
     $this->assertEquals($expected, $definition, 'Retrieved the right metadata for nonexistent configuration.');
 
     // Configuration file without schema will return Undefined as well.
-    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.noschema'));
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.noschema');
+    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.no_schema'));
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.no_schema');
     $this->assertEquals($expected, $definition, 'Retrieved the right metadata for configuration with no schema.');
 
     // Configuration file with only some schema.
-    $this->assertTrue(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'));
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema');
+    $this->assertTrue(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.some_schema'));
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.some_schema');
     $expected = [];
     $expected['label'] = 'Schema test data';
     $expected['class'] = Mapping::class;
@@ -72,14 +72,14 @@ public function testSchemaMapping() {
     $expected['mapping']['_core']['type'] = '_core_config_info';
     $expected['mapping']['testitem'] = ['label' => 'Test item'];
     $expected['mapping']['testlist'] = ['label' => 'Test list'];
-    $expected['type'] = 'config_schema_test.someschema';
+    $expected['type'] = 'config_schema_test.some_schema';
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
     $expected['unwrap_for_canonical_representation'] = TRUE;
     $expected['constraints'] = ['ValidKeys' => '<infer>'];
     $this->assertEquals($expected, $definition, 'Retrieved the right metadata for configuration with only some schema.');
 
     // Check type detection on elements with undefined types.
-    $config = \Drupal::service('config.typed')->get('config_schema_test.someschema');
+    $config = \Drupal::service('config.typed')->get('config_schema_test.some_schema');
     $definition = $config->get('testitem')->getDataDefinition()->toArray();
     $expected = [];
     $expected['label'] = 'Test item';
@@ -244,8 +244,8 @@ public function testSchemaMapping() {
     $this->assertEquals($expected, $definition, 'Retrieved the right metadata for config_test.dynamic.third_party:third_party_settings.config_schema_test');
 
     // More complex, several level deep test.
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema.somemodule.section_one.subsection');
-    // This should be the schema of config_schema_test.someschema.somemodule.*.*.
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.some_schema.some_module.section_one.subsection');
+    // This should be the schema of config_schema_test.some_schema.some_module.*.*.
     $expected = [];
     $expected['label'] = 'Schema multiple filesystem marker test';
     $expected['class'] = Mapping::class;
@@ -255,29 +255,29 @@ public function testSchemaMapping() {
     $expected['mapping']['testid']['label'] = 'ID';
     $expected['mapping']['testdescription']['type'] = 'text';
     $expected['mapping']['testdescription']['label'] = 'Description';
-    $expected['type'] = 'config_schema_test.someschema.somemodule.*.*';
+    $expected['type'] = 'config_schema_test.some_schema.some_module.*.*';
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
     $expected['unwrap_for_canonical_representation'] = TRUE;
     $expected['constraints'] = ['ValidKeys' => '<infer>'];
 
-    $this->assertEquals($expected, $definition, 'Retrieved the right metadata for config_schema_test.someschema.somemodule.section_one.subsection');
+    $this->assertEquals($expected, $definition, 'Retrieved the right metadata for config_schema_test.some_schema.some_module.section_one.subsection');
 
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema.somemodule.section_two.subsection');
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.some_schema.some_module.section_two.subsection');
     // The other file should have the same schema.
-    $this->assertEquals($expected, $definition, 'Retrieved the right metadata for config_schema_test.someschema.somemodule.section_two.subsection');
+    $this->assertEquals($expected, $definition, 'Retrieved the right metadata for config_schema_test.some_schema.some_module.section_two.subsection');
   }
 
   /**
    * Tests metadata retrieval with several levels of %parent indirection.
    */
   public function testSchemaMappingWithParents() {
-    $config_data = \Drupal::service('config.typed')->get('config_schema_test.someschema.with_parents');
+    $config_data = \Drupal::service('config.typed')->get('config_schema_test.some_schema.with_parents');
 
     // Test fetching parent one level up.
     $entry = $config_data->get('one_level');
     $definition = $entry->get('testitem')->getDataDefinition()->toArray();
     $expected = [
-      'type' => 'config_schema_test.someschema.with_parents.key_1',
+      'type' => 'config_schema_test.some_schema.with_parents.key_1',
       'label' => 'Test item nested one level',
       'class' => StringData::class,
       'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
@@ -289,7 +289,7 @@ public function testSchemaMappingWithParents() {
     $entry = $config_data->get('two_levels');
     $definition = $entry->get('wrapper')->get('testitem')->getDataDefinition()->toArray();
     $expected = [
-      'type' => 'config_schema_test.someschema.with_parents.key_2',
+      'type' => 'config_schema_test.some_schema.with_parents.key_2',
       'label' => 'Test item nested two levels',
       'class' => StringData::class,
       'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
@@ -301,7 +301,7 @@ public function testSchemaMappingWithParents() {
     $entry = $config_data->get('three_levels');
     $definition = $entry->get('wrapper_1')->get('wrapper_2')->get('testitem')->getDataDefinition()->toArray();
     $expected = [
-      'type' => 'config_schema_test.someschema.with_parents.key_3',
+      'type' => 'config_schema_test.some_schema.with_parents.key_3',
       'label' => 'Test item nested three levels',
       'class' => StringData::class,
       'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
diff --git a/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php b/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
index 5aee77231a81b6ffb96629b2c4e2e1693105adaa..fbda9ca86088625ef3b4008f2256d5cf4ef44717 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void {
    */
   public function testTrait() {
     // Test a non existing schema.
-    $ret = $this->checkConfigSchema($this->typedConfig, 'config_schema_test.noschema', $this->config('config_schema_test.noschema')->get());
+    $ret = $this->checkConfigSchema($this->typedConfig, 'config_schema_test.no_schema', $this->config('config_schema_test.no_schema')->get());
     $this->assertFalse($ret);
 
     // Test an existing schema with valid data.
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index 9a0702b28c3cb5ff709294e9f8bcf274895ef811..ec358612b7ab80d9ee70c4f3fd11d29218000c34 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -227,8 +227,8 @@ abstract class KernelTestBase extends TestCase implements ServiceProviderInterfa
   protected static $configSchemaCheckerExclusions = [
     // Following are used to test lack of or partial schema. Where partial
     // schema is provided, that is explicitly tested in specific tests.
-    'config_schema_test.noschema',
-    'config_schema_test.someschema',
+    'config_schema_test.no_schema',
+    'config_schema_test.some_schema',
     'config_schema_test.schema_data_types',
     'config_schema_test.no_schema_data_types',
     // Used to test application of schema to filtering of configuration.