diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index d3c3455..080fe8c 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1656,12 +1656,6 @@ function drupal_common_theme() {
     'page' => array(
       'render element' => 'page',
     ),
-    'page__maintenance' => array(
-      'base hook' => 'page',
-    ),
-    'page__maintenance__install' => array(
-      'base hook' => 'page',
-    ),
     'region' => array(
       'render element' => 'elements',
     ),
diff --git a/core/lib/Drupal/Core/Render/BareHtmlPageRendererInterface.php b/core/lib/Drupal/Core/Render/BareHtmlPageRendererInterface.php
index 7a85e64..5ead056 100644
--- a/core/lib/Drupal/Core/Render/BareHtmlPageRendererInterface.php
+++ b/core/lib/Drupal/Core/Render/BareHtmlPageRendererInterface.php
@@ -38,7 +38,8 @@
  * in a limited environment).
  *
  * Currently, there are two types of bare pages available:
- * - Install (hook_preprocess__page__maintenance__install(), page--maintenance--install.html.twig).
+ * - Install (hook_preprocess_page__maintenance__install(),
+ *   page--maintenance--install.html.twig).
  * - Maintenance (hook_preprocess_page__maintenance(),
  *   page--maintenance.html.twig).
  *
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 44a80fb..e864f9f 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -59,7 +59,7 @@ function bartik_preprocess_page(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK().
+ * Implements hook_preprocess_HOOK() for page--maintenance templates.
  */
 function bartik_preprocess_page__maintenance(&$variables) {
   // By default, site_name is set to Drupal if no db connection is available
diff --git a/core/themes/classy/templates/layout/maintenance-page.html.twig b/core/themes/classy/templates/layout/page--maintenance.html.twig
similarity index 96%
rename from core/themes/classy/templates/layout/maintenance-page.html.twig
rename to core/themes/classy/templates/layout/page--maintenance.html.twig
index 7463b02..f929470 100644
--- a/core/themes/classy/templates/layout/maintenance-page.html.twig
+++ b/core/themes/classy/templates/layout/page--maintenance.html.twig
@@ -6,7 +6,7 @@
  * All available variables are mirrored in page.html.twig.
  * Some may be blank but they are provided for consistency.
  *
- * @see template_preprocess_maintenance_page()
+ * @see template_preprocess_page__maintenance()
  */
 #}
 <div class="layout-container">
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index f6a00a5..0b96450 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -128,7 +128,7 @@ function seven_element_info_alter(&$type) {
 }
 
 /**
- * Implements hook_preprocess_HOOK().
+ * Implements hook_preprocess_HOOK() for page--maintenance--install templates.
  */
 function seven_preprocess_page__maintenance__install(&$variables) {
   // Seven has custom styling for the install page.
@@ -136,7 +136,7 @@ function seven_preprocess_page__maintenance__install(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK().
+ * Implements hook_preprocess_HOOK() for page--maintenance templates.
  */
 function seven_preprocess_page__maintenance(&$variables) {
   // Seven has custom styling for the maintenance page.
diff --git a/core/themes/seven/templates/page--maintenance.html.twig b/core/themes/seven/templates/page--maintenance.html.twig
index 2286e88..6fd85d5 100644
--- a/core/themes/seven/templates/page--maintenance.html.twig
+++ b/core/themes/seven/templates/page--maintenance.html.twig
@@ -6,7 +6,7 @@
  * All available variables are mirrored in page.html.twig.
  * Some may be blank but they are provided for consistency.
  *
- * @see template_preprocess_maintenance_page()
+ * @see template_preprocess_page__maintenance()
  */
 #}
 <div class="layout-container">