diff --git a/modules/block/block.install b/modules/block/block.install
index fcb95fc..ba4ed22 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -461,5 +461,26 @@ function block_update_7007() {
 }
 
 /**
+ * Rename primary-links and secondary-links delta to main-menu and secondary-menu
+ */
+function block_update_7008() {
+  $count = db_query('SELECT COUNT(*) FROM {block} WHERE delta = :delta', array(':delta' => 'main-menu'))->fetchField();
+  if ($count === 0) {
+    db_update('block')
+      ->fields(array('delta' => 'main-menu'))
+      ->condition('delta', 'primary-links')
+      ->execute();
+  }
+
+  $count = db_query('SELECT COUNT(*) FROM {block} WHERE delta = :delta', array(':delta' => 'secondary-menu'))->fetchField();
+  if ($count === 0) {
+    db_update('block')
+      ->fields(array('delta' => 'secondary-menu'))
+      ->condition('delta', 'secondary-links')
+      ->execute();
+  }
+}
+
+/**
  * @} End of "addtogroup updates-6.x-to-7.x"
  */
diff --git a/modules/menu/menu.install b/modules/menu/menu.install
index 05aed28..36b10b9 100644
--- a/modules/menu/menu.install
+++ b/modules/menu/menu.install
@@ -63,9 +63,44 @@ function menu_install() {
 }
 
 /**
+ * Rename primary-links and secondary-links to main-menu and secondary-menu.
+ */
+function menu_update_7000() {
+  $default_node_menu = variable_get('menu_default_node_menu');
+  $count = db_query('SELECT COUNT(*) FROM {menu_custom} WHERE menu_name = :menu_name', array(':menu_name' => 'main-menu'))->fetchField();
+  if ($count === 0) {
+    db_update('menu_links')
+      ->fields(array('menu_name' => 'main-menu'))
+      ->condition('menu_name', 'primary-links')
+      ->execute();
+    db_update('menu_custom')
+      ->fields(array('menu_name' => 'main-menu', 'title' => 'Main menu'))
+      ->condition('menu_name', 'primary-links')
+      ->execute();
+    if ($default_node_menu == 'primary-links') {
+      variable_set('menu_default_node_menu', 'main-menu');
+    }
+  }
+
+  $count = db_query('SELECT COUNT(*) FROM {menu_custom} WHERE menu_name = :menu_name', array(':menu_name' => 'secondary-menu'))->fetchField();
+  if ($count === 0) {
+    db_update('menu_links')
+      ->fields(array('menu_name' => 'secondary-menu'))
+      ->condition('menu_name', 'secondary-links')
+      ->execute();
+    db_update('menu_custom')
+      ->fields(array('menu_name' => 'secondary-menu', 'title' => 'Secondary menu'))
+      ->condition('menu_name', 'secondary-links')
+      ->execute();
+    if ($default_node_menu == 'secondary-links') {
+      variable_set('menu_default_node_menu', 'secondary-menu');
+    }
+  }
+}
+
+/**
  * Implements hook_uninstall().
  */
 function menu_uninstall() {
   menu_rebuild();
 }
-