Index: admin_menu.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/admin_menu/admin_menu.module,v
retrieving revision 1.84
diff -u -r1.84 admin_menu.module
--- admin_menu.module	18 Jul 2009 22:10:07 -0000	1.84
+++ admin_menu.module	21 Jul 2009 00:08:18 -0000
@@ -106,7 +106,7 @@
         // them the proper router path and b) turn their parent items from
         // MENU_CALLBACK into something visible; otherwise, the menu system
         // does not find the parents and relocates child items to the top-level.
-        if (strpos($path, 'admin/build/node-type/') === 0) {
+        if (strpos($path, 'admin/structure/node-type/') === 0) {
           // Fix router path.
           $newpath = strtr($path, array('/node-type/' => '/types/'));
           $items[$newpath] = $items[$path];
@@ -215,7 +215,7 @@
   if ($setting = variable_get('admin_menu_tweak_tabs', 0)) {
     $settings['tweak_tabs'] = $setting;
   }
-  if ($_GET['q'] == 'admin/build/modules' || strpos($_GET['q'], 'admin/build/modules/list') === 0) {
+  if ($_GET['q'] == 'admin/structure/modules' || strpos($_GET['q'], 'admin/structure/modules/list') === 0) {
     $settings['tweak_modules'] = variable_get('admin_menu_tweak_modules', 0);
   }
 
Index: tests/admin_menu.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/admin_menu/tests/admin_menu.test,v
retrieving revision 1.11
diff -u -r1.11 admin_menu.test
--- tests/admin_menu.test	19 Jul 2009 17:51:56 -0000	1.11
+++ tests/admin_menu.test	21 Jul 2009 00:08:18 -0000
@@ -45,14 +45,14 @@
     $this->drupalGet('node');
     $this->assertPattern('@<div id="admin-menu">.*admin/content/node@s', t('Administer content link found.'));
     $this->assertNoPattern('@<div id="admin-menu">.*http://drupal.org@s', t('Drupal links not found.'));
-    $this->assertNoPattern('@<div id="admin-menu">.*admin/build/contact@s', t('Contact module link not found.'));
+    $this->assertNoPattern('@<div id="admin-menu">.*admin/structure/contact@s', t('Contact module link not found.'));
 
     // Create a new user with the permission 'display drupal links'.
     $admin_user2 = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'administer nodes', 'access administration menu', 'display drupal links'));
     $this->drupalLogin($admin_user2);
     $this->drupalGet('node');
     $this->assertPattern('@<div id="admin-menu">.*http://drupal.org@s', t('Drupal links found.'));
-    $this->assertNoPattern('@<div id="admin-menu">.*admin/build/contact@s', t('Contact module link not found.'));
+    $this->assertNoPattern('@<div id="admin-menu">.*admin/structure/contact@s', t('Contact module link not found.'));
   }
 }
 
@@ -85,7 +85,7 @@
     // Verify that proper links are displayed.
     $this->assertRaw('<div id="admin-menu">', t('Administration menu is displayed.'));
     $this->drupalGet('node');
-    $this->assertNoPattern('@<div id="admin-menu">.*admin/build/contact@s', t('Contact module link not found.'));
+    $this->assertNoPattern('@<div id="admin-menu">.*admin/structure/contact@s', t('Contact module link not found.'));
 
     // Create a new user with 'administer site-wide contact form' permission.
     $admin_user = $this->drupalCreateUser(array('access administration pages', 'access administration menu', 'administer site-wide contact form'));
@@ -93,7 +93,7 @@
 
     // Verify that proper links are displayed.
     $this->drupalGet('node');
-    $this->assertPattern('@<div id="admin-menu">.*admin/build/contact@s', t('Contact module link found.'));
+    $this->assertPattern('@<div id="admin-menu">.*admin/structure/contact@s', t('Contact module link found.'));
   }
 }
 
@@ -142,8 +142,8 @@
     // We are explicitly NOT using t() here, since the purpose is to test our
     // custom link titles and 't' option.
     $links = array(
-      '/admin/build/types/page' => t('Page'),
-      '/admin/build/types/special' => t('Cool & Special'),
+      '/admin/structure/types/page' => t('Page'),
+      '/admin/structure/types/special' => t('Cool & Special'),
     );
     foreach ($links as $url => $title) {
       $this->assertFieldByXPath('//div[@id="admin-menu"]//a[@href="' . $url . '"]', $title, t('!link-title content-type link found.', array('!link-title' => $title)));