diff --git a/core/lib/Drupal/Core/Plugin/Discovery/FrontMatterDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/FrontMatterDiscovery.php
index 56790c2e07..5f17fe6336 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/FrontMatterDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/FrontMatterDiscovery.php
@@ -26,7 +26,7 @@ class FrontMatterDiscovery implements DiscoveryInterface {
    * @code
    * plugins:
    *   layouts:
-   *     layout_onecolumn:
+   *     layout_onecol:
    * @endcode
    */
   protected $arrayPosition = [];
@@ -148,7 +148,7 @@ protected function findAll() {
     $files = $this->findFiles();
     $provider_by_files = array_flip($files);
 
-    $file_cache = FileCacheFactory::get('frontmatter_discovery:' . $this->fileCacheKeySuffix);
+    $file_cache = FileCacheFactory::get('front_matter_discovery:' . $this->fileCacheKeySuffix);
     // Try to load from the file cache first.
     foreach ($file_cache->getMultiple($files) as $file => $data) {
       $all[$provider_by_files[$file]] = $data;
@@ -163,7 +163,7 @@ protected function findAll() {
           $front_matter = FrontMatter::create(file_get_contents($file), Yaml::class)->getData();
         }
         catch (InvalidDataTypeException $e) {
-          throw new DiscoveryException(sprintf('Malformed FrontMatter in frontmatter "%s": %s.', $file, $e->getMessage()));
+          throw new DiscoveryException(sprintf('Malformed FrontMatter in front matter "%s": %s.', $file, $e->getMessage()));
         }
         // If a file is empty or its contents are commented out, return an empty
         // array instead of NULL for type consistency.
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 3a3ab28b9c..c3ffa573b5 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -460,6 +460,7 @@ fozzie
 fqcn
 fraîche
 frombracket
+frontmatter
 frontpage
 fsdf
 fudgy