diff --git a/drupal/sites/all/features/user_preferences/user_preferences.features.menu_links.inc b/drupal/sites/all/features/user_preferences/user_preferences.features.menu_links.inc
index eb567b27f3..cae171818f 100644
--- a/drupal/sites/all/features/user_preferences/user_preferences.features.menu_links.inc
+++ b/drupal/sites/all/features/user_preferences/user_preferences.features.menu_links.inc
@@ -30,7 +30,7 @@ function user_preferences_menu_default_menu_links() {
   bts('Preferences', array(), NULL, 'boinc:menu-link');
   bts('Community', array(), NULL, 'boinc:menu-link');
   bts('Privacy', array(), NULL, 'boinc:menu-link');
-  bts('Subscriptions', array(), NULL, 'boinc:menu-link');
+  bts('Subscriptions', array(), NULL, 'boinc:menu-link:-1:ignoreoverwrite');
 
   return $menu_links;
 }
diff --git a/drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc b/drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc
index 799bde4af6..7856c73080 100644
--- a/drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc
+++ b/drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc
@@ -5666,7 +5666,7 @@ Cross-project stats:
   $handler->override_option('path', 'account/%/computers/active');
   $handler->override_option('menu', array(
     'type' => 'default tab',
-    'title' => bts('Active in past 30 days', array(), NULL, 'boinc:user-host-list'),
+    'title' => bts('Active in past 30 days', array(), NULL, 'boinc:account-host-list'),
     'description' => 'Show only computers that have been active in the past month',
     'weight' => '0',
     'name' => 'navigation',
@@ -5682,7 +5682,7 @@ Cross-project stats:
   $handler->override_option('path', 'account/%/computers/all');
   $handler->override_option('menu', array(
     'type' => 'tab',
-    'title' => bts('All computers', array(), NULL, 'boinc:user-host-list'),
+    'title' => bts('All computers', array(), NULL, 'boinc:account-host-list'),
     'description' => 'Show all computers associated with the account',
     'weight' => '1',
     'name' => 'navigation',
diff --git a/drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc b/drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc
index 9cdb34f97b..b3fd6c9d70 100644
--- a/drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc
+++ b/drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc
@@ -79,7 +79,7 @@ function boincteam_views_data() {
   // Foreign key fields
   
   $data['team']['userid'] = array(
-    'title' => bts('Founder', array(), NULL, 'boinc:team-founder'),
+    'title' => bts('Founder', array(), NULL, 'boinc:view-team-info'),
     'help' => t('The founder of this team.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be 
diff --git a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc
index 84fa392496..3d80ea164a 100644
--- a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc
+++ b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc
@@ -328,7 +328,7 @@ function boincteam_edit_form(&$form_state, $team_id) {
     '#disabled' => $is_boinc_wide,
   );
   $form['website'] = array(
-    '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-edit'),
+    '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
diff --git a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam_forum.forms.inc b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam_forum.forms.inc
index eea2a0a11a..cbe1e94c77 100644
--- a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam_forum.forms.inc
+++ b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam_forum.forms.inc
@@ -86,7 +86,7 @@ function boincteam_forum_create_form(&$form_state) {
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-ancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
   );
   
   $form['#redirect'] = "community/teams/{$account->team}";
diff --git a/drupal/sites/default/boinc/modules/boincuser/boincuser.module b/drupal/sites/default/boinc/modules/boincuser/boincuser.module
index c53b4cb3f8..bc509111d2 100644
--- a/drupal/sites/default/boinc/modules/boincuser/boincuser.module
+++ b/drupal/sites/default/boinc/modules/boincuser/boincuser.module
@@ -544,7 +544,7 @@ function boincuser_form_alter(&$form, $form_state, $form_id) {
       case FLAG_FRIEND_BOTH:
       case FLAG_FRIEND_FLAGGED:
         unset($form['actions']);
-        $form['flag_friend_submit']['#value'] = bts('Remove friend', array(), NULL, 'boinc:friends-page');
+        $form['flag_friend_submit']['#value'] = bts('Remove friend', array(), NULL, 'boinc:friends-remove');
         // Add in our hack handler to fix the flag_friend module
         $final_handler = array_pop($form['#submit']);
         $form['#submit'][] = 'boincuser_fix_unfriend_form_submit';
@@ -566,7 +566,7 @@ function boincuser_form_alter(&$form, $form_state, $form_id) {
       case FLAG_FRIEND_UNFLAGGED:
       default:
         $user_links[] = array(
-          'title' => bts('Add as friend', array(), NULL, 'boinc:friends-page'),
+          'title' => bts('Add as friend', array(), NULL, 'boinc:friends-add'),
           'href' => "flag/confirm/flag/friend/{$account->uid}"
         );
       }
diff --git a/drupal/sites/default/boinc/modules/boincwork/boincwork.module b/drupal/sites/default/boinc/modules/boincwork/boincwork.module
index fae97af522..f9248ec73b 100644
--- a/drupal/sites/default/boinc/modules/boincwork/boincwork.module
+++ b/drupal/sites/default/boinc/modules/boincwork/boincwork.module
@@ -392,7 +392,7 @@ function generalprefs_page($action = null, $venue = null, $advanced = FALSE) {
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
           array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences-computing'), 'status');
+          NULL, 'boinc:account-preferences'), 'status');
     }
     
     break;
@@ -564,7 +564,7 @@ function projectprefs_page($action = null, $venue = null) {
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
           array( '@venue' => $venue, ),
-          NULL, 'boinc:boinc-preferences-project'), 'status');
+          NULL, 'boinc:account-preferences'), 'status');
     }
     
     break;