diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 931f09a9df..ec653aec2a 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-07  Dan Winship  <danw@ximian.com>
+
+	* GNOME_Evolution_WombatLDAP.server.in.in: clean up server names
+
+	* GNOME_Evolution_WombatNOLDAP.server.in.in: Likewise
+
 2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
 
 	* GNOME_Evolution_WombatLDAP.server.in.in: Add InterfaceCheck
diff --git a/wombat/GNOME_Evolution_WombatLDAP.server.in.in b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
index 74450de9df..714763b8ac 100644
--- a/wombat/GNOME_Evolution_WombatLDAP.server.in.in
+++ b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
@@ -9,8 +9,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Addressbook Server"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook local/LDAP backend"/>
 
         <oaf_attribute name="addressbook:supported_protocols" type="stringv">
 		<item value="ldap"/>
@@ -27,8 +27,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Calendar Server; calendar factory"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar local file backend"/>
 
 </oaf_server>
 
@@ -41,8 +41,6 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string" _value="Wombat InterfaceCheck interface"/>
-
 </oaf_server>
 
 </oaf_info>
diff --git a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
index fee8a777c1..9e30130e53 100644
--- a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
+++ b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
@@ -9,8 +9,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Addressbook Server"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Addressbook local file backend"/>
 
         <oaf_attribute name="addressbook:supported_protocols" type="stringv">
 		<item value="file"/>
@@ -26,8 +26,8 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-                       _value="The Personal Calendar Server; calendar factory"/>
+	<oaf_attribute name="name" type="string"
+                       _value="Evolution Calendar local file backend"/>
 
 </oaf_server>
 
@@ -40,8 +40,6 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string" _value="Wombat InterfaceCheck interface"/>
-
 </oaf_server>
 
 </oaf_info>