Index: addressbook/gui/contact-editor/e-contact-editor-im.c
===================================================================
--- addressbook/gui/contact-editor/e-contact-editor-im.c	(revision 36405)
+++ addressbook/gui/contact-editor/e-contact-editor-im.c	(working copy)
@@ -52,7 +52,7 @@
 
 static const char *im_labels[] = {
 	N_("AOL Instant Messenger"),
-        N_("Novell Groupwise"),
+        N_("Novell GroupWise"),
 	N_("Jabber"),
 	N_("Yahoo Messenger"),
 	N_("Gadu-Gadu Messenger"),
Index: addressbook/gui/contact-editor/contact-editor.glade
===================================================================
--- addressbook/gui/contact-editor/contact-editor.glade	(revision 36405)
+++ addressbook/gui/contact-editor/contact-editor.glade	(working copy)
@@ -1422,7 +1422,7 @@
 				  <child>
 				    <widget class="GtkMenuItem" id="menuitem389">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Novell Groupwise</property>
+				      <property name="label" translatable="yes">Novell GroupWise</property>
 				      <property name="use_underline">True</property>
 				      <signal name="activate" handler="on_novell_groupwise1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
 				    </widget>
Index: plugins/groupwise-features/org-gnome-compose-send-options.xml
===================================================================
--- plugins/groupwise-features/org-gnome-compose-send-options.xml	(revision 36405)
+++ plugins/groupwise-features/org-gnome-compose-send-options.xml	(working copy)
@@ -1,7 +1,7 @@
 <Root>
   <commands>
   <cmd name="EPSOSendOptions" _label="Send Options"
-	  _tip="Add Send Options to groupwise messages"/>
+	  _tip="Add Send Options to GroupWise messages"/>
   </commands>
 
   <menu>
Index: plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
===================================================================
--- plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml	(revision 36405)
+++ plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml	(working copy)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-	<e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="Groupwise Features" 
+	<e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="GroupWise Features" 
 		location="@PLUGINDIR@/liborg-gnome-groupwise-features@SOEXT@">
 		<author name="Sivaiah Nallagatla" email="snallagatla@novell.com" />
 		<author name="Vivek Jain" email="jvivek@novell.com" />
@@ -10,7 +10,7 @@
     		<author name="Shreyas Srinivasan" email="sshreyas@novell.com"/>
 		<author name="Raghavendran R" email="raghavguru7@gmail.com"/>
 
-		<_description>A plugin for the features in Groupwise accounts.</_description>
+		<_description>A plugin for the features in GroupWise accounts.</_description>
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.folderConfig" target="folder"
 				check= "shared_folder_check"
Index: plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
===================================================================
--- plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml	(revision 36405)
+++ plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml	(working copy)
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-  <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="Groupwise Account Setup"
+  <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="GroupWise Account Setup"
     location="@PLUGINDIR@/liborg-gnome-gw-account-setup@SOEXT@" load-on-startup="true" system_plugin="true">
     <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
-    <_description>A plugin to setup groupwise calendar and contacts sources.</_description>
+    <_description>A plugin to setup GroupWise calendar and contacts sources.</_description>
     
     <hook class="org.gnome.evolution.mail.config:1.0">
       <group target="account" id="org.gnome.evolution.mail.config.accountDruid">
Index: composer/mail-composer.error.xml
===================================================================
--- composer/mail-composer.error.xml	(revision 36405)
+++ composer/mail-composer.error.xml	(working copy)
@@ -79,6 +79,6 @@
 
  <error id="send-options-support" type="error" modal="true">
   <_primary>Send options not available.</_primary>
-  <_secondary>Send options available only for Novell Groupwise and Microsoft Exchange accounts.</_secondary>
+  <_secondary>Send options available only for Novell GroupWise and Microsoft Exchange accounts.</_secondary>
  </error>
 </error-list>
