Index: ubuntu/internet/C/web-apps.xml
===================================================================
--- ubuntu/internet/C/web-apps.xml	(revision 4398)
+++ ubuntu/internet/C/web-apps.xml	(working copy)
@@ -161,7 +161,7 @@
 		
 		<sect2 id="email-alternative" status="review">
 			<title>Alternative email applications</title>
-			<para>You can also use <application>Mozilla Thunderbird</application> for email. To install it, install the <application>mozilla-thunderbird</application> package (see <ulink type="help" url="ghelp:add-applications">Add Applications</ulink>).</para>
+			<para>You can also use <application>Mozilla Thunderbird</application> for email. To install it, install the <application>thunderbird</application> package (see <ulink type="help" url="ghelp:add-applications">Add Applications</ulink>).</para>
 			<para>To start <application>Thunderbird</application>, choose &thunderbird;.</para>
 			<para>To change your preferred email client to <application>Mozilla Thunderbird</application>:</para>
 			<procedure>
@@ -172,7 +172,7 @@
 					<para>Click on the <guibutton>Mail Reader</guibutton> drop down menu, and select the <guilabel>Custom</guilabel> option.</para>
 				</step>
 				<step>
-					<para>In the <guilabel>Command</guilabel> text box, type	<userinput><command>mozilla-thunderbird %s</command></userinput>, then close the dialog.</para>
+					<para>In the <guilabel>Command</guilabel> text box, type	<userinput><command>thunderbird %s</command></userinput>, then close the dialog.</para>
 				</step>
 			</procedure>
 		</sect2>
Index: ubuntu/libs/gnome-menus-C.ent
===================================================================
--- ubuntu/libs/gnome-menus-C.ent	(revision 4398)
+++ ubuntu/libs/gnome-menus-C.ent	(working copy)
@@ -126,7 +126,7 @@
 <!ENTITY terminal '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Accessories</guimenuitem><guimenuitem>Terminal</guimenuitem></menuchoice>'>
 <!ENTITY text-editor '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Accessories</guimenuitem><guimenuitem>Text Editor</guimenuitem></menuchoice>'>
 <!ENTITY theme '<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Theme</guimenuitem></menuchoice>'>
-<!ENTITY thunderbird '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Internet</guimenuitem><guimenuitem>Thunderbird Mail Client</guimenuitem></menuchoice>'>
+<!ENTITY thunderbird '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Internet</guimenuitem><guimenuitem>Mozilla Thunderbird Mail/News</guimenuitem></menuchoice>'>
 <!ENTITY time-date '<menuchoice><guimenu>System</guimenu><guimenuitem>Administration</guimenuitem><guimenuitem>Time and Date</guimenuitem></menuchoice>'>
 <!ENTITY totem '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Sound &amp; Video</guimenuitem><guimenuitem>Movie Player</guimenuitem></menuchoice>'>
 <!ENTITY touchpad '<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Touchpad</guimenuitem></menuchoice>'>