diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index b687d3d..95b10fe 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -1767,10 +1767,10 @@ function menu_set_custom_theme() {
  */
 function menu_list_system_menus() {
   return array(
-    'navigation' => 'Navigation',
-    'management' => 'Management',
-    'user-menu' => 'User menu',
-    'main-menu' => 'Main menu',
+    'my-menu' => 'My menu',
+    'administration' => 'Administration',
+    'account-links' => 'Account links',
+    'main-navigation' => 'Main navigation',
   );
 }
 
@@ -1778,7 +1778,7 @@ function menu_list_system_menus() {
  * Return an array of links to be rendered as the Main menu.
  */
 function menu_main_menu() {
-  return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'));
+  return menu_navigation_links(variable_get('menu_main_links_source', 'main-navigation'));
 }
 
 /**
@@ -1788,11 +1788,11 @@ function menu_secondary_menu() {
 
   // If the secondary menu source is set as the primary menu, we display the
   // second level of the primary menu.
-  if (variable_get('menu_secondary_links_source', 'user-menu') == variable_get('menu_main_links_source', 'main-menu')) {
-    return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'), 1);
+  if (variable_get('menu_secondary_links_source', 'account-links') == variable_get('menu_main_links_source', 'main-navigation')) {
+    return menu_navigation_links(variable_get('menu_main_links_source', 'main-navigation'), 1);
   }
   else {
-    return menu_navigation_links(variable_get('menu_secondary_links_source', 'user-menu'), 0);
+    return menu_navigation_links(variable_get('menu_secondary_links_source', 'account-links'), 0);
   }
 }
 
@@ -2118,7 +2118,7 @@ function menu_local_tasks($level = 0) {
  * @param $args
  *   A list of dynamic path arguments to append to $parent_path to form the
  *   fully-qualified menu router path, for example array(123) for a certain
- *   node or array('system', 'navigation') for a certain block.
+ *   node or array('system', 'my-menu') for a certain block.
  *
  * @return
  *   A list of menu router items that are local tasks for the passed-in path.
@@ -2267,7 +2267,7 @@ function theme_menu_local_tasks(&$variables) {
  *   'menu_default_active_menus' variable may be used to assert a menu order
  *   different from the order of creation, or to prevent a particular menu from
  *   being used at all in the active trail.
- *   E.g., $conf['menu_default_active_menus'] = array('navigation', 'main-menu')
+ *   E.g., $conf['menu_default_active_menus'] = array('my-menu', 'main-navigation')
  */
 function menu_set_active_menu_names($menu_names = NULL) {
   $active = &drupal_static(__FUNCTION__);
@@ -2611,7 +2611,7 @@ function menu_link_load($mlid) {
 /**
  * Clears the cached cached data for a single named menu.
  */
-function menu_cache_clear($menu_name = 'navigation') {
+function menu_cache_clear($menu_name = 'my-menu') {
   $cache_cleared = &drupal_static(__FUNCTION__, array());
 
   if (empty($cache_cleared[$menu_name])) {
@@ -2753,7 +2753,7 @@ function _menu_link_build($item) {
   // the menu links generated automatically from entries in {menu_router}.
   $item['module'] = 'system';
   $item += array(
-    'menu_name' => 'navigation',
+    'menu_name' => 'my-menu',
     'link_title' => $item['title'],
     'link_path' => $item['path'],
     'hidden' => 0,
@@ -2998,7 +2998,7 @@ function _menu_delete_item($item, $force = FALSE) {
  *     normalized first by calling drupal_get_normal_path() on it.
  *   - link_title: (required) Title to appear in menu for the link.
  *   - menu_name: (optional) The machine name of the menu for the link.
- *     Defaults to 'navigation'.
+ *     Defaults to 'my-menu'.
  *   - weight: (optional) Integer to determine position in menu. Default is 0.
  *   - expanded: (optional) Boolean that determines if the item is expanded.
  *   - options: (optional) An array of options, see l() for more.
@@ -3025,7 +3025,7 @@ function menu_link_save(&$item, $existing_item = array(), $parent_candidates = a
   $item['external'] = (url_is_external($item['link_path'])  || $item['link_path'] == '<front>') ? 1 : 0;
   // Load defaults.
   $item += array(
-    'menu_name' => 'navigation',
+    'menu_name' => 'my-menu',
     'weight' => 0,
     'link_title' => '',
     'hidden' => 0,
diff --git a/core/modules/block/block.test b/core/modules/block/block.test
index dbd7dc4..b571362 100644
--- a/core/modules/block/block.test
+++ b/core/modules/block/block.test
@@ -334,7 +334,7 @@ class BlockTestCase extends DrupalWebTestCase {
     $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
     $this->assertText(t('The block settings have been updated.'), t('Block successfully move to first sidebar region.'));
 
-    $this->drupalPost('admin/structure/block/manage/' . $block['module'] . '/' . $block['delta'] . '/configure', array('title' => 'Navigation'), t('Save block'));
+    $this->drupalPost('admin/structure/block/manage/' . $block['module'] . '/' . $block['delta'] . '/configure', array('title' => 'my-menu'), t('Save block'));
     $this->assertText(t('The block configuration has been saved.'), t('Block title set.'));
   }
 
diff --git a/core/modules/block/tests/themes/block_test_theme/page.tpl.php b/core/modules/block/tests/themes/block_test_theme/page.tpl.php
index ba72882..17043b1 100644
--- a/core/modules/block/tests/themes/block_test_theme/page.tpl.php
+++ b/core/modules/block/tests/themes/block_test_theme/page.tpl.php
@@ -44,7 +44,7 @@
 
     <?php if ($main_menu || $secondary_menu): ?>
       <div id="navigation"><div class="section">
-        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-navigation', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Main menu'))); ?>
         <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 5cda5e2..669923e 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -255,8 +255,8 @@ function book_entity_info_alter(&$info) {
  */
 function book_block_info() {
   $block = array();
-  $block['navigation']['info'] = t('Book navigation');
-  $block['navigation']['cache'] = DRUPAL_CACHE_PER_PAGE | DRUPAL_CACHE_PER_ROLE;
+  $block['my-menu']['info'] = t('Book navigation');
+  $block['my-menu']['cache'] = DRUPAL_CACHE_PER_PAGE | DRUPAL_CACHE_PER_ROLE;
 
   return $block;
 }
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index b782c25..d21ee15 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -20,7 +20,7 @@ function contact_help($path, $arg) {
       $output .= '<dd>' . t('Site users can be contacted with a user contact form that keeps their e-mail address private. Users may enable or disable their personal contact forms by editing their <em>My account</em> page. If enabled, a <em>Contact</em> tab leads to a personal contact form displayed on their user profile. Site administrators are still able to use the contact form, even if has been disabled. The <em>Contact</em> tab is not shown when you view your own profile.') . '</dd>';
       $output .= '<dt>' . t('Site-wide contact forms') . '</dt>';
       $output .= '<dd>' . t('The <a href="@contact">Contact page</a> provides a simple form for users with the <em>Use the site-wide contact form</em> permission to send comments, feedback, or other requests. You can create categories for directing the contact form messages to a set of defined recipients. Common categories for a business site, for example, might include "Website feedback" (messages are forwarded to website administrators) and "Product information" (messages are forwarded to members of the sales department). E-mail addresses defined within a category are not displayed publicly.', array('@contact' => url('contact'))) . '</p>';
-      $output .= '<dt>' . t('Navigation') . '</dt>';
+      $output .= '<dt>' . t('my-menu') . '</dt>';
       $output .= '<dd>' . t("When the site-wide contact form is enabled, a link in the main <em>Navigation</em> menu is created, but the link is disabled by default. This menu link can be enabled on the <a href='@menu'>Menus administration page</a>.", array('@contact' => url('contact'), '@menu' => url('admin/structure/menu'))) . '</dd>';
       $output .= '<dt>' . t('Customization') . '</dt>';
       $output .= '<dd>' . t('If you would like additional text to appear on the site-wide or personal contact page, use a block. You can create and edit blocks on the <a href="@blocks">Blocks administration page</a>.', array('@blocks' => url('admin/structure/block'))) . '</dd>';
diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module
index 7b14a3f..670f66c 100644
--- a/core/modules/contextual/contextual.module
+++ b/core/modules/contextual/contextual.module
@@ -123,8 +123,8 @@ function contextual_preprocess(&$variables, $hook) {
  *   menu_contextual_links(). For example:
  *   @code
  *     array('#contextual_links' => array(
- *       'block' => array('admin/structure/block/manage', array('system', 'navigation')),
- *       'menu' => array('admin/structure/menu/manage', array('navigation')),
+ *       'block' => array('admin/structure/block/manage', array('system', 'my-menu')),
+ *       'menu' => array('admin/structure/menu/manage', array('my-menu')),
  *     ))
  *   @endcode
  *
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 26ab78f..04bd829 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -30,7 +30,7 @@ function forum_help($path, $arg) {
       $output .= '<dd>' . t('Visit the <a href="@forums">Forums page</a> to set up containers and forums to hold your discussion topics.', array('@forums' => url('admin/structure/forum'))) . '</dd>';
       $output .= '<dt>' . t('Starting a discussion') . '</dt>';
       $output .= '<dd>' . t('The <a href="@create-topic">Forum topic</a> link on the <a href="@content-add">Add new content</a> page creates the first post of a new threaded discussion, or thread.', array('@create-topic' => url('node/add/forum'), '@content-add' => url('node/add'))) . '</dd>';
-      $output .= '<dt>' . t('Navigation') . '</dt>';
+      $output .= '<dt>' . t('my-menu') . '</dt>';
       $output .= '<dd>' . t('Enabling the Forum module provides a default <em>Forums</em> menu item in the navigation menu that links to the <a href="@forums">Forums page</a>.', array('@forums' => url('forum'))) . '</dd>';
       $output .= '<dt>' . t('Moving forum topics') . '</dt>';
       $output .= '<dd>' . t('A forum topic (and all of its comments) may be moved between forums by selecting a different forum while editing a forum topic. When moving a forum topic between forums, the <em>Leave shadow copy</em> option creates a link in the original forum pointing to the new location.') . '</dd>';
diff --git a/core/modules/forum/forum.test b/core/modules/forum/forum.test
index c7c3d9c..5473e0f 100644
--- a/core/modules/forum/forum.test
+++ b/core/modules/forum/forum.test
@@ -213,7 +213,7 @@ class ForumTestCase extends DrupalWebTestCase {
     $this->assertText(t('The block settings have been updated.'), t('[New forum topics] Forum block was enabled'));
 
     // Retrieve forum menu id.
-    $mlid = db_query_range("SELECT mlid FROM {menu_links} WHERE link_path = 'forum' AND menu_name = 'navigation' AND module = 'system' ORDER BY mlid ASC", 0, 1)->fetchField();
+    $mlid = db_query_range("SELECT mlid FROM {menu_links} WHERE link_path = 'forum' AND menu_name = 'my-menu' AND module = 'system' ORDER BY mlid ASC", 0, 1)->fetchField();
 
     // Add forum to navigation menu.
     $edit = array();
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index f933feb..ad8ea07 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -661,11 +661,11 @@ function menu_configure() {
 
   $menu_options = menu_get_menus();
 
-  $main = variable_get('menu_main_links_source', 'main-menu');
+  $main = variable_get('menu_main_links_source', 'main-navigation');
   $form['menu_main_links_source'] = array(
     '#type' => 'select',
     '#title' => t('Source for the Main links'),
-    '#default_value' => variable_get('menu_main_links_source', 'main-menu'),
+    '#default_value' => variable_get('menu_main_links_source', 'main-navigation'),
     '#empty_option' => t('No Main links'),
     '#options' => $menu_options,
     '#tree' => FALSE,
@@ -675,7 +675,7 @@ function menu_configure() {
   $form['menu_secondary_links_source'] = array(
     '#type' => 'select',
     '#title' => t('Source for the Secondary links'),
-    '#default_value' => variable_get('menu_secondary_links_source', 'user-menu'),
+    '#default_value' => variable_get('menu_secondary_links_source', 'account-links'),
     '#empty_option' => t('No Secondary links'),
     '#options' => $menu_options,
     '#tree' => FALSE,
diff --git a/core/modules/menu/menu.install b/core/modules/menu/menu.install
index 05aed28..90b50b0 100644
--- a/core/modules/menu/menu.install
+++ b/core/modules/menu/menu.install
@@ -47,10 +47,10 @@ function menu_install() {
   $system_menus = menu_list_system_menus();
   $t = get_t();
   $descriptions = array(
-    'navigation' => $t('The <em>Navigation</em> menu contains links intended for site visitors. Links are added to the <em>Navigation</em> menu automatically by some modules.'),
-    'user-menu' => $t("The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link."),
-    'management' => $t('The <em>Management</em> menu contains links for administrative tasks.'),
-    'main-menu' => $t('The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.'),
+    'my-menu' => $t('Contains links for site visitors. Some modules add their links here.'),
+    'account-links' => $t("Links related to the user account."),
+    'administration' => $t('Contains links to administrative tasks.'),
+    'main-navigation' => $t('Use this for linking to the main site sections.'),
   );
   foreach ($system_menus as $menu_name => $title) {
     $menu = array(
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 1840cec..ea8319f 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -372,7 +372,7 @@ function menu_parent_options($menus, $item, $type = '') {
   }
   else {
     // If a node type is set, use all available menus for this type.
-    $type_menus = variable_get('menu_options_' . $type, array('main-menu' => 'main-menu'));
+    $type_menus = variable_get('menu_options_' . $type, array('main-navigation' => 'main-navigation'));
     foreach ($type_menus as $menu) {
       $available_menus[$menu] = $menu;
     }
@@ -566,12 +566,12 @@ function menu_node_predelete($node) {
 function menu_node_prepare($node) {
   if (empty($node->menu)) {
     // Prepare the node for the edit form so that $node->menu always exists.
-    $menu_name = strtok(variable_get('menu_parent_' . $node->type, 'main-menu:0'), ':');
+    $menu_name = strtok(variable_get('menu_parent_' . $node->type, 'main-navigation:0'), ':');
     $item = array();
     if (isset($node->nid)) {
       $mlid = FALSE;
       // Give priority to the default menu
-      $type_menus = variable_get('menu_options_' . $node->type, array('main-menu' => 'main-menu'));
+      $type_menus = variable_get('menu_options_' . $node->type, array('main-navigation' => 'main-navigation'));
       if (in_array($menu_name, $type_menus)) {
         $mlid = db_query_range("SELECT mlid FROM {menu_links} WHERE link_path = :path AND menu_name = :menu_name AND module = 'menu' ORDER BY mlid ASC", 0, 1, array(
           ':path' => 'node/' . $node->nid,
@@ -686,7 +686,7 @@ function menu_form_node_form_alter(&$form, $form_state) {
     '#description' => t('Shown when hovering over the menu link.'),
   );
 
-  $default = ($link['mlid'] ? $link['menu_name'] . ':' . $link['plid'] : variable_get('menu_parent_' . $type, 'main-menu:0'));
+  $default = ($link['mlid'] ? $link['menu_name'] . ':' . $link['plid'] : variable_get('menu_parent_' . $type, 'main-navigation:0'));
   // If the current parent menu item is not present in options, use the first
   // available option as default value.
   // @todo User should not be allowed to access menu link settings in such a
@@ -745,7 +745,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) {
   $form['menu']['menu_options'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Available menus'),
-    '#default_value' => variable_get('menu_options_' . $type->type, array('main-menu')),
+    '#default_value' => variable_get('menu_options_' . $type->type, array('main-navigation')),
     '#options' => $menu_options,
     '#description' => t('The menus available to place links in for this content type.'),
   );
@@ -757,7 +757,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) {
   $form['menu']['menu_parent'] = array(
     '#type' => 'select',
     '#title' => t('Default parent item'),
-    '#default_value' => variable_get('menu_parent_' . $type->type, 'main-menu:0'),
+    '#default_value' => variable_get('menu_parent_' . $type->type, 'main-navigation:0'),
     '#options' => $options,
     '#description' => t('Choose the menu item to be the default parent for a new link in the content authoring form.'),
     '#attributes' => array('class' => array('menu-title-select')),
diff --git a/core/modules/menu/menu.test b/core/modules/menu/menu.test
index 437adc2..ca61c56 100644
--- a/core/modules/menu/menu.test
+++ b/core/modules/menu/menu.test
@@ -195,7 +195,7 @@ class MenuTestCase extends DrupalWebTestCase {
    * Test menu functionality using navigation menu.
    *
    */
-  function doMenuTests($menu_name = 'navigation') {
+  function doMenuTests($menu_name = 'my-menu') {
     // Add nodes to use as links for menu links.
     $node1 = $this->drupalCreateNode(array('type' => 'article'));
     $node2 = $this->drupalCreateNode(array('type' => 'article'));
@@ -283,7 +283,7 @@ class MenuTestCase extends DrupalWebTestCase {
    * @param string $menu_name Menu name.
    * @return array Menu link created.
    */
-  function addMenuLink($plid = 0, $link = '<front>', $menu_name = 'navigation', $expanded = TRUE) {
+  function addMenuLink($plid = 0, $link = '<front>', $menu_name = 'my-menu', $expanded = TRUE) {
     // View add menu link page.
     $this->drupalGet("admin/structure/menu/manage/$menu_name/add");
     $this->assertResponse(200);
@@ -317,7 +317,7 @@ class MenuTestCase extends DrupalWebTestCase {
    *
    * @param string $menu_name Menu name.
    */
-  function addInvalidMenuLink($menu_name = 'navigation') {
+  function addInvalidMenuLink($menu_name = 'my-menu') {
     foreach (array('-&-', 'admin/people/permissions', '#') as $link_path) {
       $edit = array(
         'link_path' => $link_path,
@@ -551,7 +551,7 @@ class MenuTestCase extends DrupalWebTestCase {
     $this->drupalGet('admin/structure/menu/manage/navigation');
         $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Navigation'), t('Navigation menu node was displayed'));
+      $this->assertText(t('my-menu'), t('Navigation menu node was displayed'));
     }
 
     // View menu edit node.
@@ -682,7 +682,7 @@ class MenuNodeTestCase extends DrupalWebTestCase {
     $this->assertTrue($link, t('Link in not allowed menu still exists after saving node'));
 
     // Move the menu link back to the Navigation menu.
-    $item['menu_name'] = 'navigation';
+    $item['menu_name'] = 'my-menu';
     menu_link_save($item);
     // Create a second node.
     $child_node = $this->drupalCreateNode(array('type' => 'article'));
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 2910e1a..62ad071 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -2031,7 +2031,7 @@ function node_menu() {
   $items['node'] = array(
     'page callback' => 'node_page_default',
     'access arguments' => array('access content'),
-    'menu_name' => 'navigation',
+    'menu_name' => 'my-menu',
     'type' => MENU_CALLBACK,
   );
   $items['node/add'] = array(
diff --git a/core/modules/simpletest/tests/menu.test b/core/modules/simpletest/tests/menu.test
index 5a173b1..edc0436 100644
--- a/core/modules/simpletest/tests/menu.test
+++ b/core/modules/simpletest/tests/menu.test
@@ -329,14 +329,14 @@ class MenuRouterTestCase extends DrupalWebTestCase {
     menu_link_maintain('menu_test', 'insert', 'menu_test_maintain/1', 'Menu link #1-1');
     menu_link_maintain('menu_test', 'insert', 'menu_test_maintain/2', 'Menu link #2');
 
-    // Move second link to the main-menu, to test caching later on.
+    // Move second link to the main-navigation, to test caching later on.
     db_update('menu_links')
-      ->fields(array('menu_name' => 'main-menu'))
+      ->fields(array('menu_name' => 'main-navigation'))
       ->condition('link_title', 'Menu link #1-1')
       ->condition('customized', 0)
       ->condition('module', 'menu_test')
       ->execute();
-    menu_cache_clear('main-menu');
+    menu_cache_clear('main-navigation');
 
     // Load front page.
     $this->drupalGet('node');
@@ -964,21 +964,21 @@ class MenuTreeOutputTestCase extends DrupalWebTestCase {
    */
   var $tree_data = array(
     '1'=> array(
-      'link' => array( 'menu_name' => 'main-menu', 'mlid' => 1, 'hidden'=>0, 'has_children' => 1, 'title' => 'Item 1', 'in_active_trail' => 1, 'access'=>1, 'href' => 'a', 'localized_options' => array('attributes' => array('title' =>'')) ),
+      'link' => array( 'menu_name' => 'main-navigation', 'mlid' => 1, 'hidden'=>0, 'has_children' => 1, 'title' => 'Item 1', 'in_active_trail' => 1, 'access'=>1, 'href' => 'a', 'localized_options' => array('attributes' => array('title' =>'')) ),
       'below' => array(
-        '2' => array('link' => array( 'menu_name' => 'main-menu', 'mlid' => 2, 'hidden'=>0, 'has_children' => 1, 'title' => 'Item 2', 'in_active_trail' => 1, 'access'=>1, 'href' => 'a/b', 'localized_options' => array('attributes' => array('title' =>'')) ),
+        '2' => array('link' => array( 'menu_name' => 'main-navigation', 'mlid' => 2, 'hidden'=>0, 'has_children' => 1, 'title' => 'Item 2', 'in_active_trail' => 1, 'access'=>1, 'href' => 'a/b', 'localized_options' => array('attributes' => array('title' =>'')) ),
           'below' => array(
-            '3' => array('link' => array( 'menu_name' => 'main-menu', 'mlid' => 3, 'hidden'=>0, 'has_children' => 0, 'title' => 'Item 3', 'in_active_trail' => 0, 'access'=>1, 'href' => 'a/b/c', 'localized_options' => array('attributes' => array('title' =>'')) ),
+            '3' => array('link' => array( 'menu_name' => 'main-navigation', 'mlid' => 3, 'hidden'=>0, 'has_children' => 0, 'title' => 'Item 3', 'in_active_trail' => 0, 'access'=>1, 'href' => 'a/b/c', 'localized_options' => array('attributes' => array('title' =>'')) ),
               'below' => array() ),
-            '4' => array('link' => array( 'menu_name' => 'main-menu', 'mlid' => 4, 'hidden'=>0, 'has_children' => 0, 'title' => 'Item 4', 'in_active_trail' => 0, 'access'=>1, 'href' => 'a/b/d', 'localized_options' => array('attributes' => array('title' =>'')) ),
+            '4' => array('link' => array( 'menu_name' => 'main-navigation', 'mlid' => 4, 'hidden'=>0, 'has_children' => 0, 'title' => 'Item 4', 'in_active_trail' => 0, 'access'=>1, 'href' => 'a/b/d', 'localized_options' => array('attributes' => array('title' =>'')) ),
               'below' => array() )
             )
           )
         )
       ),
-    '5' => array('link' => array( 'menu_name' => 'main-menu', 'mlid' => 5, 'hidden'=>1, 'has_children' => 0, 'title' => 'Item 5', 'in_active_trail' => 0, 'access'=>1, 'href' => 'e', 'localized_options' => array('attributes' => array('title' =>'')) ), 'below' => array( ) ),
-    '6' => array('link' => array( 'menu_name' => 'main-menu', 'mlid' => 6, 'hidden'=>0, 'has_children' => 0, 'title' => 'Item 6', 'in_active_trail' => 0, 'access'=>0, 'href' => 'f', 'localized_options' => array('attributes' => array('title' =>'')) ), 'below' => array( ) ),
-    '7' => array('link' => array( 'menu_name' => 'main-menu', 'mlid' => 7, 'hidden'=>0, 'has_children' => 0, 'title' => 'Item 7', 'in_active_trail' => 0, 'access'=>1, 'href' => 'g', 'localized_options' => array('attributes' => array('title' =>'')) ), 'below' => array( ) )
+    '5' => array('link' => array( 'menu_name' => 'main-navigation', 'mlid' => 5, 'hidden'=>1, 'has_children' => 0, 'title' => 'Item 5', 'in_active_trail' => 0, 'access'=>1, 'href' => 'e', 'localized_options' => array('attributes' => array('title' =>'')) ), 'below' => array( ) ),
+    '6' => array('link' => array( 'menu_name' => 'main-navigation', 'mlid' => 6, 'hidden'=>0, 'has_children' => 0, 'title' => 'Item 6', 'in_active_trail' => 0, 'access'=>0, 'href' => 'f', 'localized_options' => array('attributes' => array('title' =>'')) ), 'below' => array( ) ),
+    '7' => array('link' => array( 'menu_name' => 'main-navigation', 'mlid' => 7, 'hidden'=>0, 'has_children' => 0, 'title' => 'Item 7', 'in_active_trail' => 0, 'access'=>1, 'href' => 'g', 'localized_options' => array('attributes' => array('title' =>'')) ), 'below' => array( ) )
   );
 
   public static function getInfo() {
@@ -999,7 +999,7 @@ class MenuTreeOutputTestCase extends DrupalWebTestCase {
   function testMenuTreeData() {
     $output = menu_tree_output($this->tree_data);
 
-    // Validate that the - in main-menu is changed into an underscore
+    // Validate that the - in main-navigation is changed into an underscore
     $this->assertEqual( $output['1']['#theme'], 'menu_link__main_menu', t('Hyphen is changed to a dash on menu_link'));
     $this->assertEqual( $output['#theme_wrappers'][0], 'menu_tree__main_menu', t('Hyphen is changed to a dash on menu_tree wrapper'));
     // Looking for child items in the data
@@ -1046,7 +1046,7 @@ class MenuBreadcrumbTestCase extends MenuWebTestCase {
         'status' => 1,
       ))
       ->condition('module', 'system')
-      ->condition('delta', 'navigation')
+      ->condition('delta', 'my-menu')
       ->execute();
   }
 
@@ -1112,7 +1112,7 @@ class MenuBreadcrumbTestCase extends MenuWebTestCase {
     );
     $this->assertBreadcrumb('admin/structure/menu/manage/navigation', $trail);
     $trail += array(
-      'admin/structure/menu/manage/navigation' => t('Navigation'),
+      'admin/structure/menu/manage/navigation' => t('my-menu'),
     );
     $this->assertBreadcrumb('admin/structure/menu/manage/navigation/edit', $trail);
     $this->assertBreadcrumb('admin/structure/menu/manage/navigation/add', $trail);
@@ -1190,7 +1190,7 @@ class MenuBreadcrumbTestCase extends MenuWebTestCase {
     // latter is a preferred menu by default.
     // @todo Also test all themes? Manually testing led to the suspicion that
     //   breadcrumbs may differ, possibly due to template.php overrides.
-    $menus = array('main-menu', 'navigation');
+    $menus = array('main-navigation', 'my-menu');
     // Alter node type menu settings.
     variable_set("menu_options_$type", $menus);
     variable_set("menu_parent_$type", 'navigation:0');
@@ -1255,7 +1255,7 @@ class MenuBreadcrumbTestCase extends MenuWebTestCase {
       $trail = array();
       $this->assertBreadcrumb('node', $trail);
 
-      if ($menu == 'navigation') {
+      if ($menu == 'my-menu') {
         $parent = $node2;
         $child = $node3;
       }
@@ -1263,7 +1263,7 @@ class MenuBreadcrumbTestCase extends MenuWebTestCase {
 
     // Create a Navigation menu link for 'node', move the last parent node menu
     // link below it, and verify a full breadcrumb for the last child node.
-    $menu = 'navigation';
+    $menu = 'my-menu';
     $edit = array(
       'link_title' => 'Root',
       'link_path' => 'node',
@@ -1539,7 +1539,7 @@ class MenuTrailTestCase extends MenuWebTestCase {
         'status' => 1,
       ))
       ->condition('module', 'system')
-      ->condition('delta', 'navigation')
+      ->condition('delta', 'my-menu')
       ->execute();
 
     // This test puts menu links in the Management menu and then tests for
diff --git a/core/modules/simpletest/tests/upgrade/drupal-7.bare.database.php.gz b/core/modules/simpletest/tests/upgrade/drupal-7.bare.database.php.gz
index 4eddff6..48c3e08 100644
Binary files a/core/modules/simpletest/tests/upgrade/drupal-7.bare.database.php.gz and b/core/modules/simpletest/tests/upgrade/drupal-7.bare.database.php.gz differ
diff --git a/core/modules/simpletest/tests/upgrade/drupal-7.filled.database.php.gz b/core/modules/simpletest/tests/upgrade/drupal-7.filled.database.php.gz
index 8b8a73a..28a95bf 100644
Binary files a/core/modules/simpletest/tests/upgrade/drupal-7.filled.database.php.gz and b/core/modules/simpletest/tests/upgrade/drupal-7.filled.database.php.gz differ
diff --git a/core/modules/system/page.tpl.php b/core/modules/system/page.tpl.php
index c76e27f..1dff760 100644
--- a/core/modules/system/page.tpl.php
+++ b/core/modules/system/page.tpl.php
@@ -102,7 +102,7 @@
 
     <?php if ($main_menu || $secondary_menu): ?>
       <nav role="navigation">
-        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-navigation', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Main menu'))); ?>
         <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       </nav>
     <?php endif; ?>
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 0157964..c9cac85 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1104,7 +1104,7 @@ function system_schema() {
     'description' => 'Contains the individual links within a menu.',
     'fields' => array(
      'menu_name' => array(
-        'description' => "The menu name. All links with the same menu name (such as 'navigation') are part of the same menu.",
+        'description' => "The menu name. All links with the same menu name (such as 'my-menu') are part of the same menu.",
         'type' => 'varchar',
         'length' => 32,
         'not null' => TRUE,
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index 89907b5..a5f049d 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -15,7 +15,7 @@ function tracker_help($path, $arg) {
       $output .= '<p>' . t('The Tracker module displays the most recently added and updated content on your site, and allows you to follow new content created by each user. This module has no configuration options. For more information, see the online handbook entry for <a href="@tracker">Tracker module</a>.', array('@tracker' => 'http://drupal.org/handbook/modules/tracker/')) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
-      $output .= '<dt>' . t('Navigation') . '</dt>';
+      $output .= '<dt>' . t('my-menu') . '</dt>';
       $output .= '<dd>' . t('The Tracker module adds a new menu item to the Navigation menu, called <em>Recent content</em>. You can configure menu items via the <a href="@menus">Menus administration page</a>.', array('@menus' => url('admin/structure/menu'))) . '</dd>';
       $output .= '<dt>' . t('Tracking new and updated site content') . '</dt>';
       $output .= '<dd>' . t("The <a href='@recent'>Recent content</a> page shows new and updated content in reverse chronological order, listing the content type, title, author's name, number of comments, and time of last update. Content is considered updated when changes occur in the text, or when new comments are added. The <em>My recent content</em> tab limits the list to the currently logged-in user.", array('@recent' => url('tracker'))) . '</dd>';
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 009a716..b5f5293 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1635,7 +1635,7 @@ function user_menu() {
     'access callback' => TRUE,
     'file' => 'user.pages.inc',
     'weight' => -10,
-    'menu_name' => 'user-menu',
+    'menu_name' => 'account-links',
   );
 
   $items['user/login'] = array(
@@ -1674,7 +1674,7 @@ function user_menu() {
     'access callback' => 'user_is_logged_in',
     'page callback' => 'user_logout',
     'weight' => 10,
-    'menu_name' => 'user-menu',
+    'menu_name' => 'account-links',
     'file' => 'user.pages.inc',
   );
 
@@ -1785,7 +1785,7 @@ function user_menu() {
     // user account pages, the preferred menu link that is used to build the
     // active trail (breadcrumb) will be found in this menu (unless there is
     // more specific link), so the link to 'user' will not be in the breadcrumb.
-    'menu_name' => 'navigation',
+    'menu_name' => 'my-menu',
   );
 
   $items['user/%user/view'] = array(
@@ -1878,7 +1878,7 @@ function user_menu_link_alter(&$link) {
     $link['options']['alter'] = TRUE;
   }
 
-  // Force the Logout link to appear on the top-level of 'user-menu' menu by
+  // Force the Logout link to appear on the top-level of 'account-links' menu by
   // default (i.e., unless it has been customized).
   if ($link['link_path'] == 'user/logout' && $link['module'] == 'system' && empty($link['customized'])) {
     $link['plid'] = 0;
diff --git a/core/themes/bartik/color/preview.css b/core/themes/bartik/color/preview.css
index dc408e0..eb3a16e 100644
--- a/core/themes/bartik/color/preview.css
+++ b/core/themes/bartik/color/preview.css
@@ -39,20 +39,20 @@ html.js #preview {
   margin-left: 15px;
   padding-top: 34px;
 }
-#preview-main-menu {
+#preview-main-navigation {
   clear: both;
   padding: 0 15px 3px;
 }
-#preview-main-menu-links a {
+#preview-main-navigation-links a {
   color: #d9d9d9;
   padding: 0.6em 1em 0.4em;
 }
-#preview-main-menu-links {
+#preview-main-navigation-links {
   font-size: 0.929em;
   margin: 0;
   padding: 0;
 }
-#preview-main-menu-links a {
+#preview-main-navigation-links a {
   color: #333;
   background: #ccc;
   background: rgba(255, 255, 255, 0.7);
@@ -64,19 +64,19 @@ html.js #preview {
   -webkit-border-top-right-radius: 8px;
   border-top-right-radius: 8px;
 }
-#preview-main-menu-links a:hover,
-#preview-main-menu-links a:focus {
+#preview-main-navigation-links a:hover,
+#preview-main-navigation-links a:focus {
   background: #fff;
   background: rgba(255, 255, 255, 0.95);
 }
-#preview-main-menu-links a:active {
+#preview-main-navigation-links a:active {
   background: #b3b3b3;
   background: rgba(255, 255, 255, 1);
 }
-#preview-main-menu-links li a.active {
+#preview-main-navigation-links li a.active {
   border-bottom: none;
 }
-#preview-main-menu-links li {
+#preview-main-navigation-links li {
   display: inline;
   list-style-type: none;
   padding: 0.6em 0 0.4em;
diff --git a/core/themes/bartik/color/preview.html b/core/themes/bartik/color/preview.html
index ae9aa14..4336615 100644
--- a/core/themes/bartik/color/preview.html
+++ b/core/themes/bartik/color/preview.html
@@ -3,8 +3,8 @@
   <div id="preview-header">
     <div id="preview-logo"><img src="../../../core/themes/bartik/logo.png" alt="Site Logo" /></div>
     <div id="preview-site-name">Bartik</div>
-    <div id="preview-main-menu">
-      <ul id="preview-main-menu-links">
+    <div id="preview-main-navigation">
+      <ul id="preview-main-navigation-links">
         <li><a>Home</a></li>
         <li><a>Te Quidne</a></li>
         <li><a>Vel Torqueo Quae Erat</a></li>
diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css
index fd83374..82f45ee 100644
--- a/core/themes/bartik/css/colors.css
+++ b/core/themes/bartik/css/colors.css
@@ -10,8 +10,8 @@ body.overlay {
 }
 #page,
 #main-wrapper,
-#main-menu-links li a.active,
-#main-menu-links li.active-trail a {
+#main-navigation-links li a.active,
+#main-navigation-links li.active-trail a {
   background: #ffffff;
 }
 .tabs ul.primary li a.active {
diff --git a/core/themes/bartik/css/ie-rtl.css b/core/themes/bartik/css/ie-rtl.css
index 6358bf3..4dbe900 100644
--- a/core/themes/bartik/css/ie-rtl.css
+++ b/core/themes/bartik/css/ie-rtl.css
@@ -32,11 +32,11 @@ ul.action-links li a,
   padding-right: 20px;
   zoom: 1;
 }
-#main-menu ul.links li {
+#main-navigation ul.links li {
   margin: 0;
 }
-#main-menu ul.links li,
-#main-menu ul.links li a {
+#main-navigation ul.links li,
+#main-navigation ul.links li a {
   display: inline;
   float: none;
   margin: 0;
diff --git a/core/themes/bartik/css/style-rtl.css b/core/themes/bartik/css/style-rtl.css
index d25006f..e2e9af7 100644
--- a/core/themes/bartik/css/style-rtl.css
+++ b/core/themes/bartik/css/style-rtl.css
@@ -69,8 +69,8 @@ ul.tips {
 
 /* --------------- Main Menu ------------ */
 
-#main-menu ul.links li,
-#main-menu ul.links li a {
+#main-navigation ul.links li,
+#main-navigation ul.links li a {
   float: right;
 }
 
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index bd5c642..a78e2d7 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -454,21 +454,21 @@ h1#site-name {
 
 /* --------------- Main Menu ------------ */
 
-#main-menu {
+#main-navigation {
   clear: both;
 }
-#main-menu-links {
+#main-navigation-links {
   font-size: 0.929em;
   margin: 0;
   padding: 0 15px;
 }
-#main-menu-links li {
+#main-navigation-links li {
   float: left; /* LTR */
   list-style: none;
   padding: 0 1px;
   margin: 0 1px;
 }
-#main-menu-links a {
+#main-navigation-links a {
   color: #333;
   background: #ccc;
   background: rgba(255, 255, 255, 0.7);
@@ -485,20 +485,20 @@ h1#site-name {
   border-top-left-radius: 8px;
   border-top-right-radius: 8px;
 }
-#main-menu-links a:hover,
-#main-menu-links a:focus {
+#main-navigation-links a:hover,
+#main-navigation-links a:focus {
   background: #f6f6f2;
   background: rgba(255, 255, 255, 0.95);
 }
-#main-menu-links a:active {
+#main-navigation-links a:active {
   background: #b3b3b3;
   background: rgba(255, 255, 255, 1);
 }
-#main-menu-links li a.active {
+#main-navigation-links li a.active {
   border-bottom: none;
 }
-.featured #main-menu-links li a:active,
-.featured #main-menu-links li a.active {
+.featured #main-navigation-links li a:active,
+.featured #main-navigation-links li a.active {
   background: #f0f0f0;
   background: rgba(240, 240, 240, 1.0);
 }
diff --git a/core/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php
index 44e9cea..264e333 100644
--- a/core/themes/bartik/templates/page.tpl.php
+++ b/core/themes/bartik/templates/page.tpl.php
@@ -123,11 +123,11 @@
     <?php print render($page['header']); ?>
 
     <?php if ($main_menu): ?>
-      <div id="main-menu" class="navigation">
+      <div id="main-navigation" class="navigation">
         <?php print theme('links__system_main_menu', array(
           'links' => $main_menu,
           'attributes' => array(
-            'id' => 'main-menu-links',
+            'id' => 'main-navigation-links',
             'class' => array('links', 'clearfix'),
           ),
           'heading' => array(
@@ -136,7 +136,7 @@
             'class' => array('element-invisible'),
           ),
         )); ?>
-      </div> <!-- /#main-menu -->
+      </div> <!-- /#main-navigation -->
     <?php endif; ?>
 
     <?php if ($secondary_menu): ?>
diff --git a/profiles/minimal/minimal.install b/profiles/minimal/minimal.install
index 6c56aec..1334aca 100644
--- a/profiles/minimal/minimal.install
+++ b/profiles/minimal/minimal.install
@@ -37,7 +37,7 @@ function minimal_install() {
     ),
     array(
       'module' => 'system',
-      'delta' => 'navigation',
+      'delta' => 'my-menu',
       'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
diff --git a/profiles/standard/standard.install b/profiles/standard/standard.install
index 9195ad9..d2b145f 100644
--- a/profiles/standard/standard.install
+++ b/profiles/standard/standard.install
@@ -114,7 +114,7 @@ function standard_install() {
     ),
     array(
       'module' => 'system',
-      'delta' => 'navigation',
+      'delta' => 'my-menu',
       'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
@@ -416,7 +416,7 @@ function standard_install() {
   $item = array(
     'link_title' => st('Home'),
     'link_path' => '<front>',
-    'menu_name' => 'main-menu',
+    'menu_name' => 'main-navigation',
   );
   menu_link_save($item);