diff --git a/modules/field/field.api.php b/modules/field/field.api.php
index 21d328be80b94688ba6df3492bd154d2fe03e9ce..1a388272e1f091be15766835c823f6534621221b 100644
--- a/modules/field/field.api.php
+++ b/modules/field/field.api.php
@@ -77,8 +77,8 @@ function hook_fieldable_info() {
     $return['taxonomy_term']['bundles'][$vocabulary->machine_name] = array(
       'label' => $vocabulary->name,
       'admin' => array(
-        'path' => 'admin/content/taxonomy/%taxonomy_vocabulary',
-        'real path' => 'admin/content/taxonomy/' . $vocabulary->vid,
+        'path' => 'admin/build/taxonomy/%taxonomy_vocabulary',
+        'real path' => 'admin/build/taxonomy/' . $vocabulary->vid,
         'bundle argument' => 3,
         'access arguments' => array('administer taxonomy'),
       ),
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index baac678adac39aa8f39cdbd4107535504c314b71..0e6d0acce67bfe13eb7ca9a7f3c9a61c5d62f1e6 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -28,7 +28,7 @@ function forum_help($path, $arg) {
     case 'admin/build/forum/add/forum':
       return '<p>' . t('A forum holds related or similar forum topics (a forum topic is the initial post to a threaded discussion). For example, a forum named "Fruit" may contain forum topics titled "Apples" and "Bananas", respectively.') . '</p>';
     case 'admin/build/forum/settings':
-      return '<p>' . t('These settings allow you to adjust the display of your forum topics. The content types available for use within a forum may be selected by editing the <em>Content types</em> on the <a href="@forum-vocabulary">forum vocabulary page</a>.', array('@forum-vocabulary' => url('admin/content/taxonomy/edit/vocabulary/' . variable_get('forum_nav_vocabulary', 0)))) . '</p>';
+      return '<p>' . t('These settings allow you to adjust the display of your forum topics. The content types available for use within a forum may be selected by editing the <em>Content types</em> on the <a href="@forum-vocabulary">forum vocabulary page</a>.', array('@forum-vocabulary' => url('admin/build/taxonomy/edit/vocabulary/' . variable_get('forum_nav_vocabulary', 0)))) . '</p>';
   }
 }
 
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index e060a153229925c03456095f0951c42a828480dd..452de17928a4f34043dc48042018d169a2d2c487 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -84,7 +84,7 @@ function theme_taxonomy_overview_vocabularies($form) {
   }
 
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No vocabularies available. <a href="@link">Add vocabulary</a>.', array('@link' => url('admin/content/taxonomy/add'))), 'colspan' => '5'));
+    $rows[] = array(array('data' => t('No vocabularies available. <a href="@link">Add vocabulary</a>.', array('@link' => url('admin/build/taxonomy/add'))), 'colspan' => '5'));
   }
 
   $header = array(t('Vocabulary name'), t('Content types'));