diff --git a/modules/block/block.install b/modules/block/block.install
index fcb95fc..eb56297 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -461,5 +461,19 @@ function block_update_7007() {
 }
 
 /**
+ * Rename primary-links and secondary-links delta to main-menu and secondary-menu
+ */
+function block_update_7008() {
+  db_update('block')
+    ->fields(array('delta' => 'main-menu'))
+    ->condition('delta', 'primary-links')
+    ->execute();
+  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..1f2ef5f 100644
--- a/modules/menu/menu.install
+++ b/modules/menu/menu.install
@@ -63,6 +63,28 @@ function menu_install() {
 }
 
 /**
+ * Rename primary-links and secondary-links to main-menu and secondary-menu.
+ */
+function menu_update_7000() {
+  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();
+  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();
+}
+
+/**
  * Implements hook_uninstall().
  */
 function menu_uninstall() {