diff --git a/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
index 4973c807dd7..d909f3b8ac6 100644
--- a/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
@@ -50,11 +50,11 @@
             }"
  %]
 
-[% tabs = [ { name => "account", description => "Account settings", 
+[% tabs = [ { name => "account", description => "Account Preferences", 
               saveable => "1" },
-            { name => "settings", description => "General Settings", 
+            { name => "settings", description => "General Preferences", 
               saveable => "1" }, 
-            { name => "email", description => "Email settings", 
+            { name => "email", description => "Email Preferences", 
               saveable => "1" },
             { name => "saved-searches", description => "Saved searches", 
               saveable => "1" },
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/settings/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/settings/edit.html.tmpl
index 97bb1ab3512..b5377a2410b 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/settings/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/settings/edit.html.tmpl
@@ -26,24 +26,24 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
-   title = "Edit Global Settings"
+   title = "Default Preferences"
  %]
 
 [% PROCESS "global/setting-descs.none.tmpl" %]
 
 <p>
-This lets you edit the global settings values.
+This lets you edit the default preferences values.
 </p>
 <p>
-The Default Value displayed for each setting will apply to all users who
+The Default Value displayed for each preference will apply to all users who
 do not choose their own value, and to anyone who is not logged in.
 </p>
 <p>
-The 'Enabled' checkbox controls whether or not this setting is available
+The 'Enabled' checkbox controls whether or not this preference is available
 to users.<br>
-If it is checked, users will see this setting on their User Preferences page,
+If it is checked, users will see this preference on their User Preferences page,
 and will be allowed to choose their own value if they desire.<br>
-If it is not checked, this setting will not appear on the User Preference
+If it is not checked, this preference will not appear on the User Preference
 page, and the Default Value will automatically apply to everyone.
 </p>
 <hr>
@@ -52,7 +52,7 @@ page, and the Default Value will automatically apply to everyone.
     <form name="adminsettingform" method="post" action="editsettings.cgi">
       <table border="1" cellpadding="4">
       <tr>
-        <th>Setting Text</th>
+        <th>Preference Text</th>
         <th>Default Value</th>
         <th>Enabled</th>
       <tr>
@@ -96,7 +96,7 @@ page, and the Default Value will automatically apply to everyone.
   
   </form>
 [% ELSE %]
-  There are no settings to edit.
+  There are no preferences to edit.
 [% END %]
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl
index 799fdde75e9..4a569ab8ebe 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/settings/updated.html.tmpl
@@ -16,12 +16,12 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
-   title = "Settings Updated"
+   title = "Preferences Updated"
  %]
 
-Your changes to the Global Settings have been saved.<br>
+Your changes to the Default Preferences have been saved.<br>
 <br>
 Return to the <a
-href="editsettings.cgi?action=load">Global Settings</a> page.
+href="editsettings.cgi?action=load">Default Preferences</a> page.
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl
index bb7dadab6c8..cd47b244c33 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl
@@ -75,7 +75,7 @@
 
         <a href="userprefs.cgi">Prefs</a>
         [% ' | <a href="editparams.cgi">Parameters</a> ' _
-           ' | <a href="editsettings.cgi">User Settings</a>' 
+           ' | <a href="editsettings.cgi">User Preferences</a>' 
                                                   IF user.groups.tweakparams %]
         [% ' | <a href="editusers.cgi">Users</a>'     IF user.groups.editusers 
                                                   || user.can_bless %]