diff --git a/admin_menu.module b/admin_menu.module
index e33bcc8..4c435a0 100644
--- a/admin_menu.module
+++ b/admin_menu.module
@@ -417,6 +417,21 @@ function admin_menu_output() {
     $content['icon'] = admin_menu_links_icon();
     $content['user'] = admin_menu_links_user();
 
+    // Improve usability by rearranging some core admin menus
+    // and improve naming.
+    $menu_modifications = array(
+      // '#href' => 'New #title',
+      'admin/index' => t('Configure by module'),
+      'admin/tasks' => t('Adminstration categories'),
+    );
+    foreach ($content['menu'] as $key => $menu_item) {
+      if (isset($menu_modifications[$menu_item['#href']])) {
+        $menu_item['#title'] = $menu_modifications[$menu_item['#href']];
+        $content['icon']['icon'][$menu_item['#href']] = $menu_item;
+        unset($content['menu'][$key]);
+      }
+    }
+
     // Allow modules to alter the output.
     drupal_alter('admin_menu_output', $content);
     $content = drupal_render($content);