3 files changed, 16 insertions, 8 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 6599fa1e1..be4dbf016 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -184,12 +184,12 @@ abstract class DrupalTestCase {
 
   /**
    * Delete an assertion record by message ID.
-   * 
+   *
    * @param $message_id
    *   Message ID of the assertion to delete.
    * @return
    *   TRUE if the assertion was deleted, FALSE otherwise.
-   * 
+   *
    * @see DrupalTestCase::insertAssert()
    */
   public static function deleteAssert($message_id) {
@@ -1137,8 +1137,8 @@ class DrupalWebTestCase extends DrupalTestCase {
     $this->preloadRegistry();
 
     // Include the default profile
-    variable_set('install_profile', 'default');
-    $profile_details = install_profile_info('default', 'en');
+    variable_set('install_profile', 'standard');
+    $profile_details = install_profile_info('standard', 'en');
 
     // Install the modules specified by the default profile.
     drupal_install_modules($profile_details['dependencies'], TRUE);
@@ -1158,7 +1158,7 @@ class DrupalWebTestCase extends DrupalTestCase {
 
     // Run default profile tasks.
     $install_state = array();
-    drupal_install_modules(array('default'), TRUE);
+    drupal_install_modules(array('standard'), TRUE);
 
     // Rebuild caches.
     node_types_rebuild();
@@ -1173,7 +1173,6 @@ class DrupalWebTestCase extends DrupalTestCase {
     $user = user_load(1);
 
     // Restore necessary variables.
-    variable_set('install_profile', 'default');
     variable_set('install_task', 'done');
     variable_set('clean_url', $clean_url_original);
     variable_set('site_mail', 'simpletest@example.com');
diff --git a/modules/system/system.install b/modules/system/system.install
index 478a09279..4a1e9ccdd 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2719,6 +2719,15 @@ function system_update_7048() {
 }
 
 /**
+ * Rename 'Default' profile to 'Standard.'
+ */
+function system_update_7049() {
+  if (variable_get('install_profile', 'standard') == 'default') {
+    variable_set('install_profile', 'standard');
+  }
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */
diff --git a/modules/system/system.module b/modules/system/system.module
index 850be5446..067f171c8 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -642,7 +642,7 @@ function system_menu() {
     );
   }
 
-  // Modules
+  // Modules.
   $items['admin/modules'] = array(
     'title' => 'Modules',
     'description' => 'Enable or disable add-on modules for your site.',
@@ -675,7 +675,7 @@ function system_menu() {
     'file' => 'system.admin.inc',
   );
 
-  // Configuration and modules.
+  // Configuration.
   $items['admin/config'] = array(
     'title' => 'Configuration',
     'page callback' => 'system_admin_config_page',