From 7b967718ce34d4637fcc479d22932e4f69f21f7b Mon Sep 17 00:00:00 2001
From: Dave Reid <dave@davereid.net>
Date: Fri, 11 Mar 2011 10:51:28 -0600
Subject: [PATCH] Issue #1089320: Convert version strings to 8.x

---
 CHANGELOG.txt                                      |    5 +-
 MAINTAINERS.txt                                    |    5 +-
 UPGRADE.txt                                        |   37 +++---
 includes/bootstrap.inc                             |    4 +-
 includes/common.inc                                |    4 +-
 includes/update.inc                                |  144 +-------------------
 modules/aggregator/aggregator.info                 |    2 +-
 modules/aggregator/tests/aggregator_test.info      |    2 +-
 modules/block/block.info                           |    2 +-
 modules/block/tests/block_test.info                |    2 +-
 modules/blog/blog.info                             |    2 +-
 modules/book/book.info                             |    2 +-
 modules/color/color.info                           |    2 +-
 modules/comment/comment.info                       |    2 +-
 modules/contact/contact.info                       |    2 +-
 modules/contextual/contextual.info                 |    2 +-
 modules/dashboard/dashboard.info                   |    2 +-
 modules/dblog/dblog.info                           |    2 +-
 modules/field/field.info                           |    2 +-
 .../field_sql_storage/field_sql_storage.info       |    2 +-
 modules/field/modules/list/list.info               |    2 +-
 modules/field/modules/list/tests/list_test.info    |    2 +-
 modules/field/modules/number/number.info           |    2 +-
 modules/field/modules/options/options.info         |    2 +-
 modules/field/modules/text/text.info               |    2 +-
 modules/field/tests/field_test.info                |    2 +-
 modules/field_ui/field_ui.info                     |    2 +-
 modules/file/file.info                             |    2 +-
 modules/file/tests/file_module_test.info           |    2 +-
 modules/filter/filter.info                         |    2 +-
 modules/forum/forum.info                           |    2 +-
 modules/help/help.info                             |    2 +-
 modules/image/image.info                           |    2 +-
 modules/image/tests/image_module_test.info         |    2 +-
 modules/locale/locale.info                         |    2 +-
 modules/locale/tests/locale_test.info              |    2 +-
 modules/menu/menu.info                             |    2 +-
 modules/node/node.info                             |    2 +-
 modules/node/tests/node_access_test.info           |    2 +-
 modules/node/tests/node_test.info                  |    2 +-
 modules/node/tests/node_test_exception.info        |    2 +-
 modules/openid/openid.info                         |    2 +-
 modules/openid/tests/openid_test.info              |    2 +-
 modules/overlay/overlay.info                       |    2 +-
 modules/path/path.info                             |    2 +-
 modules/php/php.info                               |    2 +-
 modules/poll/poll.info                             |    2 +-
 modules/profile/profile.info                       |    2 +-
 modules/rdf/rdf.info                               |    2 +-
 modules/rdf/tests/rdf_test.info                    |    2 +-
 modules/search/search.info                         |    2 +-
 modules/search/tests/search_embedded_form.info     |    2 +-
 modules/search/tests/search_extra_type.info        |    2 +-
 modules/shortcut/shortcut.info                     |    2 +-
 modules/simpletest/simpletest.info                 |    2 +-
 modules/simpletest/tests/actions_loop_test.info    |    2 +-
 modules/simpletest/tests/ajax_forms_test.info      |    2 +-
 modules/simpletest/tests/ajax_test.info            |    2 +-
 modules/simpletest/tests/batch_test.info           |    2 +-
 modules/simpletest/tests/common_test.info          |    2 +-
 modules/simpletest/tests/database_test.info        |    2 +-
 .../drupal_system_listing_compatible_test.info     |    2 +-
 .../drupal_system_listing_incompatible_test.info   |    2 +-
 modules/simpletest/tests/entity_cache_test.info    |    2 +-
 .../tests/entity_cache_test_dependency.info        |    2 +-
 .../simpletest/tests/entity_crud_hook_test.info    |    2 +-
 modules/simpletest/tests/error_test.info           |    2 +-
 modules/simpletest/tests/file_test.info            |    2 +-
 modules/simpletest/tests/filter_test.info          |    2 +-
 modules/simpletest/tests/form_test.info            |    2 +-
 modules/simpletest/tests/image_test.info           |    2 +-
 modules/simpletest/tests/menu_test.info            |    2 +-
 modules/simpletest/tests/module_test.info          |    2 +-
 modules/simpletest/tests/module_test.module        |    2 +-
 modules/simpletest/tests/requirements1_test.info   |    2 +-
 modules/simpletest/tests/requirements2_test.info   |    2 +-
 modules/simpletest/tests/session_test.info         |    2 +-
 .../simpletest/tests/system_dependencies_test.info |    2 +-
 modules/simpletest/tests/system_test.info          |    2 +-
 modules/simpletest/tests/system_test.module        |    2 +-
 modules/simpletest/tests/taxonomy_test.info        |    2 +-
 modules/simpletest/tests/theme_test.info           |    2 +-
 modules/simpletest/tests/update_test_1.info        |    2 +-
 modules/simpletest/tests/update_test_2.info        |    2 +-
 modules/simpletest/tests/update_test_3.info        |    2 +-
 .../tests/upgrade/drupal-6.filled.database.php     |    2 +-
 modules/simpletest/tests/url_alter_test.info       |    2 +-
 modules/simpletest/tests/xmlrpc_test.info          |    2 +-
 modules/statistics/statistics.info                 |    2 +-
 modules/syslog/syslog.info                         |    2 +-
 modules/system/system.info                         |    2 +-
 modules/system/system.queue.inc                    |    2 +-
 modules/system/system.test                         |    6 +-
 modules/taxonomy/taxonomy.info                     |    2 +-
 modules/toolbar/toolbar.info                       |    2 +-
 modules/tracker/tracker.info                       |    2 +-
 modules/translation/tests/translation_test.info    |    2 +-
 modules/translation/translation.info               |    2 +-
 modules/trigger/tests/trigger_test.info            |    2 +-
 modules/trigger/trigger.info                       |    2 +-
 modules/update/tests/aaa_update_test.1_0.xml       |    8 +-
 modules/update/tests/aaa_update_test.info          |    2 +-
 modules/update/tests/bbb_update_test.1_0.xml       |    8 +-
 modules/update/tests/bbb_update_test.info          |    2 +-
 modules/update/tests/ccc_update_test.1_0.xml       |    8 +-
 modules/update/tests/ccc_update_test.info          |    2 +-
 modules/update/tests/drupal.0.xml                  |    2 +-
 modules/update/tests/drupal.1.xml                  |    2 +-
 modules/update/tests/drupal.2-sec.xml              |    2 +-
 modules/update/tests/drupal.dev.xml                |    8 +-
 modules/update/tests/update_test.info              |    2 +-
 .../update/tests/update_test_basetheme.1_1-sec.xml |   14 +-
 modules/update/tests/update_test_subtheme.1_0.xml  |    8 +-
 modules/update/update.api.php                      |    4 +-
 modules/update/update.info                         |    2 +-
 modules/update/update.test                         |   30 ++--
 modules/user/tests/user_form_test.info             |    2 +-
 modules/user/user.info                             |    2 +-
 profiles/minimal/minimal.info                      |    2 +-
 profiles/standard/standard.info                    |    2 +-
 .../drupal_system_listing_compatible_test.info     |    2 +-
 profiles/testing/testing.info                      |    2 +-
 themes/bartik/bartik.info                          |    2 +-
 themes/garland/garland.info                        |    2 +-
 themes/seven/seven.info                            |    2 +-
 themes/stark/stark.info                            |    2 +-
 themes/tests/test_theme/test_theme.info            |    2 +-
 .../update_test_basetheme.info                     |    2 +-
 .../update_test_subtheme/update_test_subtheme.info |    2 +-
 129 files changed, 194 insertions(+), 327 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 70c837c..039a351 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
 
-Drupal 7.0, xxxx-xx-xx (development version)
+Drupal 8.0, xxxx-xx-xx (development version)
+----------------------
+
+Drupal 7.0, 2011-01-05
 ----------------------
 - Database:
     * Fully rewritten database layer utilizing PHP 5's PDO abstraction layer.
diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 80eb332..a512e0d 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -10,9 +10,8 @@ particular areas of Drupal.  All of them are subject to change.
 Branch maintainers
 ------------------
 
-Drupal 7
+Drupal 8
 - Dries Buytaert 'dries' <http://drupal.org/user/1>
-- Angela Byron 'webchick' <http://drupal.org/user/24967>
 
 
 Component maintainers
@@ -126,7 +125,7 @@ Topic coordinators
 
 Accessibility
 - Everett Zufelt 'Everett Zufelt' <http://drupal.org/user/406552>
-- Brandon Bowersox 'brandonojc' <http://drupal.org/user/186415> 
+- Brandon Bowersox 'brandonojc' <http://drupal.org/user/186415>
 
 Documentation
 - Ariane Khachatourians 'arianek' <http://drupal.org/user/158886>
diff --git a/UPGRADE.txt b/UPGRADE.txt
index d4909d8..edef885 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -3,10 +3,10 @@ INTRODUCTION
 ------------
 This document describes how to:
 
-  * Update your Drupal site from one minor 7.x version to another minor 7.x
-    version; for example, from 7.8 to 7.9, or from 7.6 to 7.10.
+  * Update your Drupal site from one minor 8.x version to another minor 8.x
+    version; for example, from 8.8 to 8.9, or from 8.6 to 8.10.
 
-  * Upgrade your Drupal site's major version from 6.x to 7.x.
+  * Upgrade your Drupal site's major version from 7.x to 8.x.
 
 First steps and definitions:
 
@@ -43,7 +43,7 @@ More in-depth information on upgrading can be found at http://drupal.org/upgrade
 
 MINOR VERSION UPDATES
 ---------------------
-To update from one minor 7.x version of Drupal to any later 7.x version, after
+To update from one minor 8.x version of Drupal to any later 8.x version, after
 following the instructions in the INTRODUCTION section at the top of this file:
 
 1. Log in as a user with the permission "Administer software updates".
@@ -64,7 +64,7 @@ following the instructions in the INTRODUCTION section at the top of this file:
    giving the database name, user, and password) from the old settings.php to
    the new settings.php.
 
-4. Download the latest Drupal 7.x release from http://drupal.org to a
+4. Download the latest Drupal 8.x release from http://drupal.org to a
    directory outside of your web root. Extract the archive and copy the files
    into your Drupal directory.
 
@@ -113,31 +113,31 @@ following the instructions in the INTRODUCTION section at the top of this file:
 
 MAJOR VERSION UPGRADE
 ---------------------
-To upgrade from a previous major version of Drupal to Drupal 7.x, after
+To upgrade from a previous major version of Drupal to Drupal 8.x, after
 following the instructions in the INTRODUCTION section at the top of this file:
 
-1. Check on the Drupal 7 status of your contributed and custom modules and
+1. Check on the Drupal 8 status of your contributed and custom modules and
    themes. See http://drupal.org/node/948216 for information on upgrading
    contributed modules and themes. See http://drupal.org/node/895314 for a list
-   of modules that have been moved into core for Drupal 7, and instructions on
+   of modules that have been moved into core for Drupal 8, and instructions on
    how to update them. See http://drupal.org/update/modules for information on
    how to update your custom modules, and http://drupal.org/update/theme for
    custom themes.
 
    You may decide at this point that you cannot upgrade your site, because
-   needed modules or themes are not ready for Drupal 7.
+   needed modules or themes are not ready for Drupal 8
 
-2. Update to the latest available version of Drupal 6.x (if your current version
-   is Drupal 5.x, you have to upgrade to 6.x first). If you need to update,
-   download Drupal 6.x and follow the instructions in its UPGRADE.txt. This
-   document only applies for upgrades from 6.x to 7.x.
+2. Update to the latest available version of Drupal 7.x (if your current version
+   is Drupal 6.x, you have to upgrade to 7.x first). If you need to update,
+   download Drupal 7.x and follow the instructions in its UPGRADE.txt. This
+   document only applies for upgrades from 7.x to 8.x.
 
 3. Log in as user ID 1 (the site maintenance user).
 
 4. Go to Administer > Site configuration > Site maintenance. Select
    "Off-line" and save the configuration.
 
-5. Go to Administer > Site building > Themes. Enable "Garland" and select it as
+5. Go to Administer > Site building > Themes. Enable "Bartik" and select it as
    the default theme.
 
 6. Go to Administer > Site building > Modules. Disable all modules that are not
@@ -145,7 +145,7 @@ following the instructions in the INTRODUCTION section at the top of this file:
    modules cannot be disabled, because others depend on them. Repeat this step
    until all non-core modules are disabled.
 
-   If you know that you will not re-enable some modules for Drupal 7.x and you
+   If you know that you will not re-enable some modules for Drupal 8.x and you
    no longer need their data, then you can uninstall them under the Uninstall
    tab after disabling them.
 
@@ -161,9 +161,9 @@ following the instructions in the INTRODUCTION section at the top of this file:
 
 9. If you uninstalled any modules, remove them from the sites/all/modules and
    other sites/*/modules directories. Leave other modules in place, even though
-   they are incompatible with Drupal 7.x.
+   they are incompatible with Drupal 8.x.
 
-10. Download the latest Drupal 7.x release from http://drupal.org to a
+10. Download the latest Drupal 8.x release from http://drupal.org to a
    directory outside of your web root. Extract the archive and copy the files
    into your Drupal directory.
 
@@ -185,7 +185,7 @@ following the instructions in the INTRODUCTION section at the top of this file:
 11. Re-apply any modifications to files such as .htaccess or robots.txt.
 
 12. Make your settings.php file writeable, so that the update process can
-   convert it to the format of Drupal 7.x. settings.php is usually located in
+   convert it to the format of Drupal 8.x. settings.php is usually located in
 
      sites/default/settings.php
 
@@ -221,4 +221,3 @@ following the instructions in the INTRODUCTION section at the top of this file:
 
 To get started with Drupal 7 administration, visit
 http://drupal.org/getting-started/7/admin
-
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index fe1741d..de9a175 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,12 +8,12 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.0-dev');
+define('VERSION', '8.0-dev');
 
 /**
  * Core API compatibility.
  */
-define('DRUPAL_CORE_COMPATIBILITY', '7.x');
+define('DRUPAL_CORE_COMPATIBILITY', '8.x');
 
 /**
  * Minimum supported version of PHP.
diff --git a/includes/common.inc b/includes/common.inc
index e9286f4..1b5f730 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -7166,7 +7166,7 @@ function debug($data, $label = NULL, $print_r = FALSE) {
  * Parse a dependency for comparison by drupal_check_incompatibility().
  *
  * @param $dependency
- *   A dependency string, for example 'foo (>=7.x-4.5-beta5, 3.x)'.
+ *   A dependency string, for example 'foo (>=8.x-4.5-beta5, 3.x)'.
  * @return
  *   An associative array with three keys:
  *   - 'name' includes the name of the thing to depend on (e.g. 'foo').
@@ -7183,7 +7183,7 @@ function drupal_parse_dependency($dependency) {
   // We use named subpatterns and support every op that version_compare
   // supports. Also, op is optional and defaults to equals.
   $p_op = '(?P<operation>!=|==|=|<|<=|>|>=|<>)?';
-  // Core version is always optional: 7.x-2.x and 2.x is treated the same.
+  // Core version is always optional: 8.x-2.x and 2.x is treated the same.
   $p_core = '(?:' . preg_quote(DRUPAL_CORE_COMPATIBILITY) . '-)?';
   $p_major = '(?P<major>\d+)';
   // By setting the minor version to x, branches can be matched.
diff --git a/includes/update.inc b/includes/update.inc
index 1eb7a1d..69bc061 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -9,14 +9,14 @@
  */
 
 /**
- * Minimum schema version of Drupal 6 required for upgrade to Drupal 7.
+ * Minimum schema version of Drupal 7 required for upgrade to Drupal 8.
  *
- * Upgrades from Drupal 6 to Drupal 7 require that Drupal 6 be running
+ * Upgrades from Drupal 7 to Drupal 8 require that Drupal 7 be running
  * the most recent version, or the upgrade could fail. We can't easily
- * check the Drupal 6 version once the update process has begun, so instead
+ * check the Drupal 7 version once the update process has begun, so instead
  * we check the schema version of system.module in the system table.
  */
-define('REQUIRED_D6_SCHEMA_VERSION', '6055');
+define('REQUIRED_D7_SCHEMA_VERSION', '7069');
 
 /**
  * Disable any items in the {system} table that are not core compatible.
@@ -145,7 +145,7 @@ function update_prepare_d7_bootstrap() {
   // drupal_get_installed_schema_version().
   $system_schema = drupal_get_installed_schema_version('system');
   if ($system_schema < 7000) {
-    $has_required_schema = $system_schema >= REQUIRED_D6_SCHEMA_VERSION;
+    $has_required_schema = $system_schema >= REQUIRED_D7_SCHEMA_VERSION;
     $requirements = array(
       'drupal 6 version' => array(
         'title' => 'Drupal 6 version',
@@ -305,140 +305,6 @@ function update_prepare_d7_bootstrap() {
 }
 
 /**
- * A helper function that modules can use to assist with the transformation
- * from numeric block deltas to string block deltas during the 6.x -> 7.x
- * upgrade.
- *
- * @todo This function should be removed in 8.x.
- *
- * @param $sandbox
- *   An array holding data for the batch process.
- * @param $renamed_deltas
- *   An associative array.  Keys are module names, values an associative array
- *   mapping the old block deltas to the new block deltas for the module.
- *   Example:
- *   @code
- *     $renamed_deltas = array(
- *       'mymodule' =>
- *         array(
- *           0 => 'mymodule-block-1',
- *           1 => 'mymodule-block-2',
- *         ),
- *     );
- *   @endcode
- * @param $moved_deltas
- *   An associative array. Keys are source module names, values an associative
- *   array mapping the (possibly renamed) block name to the new module name.
- *   Example:
- *   @code
- *     $moved_deltas = array(
- *       'user' =>
- *         array(
- *           'navigation' => 'system',
- *         ),
- *     );
- *   @endcode
- */
-function update_fix_d7_block_deltas(&$sandbox, $renamed_deltas, $moved_deltas) {
-  // Loop through each block and make changes to the block tables.
-  // Only run this the first time through the batch update.
-  if (!isset($sandbox['progress'])) {
-    // Determine whether to use the old or new block table names.
-    $block_tables = db_table_exists('blocks') ? array('blocks', 'blocks_roles') : array('block', 'block_role');
-    foreach ($block_tables as $table) {
-      foreach ($renamed_deltas as $module => $deltas) {
-        foreach ($deltas as $old_delta => $new_delta) {
-          // Only do the update if the old block actually exists.
-          $block_exists = db_query("SELECT COUNT(*) FROM {" . $table . "} WHERE module = :module AND delta = :delta", array(
-              ':module' => $module,
-              ':delta' => $old_delta,
-            ))
-            ->fetchField();
-          if ($block_exists) {
-            db_update($table)
-              ->fields(array('delta' => $new_delta))
-              ->condition('module', $module)
-              ->condition('delta', $old_delta)
-              ->execute();
-          }
-        }
-      }
-      foreach ($moved_deltas as $old_module => $deltas) {
-        foreach ($deltas as $delta => $new_module) {
-          // Only do the update if the old block actually exists.
-          $block_exists = db_query("SELECT COUNT(*) FROM {" . $table . "} WHERE module = :module AND delta = :delta", array(
-              ':module' => $old_module,
-              ':delta' => $delta,
-            ))
-            ->fetchField();
-          if ($block_exists) {
-            db_update($table)
-              ->fields(array('module' => $new_module))
-              ->condition('module', $old_module)
-              ->condition('delta', $delta)
-              ->execute();
-          }
-        }
-      }
-    }
-
-    // Initialize batch update information.
-    $sandbox['progress'] = 0;
-    $sandbox['last_user_processed'] = -1;
-    $sandbox['max'] = db_query("SELECT COUNT(*) FROM {users} WHERE data IS NOT NULL")->fetchField();
-  }
-  // Now do the batch update of the user-specific block visibility settings.
-  $limit = 100;
-  $result = db_select('users', 'u')
-    ->fields('u', array('uid', 'data'))
-    ->condition('uid', $sandbox['last_user_processed'], '>')
-    ->orderBy('uid', 'ASC')
-    ->where('data IS NOT NULL')
-    ->range(0, $limit)
-    ->execute();
-  foreach ($result as $row) {
-    $data = unserialize($row->data);
-    $user_needs_update = FALSE;
-    foreach ($renamed_deltas as $module => $deltas) {
-      foreach ($deltas as $old_delta => $new_delta) {
-        if (isset($data['block'][$module][$old_delta])) {
-          // Transfer the old block visibility settings to the newly-renamed
-          // block, and mark this user for a database update.
-          $data['block'][$module][$new_delta] = $data['block'][$module][$old_delta];
-          unset($data['block'][$module][$old_delta]);
-          $user_needs_update = TRUE;
-        }
-      }
-    }
-    foreach ($moved_deltas as $old_module => $deltas) {
-      foreach ($deltas as $delta => $new_module) {
-        if (isset($data['block'][$old_module][$delta])) {
-          // Transfer the old block visibility settings to the moved
-          // block, and mark this user for a database update.
-          $data['block'][$new_module][$delta] = $data['block'][$old_module][$delta];
-          unset($data['block'][$old_module][$delta]);
-          $user_needs_update = TRUE;
-        }
-      }
-    }
-    // Update the current user.
-    if ($user_needs_update) {
-      db_update('users')
-        ->fields(array('data' => serialize($data)))
-        ->condition('uid', $row->uid)
-        ->execute();
-    }
-    // Update our progress information for the batch update.
-    $sandbox['progress']++;
-    $sandbox['last_user_processed'] = $row->uid;
-  }
-  // Indicate our current progress to the batch update system.
-  if ($sandbox['progress'] < $sandbox['max']) {
-    $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max'];
-  }
-}
-
-/**
  * Perform Drupal 6.x to 7.x updates that are required for update.php
  * to function properly.
  *
diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index 988111e..f147740 100644
--- a/modules/aggregator/aggregator.info
+++ b/modules/aggregator/aggregator.info
@@ -2,7 +2,7 @@ name = Aggregator
 description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = aggregator.test
 configure = admin/config/services/aggregator/settings
 stylesheets[all][] = aggregator.css
diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info
index b8dd19d..583a7fc 100644
--- a/modules/aggregator/tests/aggregator_test.info
+++ b/modules/aggregator/tests/aggregator_test.info
@@ -2,5 +2,5 @@ name = "Aggregator module tests"
 description = "Support module for aggregator related testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/block/block.info b/modules/block/block.info
index f8c0f0c..6ad58ad 100644
--- a/modules/block/block.info
+++ b/modules/block/block.info
@@ -2,6 +2,6 @@ name = Block
 description = Controls the visual building blocks a page is constructed with. Blocks are boxes of content rendered into an area, or region, of a web page.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = block.test
 configure = admin/structure/block
diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info
index 879f251..7efb99c 100644
--- a/modules/block/tests/block_test.info
+++ b/modules/block/tests/block_test.info
@@ -2,5 +2,5 @@ name = Block test
 description = Provides test blocks.
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index 801abfb..b962d28 100644
--- a/modules/blog/blog.info
+++ b/modules/blog/blog.info
@@ -2,5 +2,5 @@ name = Blog
 description = Enables multi-user blogs.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = blog.test
diff --git a/modules/book/book.info b/modules/book/book.info
index 2c7311f..0f4d2b1 100644
--- a/modules/book/book.info
+++ b/modules/book/book.info
@@ -2,7 +2,7 @@ name = Book
 description = Allows users to create and organize related content in an outline.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = book.test
 configure = admin/content/book/settings
 stylesheets[all][] = book.css
diff --git a/modules/color/color.info b/modules/color/color.info
index b1b862d..c25e123 100644
--- a/modules/color/color.info
+++ b/modules/color/color.info
@@ -2,5 +2,5 @@ name = Color
 description = Allows administrators to change the color scheme of compatible themes.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = color.test
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index 7cbe246..a5837af 100644
--- a/modules/comment/comment.info
+++ b/modules/comment/comment.info
@@ -2,7 +2,7 @@ name = Comment
 description = Allows users to comment on and discuss published content.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = text
 files[] = comment.module
 files[] = comment.test
diff --git a/modules/contact/contact.info b/modules/contact/contact.info
index 9430045..dd2ac0f 100644
--- a/modules/contact/contact.info
+++ b/modules/contact/contact.info
@@ -2,6 +2,6 @@ name = Contact
 description = Enables the use of both personal and site-wide contact forms.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = contact.test
 configure = admin/structure/contact
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
index ffaabaf..a006377 100644
--- a/modules/contextual/contextual.info
+++ b/modules/contextual/contextual.info
@@ -2,4 +2,4 @@ name = Contextual links
 description = Provides contextual links to perform actions related to elements on a page.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info
index 41f4c9d..f98b235 100644
--- a/modules/dashboard/dashboard.info
+++ b/modules/dashboard/dashboard.info
@@ -1,6 +1,6 @@
 name = Dashboard
 description = Provides a dashboard page in the administrative interface for organizing administrative tasks and tracking information within your site.
-core = 7.x
+core = 8.x
 package = Core
 version = VERSION
 files[] = dashboard.test
diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info
index 608bdd7..2aa61fc 100644
--- a/modules/dblog/dblog.info
+++ b/modules/dblog/dblog.info
@@ -2,5 +2,5 @@ name = Database logging
 description = Logs and records system events to the database.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = dblog.test
diff --git a/modules/field/field.info b/modules/field/field.info
index f8a331a..bf419e3 100644
--- a/modules/field/field.info
+++ b/modules/field/field.info
@@ -2,7 +2,7 @@ name = Field
 description = Field API to add fields to entities like nodes and users.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = field.module
 files[] = field.attach.inc
 files[] = tests/field.test
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info
index 9313850..ee1ae57 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.info
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.info
@@ -2,7 +2,7 @@ name = Field SQL storage
 description = Stores field data in an SQL database.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = field
 files[] = field_sql_storage.test
 required = TRUE
diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info
index 6bcec5d..6eb7117 100644
--- a/modules/field/modules/list/list.info
+++ b/modules/field/modules/list/list.info
@@ -2,7 +2,7 @@ name = List
 description = Defines list field types. Use with Options to create selection lists.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = field
 dependencies[] = options
 files[] = tests/list.test
diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info
index 83ae747..32c1d69 100644
--- a/modules/field/modules/list/tests/list_test.info
+++ b/modules/field/modules/list/tests/list_test.info
@@ -1,6 +1,6 @@
 name = "List test"
 description = "Support module for the List module tests."
-core = 7.x
+core = 8.x
 package = Testing
 version = VERSION
 hidden = TRUE
diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info
index 203d85d..f38cbb4 100644
--- a/modules/field/modules/number/number.info
+++ b/modules/field/modules/number/number.info
@@ -2,6 +2,6 @@ name = Number
 description = Defines numeric field types.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = field
 files[] = number.test
diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info
index 985a74c..1cc6faf 100644
--- a/modules/field/modules/options/options.info
+++ b/modules/field/modules/options/options.info
@@ -2,6 +2,6 @@ name = Options
 description = Defines selection, check box and radio button widgets for text and numeric fields.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = field
 files[] = options.test
diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info
index 976e299..b424d2d 100644
--- a/modules/field/modules/text/text.info
+++ b/modules/field/modules/text/text.info
@@ -2,7 +2,7 @@ name = Text
 description = Defines simple text field types.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = field
 files[] = text.test
 required = TRUE
diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info
index 6d11706..5fc9b27 100644
--- a/modules/field/tests/field_test.info
+++ b/modules/field/tests/field_test.info
@@ -1,6 +1,6 @@
 name = "Field API Test"
 description = "Support module for the Field API tests."
-core = 7.x
+core = 8.x
 package = Testing
 files[] = field_test.entity.inc
 version = VERSION
diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info
index 41d0999..87bab94 100644
--- a/modules/field_ui/field_ui.info
+++ b/modules/field_ui/field_ui.info
@@ -2,6 +2,6 @@ name = Field UI
 description = User interface for the Field API.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = field
 files[] = field_ui.test
diff --git a/modules/file/file.info b/modules/file/file.info
index eda79f9..39daffc 100644
--- a/modules/file/file.info
+++ b/modules/file/file.info
@@ -2,6 +2,6 @@ name = File
 description = Defines a file field type.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = field
 files[] = tests/file.test
diff --git a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info
index 8db907b..d83441c 100644
--- a/modules/file/tests/file_module_test.info
+++ b/modules/file/tests/file_module_test.info
@@ -2,5 +2,5 @@ name = File test
 description = Provides hooks for testing File module functionality.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/filter/filter.info b/modules/filter/filter.info
index 0aebbf8..022e9ed 100644
--- a/modules/filter/filter.info
+++ b/modules/filter/filter.info
@@ -2,7 +2,7 @@ name = Filter
 description = Filters content in preparation for display.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = filter.test
 required = TRUE
 configure = admin/config/content/formats
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
index b18a0e5..cb6e3e7 100644
--- a/modules/forum/forum.info
+++ b/modules/forum/forum.info
@@ -4,7 +4,7 @@ dependencies[] = taxonomy
 dependencies[] = comment
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = forum.test
 configure = admin/structure/forum
 stylesheets[all][] = forum.css
diff --git a/modules/help/help.info b/modules/help/help.info
index d4c1b36..b01a8ae 100644
--- a/modules/help/help.info
+++ b/modules/help/help.info
@@ -2,5 +2,5 @@ name = Help
 description = Manages the display of online help.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = help.test
diff --git a/modules/image/image.info b/modules/image/image.info
index d7eece1..5f9b651 100644
--- a/modules/image/image.info
+++ b/modules/image/image.info
@@ -2,7 +2,7 @@ name = Image
 description = Provides image manipulation tools.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = file
 files[] = image.test
 configure = admin/config/media/image-styles
diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info
index db7eacd..01d4d71 100644
--- a/modules/image/tests/image_module_test.info
+++ b/modules/image/tests/image_module_test.info
@@ -2,6 +2,6 @@ name = Image test
 description = Provides hook implementations for testing Image module functionality.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = image_module_test.module
 hidden = TRUE
diff --git a/modules/locale/locale.info b/modules/locale/locale.info
index 1d6bdcf..748d274 100644
--- a/modules/locale/locale.info
+++ b/modules/locale/locale.info
@@ -2,6 +2,6 @@ name = Locale
 description = Adds language handling functionality and enables the translation of the user interface to languages other than English.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = locale.test
 configure = admin/config/regional/language
diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
index 3744a9e..83cae4f 100644
--- a/modules/locale/tests/locale_test.info
+++ b/modules/locale/tests/locale_test.info
@@ -1,6 +1,6 @@
 name = "Locale Test"
 description = "Support module for the locale layer tests."
-core = 7.x
+core = 8.x
 package = Testing
 version = VERSION
 hidden = TRUE
diff --git a/modules/menu/menu.info b/modules/menu/menu.info
index 2219f69..d93c542 100644
--- a/modules/menu/menu.info
+++ b/modules/menu/menu.info
@@ -2,6 +2,6 @@ name = Menu
 description = Allows administrators to customize the site navigation menu.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = menu.test
 configure = admin/structure/menu
diff --git a/modules/node/node.info b/modules/node/node.info
index 85866e7..7f2c7ff 100644
--- a/modules/node/node.info
+++ b/modules/node/node.info
@@ -2,7 +2,7 @@ name = Node
 description = Allows content to be submitted to the site and displayed on pages.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = node.module
 files[] = node.test
 required = TRUE
diff --git a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info
index dc5e530..4de1c2d 100644
--- a/modules/node/tests/node_access_test.info
+++ b/modules/node/tests/node_access_test.info
@@ -2,5 +2,5 @@ name = "Node module access tests"
 description = "Support module for node permission testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info
index fa6c093..86eed52 100644
--- a/modules/node/tests/node_test.info
+++ b/modules/node/tests/node_test.info
@@ -2,5 +2,5 @@ name = "Node module tests"
 description = "Support module for node related testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info
index 1a339e0..3289912 100644
--- a/modules/node/tests/node_test_exception.info
+++ b/modules/node/tests/node_test_exception.info
@@ -2,5 +2,5 @@ name = "Node module exception tests"
 description = "Support module for node related exception testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/openid/openid.info b/modules/openid/openid.info
index 6a1843c..9ecdba0 100644
--- a/modules/openid/openid.info
+++ b/modules/openid/openid.info
@@ -2,5 +2,5 @@ name = OpenID
 description = "Allows users to log into your site using OpenID."
 version = VERSION
 package = Core
-core = 7.x
+core = 8.x
 files[] = openid.test
diff --git a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info
index 755a5ee..94d125d 100644
--- a/modules/openid/tests/openid_test.info
+++ b/modules/openid/tests/openid_test.info
@@ -2,6 +2,6 @@ name = OpenID dummy provider
 description = "OpenID provider used for testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = openid
 hidden = TRUE
diff --git a/modules/overlay/overlay.info b/modules/overlay/overlay.info
index 5fb354d..a782792 100644
--- a/modules/overlay/overlay.info
+++ b/modules/overlay/overlay.info
@@ -2,4 +2,4 @@ name = Overlay
 description = Displays the Drupal administration interface in an overlay.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
diff --git a/modules/path/path.info b/modules/path/path.info
index 8b6b67c..55b6f9c 100644
--- a/modules/path/path.info
+++ b/modules/path/path.info
@@ -2,6 +2,6 @@ name = Path
 description = Allows users to rename URLs.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = path.test
 configure = admin/config/search/path
diff --git a/modules/php/php.info b/modules/php/php.info
index cf86362..669a138 100644
--- a/modules/php/php.info
+++ b/modules/php/php.info
@@ -2,5 +2,5 @@ name = PHP filter
 description = Allows embedded PHP code/snippets to be evaluated.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = php.test
diff --git a/modules/poll/poll.info b/modules/poll/poll.info
index 9297727..de6ac25 100644
--- a/modules/poll/poll.info
+++ b/modules/poll/poll.info
@@ -2,6 +2,6 @@ name = Poll
 description = Allows your site to capture votes on different topics in the form of multiple choice questions.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = poll.test
 stylesheets[all][] = poll.css
diff --git a/modules/profile/profile.info b/modules/profile/profile.info
index e45f4c5..f4c8699 100644
--- a/modules/profile/profile.info
+++ b/modules/profile/profile.info
@@ -2,7 +2,7 @@ name = Profile
 description = Supports configurable user profiles.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = profile.test
 configure = admin/config/people/profile
 ; The Profile module is deprecated, and included in Drupal 7 for legacy
diff --git a/modules/rdf/rdf.info b/modules/rdf/rdf.info
index dd5c63b..a27d680 100644
--- a/modules/rdf/rdf.info
+++ b/modules/rdf/rdf.info
@@ -2,5 +2,5 @@ name = RDF
 description = Enriches your content with metadata to let other applications (e.g. search engines, aggregators) better understand its relationships and attributes.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = rdf.test
diff --git a/modules/rdf/tests/rdf_test.info b/modules/rdf/tests/rdf_test.info
index b64e9a5..b168815 100644
--- a/modules/rdf/tests/rdf_test.info
+++ b/modules/rdf/tests/rdf_test.info
@@ -2,5 +2,5 @@ name = "RDF module tests"
 description = "Support module for RDF module testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/search/search.info b/modules/search/search.info
index 77cab05..d8d7baa 100644
--- a/modules/search/search.info
+++ b/modules/search/search.info
@@ -2,7 +2,7 @@ name = Search
 description = Enables site-wide keyword searching.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = search.extender.inc
 files[] = search.test
 configure = admin/config/search/settings
diff --git a/modules/search/tests/search_embedded_form.info b/modules/search/tests/search_embedded_form.info
index 02e4c1f..2dad9ee 100644
--- a/modules/search/tests/search_embedded_form.info
+++ b/modules/search/tests/search_embedded_form.info
@@ -2,5 +2,5 @@ name = "Search embedded form"
 description = "Support module for search module testing of embedded forms."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/search/tests/search_extra_type.info b/modules/search/tests/search_extra_type.info
index 5c3293c..23f4dea 100644
--- a/modules/search/tests/search_extra_type.info
+++ b/modules/search/tests/search_extra_type.info
@@ -2,5 +2,5 @@ name = "Test search type"
 description = "Support module for search module testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/shortcut/shortcut.info b/modules/shortcut/shortcut.info
index 8132b3c..0030605 100644
--- a/modules/shortcut/shortcut.info
+++ b/modules/shortcut/shortcut.info
@@ -2,6 +2,6 @@ name = Shortcut
 description = Allows users to manage customizable lists of shortcut links.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = shortcut.test
 configure = admin/config/user-interface/shortcut
diff --git a/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info
index 0e3c630..8545321 100644
--- a/modules/simpletest/simpletest.info
+++ b/modules/simpletest/simpletest.info
@@ -2,7 +2,7 @@ name = Testing
 description = Provides a framework for unit and functional testing.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = simpletest.test
 files[] = drupal_web_test_case.php
 configure = admin/config/development/testing/settings
diff --git a/modules/simpletest/tests/actions_loop_test.info b/modules/simpletest/tests/actions_loop_test.info
index 4350d3d..3507511 100644
--- a/modules/simpletest/tests/actions_loop_test.info
+++ b/modules/simpletest/tests/actions_loop_test.info
@@ -2,5 +2,5 @@ name = Actions loop test
 description = Support module for action loop testing.
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/ajax_forms_test.info b/modules/simpletest/tests/ajax_forms_test.info
index c1d7dd4..987ee25 100644
--- a/modules/simpletest/tests/ajax_forms_test.info
+++ b/modules/simpletest/tests/ajax_forms_test.info
@@ -1,6 +1,6 @@
 name = "AJAX form test mock module"
 description = "Test for AJAX form calls."
-core = 7.x
+core = 8.x
 package = Testing
 version = VERSION
 hidden = TRUE
diff --git a/modules/simpletest/tests/ajax_test.info b/modules/simpletest/tests/ajax_test.info
index 1f56482..dda7f55 100644
--- a/modules/simpletest/tests/ajax_test.info
+++ b/modules/simpletest/tests/ajax_test.info
@@ -2,5 +2,5 @@ name = AJAX Test
 description = Support module for AJAX framework tests.
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/batch_test.info b/modules/simpletest/tests/batch_test.info
index f354097..cf2cc30 100644
--- a/modules/simpletest/tests/batch_test.info
+++ b/modules/simpletest/tests/batch_test.info
@@ -2,5 +2,5 @@ name = "Batch API test"
 description = "Support module for Batch API tests."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/common_test.info b/modules/simpletest/tests/common_test.info
index aced983..9e6d24f 100644
--- a/modules/simpletest/tests/common_test.info
+++ b/modules/simpletest/tests/common_test.info
@@ -2,7 +2,7 @@ name = "Common Test"
 description = "Support module for Common tests."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 stylesheets[all][] = common_test.css
 stylesheets[print][] = common_test.print.css
 hidden = TRUE
diff --git a/modules/simpletest/tests/database_test.info b/modules/simpletest/tests/database_test.info
index 7141235..7f38661 100644
--- a/modules/simpletest/tests/database_test.info
+++ b/modules/simpletest/tests/database_test.info
@@ -1,6 +1,6 @@
 name = "Database Test"
 description = "Support module for Database layer tests."
-core = 7.x
+core = 8.x
 package = Testing
 version = VERSION
 hidden = TRUE
diff --git a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index 085c335..53515e7 100644
--- a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -2,5 +2,5 @@ name = "Drupal system listing compatible test"
 description = "Support module for testing the drupal_system_listing function."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
index 8e5875e..8753eda 100644
--- a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
+++ b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
@@ -2,5 +2,5 @@ name = "Drupal system listing incompatible test"
 description = "Support module for testing the drupal_system_listing function."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/entity_cache_test.info b/modules/simpletest/tests/entity_cache_test.info
index 405cefa..c13496e 100644
--- a/modules/simpletest/tests/entity_cache_test.info
+++ b/modules/simpletest/tests/entity_cache_test.info
@@ -2,6 +2,6 @@ name = "Entity cache test"
 description = "Support module for testing entity cache."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = entity_cache_test_dependency
 hidden = TRUE
diff --git a/modules/simpletest/tests/entity_cache_test_dependency.info b/modules/simpletest/tests/entity_cache_test_dependency.info
index f0dc7b6..17d551c 100644
--- a/modules/simpletest/tests/entity_cache_test_dependency.info
+++ b/modules/simpletest/tests/entity_cache_test_dependency.info
@@ -2,5 +2,5 @@ name = "Entity cache test dependency"
 description = "Support dependency module for testing entity cache."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/entity_crud_hook_test.info b/modules/simpletest/tests/entity_crud_hook_test.info
index b37114d..28ce1b5 100644
--- a/modules/simpletest/tests/entity_crud_hook_test.info
+++ b/modules/simpletest/tests/entity_crud_hook_test.info
@@ -1,6 +1,6 @@
 name = "Entity CRUD Hooks Test"
 description = "Support module for CRUD hook tests."
-core = 7.x
+core = 8.x
 package = Testing
 version = VERSION
 hidden = TRUE
diff --git a/modules/simpletest/tests/error_test.info b/modules/simpletest/tests/error_test.info
index 1764ae3..d5db3ee 100644
--- a/modules/simpletest/tests/error_test.info
+++ b/modules/simpletest/tests/error_test.info
@@ -2,5 +2,5 @@ name = "Error test"
 description = "Support module for error and exception testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/file_test.info b/modules/simpletest/tests/file_test.info
index 4edfcea..b71f2a0 100644
--- a/modules/simpletest/tests/file_test.info
+++ b/modules/simpletest/tests/file_test.info
@@ -2,6 +2,6 @@ name = "File test"
 description = "Support module for file handling tests."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = file_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/filter_test.info b/modules/simpletest/tests/filter_test.info
index 4b887ca..ee27c29 100644
--- a/modules/simpletest/tests/filter_test.info
+++ b/modules/simpletest/tests/filter_test.info
@@ -2,5 +2,5 @@ name = Filter test module
 description = Tests filter hooks and functions.
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/form_test.info b/modules/simpletest/tests/form_test.info
index ac1d864..5354350 100644
--- a/modules/simpletest/tests/form_test.info
+++ b/modules/simpletest/tests/form_test.info
@@ -2,5 +2,5 @@ name = "FormAPI Test"
 description = "Support module for Form API tests."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/image_test.info b/modules/simpletest/tests/image_test.info
index a9ef05a..becc207 100644
--- a/modules/simpletest/tests/image_test.info
+++ b/modules/simpletest/tests/image_test.info
@@ -2,5 +2,5 @@ name = "Image test"
 description = "Support module for image toolkit tests."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info
index c1c39c1..4549a25 100644
--- a/modules/simpletest/tests/menu_test.info
+++ b/modules/simpletest/tests/menu_test.info
@@ -2,5 +2,5 @@ name = "Hook menu tests"
 description = "Support module for menu hook testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/module_test.info b/modules/simpletest/tests/module_test.info
index 0a0f3c0..c0b243c 100644
--- a/modules/simpletest/tests/module_test.info
+++ b/modules/simpletest/tests/module_test.info
@@ -2,5 +2,5 @@ name = "Module test"
 description = "Support module for module system testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/module_test.module b/modules/simpletest/tests/module_test.module
index d781350..bd85049 100644
--- a/modules/simpletest/tests/module_test.module
+++ b/modules/simpletest/tests/module_test.module
@@ -46,7 +46,7 @@ function module_test_system_info_alter(&$info, $file, $type) {
     }
     elseif ($file->name == 'php') {
       // Set php module to a version compatible with the above.
-      $info['version'] = '7.x-1.0';
+      $info['version'] = '8.x-1.0';
     }
   }
   if ($file->name == 'seven' && $type == 'theme') {
diff --git a/modules/simpletest/tests/requirements1_test.info b/modules/simpletest/tests/requirements1_test.info
index ef39535..f4d6ed5 100644
--- a/modules/simpletest/tests/requirements1_test.info
+++ b/modules/simpletest/tests/requirements1_test.info
@@ -2,5 +2,5 @@ name = Requirements 1 Test
 description = "Tests that a module is not installed when it fails hook_requirements('install')."
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/requirements2_test.info b/modules/simpletest/tests/requirements2_test.info
index 0cf8647..79d16cf 100644
--- a/modules/simpletest/tests/requirements2_test.info
+++ b/modules/simpletest/tests/requirements2_test.info
@@ -4,5 +4,5 @@ dependencies[] = requirements1_test
 dependencies[] = comment
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/session_test.info b/modules/simpletest/tests/session_test.info
index 3272156..73de0a1 100644
--- a/modules/simpletest/tests/session_test.info
+++ b/modules/simpletest/tests/session_test.info
@@ -2,5 +2,5 @@ name = "Session test"
 description = "Support module for session data testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/system_dependencies_test.info b/modules/simpletest/tests/system_dependencies_test.info
index 5b4bd10..c90706d 100644
--- a/modules/simpletest/tests/system_dependencies_test.info
+++ b/modules/simpletest/tests/system_dependencies_test.info
@@ -2,6 +2,6 @@ name = "System dependency test"
 description = "Support module for testing system dependencies."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
 dependencies[] = _missing_dependency
diff --git a/modules/simpletest/tests/system_test.info b/modules/simpletest/tests/system_test.info
index c4ad536..3b9aebc 100644
--- a/modules/simpletest/tests/system_test.info
+++ b/modules/simpletest/tests/system_test.info
@@ -2,6 +2,6 @@ name = System test
 description = Support module for system testing.
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = system_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/system_test.module b/modules/simpletest/tests/system_test.module
index 76841fb..46fb876 100644
--- a/modules/simpletest/tests/system_test.module
+++ b/modules/simpletest/tests/system_test.module
@@ -217,7 +217,7 @@ function system_test_system_info_alter(&$info, $file, $type) {
     }
     if ($file->name == 'common_test') {
       $info['hidden'] = FALSE;
-      $info['version'] = '7.x-2.4-beta3';
+      $info['version'] = '8.x-2.4-beta3';
     }
   }
 
diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info
index e5bb4f1..b4489d6 100644
--- a/modules/simpletest/tests/taxonomy_test.info
+++ b/modules/simpletest/tests/taxonomy_test.info
@@ -2,6 +2,6 @@ name = "Taxonomy test module"
 description = "Tests functions and hooks not used in core".
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
 dependencies[] = taxonomy
diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info
index 72cd23b..c4d0659 100644
--- a/modules/simpletest/tests/theme_test.info
+++ b/modules/simpletest/tests/theme_test.info
@@ -2,5 +2,5 @@ name = "Theme test"
 description = "Support module for theme system testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info
index d9764ee..5a5b14f 100644
--- a/modules/simpletest/tests/update_test_1.info
+++ b/modules/simpletest/tests/update_test_1.info
@@ -2,5 +2,5 @@ name = "Update test"
 description = "Support module for update testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info
index d9764ee..5a5b14f 100644
--- a/modules/simpletest/tests/update_test_2.info
+++ b/modules/simpletest/tests/update_test_2.info
@@ -2,5 +2,5 @@ name = "Update test"
 description = "Support module for update testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info
index d9764ee..5a5b14f 100644
--- a/modules/simpletest/tests/update_test_3.info
+++ b/modules/simpletest/tests/update_test_3.info
@@ -2,5 +2,5 @@ name = "Update test"
 description = "Support module for update testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php
index a916281..da7f00e 100644
--- a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php
+++ b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php
@@ -12431,7 +12431,7 @@ db_insert('system')->fields(array(
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:9:{s:4:"name";s:12:"Drush extras";s:11:"description";s:43:"Useful Drush commands. Requires Drush core.";s:7:"package";s:11:"Development";s:4:"core";s:3:"7.x";s:5:"files";a:7:{i:0;s:19:"drush_extras.module";i:1;s:12:"pm.drush.inc";i:2;s:16:"pm_cvs.drush.inc";i:3;s:16:"pm_svn.drush.inc";i:4;s:20:"simpletest.drush.inc";i:5;s:13:"sql.drush.inc";i:6;s:15:"tools.drush.inc";}s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:7:"version";N;s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:9:{s:4:"name";s:12:"Drush extras";s:11:"description";s:43:"Useful Drush commands. Requires Drush core.";s:7:"package";s:11:"Development";s:4:"core";s:3:"8.x";s:5:"files";a:7:{i:0;s:19:"drush_extras.module";i:1;s:12:"pm.drush.inc";i:2;s:16:"pm_cvs.drush.inc";i:3;s:16:"pm_svn.drush.inc";i:4;s:20:"simpletest.drush.inc";i:5;s:13:"sql.drush.inc";i:6;s:15:"tools.drush.inc";}s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:7:"version";N;s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/mymap/mymap.module',
diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info
index a8e9474..1947b2e 100644
--- a/modules/simpletest/tests/url_alter_test.info
+++ b/modules/simpletest/tests/url_alter_test.info
@@ -1,6 +1,6 @@
 name = Url_alter tests
 description = A support modules for url_alter hook testing.
-core = 7.x
+core = 8.x
 package = Testing
 version = VERSION
 hidden = TRUE
diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info
index bddfc95..6985439 100644
--- a/modules/simpletest/tests/xmlrpc_test.info
+++ b/modules/simpletest/tests/xmlrpc_test.info
@@ -2,5 +2,5 @@ name = "XML-RPC Test"
 description = "Support module for XML-RPC tests according to the validator1 specification."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info
index d3d1f54..e7add60 100644
--- a/modules/statistics/statistics.info
+++ b/modules/statistics/statistics.info
@@ -2,6 +2,6 @@ name = Statistics
 description = Logs access statistics for your site.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = statistics.test
 configure = admin/config/system/statistics
diff --git a/modules/syslog/syslog.info b/modules/syslog/syslog.info
index e0ef55c..4024bfd 100644
--- a/modules/syslog/syslog.info
+++ b/modules/syslog/syslog.info
@@ -2,5 +2,5 @@ name = Syslog
 description = Logs and records system events to syslog.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = syslog.test
diff --git a/modules/system/system.info b/modules/system/system.info
index 28abf66..c394849 100644
--- a/modules/system/system.info
+++ b/modules/system/system.info
@@ -2,7 +2,7 @@ name = System
 description = Handles general site configuration for administrators.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = system.archiver.inc
 files[] = system.mail.inc
 files[] = system.queue.inc
diff --git a/modules/system/system.queue.inc b/modules/system/system.queue.inc
index 806015c..00d3940 100644
--- a/modules/system/system.queue.inc
+++ b/modules/system/system.queue.inc
@@ -215,7 +215,7 @@ class SystemQueue implements DrupalReliableQueueInterface {
   }
 
   public function createItem($data) {
-    // During a Drupal 6.x to 7.x update, drupal_get_schema() does not contain
+    // During a Drupal 6.x to 8.x update, drupal_get_schema() does not contain
     // the queue table yet, so we cannot rely on drupal_write_record().
     $query = db_insert('queue')
       ->fields(array(
diff --git a/modules/system/system.test b/modules/system/system.test
index fb6a6e8..ae69d1f 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -411,7 +411,7 @@ class ModuleVersionTestCase extends ModuleTestCase {
    */
   function testModuleVersions() {
     $dependencies = array(
-      // Alternating between being compatible and incompatible with 7.x-2.4-beta3.
+      // Alternating between being compatible and incompatible with 8.x-2.4-beta3.
       // The first is always a compatible.
       'common_test',
       // Branch incompatibility.
@@ -427,9 +427,9 @@ class ModuleVersionTestCase extends ModuleTestCase {
       // Another branch compatibility.
       'common_test (>=2.x)',
       // Nonsense, misses a dash. Incompatible with everything.
-      'common_test (=7.x2.x, >=2.4)',
+      'common_test (=8.x2.x, >=2.4)',
       // Core version is optional. Compatible.
-      'common_test (=7.x-2.x, >=2.4-alpha2)',
+      'common_test (=8.x-2.x, >=2.4-alpha2)',
       // Test !=, explicitly incompatible.
       'common_test (=2.x, !=2.4-beta3)',
       // Three operations. Compatible.
diff --git a/modules/taxonomy/taxonomy.info b/modules/taxonomy/taxonomy.info
index 44d4ebc..cba3869 100644
--- a/modules/taxonomy/taxonomy.info
+++ b/modules/taxonomy/taxonomy.info
@@ -2,7 +2,7 @@ name = Taxonomy
 description = Enables the categorization of content.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = options
 files[] = taxonomy.module
 files[] = taxonomy.test
diff --git a/modules/toolbar/toolbar.info b/modules/toolbar/toolbar.info
index 2c5abbb..758dc9c 100644
--- a/modules/toolbar/toolbar.info
+++ b/modules/toolbar/toolbar.info
@@ -1,5 +1,5 @@
 name = Toolbar
 description = Provides a toolbar that shows the top-level administration menu items and links from other modules.
-core = 7.x
+core = 8.x
 package = Core
 version = VERSION
diff --git a/modules/tracker/tracker.info b/modules/tracker/tracker.info
index 1d7c65b..a765504 100644
--- a/modules/tracker/tracker.info
+++ b/modules/tracker/tracker.info
@@ -3,5 +3,5 @@ description = Enables tracking of recent content for users.
 dependencies[] = comment
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = tracker.test
diff --git a/modules/translation/tests/translation_test.info b/modules/translation/tests/translation_test.info
index ee1d7ec..5b42c5a 100644
--- a/modules/translation/tests/translation_test.info
+++ b/modules/translation/tests/translation_test.info
@@ -1,6 +1,6 @@
 name = "Content Translation Test"
 description = "Support module for the content translation tests."
-core = 7.x
+core = 8.x
 package = Testing
 version = VERSION
 hidden = TRUE
diff --git a/modules/translation/translation.info b/modules/translation/translation.info
index 6c652a1..ab6feec 100644
--- a/modules/translation/translation.info
+++ b/modules/translation/translation.info
@@ -3,5 +3,5 @@ description = Allows content to be translated into different languages.
 dependencies[] = locale
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = translation.test
diff --git a/modules/trigger/tests/trigger_test.info b/modules/trigger/tests/trigger_test.info
index bd94331..8b25cd9 100644
--- a/modules/trigger/tests/trigger_test.info
+++ b/modules/trigger/tests/trigger_test.info
@@ -1,5 +1,5 @@
 name = "Trigger Test"
 description = "Support module for Trigger tests."
 package = Testing
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/trigger/trigger.info b/modules/trigger/trigger.info
index 76102a2..f47604d 100644
--- a/modules/trigger/trigger.info
+++ b/modules/trigger/trigger.info
@@ -2,6 +2,6 @@ name = Trigger
 description = Enables actions to be fired on certain system events, such as when new content is created.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = trigger.test
 configure = admin/structure/trigger
diff --git a/modules/update/tests/aaa_update_test.1_0.xml b/modules/update/tests/aaa_update_test.1_0.xml
index a168453..5fc0d44 100644
--- a/modules/update/tests/aaa_update_test.1_0.xml
+++ b/modules/update/tests/aaa_update_test.1_0.xml
@@ -3,7 +3,7 @@
 <title>AAA Update test</title>
 <short_name>aaa_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>1</recommended_major>
 <supported_majors>1</supported_majors>
 <default_major>1</default_major>
@@ -14,14 +14,14 @@
   </terms>
 <releases>
  <release>
-  <name>aaa_update_test 7.x-1.0</name>
-  <version>7.x-1.0</version>
+  <name>aaa_update_test 8.x-1.0</name>
+  <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
   <version_major>1</version_major>
   <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/aaa_update_test-7-x-1-0-release</release_link>
-  <download_link>http://example.com/aaa_update_test-7.x-1.0.tar.gz</download_link>
+  <download_link>http://example.com/aaa_update_test-8.x-1.0.tar.gz</download_link>
   <date>1250424521</date>
   <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
   <filesize>1073741824</filesize>
diff --git a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info
index a283720..6064678 100644
--- a/modules/update/tests/aaa_update_test.info
+++ b/modules/update/tests/aaa_update_test.info
@@ -1,5 +1,5 @@
 name = AAA Update test
 description = Support module for update module testing.
 package = Testing
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/update/tests/bbb_update_test.1_0.xml b/modules/update/tests/bbb_update_test.1_0.xml
index bfdf196..8d705b5 100644
--- a/modules/update/tests/bbb_update_test.1_0.xml
+++ b/modules/update/tests/bbb_update_test.1_0.xml
@@ -3,7 +3,7 @@
 <title>BBB Update test</title>
 <short_name>bbb_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>1</recommended_major>
 <supported_majors>1</supported_majors>
 <default_major>1</default_major>
@@ -14,14 +14,14 @@
   </terms>
 <releases>
  <release>
-  <name>bbb_update_test 7.x-1.0</name>
-  <version>7.x-1.0</version>
+  <name>bbb_update_test 8.x-1.0</name>
+  <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
   <version_major>1</version_major>
   <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/bbb_update_test-7-x-1-0-release</release_link>
-  <download_link>http://example.com/bbb_update_test-7.x-1.0.tar.gz</download_link>
+  <download_link>http://example.com/bbb_update_test-8.x-1.0.tar.gz</download_link>
   <date>1250424521</date>
   <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
   <filesize>1073741824</filesize>
diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info
index 75084ae..95aacba 100644
--- a/modules/update/tests/bbb_update_test.info
+++ b/modules/update/tests/bbb_update_test.info
@@ -1,5 +1,5 @@
 name = BBB Update test
 description = Support module for update module testing.
 package = Testing
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/update/tests/ccc_update_test.1_0.xml b/modules/update/tests/ccc_update_test.1_0.xml
index 1b9ba75..82764c2 100644
--- a/modules/update/tests/ccc_update_test.1_0.xml
+++ b/modules/update/tests/ccc_update_test.1_0.xml
@@ -3,7 +3,7 @@
 <title>CCC Update test</title>
 <short_name>ccc_update_test</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>1</recommended_major>
 <supported_majors>1</supported_majors>
 <default_major>1</default_major>
@@ -14,14 +14,14 @@
   </terms>
 <releases>
  <release>
-  <name>ccc_update_test 7.x-1.0</name>
-  <version>7.x-1.0</version>
+  <name>ccc_update_test 8.x-1.0</name>
+  <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
   <version_major>1</version_major>
   <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/ccc_update_test-7-x-1-0-release</release_link>
-  <download_link>http://example.com/ccc_update_test-7.x-1.0.tar.gz</download_link>
+  <download_link>http://example.com/ccc_update_test-8.x-1.0.tar.gz</download_link>
   <date>1250424521</date>
   <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
   <filesize>1073741824</filesize>
diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info
index 0bd4cde..f4df516 100644
--- a/modules/update/tests/ccc_update_test.info
+++ b/modules/update/tests/ccc_update_test.info
@@ -1,5 +1,5 @@
 name = CCC Update test
 description = Support module for update module testing.
 package = Testing
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/update/tests/drupal.0.xml b/modules/update/tests/drupal.0.xml
index 701e11e..7e32072 100644
--- a/modules/update/tests/drupal.0.xml
+++ b/modules/update/tests/drupal.0.xml
@@ -3,7 +3,7 @@
 <title>Drupal</title>
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>7</recommended_major>
 <supported_majors>7</supported_majors>
 <default_major>7</default_major>
diff --git a/modules/update/tests/drupal.1.xml b/modules/update/tests/drupal.1.xml
index de4cfd0..c210a5a 100644
--- a/modules/update/tests/drupal.1.xml
+++ b/modules/update/tests/drupal.1.xml
@@ -3,7 +3,7 @@
 <title>Drupal</title>
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>7</recommended_major>
 <supported_majors>7</supported_majors>
 <default_major>7</default_major>
diff --git a/modules/update/tests/drupal.2-sec.xml b/modules/update/tests/drupal.2-sec.xml
index 1e68c8d..8018fa2 100644
--- a/modules/update/tests/drupal.2-sec.xml
+++ b/modules/update/tests/drupal.2-sec.xml
@@ -3,7 +3,7 @@
 <title>Drupal</title>
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>7</recommended_major>
 <supported_majors>7</supported_majors>
 <default_major>7</default_major>
diff --git a/modules/update/tests/drupal.dev.xml b/modules/update/tests/drupal.dev.xml
index 49dcc3f..4f70789 100644
--- a/modules/update/tests/drupal.dev.xml
+++ b/modules/update/tests/drupal.dev.xml
@@ -3,7 +3,7 @@
 <title>Drupal</title>
 <short_name>drupal</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>7</recommended_major>
 <supported_majors>7</supported_majors>
 <default_major>7</default_major>
@@ -31,14 +31,14 @@
   </terms>
  </release>
  <release>
-  <name>Drupal 7.x-dev</name>
-  <version>7.x-dev</version>
+  <name>Drupal 8.x-dev</name>
+  <version>8.x-dev</version>
   <tag>DRUPAL-7</tag>
   <version_major>7</version_major>
   <version_extra>dev</version_extra>
   <status>published</status>
   <release_link>http://example.com/drupal-7-x-dev-release</release_link>
-  <download_link>http://example.com/drupal-7.x-dev.tar.gz</download_link>
+  <download_link>http://example.com/drupal-8.x-dev.tar.gz</download_link>
   <date>1250424581</date>
   <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
   <filesize>2147483648</filesize>
diff --git a/modules/update/tests/update_test.info b/modules/update/tests/update_test.info
index f68dc9d..708dc97 100644
--- a/modules/update/tests/update_test.info
+++ b/modules/update/tests/update_test.info
@@ -2,5 +2,5 @@ name = Update test
 description = Support module for update module testing.
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/update/tests/update_test_basetheme.1_1-sec.xml b/modules/update/tests/update_test_basetheme.1_1-sec.xml
index 5c11c03..462558b 100644
--- a/modules/update/tests/update_test_basetheme.1_1-sec.xml
+++ b/modules/update/tests/update_test_basetheme.1_1-sec.xml
@@ -3,7 +3,7 @@
 <title>Update test base theme</title>
 <short_name>update_test_basetheme</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>1</recommended_major>
 <supported_majors>1</supported_majors>
 <default_major>1</default_major>
@@ -14,14 +14,14 @@
   </terms>
 <releases>
  <release>
-  <name>update_test_basetheme 7.x-1.1</name>
-  <version>7.x-1.1</version>
+  <name>update_test_basetheme 8.x-1.1</name>
+  <version>8.x-1.1</version>
   <tag>DRUPAL-7--1-1</tag>
   <version_major>1</version_major>
   <version_patch>1</version_patch>
   <status>published</status>
   <release_link>http://example.com/update_test_basetheme-7-x-1-1-release</release_link>
-  <download_link>http://example.com/update_test_basetheme-7.x-1.1.tar.gz</download_link>
+  <download_link>http://example.com/update_test_basetheme-8.x-1.1.tar.gz</download_link>
   <date>1250624521</date>
   <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
   <filesize>1073763241</filesize>
@@ -32,14 +32,14 @@
   </terms>
  </release>
  <release>
-  <name>update_test_basetheme 7.x-1.0</name>
-  <version>7.x-1.0</version>
+  <name>update_test_basetheme 8.x-1.0</name>
+  <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
   <version_major>1</version_major>
   <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/update_test_basetheme-7-x-1-0-release</release_link>
-  <download_link>http://example.com/update_test_basetheme-7.x-1.0.tar.gz</download_link>
+  <download_link>http://example.com/update_test_basetheme-8.x-1.0.tar.gz</download_link>
   <date>1250524521</date>
   <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
   <filesize>1073741824</filesize>
diff --git a/modules/update/tests/update_test_subtheme.1_0.xml b/modules/update/tests/update_test_subtheme.1_0.xml
index 5d04ec8..c791b7f 100644
--- a/modules/update/tests/update_test_subtheme.1_0.xml
+++ b/modules/update/tests/update_test_subtheme.1_0.xml
@@ -3,7 +3,7 @@
 <title>Update test subtheme</title>
 <short_name>update_test_subtheme</short_name>
 <dc:creator>Drupal</dc:creator>
-<api_version>7.x</api_version>
+<api_version>8.x</api_version>
 <recommended_major>1</recommended_major>
 <supported_majors>1</supported_majors>
 <default_major>1</default_major>
@@ -14,14 +14,14 @@
   </terms>
 <releases>
  <release>
-  <name>update_test_subtheme 7.x-1.0</name>
-  <version>7.x-1.0</version>
+  <name>update_test_subtheme 8.x-1.0</name>
+  <version>8.x-1.0</version>
   <tag>DRUPAL-7--1-0</tag>
   <version_major>1</version_major>
   <version_patch>0</version_patch>
   <status>published</status>
   <release_link>http://example.com/update_test_subtheme-7-x-1-0-release</release_link>
-  <download_link>http://example.com/update_test_subtheme-7.x-1.0.tar.gz</download_link>
+  <download_link>http://example.com/update_test_subtheme-8.x-1.0.tar.gz</download_link>
   <date>1250524521</date>
   <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
   <filesize>1073741824</filesize>
diff --git a/modules/update/update.api.php b/modules/update/update.api.php
index 87f95ca..83b93b2 100644
--- a/modules/update/update.api.php
+++ b/modules/update/update.api.php
@@ -48,8 +48,8 @@ function hook_update_projects_alter(&$projects) {
     'info' => array(
       'name' => 'Some disabled module',
       'description' => 'A module not enabled on the site that you want to see in the available updates report.',
-      'version' => '7.x-1.0',
-      'core' => '7.x',
+      'version' => '8.x-1.0',
+      'core' => '8.x',
       // The maximum file change time (the "ctime" returned by the filectime()
       // PHP method) for all of the .info files included in this project.
       '_info_file_ctime' => 1243888165,
diff --git a/modules/update/update.info b/modules/update/update.info
index 250cae1..83b9857 100644
--- a/modules/update/update.info
+++ b/modules/update/update.info
@@ -2,6 +2,6 @@ name = Update manager
 description = Checks for available updates, and can securely install or update modules and themes via a web interface.
 version = VERSION
 package = Core
-core = 7.x
+core = 8.x
 files[] = update.test
 configure = admin/reports/updates/settings
diff --git a/modules/update/update.test b/modules/update/update.test
index 6f9ef08..3affeb8 100644
--- a/modules/update/update.test
+++ b/modules/update/update.test
@@ -239,7 +239,7 @@ class UpdateTestContribCase extends UpdateTestHelper {
       ),
       'aaa_update_test' => array(
         'project' => 'aaa_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
     );
@@ -267,7 +267,7 @@ class UpdateTestContribCase extends UpdateTestHelper {
       ),
       'aaa_update_test' => array(
         'project' => 'aaa_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
     );
@@ -304,21 +304,21 @@ class UpdateTestContribCase extends UpdateTestHelper {
       '#all' => array(
         'version' => '7.0',
       ),
-      // All the rest should be visible as contrib modules at version 7.x-1.0.
+      // All the rest should be visible as contrib modules at version 8.x-1.0.
 
       // aaa_update_test needs to be part of the "CCC Update test" project,
       // which would throw off the report if we weren't properly sorting by
       // the project names.
       'aaa_update_test' => array(
         'project' => 'ccc_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
 
       // This should be its own project, and listed first on the report.
       'bbb_update_test' => array(
         'project' => 'bbb_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
 
@@ -326,7 +326,7 @@ class UpdateTestContribCase extends UpdateTestHelper {
       // should come after the bbb_update_test project.
       'ccc_update_test' => array(
         'project' => 'ccc_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
     );
@@ -377,13 +377,13 @@ class UpdateTestContribCase extends UpdateTestHelper {
       // Show the update_test_basetheme
       'update_test_basetheme' => array(
         'project' => 'update_test_basetheme',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
       // Show the update_test_subtheme
       'update_test_subtheme' => array(
         'project' => 'update_test_subtheme',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
     );
@@ -418,13 +418,13 @@ class UpdateTestContribCase extends UpdateTestHelper {
       // The update_test_basetheme should be visible and up to date.
       'update_test_basetheme' => array(
         'project' => 'update_test_basetheme',
-        'version' => '7.x-1.1',
+        'version' => '8.x-1.1',
         'hidden' => FALSE,
       ),
       // The update_test_subtheme should be visible and up to date.
       'update_test_subtheme' => array(
         'project' => 'update_test_subtheme',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
     );
@@ -464,17 +464,17 @@ class UpdateTestContribCase extends UpdateTestHelper {
       ),
       'aaa_update_test' => array(
         'project' => 'aaa_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
       'bbb_update_test' => array(
         'project' => 'bbb_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
       'ccc_update_test' => array(
         'project' => 'ccc_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
     );
@@ -513,7 +513,7 @@ class UpdateTestContribCase extends UpdateTestHelper {
   /**
    * Check that hook_update_status_alter() works to change a status.
    *
-   * We provide the same external data as if aaa_update_test 7.x-1.0 were
+   * We provide the same external data as if aaa_update_test 8.x-1.0 were
    * installed and that was the latest release. Then we use
    * hook_update_status_alter() to try to mark this as missing a security
    * update, then assert if we see the appropriate warnings on the right
@@ -530,7 +530,7 @@ class UpdateTestContribCase extends UpdateTestHelper {
       ),
       'aaa_update_test' => array(
         'project' => 'aaa_update_test',
-        'version' => '7.x-1.0',
+        'version' => '8.x-1.0',
         'hidden' => FALSE,
       ),
     );
diff --git a/modules/user/tests/user_form_test.info b/modules/user/tests/user_form_test.info
index 39d6c57..ed2f39e 100644
--- a/modules/user/tests/user_form_test.info
+++ b/modules/user/tests/user_form_test.info
@@ -2,5 +2,5 @@ name = "User module form tests"
 description = "Support module for user form testing."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/modules/user/user.info b/modules/user/user.info
index 1154f53..a4d18d6 100644
--- a/modules/user/user.info
+++ b/modules/user/user.info
@@ -2,7 +2,7 @@ name = User
 description = Manages the user registration and login system.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 files[] = user.module
 files[] = user.test
 required = TRUE
diff --git a/profiles/minimal/minimal.info b/profiles/minimal/minimal.info
index 9b0f250..c384680 100644
--- a/profiles/minimal/minimal.info
+++ b/profiles/minimal/minimal.info
@@ -1,7 +1,7 @@
 name = Minimal
 description = Start with only a few modules enabled.
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = block
 dependencies[] = dblog
 files[] = minimal.profile
diff --git a/profiles/standard/standard.info b/profiles/standard/standard.info
index 73d5d9b..56e4308 100644
--- a/profiles/standard/standard.info
+++ b/profiles/standard/standard.info
@@ -1,7 +1,7 @@
 name = Standard
 description = Install with commonly used features pre-configured.
 version = VERSION
-core = 7.x
+core = 8.x
 dependencies[] = block
 dependencies[] = color
 dependencies[] = comment
diff --git a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index 085c335..53515e7 100644
--- a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -2,5 +2,5 @@ name = "Drupal system listing compatible test"
 description = "Support module for testing the drupal_system_listing function."
 package = Testing
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/profiles/testing/testing.info b/profiles/testing/testing.info
index 8217201..8e353ed 100644
--- a/profiles/testing/testing.info
+++ b/profiles/testing/testing.info
@@ -1,5 +1,5 @@
 name = Testing
 description = Minimal profile for running tests. Includes absolutely required modules only.
 version = VERSION
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info
index ce7e13f..aab37a7 100644
--- a/themes/bartik/bartik.info
+++ b/themes/bartik/bartik.info
@@ -3,7 +3,7 @@ name = Bartik
 description = A flexible, recolorable theme with many regions.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 
 stylesheets[all][] = css/layout.css
 stylesheets[all][] = css/style.css
diff --git a/themes/garland/garland.info b/themes/garland/garland.info
index 307f03a..add4149 100644
--- a/themes/garland/garland.info
+++ b/themes/garland/garland.info
@@ -2,7 +2,7 @@ name = Garland
 description = A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 stylesheets[all][] = style.css
 stylesheets[print][] = print.css
 settings[garland_width] = fluid
diff --git a/themes/seven/seven.info b/themes/seven/seven.info
index 4293c07..969f749 100644
--- a/themes/seven/seven.info
+++ b/themes/seven/seven.info
@@ -2,7 +2,7 @@ name = Seven
 description = A simple one-column, tableless, fluid width administration theme.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 stylesheets[screen][] = reset.css
 stylesheets[screen][] = style.css
 settings[shortcut_module_link] = 1
diff --git a/themes/stark/stark.info b/themes/stark/stark.info
index f9b88df..5773c5e 100644
--- a/themes/stark/stark.info
+++ b/themes/stark/stark.info
@@ -2,5 +2,5 @@ name = Stark
 description = This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href="http://drupal.org/theme-guide">Theming Guide</a>.
 package = Core
 version = VERSION
-core = 7.x
+core = 8.x
 stylesheets[all][] = layout.css
diff --git a/themes/tests/test_theme/test_theme.info b/themes/tests/test_theme/test_theme.info
index dd5584b..c32fe57 100644
--- a/themes/tests/test_theme/test_theme.info
+++ b/themes/tests/test_theme/test_theme.info
@@ -1,6 +1,6 @@
 name = Test theme
 description = Theme for testing the theme system
-core = 7.x
+core = 8.x
 hidden = TRUE
 
 ; Normally, themes may list CSS files like this, and if they exist in the theme
diff --git a/themes/tests/update_test_basetheme/update_test_basetheme.info b/themes/tests/update_test_basetheme/update_test_basetheme.info
index 9718784..c8550b5 100644
--- a/themes/tests/update_test_basetheme/update_test_basetheme.info
+++ b/themes/tests/update_test_basetheme/update_test_basetheme.info
@@ -1,4 +1,4 @@
 name = Update test base theme
 description = Test theme which acts as a base theme for other test subthemes.
-core = 7.x
+core = 8.x
 hidden = TRUE
diff --git a/themes/tests/update_test_subtheme/update_test_subtheme.info b/themes/tests/update_test_subtheme/update_test_subtheme.info
index 6ca42f4..c783dc2 100644
--- a/themes/tests/update_test_subtheme/update_test_subtheme.info
+++ b/themes/tests/update_test_subtheme/update_test_subtheme.info
@@ -1,5 +1,5 @@
 name = Update test subtheme
 description = Test theme which uses update_test_basetheme as the base theme.
-core = 7.x
+core = 8.x
 base theme = update_test_basetheme
 hidden = TRUE
-- 
1.7.3.1

