diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 928694d..e1b3017 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -990,7 +990,7 @@ function install_display_output($output, $install_state) {
     );
     drupal_add_region_content('sidebar_first', drupal_render($task_list));
   }
-  $install_page = array('#theme' => 'install_page', '#content' => $output);
+  $install_page = array('#theme' => 'maintenance_page__install', '#content' => $output);
   print drupal_render($install_page);
   exit;
 }
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 3d57521..0a4de6c 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -657,6 +657,9 @@ function _theme($hook, $variables = array()) {
       break;
     }
   }
+  // Add suggestions to the $info array so preprocessors have access to the
+  // full list of suggestions.
+  $info['suggestions'] = $suggestions;
 
   // Invoke the variable preprocessors, if any.
   if (isset($info['base hook'])) {
@@ -2364,7 +2367,12 @@ function theme_get_suggestions($args, $base, $delimiter = '__') {
  *
  * @see system_page_build()
  */
-function template_preprocess_maintenance_page(&$variables) {
+function template_preprocess_maintenance_page(&$variables, $hook, $info) {
+  if (in_array('maintenance_page__install', $info['suggestions'])) {
+    // Override the site name that is displayed on the page, since Drupal is
+    // still in the process of being installed.
+    $variables['site_name'] = drupal_install_profile_distribution_name();
+  }
   $language_interface = language(Language::TYPE_INTERFACE);
 
   // Initializes attributes which are specific to the html element.
@@ -2513,29 +2521,6 @@ function template_preprocess_maintenance_page(&$variables) {
 }
 
 /**
- * Prepares variables for install page templates.
- *
- * Default template: install-page.html.twig.
- *
- * The variables array generated here is a mirror of
- * template_preprocess_page(). This preprocessor will run its course when
- * theme_install_page() is invoked.
- *
- * @param array $variables
- *   An associative array containing:
- *   - content - An array of page content.
- *
- * @see template_preprocess_maintenance_page()
- *
- */
-function template_preprocess_install_page(&$variables) {
-  template_preprocess_maintenance_page($variables);
-  // Override the site name that is displayed on the page, since Drupal is
-  // still in the process of being installed.
-  $variables['site_name'] = drupal_install_profile_distribution_name();
-}
-
-/**
  * Prepares variables for region templates.
  *
  * Default template: region.html.twig.
@@ -2643,10 +2628,6 @@ function drupal_common_theme() {
       'variables' => array('content' => NULL, 'show_messages' => TRUE, 'page' => array()),
       'template' => 'maintenance-page',
     ),
-    'install_page' => array(
-      'variables' => array('content' => NULL, 'show_messages' => TRUE),
-      'template' => 'install-page',
-    ),
     'task_list' => array(
       'variables' => array('items' => NULL, 'active' => NULL,  'variant' => NULL),
     ),
diff --git a/core/modules/system/templates/install-page.html.twig b/core/modules/system/templates/install-page.html.twig
deleted file mode 100644
index a462a5a..0000000
--- a/core/modules/system/templates/install-page.html.twig
+++ /dev/null
@@ -1,66 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a Drupal installation page.
- *
- * All the available variables are mirrored in html.html.twig and
- * page.html.twig. Some may be blank but they are provided for consistency.
- *
- * @see template_preprocess_install_page()
- *
- * @ingroup themeable
- */
-#}
-<!DOCTYPE html>
-<html lang="{{ language.langcode }}" dir="{{ language.dir }}">
-<head>
-  {{ head }}
-  <title>{{ head_title }}</title>
-  {{ styles }}
-  {{ scripts }}
-</head>
-<body class="install-page">
-
-  <div class="l-container">
-
-    <header role="banner">
-      {% if site_name or site_slogan %}
-        <div class="name-and-slogan">
-          {% if site_name %}
-            <h1>{{ site_name }}</h1>
-          {% endif %}
-          {% if site_slogan %}
-            <div class="site-slogan">{{ site_slogan }}</div>
-          {% endif %}
-        </div>{# /.name-and-slogan #}
-      {% endif %}
-    </header>
-
-    <main role="main">
-      {% if title %}
-        <h1>{{ title }}</h1>
-      {% endif %}
-      {{ messages }}
-      {{ content }}
-    </main>
-
-    {% if sidebar_first %}
-      <aside class="l-sidebar-first" role="complementary">
-        {{ sidebar_first }}
-      </aside>{# /.l-sidebar-first #}
-    {% endif %}
-
-    {% if sidebar_second %}
-      <aside class="l-sidebar-second" role="complementary">
-        {{ sidebar_second }}
-      </aside>{# /.l-sidebar-second #}
-    {% endif %}
-
-    {% if footer %}
-      <footer role="contentinfo">
-        {{ footer }}
-      </footer>
-    {% endif %}
-
-</body>
-</html>
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 409632b..6d73f3a 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -303,22 +303,24 @@ function seven_element_info_alter(&$type) {
 }
 
 /**
- * Implements hook_preprocess_install_page().
+ * Implements hook_preprocess_HOOK() for maintenance-page.html.twig.
  */
-function seven_preprocess_install_page(&$variables) {
-  $variables['styles'] = new RenderWrapper('drupal_get_css');
-  $variables['scripts'] = new RenderWrapper('drupal_get_js');
-
-  // Normally we could attach libraries via hook_page_alter(), but when the
-  // database is inactive it's not called so we add them here.
-  $libraries = array(
-    '#attached' => array(
-      'library' => array(
-        array('seven', 'install-page'),
+function seven_preprocess_maintenance_page(&$variables, $hook) {
+  if ($hook == 'maintenance_page__install') {
+    $variables['styles'] = new RenderWrapper('drupal_get_css');
+    $variables['scripts'] = new RenderWrapper('drupal_get_js');
+
+    // Normally we could attach libraries via hook_page_alter(), but when the
+    // database is inactive it's not called so we add them here.
+    $libraries = array(
+      '#attached' => array(
+        'library' => array(
+          array('seven', 'install-page'),
+        ),
       ),
-    ),
-  );
-  drupal_render($libraries);
+    );
+    drupal_render($libraries);
+  }
 }
 
 /**
diff --git a/core/themes/seven/install-page.html.twig b/core/themes/seven/templates/maintenance-page--install.html.twig
similarity index 96%
rename from core/themes/seven/install-page.html.twig
rename to core/themes/seven/templates/maintenance-page--install.html.twig
index 1e9a1c2..67f2dce 100644
--- a/core/themes/seven/install-page.html.twig
+++ b/core/themes/seven/templates/maintenance-page--install.html.twig
@@ -7,7 +7,7 @@
  * page.html.twig.
  * Some may be blank but they are provided for consistency.
  *
- * @see template_preprocess_install_page()
+ * @see template_preprocess_maintenance_page()
  *
  * @ingroup themeable
  */
