diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index c0ccf836c45..106236175ef 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -862,7 +862,7 @@ while (my @row = $buglist_sth->fetchrow_array()) {
         $bug->{'opendate'} = DiffDate($bug->{'opendate'});
     }
 
-    # Record the owner, product, and status in the big hashes of those things.
+    # Record the assignee, product, and status in the big hashes of those things.
     $bugowners->{$bug->{'assigned_to'}} = 1 if $bug->{'assigned_to'};
     $bugproducts->{$bug->{'product'}} = 1 if $bug->{'product'};
     $bugstatuses->{$bug->{'bug_status'}} = 1 if $bug->{'bug_status'};
diff --git a/mozilla/webtools/bugzilla/checksetup.pl b/mozilla/webtools/bugzilla/checksetup.pl
index 369551131e0..57981a63943 100755
--- a/mozilla/webtools/bugzilla/checksetup.pl
+++ b/mozilla/webtools/bugzilla/checksetup.pl
@@ -2231,7 +2231,7 @@ if ($comp_init_owner && $comp_init_owner->{TYPE} eq 'TINYTEXT') {
         my $initialownerid = $s2->fetchrow_array();
 
         unless (defined $initialownerid) {
-            print "Warning: You have an invalid initial owner '$initialowner'\n" .
+            print "Warning: You have an invalid default assignee '$initialowner'\n" .
               "in component '$value' of program '$program'. !\n";
             $initialownerid = 0;
         }
@@ -2271,7 +2271,7 @@ if ($comp_init_qa && $comp_init_qa->{TYPE} eq 'TINYTEXT') {
 
         unless (defined $initialqacontactid) {
             if ($initialqacontact ne '') {
-                print "Warning: You have an invalid initial QA contact $initialqacontact' in program '$program', component '$value'!\n";
+                print "Warning: You have an invalid default QA contact $initialqacontact' in program '$program', component '$value'!\n";
             }
             $initialqacontactid = 0;
         }
@@ -3528,7 +3528,7 @@ if (!$series_exists) {
     }
 }
 
-AddFDef("owner_idle_time", "Time Since Owner Touched", 0);
+AddFDef("owner_idle_time", "Time Since Assignee Touched", 0);
 
 # 2004-04-12 - Keep regexp-based group permissions up-to-date - Bug 240325
 if ($dbh->bz_column_info("user_group_map", "isderived")) {
diff --git a/mozilla/webtools/bugzilla/contrib/bugmail_help.html b/mozilla/webtools/bugzilla/contrib/bugmail_help.html
index 00b0f515373..a2f89f26040 100644
--- a/mozilla/webtools/bugzilla/contrib/bugmail_help.html
+++ b/mozilla/webtools/bugzilla/contrib/bugmail_help.html
@@ -112,8 +112,8 @@ hopefully valid value.
 	<TR>
 	        <TD>@assigned_to</TD>
 	        <TD>The one to whom the bug is assigned to</TD>
-	        <TD>no. <br>There is an initial owner for every product/version/component.
-		He owns the bug by default. The initial owner can only be found if 
+	        <TD>no. <br>There is a default assignee for every product/version/component.
+		He owns the bug by default. The default assignee can only be found if 
 		product, version and component are valid.</TD>
 	</TR>
 	<TR>
diff --git a/mozilla/webtools/bugzilla/defparams.pl b/mozilla/webtools/bugzilla/defparams.pl
index 8534615ab46..47edf8a1a71 100644
--- a/mozilla/webtools/bugzilla/defparams.pl
+++ b/mozilla/webtools/bugzilla/defparams.pl
@@ -811,7 +811,7 @@ Generally, this means one of three things:
 (2) You decide the bug doesn\'t belong to you, and you reassign it to someone
     else.  (Hint: if you don\'t know who to reassign it to, make sure that
     the Component field seems reasonable, and then use the "Reassign bug to
-    owner of selected component" option.)
+    default assignee of selected component" option.)
 (3) You decide the bug belongs to you, but you can\'t solve it this moment.
     Just use the "Accept bug" command.
 
diff --git a/mozilla/webtools/bugzilla/docs/xml/administration.xml b/mozilla/webtools/bugzilla/docs/xml/administration.xml
index 36dcc14e9d2..2c4bbad92b3 100644
--- a/mozilla/webtools/bugzilla/docs/xml/administration.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/administration.xml
@@ -193,7 +193,7 @@
         <listitem>
           <para>
             This allows you to define an email address for each component, 
-            in addition to that of the default owner, who will be sent
+            in addition to that of the default assignee, who will be sent
             carbon copies of incoming bugs.
           </para>
         </listitem>
@@ -580,12 +580,12 @@
     company.</para>
 
     <para>
-    Each component has a owner and (if you turned it on in the parameters),
-    a QA Contact. The owner should be the primary person who fixes bugs in
+    Each component has a default assignee and (if you turned it on in the parameters),
+    a QA Contact. The default assignee should be the primary person who fixes bugs in
     that component. The QA Contact should be the person who will ensure
-    these bugs are completely fixed. The Owner, QA Contact, and Reporter
+    these bugs are completely fixed. The Assignee, QA Contact, and Reporter
     will get email when new bugs are created in this Component and when
-    these bugs change. Default Owner and Default QA Contact fields only
+    these bugs change. Default Assignee and Default QA Contact fields only
     dictate the 
     <emphasis>default assignments</emphasis>; 
     these can be changed on bug submission, or at any later point in
@@ -605,9 +605,9 @@
 
       <listitem>
         <para>Fill out the "Component" field, a short "Description", 
-        the "Initial Owner" and "Initial QA Contact" (if enabled.) 
+        the "Default Assignee" and "Default QA Contact" (if enabled.) 
         The Component and Description fields may contain HTML; 
-        the "Initial Owner" field must be a login name
+        the "Default Assignee" field must be a login name
         already existing in the database. 
         </para>
       </listitem>
@@ -874,7 +874,7 @@
        </para>
        <para>
          Only users with the ability to edit the bug may 
-         set flags on bugs. This includes the owner, reporter, and 
+         set flags on bugs. This includes the assignee, reporter, and 
          any user with the <computeroutput>editbugs</computeroutput> 
          permission.
        </para>
diff --git a/mozilla/webtools/bugzilla/docs/xml/customization.xml b/mozilla/webtools/bugzilla/docs/xml/customization.xml
index 14ac3f86a60..1eef1667373 100644
--- a/mozilla/webtools/bugzilla/docs/xml/customization.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/customization.xml
@@ -665,7 +665,7 @@
       Certain marked sections should not be changed - these are
       the <quote>plumbing</quote> which makes the rest of the function work.
       In between those sections, you'll find snippets of code like:
-      <programlisting>    # Allow the owner to change anything.
+      <programlisting>    # Allow the assignee to change anything.
     if ($ownerid eq $whoid) {
         return 1;
     }</programlisting>
diff --git a/mozilla/webtools/bugzilla/docs/xml/using.xml b/mozilla/webtools/bugzilla/docs/xml/using.xml
index 45d2574dace..4e63bac86b4 100644
--- a/mozilla/webtools/bugzilla/docs/xml/using.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/using.xml
@@ -487,12 +487,12 @@
 
       If your account is sufficiently empowered, you can make the same
       change to all the bugs in the list - for example, changing their
-      owner.</member>
+      assignee.</member>
 
       <member>
-      <emphasis>Send mail to bug owners:</emphasis>
+      <emphasis>Send mail to bug assignees:</emphasis>
 
-      Sends mail to the owners of all bugs on the list.</member>
+      Sends mail to the assignees of all bugs on the list.</member>
 
       <member>
       <emphasis>Edit Search:</emphasis>
diff --git a/mozilla/webtools/bugzilla/editusers.cgi b/mozilla/webtools/bugzilla/editusers.cgi
index 74ad463fdfc..371e2a6121f 100755
--- a/mozilla/webtools/bugzilla/editusers.cgi
+++ b/mozilla/webtools/bugzilla/editusers.cgi
@@ -404,7 +404,7 @@ if ($action eq 'search') {
     $vars->{'otheruser'}      = $otherUser;
     $vars->{'editcomponents'} = UserInGroup('editcomponents');
 
-    # If the user is initial owner or initial QA contact of a component,
+    # If the user is default assignee or default QA contact of a component,
     # then no deletion is possible.
     $vars->{'product_responsibilities'} = productResponsibilities($otherUserID);
 
diff --git a/mozilla/webtools/bugzilla/editwhines.cgi b/mozilla/webtools/bugzilla/editwhines.cgi
index e65a585d02f..9c27bcd0ad0 100755
--- a/mozilla/webtools/bugzilla/editwhines.cgi
+++ b/mozilla/webtools/bugzilla/editwhines.cgi
@@ -203,7 +203,7 @@ if ($cgi->param('update')) {
 
             for my $sid (@scheduleids) {
                 if ($cgi->param("remove_schedule_$sid")) {
-                    # having the owner id in here is a security failsafe
+                    # having the assignee id in here is a security failsafe
                     $sth = $dbh->prepare("SELECT whine_schedules.id " .
                                          "FROM whine_schedules " .
                                          "LEFT JOIN whine_events " .
diff --git a/mozilla/webtools/bugzilla/importxml.pl b/mozilla/webtools/bugzilla/importxml.pl
index 8cf9a6179c2..b8e0174128a 100755
--- a/mozilla/webtools/bugzilla/importxml.pl
+++ b/mozilla/webtools/bugzilla/importxml.pl
@@ -531,13 +531,13 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
     push (@values, SqlQuote($exporterid) );
     push (@query, "assigned_to");
     $changed_owner = 1;
-    $err .= "The original owner of this bug does not have\n";
+    $err .= "The original assignee of this bug does not have\n";
     $err .= "   an account here. Reassigning to the person who moved\n";
     $err .= "   it here, $exporter.\n";
     if ( $bug_fields{'assigned_to'} ) {
-      $err .= "   Previous owner was $bug_fields{'assigned_to'}.\n";
+      $err .= "   Previous assignee was $bug_fields{'assigned_to'}.\n";
     } else {
-      $err .= "   Previous owner is unknown.\n";
+      $err .= "   Previous assignee is unknown.\n";
     }
   }
 
@@ -550,13 +550,13 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
     $err .= "Unknown resolution \"$bug_fields{'resolution'}\".\n";
   }
 
-  # if the bug's owner changed, mark the bug NEW, unless a valid 
+  # if the bug's assignee changed, mark the bug NEW, unless a valid 
   # resolution is set, which indicates that the bug should be closed.
   #
   if ( ($changed_owner) && (!$resolution[0]) ) {
     push (@values, SqlQuote("NEW"));
     push (@query, "bug_status");
-    $err .= "Bug assigned to new owner, setting status to \"NEW\".\n";
+    $err .= "Bug reassigned, setting status to \"NEW\".\n";
     $err .= "   Previous status was \"";
     $err .= (defined $bug_fields{'bug_status'})?
                      $bug_fields{'bug_status'}:"unknown";
diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
index 34444dfcfc9..d974748633e 100755
--- a/mozilla/webtools/bugzilla/process_bug.cgi
+++ b/mozilla/webtools/bugzilla/process_bug.cgi
@@ -447,8 +447,8 @@ sub CheckCanChangeField {
     # variable which gets passed to the error template.
     #
     # $PrivilegesRequired = 0 : no privileges required;
-    # $PrivilegesRequired = 1 : the reporter, owner or an empowered user;
-    # $PrivilegesRequired = 2 : the owner or an empowered user;
+    # $PrivilegesRequired = 1 : the reporter, assignee or an empowered user;
+    # $PrivilegesRequired = 2 : the assignee or an empowered user;
     # $PrivilegesRequired = 3 : an empowered user.
 
     # Allow anyone with "editbugs" privs to change anything.
@@ -468,7 +468,7 @@ sub CheckCanChangeField {
 
     # START DO_NOT_CHANGE
     # $reporterid, $ownerid and $qacontactid are caches of the results of
-    # the call to find out the owner, reporter and qacontact of the current bug.
+    # the call to find out the assignee, reporter and qacontact of the current bug.
     if ($lastbugid != $bugid) {
         SendSQL("SELECT reporter, assigned_to, qa_contact FROM bugs
                  WHERE bug_id = $bugid");
@@ -477,7 +477,7 @@ sub CheckCanChangeField {
     }    
     # END DO_NOT_CHANGE
 
-    # Allow the owner to change anything else.
+    # Allow the assignee to change anything else.
     if ($ownerid == $whoid) {
         return 1;
     }
@@ -494,7 +494,7 @@ sub CheckCanChangeField {
     # The reporter may not:
     # - reassign bugs, unless the bugs are assigned to him;
     #   in that case we will have already returned 1 above
-    #   when checking for the owner of the bug.
+    #   when checking for the assignee of the bug.
     if ($field eq "assigned_to") {
         $PrivilegesRequired = 2;
         return 0;
@@ -1770,7 +1770,7 @@ foreach my $id (@idlist) {
             }
 
             # save off the old value for passing to Bugzilla::BugMail so
-            # the old owner can be notified
+            # the old assignee can be notified
             #
             if ($col eq 'assigned_to') {
                 $old = ($old) ? DBID_to_name($old) : "";
diff --git a/mozilla/webtools/bugzilla/quicksearchhack.html b/mozilla/webtools/bugzilla/quicksearchhack.html
index e4d387a818e..d514082f839 100644
--- a/mozilla/webtools/bugzilla/quicksearchhack.html
+++ b/mozilla/webtools/bugzilla/quicksearchhack.html
@@ -47,8 +47,8 @@ The generic format for a ``word'' is
 &nbsp;<tt>field1,...,fieldN:value1,...,valueM</tt>&nbsp;.
 A bug qualifies if at least one of the values occurs as a substring in 
 at least one of the fields. 
-For example, &nbsp;<tt>owner,reporter,qa:ibm,sun</tt>&nbsp;
-will give you bugs where the owner, reporter, or qa contact 
+For example, &nbsp;<tt>assignee,reporter,qa:ibm,sun</tt>&nbsp;
+will give you bugs where the assignee, reporter, or qa contact 
 has an email address that contains 
 &nbsp;<tt>ibm</tt>&nbsp; or &nbsp;<tt>sun</tt>&nbsp;.
 If only &nbsp;<tt>value1,...,valueM</tt>&nbsp; is given,
@@ -123,7 +123,7 @@ for access speed):
 
 <tr>
   <td>&nbsp;</td>
-  <td><b>@</b><i>owner</i></td>
+  <td><b>@</b><i>assignee</i></td>
   <td><tt>assignedto</tt></td>
   <td><tt>assignee, owner</tt></td>
   <td><a href="page.cgi?id=fields.html#assigned_to">Assignee</a> <i>("assigned_to")</i></td>
@@ -317,8 +317,8 @@ Examples for some useful abbreviations:
   <td><i>high-priority bugs</i></td>
 </tr>
 <tr>
-  <td><b>@</b><i>owner</i></td>
-  <td><b>assignedto:</b><i>owner</i></td>
+  <td><b>@</b><i>assignee</i></td>
+  <td><b>assignedto:</b><i>assignee</i></td>
 </tr>
 <!--
 <tr>
diff --git a/mozilla/webtools/bugzilla/template/en/default/account/prefs/email.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/prefs/email.html.tmpl
index bd265ca9fca..90cbc7e256c 100644
--- a/mozilla/webtools/bugzilla/template/en/default/account/prefs/email.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/account/prefs/email.html.tmpl
@@ -28,7 +28,7 @@
   #               Array of users watching this user's account.
   # excludeself:  boolean.
   #               True if user is not receiving self-generated mail.
-  # <rolename>:   Multiple hashes, one for each rolename (e.g. owner; see
+  # <rolename>:   Multiple hashes, one for each rolename (e.g. assignee; see
   #               below), keyed by reasonname (e.g. comments; again, see
   #               below). The value is a boolean - true if the user is
   #               receiving mail for that reason when in that role.
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/components/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/components/confirm-delete.html.tmpl
index e2c77cca2b1..5e108e7a88d 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/components/confirm-delete.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/components/confirm-delete.html.tmpl
@@ -26,9 +26,9 @@
   #
   # bug_count: number; The number of bugs belonging to the component
   #
-  # initialowner: string; initial owner, may be empty
+  # initialowner: string; default assignee, may be empty
   #
-  # initialqacontact: string; if system parameter is set to use the initial
+  # initialqacontact: string; if system parameter is set to use the default
   #                           qa contact field, then this will be it, 
   #                           may be empty
   #
@@ -63,13 +63,13 @@
   <td valign="top">[% description FILTER html %]</td>
 </tr>
 <tr>
-  <td valign="top">Initial owner:</td>
+  <td valign="top">Default assignee:</td>
   <td valign="top">[% initialowner FILTER html %]</td>
   
 [% IF Param('useqacontact') %]
 </tr>
 <tr>
-  <td valign="top">Initial QA contact:</td>
+  <td valign="top">Default QA contact:</td>
   <td valign="top">[% initialqacontact FILTER html %]</td>
 [% END %]
   
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/components/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/components/create.html.tmpl
index c8838eea6ed..769b61ca15c 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/components/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/components/create.html.tmpl
@@ -45,7 +45,7 @@
       </td>
     </tr>
     <tr>
-      <th align="right"><label for="initialowner">Initial Owner:</label></th>
+      <th align="right"><label for="initialowner">Default Assignee:</label></th>
       <td>
         [% INCLUDE global/userselect.html.tmpl
            name => "initialowner"
@@ -59,7 +59,7 @@
 [% IF Param('useqacontact') %]
     <tr>
       <th align="right">
-        <label for="initialqacontact">Initial QA Contact:</label></th>
+        <label for="initialqacontact">Default QA Contact:</label></th>
       <td>
         [% INCLUDE global/userselect.html.tmpl
            name => "initialqacontact"
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/components/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/components/edit.html.tmpl
index 580008008e9..64959ad9629 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/components/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/components/edit.html.tmpl
@@ -24,9 +24,9 @@
   #
   # description: string; Component description, may be empty
   #
-  # initialowner: string; initial owner, may be empty
+  # initialowner: string; default assignee, may be empty
   #
-  # initialqacontact: string; initial qa contact, may be empty
+  # initialqacontact: string; default qa contact, may be empty
   #
   # product: string; The product the component belongs to
   #
@@ -55,7 +55,7 @@
       </td>
     </tr>
     <tr>
-      <td valign="top"><label for="initialowner">Initial owner:</label></td>
+      <td valign="top"><label for="initialowner">Default Assignee:</label></td>
       <td>
         [% INCLUDE global/userselect.html.tmpl
            name => "initialowner"
@@ -69,7 +69,7 @@
 [% IF Param('useqacontact') %]
     </tr>
     <tr>
-      <td valign="top"><label for="initialqacontact">Initial QA contact:</label></td>
+      <td valign="top"><label for="initialqacontact">Default QA contact:</label></td>
       <td>
         [% INCLUDE global/userselect.html.tmpl
            name => "initialqacontact"
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/components/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/components/list.html.tmpl
index 027e1e02825..c321219fc7b 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/components/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/components/list.html.tmpl
@@ -23,7 +23,7 @@
   # components: array of hashes having the properties:
   #   - name: string; The name of the component.
   #   - description: string; The description of the component.
-  #   - initialowner: string; The initial owner of the component.
+  #   - initialowner: string; The default assignee of the component.
   #   - initialqacontact: string; The qa_contact of the component.
   #   - bug_count: number; The number of bugs in the component
   #                        (if showbugcounts defined).
@@ -65,7 +65,7 @@
      },
      { 
        name => "initialowner"
-       heading => "Initial owner"
+       heading => "Default Assignee"
      },
    ]
 %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/components/updated.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/components/updated.html.tmpl
index 2382814df96..b4c4fea3cf2 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/components/updated.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/components/updated.html.tmpl
@@ -30,9 +30,9 @@
   #
   # description & updated_description: the component description
   #
-  # initialowner & updated_initialowner: the initial owner
+  # initialowner & updated_initialowner: the default assignee
   #
-  # initialqacontact & updated_initialqacontact: the initial qa contact
+  # initialqacontact & updated_initialqacontact: the default qa contact
   #
   # product: string; the name of the product the component belongs to
   #%]
@@ -54,15 +54,15 @@
 [% END %]
 
 [% IF updated_initialowner %]
-  <p>Updated Initial Owner to: '[% initialowner FILTER html %]'.</p>
+  <p>Updated Default Assignee to: '[% initialowner FILTER html %]'.</p>
 [% END %]
 
 [% IF updated_initialqacontact %]
   <p>
   [% IF initialqacontact %]
-    Updated Initial QA Contact to '[% initialqacontact FILTER html %]'.
+    Updated Default QA Contact to '[% initialqacontact FILTER html %]'.
   [% ELSE %]
-    Removed initial QA Contact.
+    Removed Default QA Contact.
   [% END %]
   </p>
 [% END %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl
index 91b9395b805..4e5fd9c10af 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -24,8 +24,8 @@
   # product_responsibilities: list of hashes, one entry per Bugzilla component.
   #                           productname:      Name of the product.
   #                           componentname:    Name of the component.
-  #                           initialowner:     User ID of initial owner.
-  #                           initialqacontact: User ID of initial QA contact.
+  #                           initialowner:     User ID of default assignee.
+  #                           initialqacontact: User ID of default QA contact.
   # bugs:                     number of bugs the viewed user has a role in
   # bug_activity:             number of bugs the viewed user has activity
   #                           entries on
@@ -57,8 +57,8 @@
 %]
 
 [% responsibilityterms = {
-  'initialowner'     => 'Initial Owner',
-  'initialqacontact' => 'Initial QA Contact'
+  'initialowner'     => 'Default Assignee',
+  'initialqacontact' => 'Default QA Contact'
   }
 %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
index cf354ad05f1..11a29a22397 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
@@ -223,7 +223,7 @@ function set_assign_to() {
          size => 32
          emptyok => 1
        %]
-      <noscript>(Leave blank to assign to default component owner)</noscript>
+      <noscript>(Leave blank to assign to component's default assignee)</noscript>
     </td>
   </tr>
   
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/knob.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/knob.html.tmpl
index 15bbcbacd1b..2ade9a37379 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/knob.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/knob.html.tmpl
@@ -118,7 +118,7 @@
 
         <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent">
         <label for="knob-reassign-cmp">
-          Reassign [% terms.bug %] to owner
+          Reassign [% terms.bug %] to default assignee
           [% " and QA contact" IF Param('useqacontact') %]
           of selected component
         </label>
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
index d01af23750e..f19ecbe3332 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
@@ -280,17 +280,17 @@
     '[% name FILTER html %]' is too long ([% name.size %] characters).
 
   [% ELSIF error == "component_need_initialowner" %]
-    [% title = "Component Requires Initial Owner" %]
-    You must enter an initial owner for component '[% name FILTER html %]'.
+    [% title = "Component Requires Default Assignee" %]
+    You must enter a default assignee for component '[% name FILTER html %]'.
 
   [% ELSIF error == "component_need_valid_initialowner" %]
-    [% title = "Component Requires A Valid Initial Owner" %]
-    You must use an existing [% terms.Bugzilla %] account as initial owner for
+    [% title = "Component Requires A Valid Default Assignee" %]
+    You must use an existing [% terms.Bugzilla %] account as the default assignee for
     component '[% name FILTER html %]'.
 
   [% ELSIF error == "component_need_valid_initialqacontact" %]
-    [% title = "Component Requires A Valid Initial QA Contact" %]
-    You must use an existing [% terms.Bugzilla %] account as initial QA contact for
+    [% title = "Component Requires A Valid Default QA Contact" %]
+    You must use an existing [% terms.Bugzilla %] account as default QA contact for
     component '[% name FILTER html %]'.
      
   [% ELSIF error == "product_not_specified" %]
@@ -516,7 +516,7 @@
     from <em>[% oldvalue FILTER html %]</em> to 
     <em>[% newvalue FILTER html %]</em>, but only
     [% IF privs < 3 %]
-      the owner
+      the assignee
       [% IF privs < 2 %] or reporter [% END %]
       of the [% terms.bug %], or
     [% END %]
@@ -797,12 +797,12 @@
                 
   [% ELSIF error == "need_component" %]
     [% title = "Component Required" %]
-    You must specify a component to help determine the new owner of these 
+    You must specify a component to help determine the new assignee of these 
     [% terms.bugs %].
 
   [% ELSIF error == "need_product" %]
     [% title = "Product Required" %]
-    You must specify a product to help determine the new owner of these [% terms.bugs %].
+    You must specify a product to help determine the new assignee of these [% terms.bugs %].
 
   [% ELSIF error == "need_quip" %]
     [% title = "Quip Required" %]
@@ -958,7 +958,7 @@
   [% ELSIF error == "reassign_to_empty" %]
     [% title = "Illegal Reassignment" %]
     To reassign [% terms.abug %], you must provide an address for
-    the new owner. If you did not intentionally clear out the 
+    the new assignee. If you did not intentionally clear out the 
     "Reassign [% terms.bug %] to" field, [% Param("browserbugmessage") %]
 
   [% ELSIF error == "report_access_denied" %]
@@ -1088,8 +1088,8 @@
 
   [% ELSIF error == "user_has_responsibility" %]
     [% title = "Can't Delete User Account" %]
-    The user you want to delete is set up for roles as initial [% terms.bug %]
-    owner or QA contact for at least one component.
+    The user you want to delete is set up for roles as default [% terms.bug %]
+    assignee or QA contact for at least one component.
     For this reason, you cannot delete the account at this time.
 
   [% ELSIF error == "user_login_required" %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
index 64131e973e6..1bee75f5483 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
@@ -317,7 +317,7 @@
        name="knob"
        value="reassignbycomponent">
 <label for="knob-reassignbycomponent">
-  Reassign [% terms.bugs %] to owner of selected component
+  Reassign [% terms.bugs %] to default assignee of selected component
 </label><br>
 
 <input type="submit" value="Commit">
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
index 0d3a38d5e39..9961bb1b34b 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
@@ -170,7 +170,7 @@
 
         [% IF bugowners %]
           <a href="mailto:
-            [% bugowners FILTER html %]">Send&nbsp;Mail&nbsp;to&nbsp;[% terms.Bug %]&nbsp;Owners</a> |
+            [% bugowners FILTER html %]">Send&nbsp;Mail&nbsp;to&nbsp;[% terms.Bug %]&nbsp;Assignees</a> |
         [% END %]
 
         [%# Links to more things users can do with this bug list. %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/reports/components.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/reports/components.html.tmpl
index ae969171bf7..3578a86e418 100644
--- a/mozilla/webtools/bugzilla/template/en/default/reports/components.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/reports/components.html.tmpl
@@ -24,8 +24,8 @@
   # components: List of hashes. May be empty. Each hash has four members:
   #   name: string. Name of the component.
   #   description: string. Description of the component. May contain HTML.
-  #   initialowner: string. Component's initial owner.
-  #   initialqacontact: string. Component's initial QA contact.
+  #   initialowner: string. Component's default assignee.
+  #   initialqacontact: string. Component's default QA contact.
   #%]
   
 [% filtered_product = product FILTER html %]
@@ -45,7 +45,7 @@
   <table>
     <tr>
       <th align="left">Component</th>
-      <th align="left">Default Owner</th>
+      <th align="left">Default Assignee</th>
       [% IF Param("useqacontact") %]
         <th align="left">Default QA Contact</th>
       [% END %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl
index cc33c4f9628..a8905cc0973 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl
@@ -441,7 +441,7 @@ function doOnSelectProduct(selectmode) {
              id="emailassigned_to[% n %]" value="1"
              [% " checked" IF default.emailassigned_to.$n %]>
       <label for="emailassigned_to[% n %]">
-        the [% terms.bug %] owner
+        the [% terms.bug %] assignee
       </label>
     </td>
   </tr>