diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 6684c72..a4e07cd 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -455,7 +455,6 @@ public function rebuildThemeData() {
         'secondary_menu' => 'Secondary menu',
         'footer' => 'Footer',
         'highlighted' => 'Highlighted',
-        'messages' => 'Messages',
         'help' => 'Help',
         'page_top' => 'Page top',
         'page_bottom' => 'Page bottom',
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index eb5c7bf..c5a3711 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -46,7 +46,6 @@
  * - page.primary_menu: Items for the primary menu region.
  * - page.secondary_menu: Items for the secondary menu region.
  * - page.highlighted: Items for the highlighted content region.
- * - page.messages: Status messages block can be placed in messages region.
  * - page.help: Dynamic help text, mostly for admin pages.
  * - page.content: The main content of the current page.
  * - page.sidebar_first: Items for the first sidebar.
@@ -97,7 +96,7 @@
 
   {{ page.breadcrumb }}
 
-  {{ page.messages }}
+  {{ page.highlighted }}
 
   {{ page.help }}
 
@@ -105,7 +104,6 @@
     <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
     <div class="layout-content">
-      {{ page.highlighted }}
 
       {{ title_prefix }}
       {% if title %}
diff --git a/core/profiles/minimal/config/install/block.block.stark_messages.yml b/core/profiles/minimal/config/install/block.block.stark_messages.yml
index 838d8c0..34a5e23 100644
--- a/core/profiles/minimal/config/install/block.block.stark_messages.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_messages.yml
@@ -3,7 +3,7 @@ theme: stark
 weight: 0
 status: true
 langcode: en
-region: messages
+region: highlighted
 plugin: system_messages_block
 settings:
   id: system_messages_block
diff --git a/core/profiles/standard/config/install/block.block.bartik_messages.yml b/core/profiles/standard/config/install/block.block.bartik_messages.yml
index 1d817dd..0bb9590 100644
--- a/core/profiles/standard/config/install/block.block.bartik_messages.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_messages.yml
@@ -3,7 +3,7 @@ theme: bartik
 weight: 0
 status: true
 langcode: en
-region: messages
+region: highlighted
 plugin: system_messages_block
 settings:
   id: system_messages_block
diff --git a/core/profiles/standard/config/install/block.block.seven_messages.yml b/core/profiles/standard/config/install/block.block.seven_messages.yml
index 4a15ee9..35c3531 100644
--- a/core/profiles/standard/config/install/block.block.seven_messages.yml
+++ b/core/profiles/standard/config/install/block.block.seven_messages.yml
@@ -3,7 +3,7 @@ theme: seven
 weight: 0
 status: true
 langcode: en
-region: messages
+region: highlighted
 plugin: system_messages_block
 settings:
   id: system_messages_block
diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index 3c02894..fb8f2fb 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -21,7 +21,7 @@ regions:
   help: Help
   page_top: 'Page top'
   page_bottom: 'Page bottom'
-  messages: Messages
+  highlighted: Highlighted
   featured_top: 'Featured top'
   breadcrumb: Breadcrumb
   content: Content
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index c4eae01..3cd787b 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -39,7 +39,7 @@
               <h1 class="title" id="page-title">{{ title }}</h1>
             {% endif %}
             {{ page.content }}
-            {{ page.messages }}
+            {{ page.highlighted }}
           </section>
         </main>
       </div>
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 60b2885..446814e 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -49,7 +49,7 @@
  *
  * Regions:
  * - page.header: Items for the header region.
- * - page.messages: Status and error messages. Should be displayed prominently.
+ * - page.highlighted: Items for the highlighted region.
  * - page.primary_menu: Items for the primary menu region.
  * - page.secondary_menu: Items for the secondary menu region.
  * - page.featured_top: Items for the featured top region.
@@ -109,7 +109,7 @@
         {{ page.primary_menu }}
       </div>
     </header>
-    {{ page.messages }}
+    {{ page.highlighted }}
     {% if page.featured_top %}
       <div class="featured-top">
         <aside class="featured-top__inner section layout-container clearfix" role="complementary">
diff --git a/core/themes/classy/templates/layout/maintenance-page.html.twig b/core/themes/classy/templates/layout/maintenance-page.html.twig
index a1233e2..7463b02 100644
--- a/core/themes/classy/templates/layout/maintenance-page.html.twig
+++ b/core/themes/classy/templates/layout/maintenance-page.html.twig
@@ -39,7 +39,7 @@
       <h1>{{ title }}</h1>
     {% endif %}
 
-    {{ page.messages }}
+    {{ page.highlighted }}
 
     {{ page.content }}
   </main>
diff --git a/core/themes/classy/templates/layout/page.html.twig b/core/themes/classy/templates/layout/page.html.twig
index dcb8f4c..57533c8 100644
--- a/core/themes/classy/templates/layout/page.html.twig
+++ b/core/themes/classy/templates/layout/page.html.twig
@@ -42,7 +42,7 @@
  *
  * Regions:
  * - page.header: Items for the header region.
- * - page.messages: Status and error messages. Should be displayed prominently.
+ * - page.highlighted: Items for the highlighted region.
  * - page.primary_menu: Items for the primary menu region.
  * - page.secondary_menu: Items for the secondary menu region.
  * - page.highlighted: Items for the highlighted content region.
@@ -94,7 +94,7 @@
 
   {{ page.breadcrumb }}
 
-  {{ page.messages }}
+  {{ page.highlighted }}
 
   {{ page.help }}
 
diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml
index 8ee0914..99a3ec1 100644
--- a/core/themes/seven/seven.info.yml
+++ b/core/themes/seven/seven.info.yml
@@ -15,7 +15,7 @@ quickedit_stylesheets:
   - css/components/quickedit.css
 regions:
   content: Content
-  messages: Messages
+  highlighted: Highlighted
   help: Help
   page_top: 'Page top'
   page_bottom: 'Page bottom'
diff --git a/core/themes/seven/templates/install-page.html.twig b/core/themes/seven/templates/install-page.html.twig
index 0e22c94..b501fb8 100644
--- a/core/themes/seven/templates/install-page.html.twig
+++ b/core/themes/seven/templates/install-page.html.twig
@@ -27,7 +27,7 @@
     {% if title %}
       <h1>{{ title }}</h1>
     {% endif %}
-    {{ page.messages }}
+    {{ page.highlighted }}
     {{ page.content }}
   </main>
 
diff --git a/core/themes/seven/templates/maintenance-page.html.twig b/core/themes/seven/templates/maintenance-page.html.twig
index 1bfea5a..2286e88 100644
--- a/core/themes/seven/templates/maintenance-page.html.twig
+++ b/core/themes/seven/templates/maintenance-page.html.twig
@@ -27,7 +27,7 @@
     {% if title %}
       <h1>{{ title }}</h1>
     {% endif %}
-    {{ page.messages }}
+    {{ page.highlighted }}
     {{ page.content }}
   </main>
 
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index 4110987..1c36be5 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -43,8 +43,7 @@
  *
  * Regions:
  * - page.page_top: Items for the header region.
- * - page.highlighted: Items for the highlighted content region.
- * - page.messages: Status and error messages. Should be displayed prominently.
+ * - page.highlighted: Items for the highlighted region.
  * - page.help: Dynamic help text, mostly for admin pages.
  * - page.content: The main content of the current page.
  * - page.sidebar_first: Items for the first sidebar.
@@ -79,7 +78,7 @@
 
     <main class="page-content clearfix" role="main">
       <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
-      {{ page.messages }}
+      {{ page.highlighted }}
       {% if page.help %}
         <div class="help">
           {{ page.help }}