A very, long, very tedious IDL API rename and re-scoping;

this script + some grunt approximates the work:

    s/Evolution_MessageList/GNOME_Evolution_MessageList/g;
    s/GNOME_Evolution_MessageList_select_message/GNOME_Evolution_MessageList_selectMessage/g;
    s/GNOME_Evolution_MessageList_open_message/GNOME_Evolution_MessageList_openMessage/g;

    s/Evolution_Folder([ \t])/GNOME_Evolution_Folder$1/g;
    s/Evolution_FolderTypeList/GNOME_Evolution_FolderTypeList/g;
    s/Evolution_FolderBrowser/GNOME_Evolution_FolderBrowser/g;
    s/GNOME_Evolution_FolderBrowser_get_message_list/GNOME_Evolution_FolderBrowser_getMessageList/g;

    s/Evolution_LocalStorage/GNOME_Evolution_LocalStorage/g;
    s/GNOME_Evolution_LocalStorage_update_folder/GNOME_Evolution_LocalStorage_updateFolder/g;

    s/Evolution_ShellView/GNOME_Evolution_ShellView/g;
    s/GNOME_Evolution_ShellView_set_message/GNOME_Evolution_ShellView_setMessage/g;
    s/GNOME_Evolution_ShellView_unset_message/GNOME_Evolution_ShellView_unsetMessage/g;
    s/GNOME_Evolution_ShellView_change_current_view/GNOME_Evolution_ShellView_changeCurrentView/g;

    s/Evolution_StorageSetViewListener/GNOME_Evolution_StorageSetViewListener/g;
    s/GNOME_Evolution_StorageSetViewListener_folder_selected/GNOME_Evolution_StorageSetViewListener_notifyFolderSelected/g;
    s/GNOME_Evolution_StorageSetViewListener_storage_selected/GNOME_Evolution_StorageSetViewListener_notifyStorageSelected/g;

    s/Evolution_StorageSetView/GNOME_Evolution_StorageSetView/g;
    s/GNOME_Evolution_StorageSetView_add_listener/GNOME_Evolution_StorageSetView_addListener/g;
    s/GNOME_Evolution_StorageSetView_remove_listener/GNOME_Evolution_StorageSetView_removeListener/g;

    s/Evolution_Shell/GNOME_Evolution_Shell/g;
    s/GNOME_Evolution_Shell_get_component_for_type/GNOME_Evolution_Shell_getComponentByType/g;
    s/GNOME_Evolution_Shell_user_select_folder/GNOME_Evolution_Shell_selectUserFolder/g;
    s/GNOME_Evolution_Shell_get_local_storage/GNOME_Evolution_Shell_getLocalStorage/g;
    s/GNOME_Evolution_Shell_create_storage_set_view/GNOME_Evolution_Shell_createStorageSetView/g;

    s/Evolution_FolderSelectionListener/GNOME_Evolution_FolderSelectionListener/g;
    s/GNOME_Evolution_FolderSelectionListener_selected/GNOME_Evolution_FolderSelectionListener_notifySelected/g;
    s/GNOME_Evolution_FolderSelectionListener_cancel/GNOME_Evolution_FolderSelectionListener_notifyCanceled/g;

    s/Evolution_Storage/GNOME_Evolution_Storage/g;
    s/GNOME_Evolution_Storage_add_listener/GNOME_Evolution_Storage_addListener/g;
    s/GNOME_Evolution_Storage_remove_listener/GNOME_Evolution_Storage_removeListener/g;

    s/GNOME_Evolution_StorageListener_destroyed/GNOME_Evolution_StorageListener_notifyDestroyed/g;
    s/GNOME_Evolution_StorageListener_new_folder/GNOME_Evolution_StorageListener_notifyFolderCreated/g;
    s/GNOME_Evolution_StorageListener_update_folder/GNOME_Evolution_StorageListener_notifyFolderUpdated/g;
    s/GNOME_Evolution_StorageListener_removed_folder/GNOME_Evolution_StorageListener_notifyFolderRemoved/g;

    s/GNOME_Evolution_StorageRegistry_register_storage/GNOME_Evolution_StorageRegistry_addStorage/g;
    s/GNOME_Evolution_StorageRegistry_unregister_storage/GNOME_Evolution_StorageRegistry_removeStorageByName/g;

    s/Evolution_ShellComponent/GNOME_Evolution_ShellComponent/g;
    s/GNOME_Evolution_ShellComponent_set_owner/GNOME_Evolution_ShellComponent_setOwner/g;
    s/GNOME_Evolution_ShellComponent_unset_owner/GNOME_Evolution_ShellComponent_unsetOwner/g;
    s/GNOME_Evolution_ShellComponent_create_view/GNOME_Evolution_ShellComponent_createView/g;
    s/GNOME_Evolution_ShellComponent_async_create_folder/GNOME_Evolution_ShellComponent_addFolderAsync/g;
    s/GNOME_Evolution_ShellComponent_async_remove_folder/GNOME_Evolution_ShellComponent_removeFolderAsync/g;
    s/GNOME_Evolution_ShellComponent_populate_folder_context_menu/GNOME_Evolution_ShellComponent_populateFolderContextMenu/g;

    s/GNOME_Evolution_ShellComponentListener_report_result/GNOME_Evolution_ShellComponentListener_notifyResult/g;

    s/Evolution_Session/GNOME_Evolution_Session/g;
    s/GNOME_Evolution_Session_save_configuration/GNOME_Evolution_Session_saveConfiguration/g;
    s/GNOME_Evolution_Session_load_configuration/GNOME_Evolution_Session_loadConfiguration/g;

    s/Evolution_Calendar_Cal/GNOME_Evolution_Calendar_Cal/g;
    s/GNOME_Evolution_Calendar_Cal_get_n_objects/GNOME_Evolution_Calendar_Cal_countObjects/g;
    s/GNOME_Evolution_Calendar_Cal_get_object/GNOME_Evolution_Calendar_Cal_getObject/g;
    s/GNOME_Evolution_Calendar_Cal_get_uids/GNOME_Evolution_Calendar_Cal_getUIds/g;
    s/GNOME_Evolution_Calendar_Cal_get_changed_uids/GNOME_Evolution_Calendar_Cal_getChangedUIds/g;
    s/GNOME_Evolution_Calendar_Cal_get_objects_in_range/GNOME_Evolution_Calendar_Cal_getObjectsInRange/g;
    s/GNOME_Evolution_Calendar_Cal_get_alarms_in_range/GNOME_Evolution_Calendar_Cal_getAlarmsInRange/g;
    s/GNOME_Evolution_Calendar_Cal_get_alarms_for_object/GNOME_Evolution_Calendar_Cal_getAlarmsForObject/g;
    s/GNOME_Evolution_Calendar_Cal_update_object/GNOME_Evolution_Calendar_Cal_updateObject/g;
    s/GNOME_Evolution_Calendar_Cal_remove_object/GNOME_Evolution_Calendar_Cal_removeObject/g;

    s/Evolution_Calendar_Listener/GNOME_Evolution_Calendar_Listener/g;
    s/GNOME_Evolution_Calendar_Listener_cal_loaded/GNOME_Evolution_Calendar_Listener_notifyCalLoaded/g;
    s/GNOME_Evolution_Calendar_Listener_obj_updated/GNOME_Evolution_Calendar_Listener_notifyObjUpdated/g;
    s/GNOME_Evolution_Calendar_Listener_obj_removed/GNOME_Evolution_Calendar_Listener_notifyObjRemoved/g;

    s/Evolution_Calendar_CalFactory/GNOME_Evolution_Calendar_CalFactory/g;
    s/GNOME_Evolution_Calendar_CalFactory_load/GNOME_Evolution_Calendar_CalFactory_load/g;
    s/GNOME_Evolution_Calendar_CalFactory_create/GNOME_Evolution_Calendar_CalFactory_create/g;

    s/Evolution_Composer/GNOME_Evolution_Composer/g;
    s/GNOME_Evolution_Composer_set_headers/GNOME_Evolution_Composer_setHeaders/g;
    s/GNOME_Evolution_Composer_set_body_text/GNOME_Evolution_Composer_setBodyText/g;
    s/GNOME_Evolution_Composer_attach_MIME/GNOME_Evolution_Composer_attachMIME/g;
    s/GNOME_Evolution_Composer_attach_data/GNOME_Evolution_Composer_attachData/g;
    s/GNOME_Evolution_Composer_show/GNOME_Evolution_Composer_show/g;

    s/Evolution_Addressbook_SelectNames/GNOME_Evolution_Addressbook_SelectNames/g;
    s/GNOME_Evolution_Addressbook_SelectNames_add_section/GNOME_Evolution_Addressbook_SelectNames_addSection/g;
    s/GNOME_Evolution_Addressbook_SelectNames_get_entry_for_section/GNOME_Evolution_Addressbook_SelectNames_getEntryBySection/g;
    s/GNOME_Evolution_Addressbook_SelectNames_activate_dialog/GNOME_Evolution_Addressbook_SelectNames_activateDialog/g;

    s/Evolution_CardCursor/GNOME_Evolution_Addressbook_CardCursor/g;
    s/GNOME_Evolution_Addressbook_CardCursor_get_length/GNOME_Evolution_Addressbook_CardCursor_getLength/g;
    s/GNOME_Evolution_Addressbook_CardCursor_get_nth/GNOME_Evolution_Addressbook_CardCursor_getNth/g;

    s/Evolution_BookViewListener/GNOME_Evolution_Addressbook_BookViewListener/g;
    s/GNOME_Evolution_Addressbook_BookViewListener_signal_card_added/GNOME_Evolution_Addressbook_BookViewListener_notifyCardAdded/g;
    s/GNOME_Evolution_Addressbook_BookViewListener_signal_card_removed/GNOME_Evolution_Addressbook_BookViewListener_notifyCardRemoved/g;
    s/GNOME_Evolution_Addressbook_BookViewListener_signal_card_changed/GNOME_Evolution_Addressbook_BookViewListener_notifyCardChanged/g;
    s/GNOME_Evolution_Addressbook_BookViewListener_signal_sequence_complete/GNOME_Evolution_Addressbook_BookViewListener_notifySequenceComplete/g;
    s/GNOME_Evolution_Addressbook_BookViewListener_signal_status_message/GNOME_Evolution_Addressbook_BookViewListener_notifyStatusMessage/g;

    s/Evolution_BookView/GNOME_Evolution_Addressbook_BookView/g;

    s/Evolution_Book/GNOME_Evolution_Addressbook_Book/g;
    s/GNOME_Evolution_Addressbook_Book_get_vcard/GNOME_Evolution_Addressbook_Book_getVCard/g;
    s/GNOME_Evolution_Addressbook_Book_can_write/GNOME_Evolution_Addressbook_Book_isWriteable/g;
    s/GNOME_Evolution_Addressbook_Book_can_write_card/GNOME_Evolution_Addressbook_Book_isCardWriteable/g;
    s/GNOME_Evolution_Addressbook_Book_create_card/GNOME_Evolution_Addressbook_Book_addCard/g;
    s/GNOME_Evolution_Addressbook_Book_remove_card/GNOME_Evolution_Addressbook_Book_removeCard/g;
    s/GNOME_Evolution_Addressbook_Book_modify_card/GNOME_Evolution_Addressbook_Book_modifyCard/g;
    s/GNOME_Evolution_Addressbook_Book_get_cursor/GNOME_Evolution_Addressbook_Book_getCursor/g;
    s/GNOME_Evolution_Addressbook_Book_get_book_view/GNOME_Evolution_Addressbook_Book_getBookView/g;
    s/GNOME_Evolution_Addressbook_Book_get_changes/GNOME_Evolution_Addressbook_Book_getChanges/g;
    s/GNOME_Evolution_Addressbook_Book_check_connection/GNOME_Evolution_Addressbook_Book_checkConnection/g;
    s/GNOME_Evolution_Addressbook_Book_get_static_capabilities/GNOME_Evolution_Addressbook_Book_getStaticCapabilities/g;
    s/GNOME_Evolution_Addressbook_Book_get_name/GNOME_Evolution_Addressbook_Book_getName/g;

    s/Evolution_BookListener/GNOME_Evolution_Addressbook_BookListener/g;
    s/GNOME_Evolution_Addressbook_BookListener_respond_create_card/GNOME_Evolution_Addressbook_BookListener_notifyCardCreated/g;
    s/GNOME_Evolution_Addressbook_BookListener_respond_remove_card/GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved/g;
    s/GNOME_Evolution_Addressbook_BookListener_respond_modify_card/GNOME_Evolution_Addressbook_BookListener_notifyCardModified/g;
    s/GNOME_Evolution_Addressbook_BookListener_report_open_book_progress/GNOME_Evolution_Addressbook_BookListener_notifyOpenBookProgress/g;
    s/GNOME_Evolution_Addressbook_BookListener_respond_open_book/GNOME_Evolution_Addressbook_BookListener_notifyBookOpened/g;
    s/GNOME_Evolution_Addressbook_BookListener_respond_get_cursor/GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested/g;
    s/GNOME_Evolution_Addressbook_BookListener_respond_get_view/GNOME_Evolution_Addressbook_BookListener_notifyViewRequested/g;
    s/GNOME_Evolution_Addressbook_BookListener_respond_get_changes/GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested/g;
    s/GNOME_Evolution_Addressbook_BookListener_report_connection_status/GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus/g;

    s/Evolution_BookFactory/GNOME_Evolution_Addressbook_BookFactory/g;
    s/GNOME_Evolution_Addressbook_BookFactory_open_book/GNOME_Evolution_Addressbook_BookFactory_openBook/g;

    s/Evolution_SummaryComponent/GNOME_Evolution_Summary_Component/g;
    s/GNOME_Evolution_Summary_SummaryComponent_set_owner/GNOME_Evolution_Summary_Component_setOwner/g;
    s/GNOME_Evolution_Summary_SummaryComponent_unset_owner/GNOME_Evolution_Summary_Component_unsetOwner/g;
    s/GNOME_Evolution_Summary_SummaryComponent_create_view/GNOME_Evolution_Summary_Component_createView/g;
    s/GNOME_Evolution_Summary_SummaryComponent_destroy_view/GNOME_Evolution_Summary_Component_destroyView/g;

    s/Evolution_Summary([ \t])/GNOME_Evolution_Summary_ViewFrame$1/g;
    s/Evolution_Summary_set_title/GNOME_Evolution_Summary_ViewFrame_setTitle/g;
    s/Evolution_Summary_set_icon/GNOME_Evolution_Summary_ViewFrame_setIcon/g;
    s/Evolution_Summary_update_component/GNOME_Evolution_Summary_ViewFrame_updateComponent/g;

    s/GNOME_GNOME/GNOME/g;
    s/GNOME_GNOME/GNOME/g;
    s/GNOME_GNOME/GNOME/g;

svn path=/trunk/; revision=6535

125 files changed, 1663 insertions, 1624 deletions

diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 7fef103315..1dc9618851 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -14,7 +14,7 @@ idls =							\
 idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
 
 $(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
+	$(ORBIT_IDL) -I $(srcdir) $(srcdir)/../idl/addressbook.idl $(idl_flags)
 
 INCLUDES =						\
         -DGNOMELOCALEDIR=\""$(localedir)"\"        \
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
index fb96329825..abdda55b59 100644
--- a/addressbook/backend/ebook/e-book-listener.c
+++ b/addressbook/backend/ebook/e-book-listener.c
@@ -13,7 +13,7 @@
 #include <gtk/gtksignal.h>
 #include "e-book-listener.h"
 
-static EBookStatus e_book_listener_convert_status (Evolution_BookListener_CallStatus status);
+static EBookStatus e_book_listener_convert_status (GNOME_Evolution_Addressbook_BookListener_CallStatus status);
 
 enum {
 	RESPONSES_QUEUED,
@@ -23,7 +23,7 @@ enum {
 static guint e_book_listener_signals [LAST_SIGNAL];
 
 static BonoboObjectClass          *e_book_listener_parent_class;
-POA_Evolution_BookListener__vepv  e_book_listener_vepv;
+POA_GNOME_Evolution_Addressbook_BookListener__vepv  e_book_listener_vepv;
 
 struct _EBookListenerPrivate {
 	GList *response_queue;
@@ -79,7 +79,7 @@ e_book_listener_queue_generic_response (EBookListener          *listener,
 static void
 e_book_listener_queue_open_response (EBookListener  *listener,
 				     EBookStatus     status,
-				     Evolution_Book  book)
+				     GNOME_Evolution_Addressbook_Book  book)
 {
 	EBookListenerResponse *resp;
 
@@ -128,7 +128,7 @@ e_book_listener_queue_create_card_response (EBookListener *listener,
 static void
 e_book_listener_queue_get_cursor_response (EBookListener        *listener,
 					   EBookStatus           status,
-					   Evolution_CardCursor  cursor)
+					   GNOME_Evolution_Addressbook_CardCursor  cursor)
 {
 	EBookListenerResponse *resp;
 	
@@ -144,7 +144,7 @@ e_book_listener_queue_get_cursor_response (EBookListener        *listener,
 static void
 e_book_listener_queue_get_view_response (EBookListener        *listener,
 					 EBookStatus           status,
-					 Evolution_BookView    book_view)
+					 GNOME_Evolution_Addressbook_BookView    book_view)
 {
 	EBookListenerResponse *resp;
 	
@@ -160,7 +160,7 @@ e_book_listener_queue_get_view_response (EBookListener        *listener,
 static void
 e_book_listener_queue_get_changes_response (EBookListener        *listener,
 					    EBookStatus           status,
-					    Evolution_BookView    book_view)
+					    GNOME_Evolution_Addressbook_BookView book_view)
 {
 	EBookListenerResponse *resp;
 	
@@ -189,8 +189,8 @@ e_book_listener_queue_link_status (EBookListener *listener,
 
 static void
 impl_BookListener_respond_create_card (PortableServer_Servant                   servant,
-				       const Evolution_BookListener_CallStatus  status,
-				       const Evolution_CardId                   id,
+				       const GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
+				       const GNOME_Evolution_Addressbook_CardId id,
 				       CORBA_Environment                       *ev)
 {
 	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
@@ -203,7 +203,7 @@ impl_BookListener_respond_create_card (PortableServer_Servant
 
 static void
 impl_BookListener_respond_remove_card (PortableServer_Servant servant,
-				       const Evolution_BookListener_CallStatus status,
+				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
 				       CORBA_Environment *ev)
 {
 	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
@@ -215,7 +215,7 @@ impl_BookListener_respond_remove_card (PortableServer_Servant servant,
 
 static void
 impl_BookListener_respond_modify_card (PortableServer_Servant servant,
-				       const Evolution_BookListener_CallStatus status,
+				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
 				       CORBA_Environment *ev)
 {
 	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
@@ -227,12 +227,12 @@ impl_BookListener_respond_modify_card (PortableServer_Servant servant,
 
 static void
 impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
-				      const Evolution_BookListener_CallStatus status,
-				      const Evolution_CardCursor cursor,
+				      const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+				      const GNOME_Evolution_Addressbook_CardCursor cursor,
 				      CORBA_Environment *ev)
 {
 	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_CardCursor  cursor_copy;
+	GNOME_Evolution_Addressbook_CardCursor  cursor_copy;
 
 	cursor_copy = CORBA_Object_duplicate (cursor, ev);
 
@@ -249,12 +249,12 @@ impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
 
 static void
 impl_BookListener_respond_get_view (PortableServer_Servant servant,
-				    const Evolution_BookListener_CallStatus status,
-				    const Evolution_BookView book_view,
+				    const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+				    const GNOME_Evolution_Addressbook_BookView book_view,
 				    CORBA_Environment *ev)
 {
 	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_BookView    book_view_copy;
+	GNOME_Evolution_Addressbook_BookView    book_view_copy;
 
 	book_view_copy = CORBA_Object_duplicate (book_view, ev);
 
@@ -271,12 +271,12 @@ impl_BookListener_respond_get_view (PortableServer_Servant servant,
 
 static void
 impl_BookListener_respond_get_changes (PortableServer_Servant servant,
-				       const Evolution_BookListener_CallStatus status,
-				       const Evolution_BookView book_view,
+				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+				       const GNOME_Evolution_Addressbook_BookView book_view,
 				       CORBA_Environment *ev)
 {
 	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_BookView    book_view_copy;
+	GNOME_Evolution_Addressbook_BookView    book_view_copy;
 
 	book_view_copy = CORBA_Object_duplicate (book_view, ev);
 
@@ -293,12 +293,12 @@ impl_BookListener_respond_get_changes (PortableServer_Servant servant,
 
 static void
 impl_BookListener_respond_open_book (PortableServer_Servant servant,
-				     const Evolution_BookListener_CallStatus status,
-				     const Evolution_Book book,
+				     const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
+				     const GNOME_Evolution_Addressbook_Book book,
 				     CORBA_Environment *ev)
 {
 	EBookListener  *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_Book  book_copy;
+	GNOME_Evolution_Addressbook_Book  book_copy;
 
 	book_copy = CORBA_Object_duplicate (book, ev);
 
@@ -384,20 +384,20 @@ e_book_listener_pop_response (EBookListener *listener)
 }
 
 static EBookStatus
-e_book_listener_convert_status (const Evolution_BookListener_CallStatus status)
+e_book_listener_convert_status (const GNOME_Evolution_Addressbook_BookListener_CallStatus status)
 {
 	switch (status) {
-	case Evolution_BookListener_Success:
+	case GNOME_Evolution_Addressbook_BookListener_Success:
 		return E_BOOK_STATUS_SUCCESS;
-	case Evolution_BookListener_RepositoryOffline:
+	case GNOME_Evolution_Addressbook_BookListener_RepositoryOffline:
 		return E_BOOK_STATUS_REPOSITORY_OFFLINE;
-	case Evolution_BookListener_PermissionDenied:
+	case GNOME_Evolution_Addressbook_BookListener_PermissionDenied:
 		return E_BOOK_STATUS_PERMISSION_DENIED;
-	case Evolution_BookListener_CardNotFound:
+	case GNOME_Evolution_Addressbook_BookListener_CardNotFound:
 		return E_BOOK_STATUS_CARD_NOT_FOUND;
-	case Evolution_BookListener_ProtocolNotSupported:
+	case GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported:
 		return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;
-	case Evolution_BookListener_OtherError:
+	case GNOME_Evolution_Addressbook_BookListener_OtherError:
 		return E_BOOK_STATUS_OTHER_ERROR;
 	default:
 		g_warning ("e_book_listener_convert_status: Unknown status "
@@ -410,19 +410,19 @@ e_book_listener_convert_status (const Evolution_BookListener_CallStatus status)
 static EBookListener *
 e_book_listener_construct (EBookListener *listener)
 {
-	POA_Evolution_BookListener *servant;
+	POA_GNOME_Evolution_Addressbook_BookListener *servant;
 	CORBA_Environment           ev;
 	CORBA_Object                obj;
 
 	g_assert (listener != NULL);
 	g_assert (E_IS_BOOK_LISTENER (listener));
 
-	servant = (POA_Evolution_BookListener *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Addressbook_BookListener *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &e_book_listener_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_BookListener__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Addressbook_BookListener__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -547,25 +547,25 @@ e_book_listener_destroy (GtkObject *object)
 	GTK_OBJECT_CLASS (e_book_listener_parent_class)->destroy (object);
 }
 
-POA_Evolution_BookListener__epv *
+POA_GNOME_Evolution_Addressbook_BookListener__epv *
 e_book_listener_get_epv (void)
 {
-	POA_Evolution_BookListener__epv *epv;
+	POA_GNOME_Evolution_Addressbook_BookListener__epv *epv;
 
-	epv = g_new0 (POA_Evolution_BookListener__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookListener__epv, 1);
 
-	epv->report_open_book_progress = impl_BookListener_report_open_book_progress;
-	epv->respond_open_book         = impl_BookListener_respond_open_book;
+	epv->notifyOpenBookProgress = impl_BookListener_report_open_book_progress;
+	epv->notifyBookOpened       = impl_BookListener_respond_open_book;
 
-	epv->respond_create_card       = impl_BookListener_respond_create_card;
-	epv->respond_remove_card       = impl_BookListener_respond_remove_card;
-	epv->respond_modify_card       = impl_BookListener_respond_modify_card;
+	epv->notifyCardCreated  = impl_BookListener_respond_create_card;
+	epv->notifyCardRemoved  = impl_BookListener_respond_remove_card;
+	epv->notifyCardModified = impl_BookListener_respond_modify_card;
 
-	epv->respond_get_cursor        = impl_BookListener_respond_get_cursor;
-	epv->respond_get_view          = impl_BookListener_respond_get_view;
-	epv->respond_get_changes       = impl_BookListener_respond_get_changes;
+	epv->notifyCursorRequested  = impl_BookListener_respond_get_cursor;
+	epv->notifyViewRequested    = impl_BookListener_respond_get_view;
+	epv->notifyChangesRequested = impl_BookListener_respond_get_changes;
 
-	epv->report_connection_status  = impl_BookListener_report_connection_status;
+	epv->notifyConnectionStatus = impl_BookListener_report_connection_status;
 
 	return epv;
 }
@@ -574,7 +574,7 @@ static void
 e_book_listener_corba_class_init (void)
 {
 	e_book_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
-	e_book_listener_vepv.Evolution_BookListener_epv = e_book_listener_get_epv ();
+	e_book_listener_vepv.GNOME_Evolution_Addressbook_BookListener_epv = e_book_listener_get_epv ();
 }
 
 static void
diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h
index 3e4a160d33..d553324ee4 100644
--- a/addressbook/backend/ebook/e-book-listener.h
+++ b/addressbook/backend/ebook/e-book-listener.h
@@ -59,13 +59,13 @@ typedef struct {
 	EBookStatus             status;
 
 	/* For OpenBookResponse */
-	Evolution_Book          book;
+	GNOME_Evolution_Addressbook_Book          book;
 
 	/* For GetCursorResponse */
-	Evolution_CardCursor    cursor;
+	GNOME_Evolution_Addressbook_CardCursor    cursor;
 
 	/* For GetBookViewReponse */
-	Evolution_BookView      book_view;
+	GNOME_Evolution_Addressbook_BookView      book_view;
 
 	/* For OpenProgressEvent */
 	char                   *msg;
@@ -83,7 +83,7 @@ int                    e_book_listener_check_pending  (EBookListener *listener);
 EBookListenerResponse *e_book_listener_pop_response   (EBookListener *listener);
 GtkType                e_book_listener_get_type       (void);
 
-POA_Evolution_BookListener__epv *e_book_listener_get_epv (void);
+POA_GNOME_Evolution_Addressbook_BookListener__epv *e_book_listener_get_epv (void);
 
 #define E_BOOK_LISTENER_TYPE        (e_book_listener_get_type ())
 #define E_BOOK_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_LISTENER_TYPE, EBookListener))
diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
index cd1bdc6000..23133ecc22 100644
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ b/addressbook/backend/ebook/e-book-view-listener.c
@@ -23,7 +23,7 @@ enum {
 static guint e_book_view_listener_signals [LAST_SIGNAL];
 
 static BonoboObjectClass          *e_book_view_listener_parent_class;
-POA_Evolution_BookViewListener__vepv  e_book_view_listener_vepv;
+POA_GNOME_Evolution_Addressbook_BookViewListener__vepv  e_book_view_listener_vepv;
 
 struct _EBookViewListenerPrivate {
 	GList *response_queue;
@@ -99,7 +99,7 @@ e_book_view_listener_queue_id_event (EBookViewListener          *listener,
 static void
 e_book_view_listener_queue_sequence_event (EBookViewListener          *listener,
 					   EBookViewListenerOperation  op,
-					   const Evolution_VCardList  *cards)
+					   const GNOME_Evolution_Addressbook_VCardList  *cards)
 {
 	EBookViewListenerResponse *resp;
 	int i;
@@ -137,8 +137,8 @@ e_book_view_listener_queue_message_event (EBookViewListener          *listener,
 }
 
 static void
-impl_BookViewListener_signal_card_added (PortableServer_Servant servant,
-					 const Evolution_VCardList *cards,
+impl_BookViewListener_notify_card_added (PortableServer_Servant servant,
+					 const GNOME_Evolution_Addressbook_VCardList *cards,
 					 CORBA_Environment *ev)
 {
 	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
@@ -148,8 +148,8 @@ impl_BookViewListener_signal_card_added (PortableServer_Servant servant,
 }
 
 static void
-impl_BookViewListener_signal_card_removed (PortableServer_Servant servant,
-					   const Evolution_CardId id,
+impl_BookViewListener_notify_card_removed (PortableServer_Servant servant,
+					   const GNOME_Evolution_Addressbook_CardId id,
 					   CORBA_Environment *ev)
 {
 	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
@@ -159,8 +159,8 @@ impl_BookViewListener_signal_card_removed (PortableServer_Servant servant,
 }
 
 static void
-impl_BookViewListener_signal_card_changed (PortableServer_Servant servant,
-					   const Evolution_VCardList *cards,
+impl_BookViewListener_notify_card_changed (PortableServer_Servant servant,
+					   const GNOME_Evolution_Addressbook_VCardList *cards,
 					   CORBA_Environment *ev)
 {
 	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
@@ -170,7 +170,7 @@ impl_BookViewListener_signal_card_changed (PortableServer_Servant servant,
 }
 
 static void
-impl_BookViewListener_signal_sequence_complete (PortableServer_Servant servant,
+impl_BookViewListener_notify_sequence_complete (PortableServer_Servant servant,
 						CORBA_Environment *ev)
 {
 	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
@@ -179,7 +179,7 @@ impl_BookViewListener_signal_sequence_complete (PortableServer_Servant servant,
 }
 
 static void
-impl_BookViewListener_signal_status_message (PortableServer_Servant  servant,
+impl_BookViewListener_notify_status_message (PortableServer_Servant  servant,
 					     const char             *message,
 					     CORBA_Environment      *ev)
 {
@@ -238,19 +238,19 @@ e_book_view_listener_pop_response (EBookViewListener *listener)
 static EBookViewListener *
 e_book_view_listener_construct (EBookViewListener *listener)
 {
-	POA_Evolution_BookViewListener *servant;
+	POA_GNOME_Evolution_Addressbook_BookViewListener *servant;
 	CORBA_Environment           ev;
 	CORBA_Object                obj;
 
 	g_assert (listener != NULL);
 	g_assert (E_IS_BOOK_VIEW_LISTENER (listener));
 
-	servant = (POA_Evolution_BookViewListener *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Addressbook_BookViewListener *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &e_book_view_listener_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_BookViewListener__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Addressbook_BookViewListener__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -336,18 +336,18 @@ e_book_view_listener_destroy (GtkObject *object)
 	GTK_OBJECT_CLASS (e_book_view_listener_parent_class)->destroy (object);
 }
 
-POA_Evolution_BookViewListener__epv *
+POA_GNOME_Evolution_Addressbook_BookViewListener__epv *
 e_book_view_listener_get_epv (void)
 {
-	POA_Evolution_BookViewListener__epv *epv;
+	POA_GNOME_Evolution_Addressbook_BookViewListener__epv *epv;
 
-	epv = g_new0 (POA_Evolution_BookViewListener__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookViewListener__epv, 1);
 
-	epv->signal_card_changed       = impl_BookViewListener_signal_card_changed;
-	epv->signal_card_removed       = impl_BookViewListener_signal_card_removed;
-	epv->signal_card_added         = impl_BookViewListener_signal_card_added;
-	epv->signal_sequence_complete  = impl_BookViewListener_signal_sequence_complete;
-	epv->signal_status_message     = impl_BookViewListener_signal_status_message;
+	epv->notifyCardChanged      = impl_BookViewListener_notify_card_changed;
+	epv->notifyCardRemoved      = impl_BookViewListener_notify_card_removed;
+	epv->notifyCardAdded        = impl_BookViewListener_notify_card_added;
+	epv->notifySequenceComplete = impl_BookViewListener_notify_sequence_complete;
+	epv->notifyStatusMessage    = impl_BookViewListener_notify_status_message;
 
 	return epv;
 }
@@ -356,7 +356,7 @@ static void
 e_book_view_listener_corba_class_init (void)
 {
 	e_book_view_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
-	e_book_view_listener_vepv.Evolution_BookViewListener_epv = e_book_view_listener_get_epv ();
+	e_book_view_listener_vepv.GNOME_Evolution_Addressbook_BookViewListener_epv = e_book_view_listener_get_epv ();
 }
 
 static void
diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h
index 5a535a209a..addf91e702 100644
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ b/addressbook/backend/ebook/e-book-view-listener.h
@@ -64,7 +64,7 @@ int                        e_book_view_listener_check_pending  (EBookViewListene
 EBookViewListenerResponse *e_book_view_listener_pop_response   (EBookViewListener *listener);
 GtkType                    e_book_view_listener_get_type       (void);
 
-POA_Evolution_BookViewListener__epv *e_book_view_listener_get_epv (void);
+POA_GNOME_Evolution_Addressbook_BookViewListener__epv *e_book_view_listener_get_epv (void);
 
 #define E_BOOK_VIEW_LISTENER_TYPE        (e_book_view_listener_get_type ())
 #define E_BOOK_VIEW_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListener))
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
index 6e0379f2cc..8faebe140f 100644
--- a/addressbook/backend/ebook/e-book-view.c
+++ b/addressbook/backend/ebook/e-book-view.c
@@ -20,7 +20,7 @@
 GtkObjectClass *e_book_view_parent_class;
 
 struct _EBookViewPrivate {
-	Evolution_BookView     corba_book_view;
+	GNOME_Evolution_Addressbook_BookView     corba_book_view;
 	
 	EBookViewListener     *listener;
 
@@ -125,7 +125,7 @@ e_book_view_check_listener_queue (EBookViewListener *listener, EBookView *book_v
 }
 
 static gboolean
-e_book_view_construct (EBookView *book_view, Evolution_BookView corba_book_view, EBookViewListener *listener)
+e_book_view_construct (EBookView *book_view, GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)
 {
 	CORBA_Environment  ev;
 	g_return_val_if_fail (book_view != NULL,     FALSE);
@@ -144,7 +144,7 @@ e_book_view_construct (EBookView *book_view, Evolution_BookView corba_book_view,
 		return FALSE;
 	}
 
-	Evolution_BookView_ref(book_view->priv->corba_book_view, &ev);
+	GNOME_Evolution_Addressbook_BookView_ref(book_view->priv->corba_book_view, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_view_construct: Exception reffing corba_book_view.\n");
@@ -177,7 +177,7 @@ e_book_view_construct (EBookView *book_view, Evolution_BookView corba_book_view,
  * e_book_view_new:
  */
 EBookView *
-e_book_view_new (Evolution_BookView corba_book_view, EBookViewListener *listener)
+e_book_view_new (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)
 {
 	EBookView *book_view;
 
@@ -209,7 +209,7 @@ e_book_view_destroy (GtkObject *object)
 	if (book_view->priv->corba_book_view) {
 		CORBA_exception_init (&ev);
 
-		Evolution_BookView_unref(book_view->priv->corba_book_view, &ev);
+		GNOME_Evolution_Addressbook_BookView_unref(book_view->priv->corba_book_view, &ev);
 		if (ev._major != CORBA_NO_EXCEPTION) {
 			g_warning ("EBookView: Exception while unreffing BookView\n");
 			
diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h
index bd64c9dbc7..35126d4fce 100644
--- a/addressbook/backend/ebook/e-book-view.h
+++ b/addressbook/backend/ebook/e-book-view.h
@@ -41,7 +41,7 @@ struct _EBookViewClass {
 };
 
 /* Creating a new addressbook. */
-EBookView         *e_book_view_new                    (Evolution_BookView corba_book_view, EBookViewListener *listener);
+EBookView         *e_book_view_new                    (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener);
 
 GtkType            e_book_view_get_type               (void);
 void               e_book_view_get_book_view_listener (EBookView *book_view);
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index ce130a5888..65925e5036 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -29,10 +29,10 @@ typedef enum {
 } EBookLoadState;
 
 struct _EBookPrivate {
-	Evolution_BookFactory  book_factory;
+	GNOME_Evolution_Addressbook_BookFactory  book_factory;
 	EBookListener	      *listener;
 
-	Evolution_Book         corba_book;
+	GNOME_Evolution_Addressbook_Book         corba_book;
 
 	EBookLoadState         load_state;
 
@@ -160,7 +160,7 @@ e_book_do_response_get_cursor (EBook                 *book,
 		((EBookCursorCallback) op->cb) (book, resp->status, cursor, op->closure);
 
 	/*
-	 * Release the remote Evolution_Book in the PAS.
+	 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
 	 */
 	CORBA_exception_init (&ev);
 
@@ -168,7 +168,7 @@ e_book_do_response_get_cursor (EBook                 *book,
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_do_response_get_cursor: Exception unref'ing "
-			   "remote Evolution_CardCursor interface!\n");
+			   "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");
 		CORBA_exception_free (&ev);
 		CORBA_exception_init (&ev);
 	}
@@ -177,7 +177,7 @@ e_book_do_response_get_cursor (EBook                 *book,
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_do_response_get_cursor: Exception releasing "
-			   "remote Evolution_CardCursor interface!\n");
+			   "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");
 	}
 
 	CORBA_exception_free (&ev);
@@ -211,7 +211,7 @@ e_book_do_response_get_view (EBook                 *book,
 		((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
 
 	/*
-	 * Release the remote Evolution_Book in the PAS.
+	 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
 	 */
 	CORBA_exception_init (&ev);
 
@@ -219,7 +219,7 @@ e_book_do_response_get_view (EBook                 *book,
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_do_response_get_view: Exception unref'ing "
-			   "remote Evolution_BookView interface!\n");
+			   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
 		CORBA_exception_free (&ev);
 		CORBA_exception_init (&ev);
 	}
@@ -228,7 +228,7 @@ e_book_do_response_get_view (EBook                 *book,
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_do_response_get_view: Exception releasing "
-			   "remote Evolution_BookView interface!\n");
+			   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
 	}
 
 	CORBA_exception_free (&ev);
@@ -255,7 +255,7 @@ e_book_do_response_get_changes (EBook                 *book,
 		return;
 	}
 
-	book_view = e_book_view_new(resp->book_view, op->listener);
+	book_view = e_book_view_new (resp->book_view, op->listener);
 	
 	if (op->cb)
 		((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
@@ -419,7 +419,7 @@ e_book_load_uri (EBook                     *book,
 	 */
 	CORBA_exception_init (&ev);
 
-	Evolution_BookFactory_open_book (
+	GNOME_Evolution_Addressbook_BookFactory_openBook (
 		book->priv->book_factory, uri,
 		bonobo_object_corba_objref (BONOBO_OBJECT (book->priv->listener)),
 		&ev);
@@ -462,7 +462,7 @@ e_book_unload_uri (EBook *book)
 	}
 
 	/*
-	 * Release the remote Evolution_Book in the PAS.
+	 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
 	 */
 	CORBA_exception_init (&ev);
 
@@ -470,7 +470,7 @@ e_book_unload_uri (EBook *book)
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_unload_uri: Exception unref'ing "
-			   "remote Evolution_Book interface!\n");
+			   "remote GNOME_Evolution_Addressbook_Book interface!\n");
 		CORBA_exception_free (&ev);
 		CORBA_exception_init (&ev);
 	}
@@ -504,7 +504,7 @@ e_book_get_static_capabilities (EBook *book)
 		return g_strdup("");
 	}
 
-	temp = Evolution_Book_get_static_capabilities(book->priv->corba_book, &ev);
+	temp = GNOME_Evolution_Addressbook_Book_getStaticCapabilities(book->priv->corba_book, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_get_static_capabilities: Exception "
@@ -531,7 +531,7 @@ e_book_construct (EBook *book)
 	 * Connect to the Personal Addressbook Server.
 	 */
 
-	book->priv->book_factory = (Evolution_BookFactory)
+	book->priv->book_factory = (GNOME_Evolution_Addressbook_BookFactory)
 		oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL);
 	if (book->priv->book_factory == CORBA_OBJECT_NIL) {
 		g_warning ("e_book_construct: Could not obtain a handle "
@@ -616,8 +616,8 @@ e_book_get_vcard (EBook       *book,
 
 	CORBA_exception_init (&ev);
 
-	vcard = Evolution_Book_get_vcard (book->priv->corba_book,
-					  (Evolution_CardId) id,
+	vcard = GNOME_Evolution_Addressbook_Book_getVCard (book->priv->corba_book,
+					  (GNOME_Evolution_Addressbook_CardId) id,
 					  &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -691,8 +691,8 @@ e_book_remove_card_by_id (EBook         *book,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_Book_remove_card (
-		book->priv->corba_book, (const Evolution_CardId) id, &ev);
+	GNOME_Evolution_Addressbook_Book_removeCard (
+		book->priv->corba_book, (const GNOME_Evolution_Addressbook_CardId) id, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_remove_card_by_id: CORBA exception "
@@ -769,8 +769,8 @@ e_book_add_vcard (EBook           *book,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_Book_create_card (
-		book->priv->corba_book, (const Evolution_VCard) vcard, &ev);
+	GNOME_Evolution_Addressbook_Book_addCard (
+		book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_add_vcard: Exception adding card to PAS!\n");
@@ -846,8 +846,8 @@ e_book_commit_vcard (EBook         *book,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_Book_modify_card (
-		book->priv->corba_book, (const Evolution_VCard) vcard, &ev);
+	GNOME_Evolution_Addressbook_Book_modifyCard (
+		book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_commit_vcard: Exception "
@@ -881,7 +881,7 @@ e_book_check_connection (EBook *book)
 
 	CORBA_exception_init (&ev);
 
-	Evolution_Book_check_connection (book->priv->corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_checkConnection (book->priv->corba_book, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_check_connection: Exception "
@@ -912,7 +912,7 @@ gboolean e_book_get_cursor       (EBook               *book,
 	
 	CORBA_exception_init (&ev);
 	
-	Evolution_Book_get_cursor (book->priv->corba_book, query, &ev);
+	GNOME_Evolution_Addressbook_Book_getCursor (book->priv->corba_book, query, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_get_all_cards: Exception "
@@ -948,7 +948,7 @@ gboolean e_book_get_book_view       (EBook                 *book,
 	
 	CORBA_exception_init (&ev);
 	
-	Evolution_Book_get_book_view (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), query, &ev);
+	GNOME_Evolution_Addressbook_Book_getBookView (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), query, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_get_book_view: Exception "
@@ -984,7 +984,7 @@ gboolean e_book_get_changes         (EBook                 *book,
 	
 	CORBA_exception_init (&ev);
 	
-	Evolution_Book_get_changes (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &ev);
+	GNOME_Evolution_Addressbook_Book_getChanges (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_changes: Exception "
@@ -1020,7 +1020,7 @@ e_book_get_name (EBook *book)
 
 	CORBA_exception_init (&ev);
 
-	name = Evolution_Book_get_name (book->priv->corba_book, &ev);
+	name = GNOME_Evolution_Addressbook_Book_getName (book->priv->corba_book, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("e_book_get_name: Exception getting name from PAS!\n");
diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
index 1618a6ddee..faf402d1e7 100644
--- a/addressbook/backend/ebook/e-card-cursor.c
+++ b/addressbook/backend/ebook/e-card-cursor.c
@@ -12,7 +12,7 @@
 #include "e-card-cursor.h"
 
 struct _ECardCursorPrivate {
-	Evolution_CardCursor corba_cursor;
+	GNOME_Evolution_Addressbook_CardCursor corba_cursor;
 };
 
 /*
@@ -31,7 +31,7 @@ e_card_cursor_destroy (GtkObject *object)
 
 	CORBA_exception_init (&ev);
 
-	Evolution_CardCursor_unref( cursor->priv->corba_cursor, &ev );
+	GNOME_Evolution_Addressbook_CardCursor_unref( cursor->priv->corba_cursor, &ev );
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("e_card_cursor_destroy: Exception unreffing "
@@ -71,7 +71,7 @@ e_card_cursor_get_length (ECardCursor *cursor)
 
 		CORBA_exception_init (&ev);
 
-		ret_val = Evolution_CardCursor_get_length(cursor->priv->corba_cursor, &ev);
+		ret_val = GNOME_Evolution_Addressbook_CardCursor_count (cursor->priv->corba_cursor, &ev);
 		
 		if (ev._major != CORBA_NO_EXCEPTION) {
 			g_warning("e_card_cursor_get_length: Exception during "
@@ -107,7 +107,7 @@ e_card_cursor_get_nth (ECardCursor *cursor,
 
 		CORBA_exception_init (&en);
 
-		vcard = Evolution_CardCursor_get_nth(cursor->priv->corba_cursor, n, &en);
+		vcard = GNOME_Evolution_Addressbook_CardCursor_getNth(cursor->priv->corba_cursor, n, &en);
 		
 		if (en._major != CORBA_NO_EXCEPTION) {
 			g_warning("e_card_cursor_get_nth: Exception during "
@@ -169,16 +169,16 @@ e_card_cursor_get_type (void)
 /**
  * e_card_cursor_construct:
  * @cursor: an #ECardCursor object
- * @corba_cursor: an #Evolution_CardCursor
+ * @corba_cursor: an #GNOME_Evolution_Addressbook_CardCursor
  *
- * Wraps an #Evolution_CardCursor object inside the #ECardCursor
+ * Wraps an #GNOME_Evolution_Addressbook_CardCursor object inside the #ECardCursor
  * @cursor object.
  *
  * Returns: a new #ECardCursor on success, or %NULL on failure.
  */
 ECardCursor *
 e_card_cursor_construct (ECardCursor          *cursor,
-			 Evolution_CardCursor  corba_cursor)
+			 GNOME_Evolution_Addressbook_CardCursor  corba_cursor)
 {
 	CORBA_Environment      ev;
 	g_return_val_if_fail (cursor != NULL, NULL);
@@ -199,7 +199,7 @@ e_card_cursor_construct (ECardCursor          *cursor,
 		CORBA_exception_init (&ev);
 	}
 	
-	Evolution_CardCursor_ref(cursor->priv->corba_cursor, &ev);
+	GNOME_Evolution_Addressbook_CardCursor_ref(cursor->priv->corba_cursor, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("e_card_cursor_construct: Exception reffing "
@@ -216,15 +216,15 @@ e_card_cursor_construct (ECardCursor          *cursor,
 
 /**
  * e_card_cursor_new:
- * @cursor: the #Evolution_CardCursor to be wrapped
+ * @cursor: the #GNOME_Evolution_Addressbook_CardCursor to be wrapped
  *
- * Creates a new #ECardCursor, which wraps an #Evolution_CardCursor
+ * Creates a new #ECardCursor, which wraps an #GNOME_Evolution_Addressbook_CardCursor
  * object.
  *
  * Returns: a new #ECardCursor on success, or %NULL on failure.
  */
 ECardCursor *
-e_card_cursor_new (Evolution_CardCursor corba_cursor)
+e_card_cursor_new (GNOME_Evolution_Addressbook_CardCursor corba_cursor)
 {
 	ECardCursor *cursor;
 
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
index b318e646c4..1b5f0d0e0c 100644
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ b/addressbook/backend/ebook/e-card-cursor.h
@@ -31,9 +31,9 @@ struct _ECardCursorClass {
 };
 
 /* Creating a new addressbook. */
-ECardCursor *e_card_cursor_new       (Evolution_CardCursor  corba_cursor);
+ECardCursor *e_card_cursor_new       (GNOME_Evolution_Addressbook_CardCursor  corba_cursor);
 ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,
-				      Evolution_CardCursor  corba_cursor);
+				      GNOME_Evolution_Addressbook_CardCursor  corba_cursor);
 
 GtkType      e_card_cursor_get_type    (void);
 
diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl
index 95d52e085c..6edfee992d 100644
--- a/addressbook/backend/idl/addressbook.idl
+++ b/addressbook/backend/idl/addressbook.idl
@@ -9,15 +9,16 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
-
+module Addressbook {
 	typedef string CardId;
 	typedef string VCard;
 	typedef sequence<VCard> VCardList;
 
 	interface CardCursor : Bonobo::Unknown {
-		long   get_length ();
-		string get_nth    (in long n);
+		long   count  ();
+		string getNth (in long n);
 	};
 
 	/* 
@@ -29,11 +30,11 @@ module Evolution {
 	 * changes (if it affects the set of viewed cards.)
 	 */
 	interface BookViewListener : Bonobo::Unknown {
-		void signal_card_added (in VCardList cards);
-		void signal_card_removed (in CardId id);
-		void signal_card_changed (in VCardList cards);
-		void signal_sequence_complete ();
-		void signal_status_message (in string message);
+		void notifyCardAdded        (in VCardList cards);
+		void notifyCardRemoved      (in CardId id);
+		void notifyCardChanged      (in VCardList cards);
+		void notifySequenceComplete ();
+		void notifyStatusMessage    (in string message);
 	};
 	
 	interface BookView : Bonobo::Unknown {
@@ -43,7 +44,7 @@ module Evolution {
 		/*
 		 * Fetching cards in the addresbook.
 		 */
-		VCard get_vcard (in CardId id);
+		VCard getVCard (in CardId id);
 
 		/*
 		 * Permissions.  the first form is general write
@@ -54,42 +55,42 @@ module Evolution {
 		 * return FALSE if the user doesn't have permission to
 		 * modify/remove that specific card.
 		 */
-		boolean can_write ();
-		boolean can_write_card (in CardId Id);
+		boolean isWriteable     ();
+		boolean isCardWriteable (in CardId Id);
 
 		/*
 		 * Adding and deleting cards in the book.
 		 */
-		void create_card (in VCard vcard);
-		void remove_card (in CardId Id);
+		void addCard    (in VCard vcard);
+		void removeCard (in CardId Id);
 	        
 		/*
 		 * Modifying cards in the addressbook.
 		 */
-		void modify_card (in VCard vcard);
+		void modifyCard (in VCard vcard);
 		
 		/*
-		 * These two functions return a cursor to the book
+		 * This function returns a cursor to the book
 		 * listener.  This is for people who want a snapshot
 		 * of the addressbook.  The syntax for the query
 		 * string is not yet defined.
 		 */
-		void get_cursor (in string query);
+		void getCursor (in string query);
 		
 		/*
 		 * These two functions return a book view to the book
 		 * listener.  This is for people who want a live view
 		 * of the addressbook.
 		 */
-		void get_book_view(in BookViewListener listener, in string query);
+		void getBookView (in BookViewListener listener, in string query);
 
-		void get_changes(in BookViewListener listener, in string change_id);
+		void getChanges  (in BookViewListener listener, in string change_id);
 
-		void check_connection ();
+		void checkConnection ();
 
-		string get_static_capabilities ();
+		string getStaticCapabilities ();
 
-		string get_name ();
+		string getName ();
 	};
 
 	interface BookListener : Bonobo::Unknown {
@@ -103,24 +104,24 @@ module Evolution {
 			OtherError
 		};
 
-		void respond_create_card (in CallStatus status, in CardId Id);
+		void notifyCardCreated  (in CallStatus status, in CardId Id);
 
-		void respond_remove_card (in CallStatus status);
+		void notifyCardRemoved  (in CallStatus status);
 
-		void respond_modify_card (in CallStatus status);
+		void notifyCardModified (in CallStatus status);
 		
-		void report_open_book_progress (in string status_message, in short percent);
+		void notifyOpenBookProgress (in string status_message, in short percent);
 
-		void respond_open_book (in CallStatus status, in Book book);
+		void notifyBookOpened       (in CallStatus status, in Book book);
 
-		void respond_get_cursor (in CallStatus status, in CardCursor cursor);
+		void notifyCursorRequested  (in CallStatus status, in CardCursor cursor);
 
-		void respond_get_view (in CallStatus status, in BookView view);
+		void notifyViewRequested    (in CallStatus status, in BookView view);
 
-		void respond_get_changes (in CallStatus status, in BookView view);
+		void notifyChangesRequested (in CallStatus status, in BookView view);
 
 		/**
-		 * report_connection_status:
+		 * notifyConnectionStatus:
 		 *
 		 * Used to report changes in the connection to the
 		 * contact repository.  This is often a response to a
@@ -128,13 +129,16 @@ module Evolution {
 		 * is free to report the connection status without
 		 * being asked.
 		 */
-		void report_connection_status (in boolean connected);
+		void notifyConnectionStatus (in boolean connected);
 	};
 
 	interface BookFactory : Bonobo::Unknown {
 		exception ProtocolNotSupported {};
 
-		void open_book (in string uri, in BookListener listener)
+		void openBook (in string uri, in BookListener listener)
 			raises (ProtocolNotSupported);
 	};
 };
+};
+};
+
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 819f99e57d..4bd2888c10 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -10,7 +10,7 @@ idls =							\
 idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
 
 $(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
+	$(ORBIT_IDL) -I $(srcdir) $(srcdir)/../idl/addressbook.idl $(idl_flags)
 
 INCLUDES =						\
         -DGNOMELOCALEDIR=\""$(localedir)"\"		\
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index ce4ada1bc2..ee82c94b2d 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -143,14 +143,14 @@ static void
 cursor_destroy(GtkObject *object, gpointer data)
 {
 	CORBA_Environment ev;
-	Evolution_Book corba_book;
+	GNOME_Evolution_Addressbook_Book corba_book;
 	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
 
 	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_unref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("cursor_destroy: Exception unreffing "
@@ -169,7 +169,7 @@ static void
 view_destroy(GtkObject *object, gpointer data)
 {
 	CORBA_Environment ev;
-	Evolution_Book    corba_book;
+	GNOME_Evolution_Addressbook_Book    corba_book;
 	PASBook           *book = (PASBook *)data;
 	PASBackendFile    *bf;
 	EIterator         *iterator;
@@ -188,7 +188,7 @@ view_destroy(GtkObject *object, gpointer data)
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_unref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("view_destroy: Exception unreffing "
@@ -713,7 +713,7 @@ pas_backend_file_process_create_card (PASBackend *backend,
 		
 		pas_book_respond_create (
 			book,
-			Evolution_BookListener_Success,
+			GNOME_Evolution_Addressbook_BookListener_Success,
 			id);
 		g_free(vcard);
 		g_free(id);
@@ -723,7 +723,7 @@ pas_backend_file_process_create_card (PASBackend *backend,
                    think */
 		pas_book_respond_create (
 				 book,
-				 Evolution_BookListener_CardNotFound,
+				 GNOME_Evolution_Addressbook_BookListener_CardNotFound,
 				 "");
 	}
 
@@ -748,7 +748,7 @@ pas_backend_file_process_remove_card (PASBackend *backend,
 	if (0 != db_error) {
 		pas_book_respond_remove (
 				 book,
-				 Evolution_BookListener_CardNotFound);
+				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
 		g_free (req->id);
 		return;
 	}
@@ -757,7 +757,7 @@ pas_backend_file_process_remove_card (PASBackend *backend,
 	if (0 != db_error) {
 		pas_book_respond_remove (
 				 book,
-				 Evolution_BookListener_CardNotFound);
+				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
 		g_free (req->id);
 		return;
 	}
@@ -779,7 +779,7 @@ pas_backend_file_process_remove_card (PASBackend *backend,
 	
 	pas_book_respond_remove (
 				 book,
-				 Evolution_BookListener_Success);
+				 GNOME_Evolution_Addressbook_BookListener_Success);
 	
 	g_free (req->id);
 }
@@ -809,7 +809,7 @@ pas_backend_file_process_modify_card (PASBackend *backend,
 	if (0 != db_error) {
 		pas_book_respond_modify (
 				 book,
-				 Evolution_BookListener_CardNotFound);
+				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
 		g_free (req->id);
 		return;
 	}
@@ -849,12 +849,12 @@ pas_backend_file_process_modify_card (PASBackend *backend,
 
 		pas_book_respond_modify (
 				 book,
-				 Evolution_BookListener_Success);
+				 GNOME_Evolution_Addressbook_BookListener_Success);
 	}
 	else {
 		pas_book_respond_modify (
 				 book,
-				 Evolution_BookListener_CardNotFound);
+				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
 	}
 
 	g_free(old_vcard_string);
@@ -913,7 +913,7 @@ pas_backend_file_process_get_cursor (PASBackend *backend,
 	int            db_error = 0;
 	PASBackendFileCursorPrivate *cursor_data;
 	PASCardCursor *cursor;
-	Evolution_Book corba_book;
+	GNOME_Evolution_Addressbook_Book corba_book;
 
 	cursor_data = g_new(PASBackendFileCursorPrivate, 1);
 	cursor_data->backend = backend;
@@ -925,7 +925,7 @@ pas_backend_file_process_get_cursor (PASBackend *backend,
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_ref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("pas_backend_file_process_get_cursor: Exception reffing "
@@ -944,8 +944,8 @@ pas_backend_file_process_get_cursor (PASBackend *backend,
 	pas_book_respond_get_cursor (
 		book,
 		(db_error == 0 
-		 ? Evolution_BookListener_Success 
-		 : Evolution_BookListener_CardNotFound),
+		 ? GNOME_Evolution_Addressbook_BookListener_Success 
+		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound),
 		cursor);
 }
 
@@ -957,7 +957,7 @@ pas_backend_file_process_get_book_view (PASBackend *backend,
 	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
 	CORBA_Environment ev;
 	PASBookView       *book_view;
-	Evolution_Book    corba_book;
+	GNOME_Evolution_Addressbook_Book    corba_book;
 	PASBackendFileBookView view;
 	PASBackendFileSearchContext ctx;
 	EIterator *iterator;
@@ -968,7 +968,7 @@ pas_backend_file_process_get_book_view (PASBackend *backend,
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_ref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
@@ -984,8 +984,8 @@ pas_backend_file_process_get_book_view (PASBackend *backend,
 
 	pas_book_respond_get_book_view (book,
 		   (book_view != NULL
-		    ? Evolution_BookListener_Success 
-		    : Evolution_BookListener_CardNotFound /* XXX */),
+		    ? GNOME_Evolution_Addressbook_BookListener_Success 
+		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
 		   book_view);
 
 	view.book_view = book_view;
@@ -1012,7 +1012,7 @@ pas_backend_file_process_get_changes (PASBackend *backend,
 	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
 	CORBA_Environment ev;
 	PASBookView       *book_view;
-	Evolution_Book    corba_book;
+	GNOME_Evolution_Addressbook_Book    corba_book;
 	PASBackendFileBookView view;
 	PASBackendFileChangeContext ctx;
 	EIterator *iterator;
@@ -1023,7 +1023,7 @@ pas_backend_file_process_get_changes (PASBackend *backend,
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_ref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
@@ -1039,8 +1039,8 @@ pas_backend_file_process_get_changes (PASBackend *backend,
 
 	pas_book_respond_get_changes (book,
 		   (book_view != NULL
-		    ? Evolution_BookListener_Success 
-		    : Evolution_BookListener_CardNotFound /* XXX */),
+		    ? GNOME_Evolution_Addressbook_BookListener_Success 
+		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
 		   book_view);
 
 	view.book_view = book_view;
@@ -1317,7 +1317,7 @@ pas_backend_file_get_uri (PASBackend *backend)
 
 static gboolean
 pas_backend_file_add_client (PASBackend             *backend,
-			     Evolution_BookListener  listener)
+			     GNOME_Evolution_Addressbook_BookListener  listener)
 {
 	PASBackendFile *bf;
 	PASBook        *book;
@@ -1351,11 +1351,11 @@ pas_backend_file_add_client (PASBackend             *backend,
 
 	if (bf->priv->loaded) {
 		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
+			book, GNOME_Evolution_Addressbook_BookListener_Success);
 	} else {
 		/* Open the book. */
 		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
+			book, GNOME_Evolution_Addressbook_BookListener_Success);
 	}
 
 	return TRUE;
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 46010dc4a7..22e37b3841 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -143,7 +143,7 @@ static void
 view_destroy(GtkObject *object, gpointer data)
 {
 	CORBA_Environment ev;
-	Evolution_Book    corba_book;
+	GNOME_Evolution_Addressbook_Book    corba_book;
 	PASBook           *book = (PASBook *)data;
 	PASBackendLDAP    *bl;
 	GList             *list;
@@ -185,7 +185,7 @@ view_destroy(GtkObject *object, gpointer data)
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_unref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("view_destroy: Exception unreffing "
@@ -329,15 +329,15 @@ static int
 ldap_error_to_response (int ldap_error)
 {
 	if (ldap_error == LDAP_SUCCESS)
-		return Evolution_BookListener_Success;
+		return GNOME_Evolution_Addressbook_BookListener_Success;
 	else if (NAME_ERROR (ldap_error))
-		return Evolution_BookListener_CardNotFound;
+		return GNOME_Evolution_Addressbook_BookListener_CardNotFound;
 	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
-		return Evolution_BookListener_PermissionDenied;
+		return GNOME_Evolution_Addressbook_BookListener_PermissionDenied;
 	else if (ldap_error == LDAP_SERVER_DOWN)
-		return Evolution_BookListener_RepositoryOffline;
+		return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline;
 	else
-		return Evolution_BookListener_OtherError;
+		return GNOME_Evolution_Addressbook_BookListener_OtherError;
 }
 
 
@@ -757,14 +757,14 @@ static void
 cursor_destroy(GtkObject *object, gpointer data)
 {
 	CORBA_Environment ev;
-	Evolution_Book corba_book;
+	GNOME_Evolution_Addressbook_Book corba_book;
 	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
 
 	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_unref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("cursor_destroy: Exception unreffing "
@@ -831,7 +831,7 @@ get_cursor_handler (PASBackend *backend, LDAPOp *op)
 	CORBA_Environment ev;
 	int            ldap_error = 0;
 	PASCardCursor *cursor;
-	Evolution_Book corba_book;
+	GNOME_Evolution_Addressbook_Book corba_book;
 	PASBackendLDAPCursorPrivate *cursor_data;
 	PASBook *book = cursor_op->book;
 
@@ -845,7 +845,7 @@ get_cursor_handler (PASBackend *backend, LDAPOp *op)
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_ref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("pas_backend_file_process_get_cursor: Exception reffing "
@@ -1467,7 +1467,7 @@ pas_backend_ldap_process_get_book_view (PASBackend *backend,
 {
 	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
 	CORBA_Environment ev;
-	Evolution_Book    corba_book;
+	GNOME_Evolution_Addressbook_Book    corba_book;
 	PASBookView       *book_view;
 	PASBackendLDAPBookView *view;
 
@@ -1477,7 +1477,7 @@ pas_backend_ldap_process_get_book_view (PASBackend *backend,
 
 	CORBA_exception_init(&ev);
 
-	Evolution_Book_ref(corba_book, &ev);
+	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
@@ -1493,8 +1493,8 @@ pas_backend_ldap_process_get_book_view (PASBackend *backend,
 
 	pas_book_respond_get_book_view (book,
 		(book_view != NULL
-		 ? Evolution_BookListener_Success 
-		 : Evolution_BookListener_CardNotFound /* XXX */),
+		 ? GNOME_Evolution_Addressbook_BookListener_Success 
+		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
 		book_view);
 
 	view = g_new0(PASBackendLDAPBookView, 1);
@@ -1650,7 +1650,7 @@ pas_backend_ldap_get_uri (PASBackend *backend)
 
 static gboolean
 pas_backend_ldap_add_client (PASBackend             *backend,
-			     Evolution_BookListener  listener)
+			     GNOME_Evolution_Addressbook_BookListener  listener)
 {
 	PASBackendLDAP *bl;
 	PASBook        *book;
@@ -1684,11 +1684,11 @@ pas_backend_ldap_add_client (PASBackend             *backend,
 
 	if (bl->priv->connected) {
 		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
+			book, GNOME_Evolution_Addressbook_BookListener_Success);
 	} else {
 		/* Open the book. */
 		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
+			book, GNOME_Evolution_Addressbook_BookListener_Success);
 	}
 
 	return TRUE;
diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c
index 1568918560..22b7184813 100644
--- a/addressbook/backend/pas/pas-backend.c
+++ b/addressbook/backend/pas/pas-backend.c
@@ -71,7 +71,7 @@ pas_backend_get_uri (PASBackend *backend)
  */
 gboolean
 pas_backend_add_client (PASBackend             *backend,
-			Evolution_BookListener  listener)
+			GNOME_Evolution_Addressbook_BookListener  listener)
 {
 	g_return_val_if_fail (backend != NULL, FALSE);
 	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h
index 4045074284..be08d48950 100644
--- a/addressbook/backend/pas/pas-backend.h
+++ b/addressbook/backend/pas/pas-backend.h
@@ -11,7 +11,7 @@
  *    add a new client to an existing PASBackend server.
  *
  * 2. A PASBook, when a client has requested an operation on the
- *    Evolution_Book interface.
+ *    GNOME_Evolution_Addressbook_Book interface.
  *
  * Author:
  *   Nat Friedman (nat@helixcode.com)
@@ -42,7 +42,7 @@ typedef struct {
 	/* Virtual methods */
 	gboolean (*load_uri) (PASBackend *backend, const char *uri);
 	const char *(* get_uri) (PASBackend *backend);
-	gboolean (*add_client) (PASBackend *backend, Evolution_BookListener listener);
+	gboolean (*add_client) (PASBackend *backend, GNOME_Evolution_Addressbook_BookListener listener);
 	void (*remove_client) (PASBackend *backend, PASBook *book);
         char *(*get_static_capabilities) (PASBackend *backend);
 
@@ -58,7 +58,7 @@ gboolean    pas_backend_load_uri                 (PASBackend             *backen
 const char *pas_backend_get_uri                  (PASBackend             *backend);
 
 gboolean    pas_backend_add_client               (PASBackend             *backend,
-						  Evolution_BookListener  listener);
+						  GNOME_Evolution_Addressbook_BookListener  listener);
 void        pas_backend_remove_client            (PASBackend             *backend,
 						  PASBook                *book);
 char       *pas_backend_get_static_capabilities  (PASBackend             *backend);
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index 02dedbabe5..c81513de0f 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -18,11 +18,11 @@
 #define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
 
 static BonoboObjectClass          *pas_book_factory_parent_class;
-POA_Evolution_BookFactory__vepv   pas_book_factory_vepv;
+POA_GNOME_Evolution_Addressbook_BookFactory__vepv   pas_book_factory_vepv;
 
 typedef struct {
 	char                              *uri;
-	Evolution_BookListener             listener;
+	GNOME_Evolution_Addressbook_BookListener             listener;
 } PASBookFactoryQueuedRequest;
 
 struct _PASBookFactoryPrivate {
@@ -174,7 +174,7 @@ pas_book_factory_lookup_backend_factory (PASBookFactory *factory,
 
 static PASBackend *
 pas_book_factory_launch_backend (PASBookFactory              *factory,
-				 Evolution_BookListener       listener,
+				 GNOME_Evolution_Addressbook_BookListener       listener,
 				 const char                  *uri)
 {
 	PASBackendFactoryFn  backend_factory;
@@ -187,9 +187,9 @@ pas_book_factory_launch_backend (PASBookFactory              *factory,
 		CORBA_Environment ev;
 
 		CORBA_exception_init (&ev);
-		Evolution_BookListener_respond_open_book (
+		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
 			listener,
-			Evolution_BookListener_ProtocolNotSupported,
+			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
 			CORBA_OBJECT_NIL,
 			&ev);
 
@@ -206,9 +206,9 @@ pas_book_factory_launch_backend (PASBookFactory              *factory,
 		CORBA_Environment ev;
 
 		CORBA_exception_init (&ev);
-		Evolution_BookListener_respond_open_book (
+		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
 			listener,
-			Evolution_BookListener_OtherError,
+			GNOME_Evolution_Addressbook_BookListener_OtherError,
 			CORBA_OBJECT_NIL,
 			&ev);
 
@@ -237,7 +237,7 @@ pas_book_factory_process_request (PASBookFactory              *factory,
 {
 	PASBackend *backend;
 	char *uri;
-	Evolution_BookListener listener;
+	GNOME_Evolution_Addressbook_BookListener listener;
 	CORBA_Environment ev;
 
 	uri = request->uri;
@@ -305,10 +305,10 @@ pas_book_factory_process_queue (PASBookFactory *factory)
 static void
 pas_book_factory_queue_request (PASBookFactory               *factory,
 				const char                   *uri,
-				const Evolution_BookListener  listener)
+				const GNOME_Evolution_Addressbook_BookListener  listener)
 {
 	PASBookFactoryQueuedRequest *request;
-	Evolution_BookListener       listener_copy;
+	GNOME_Evolution_Addressbook_BookListener       listener_copy;
 	CORBA_Environment            ev;
 
 	CORBA_exception_init (&ev);
@@ -338,9 +338,9 @@ pas_book_factory_queue_request (PASBookFactory               *factory,
 
 
 static void
-impl_Evolution_BookFactory_open_book (PortableServer_Servant        servant,
+impl_GNOME_Evolution_Addressbook_BookFactory_openBook (PortableServer_Servant        servant,
 				      const CORBA_char             *uri,
-				      const Evolution_BookListener  listener,
+				      const GNOME_Evolution_Addressbook_BookListener  listener,
 				      CORBA_Environment            *ev)
 {
 	PASBookFactory      *factory =
@@ -350,9 +350,9 @@ impl_Evolution_BookFactory_open_book (PortableServer_Servant        servant,
 	backend_factory = pas_book_factory_lookup_backend_factory (factory, uri);
 
 	if (backend_factory == NULL) {
-		Evolution_BookListener_respond_open_book (
+		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
 			listener,
-			Evolution_BookListener_ProtocolNotSupported,
+			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
 			CORBA_OBJECT_NIL,
 			ev);
 
@@ -365,19 +365,19 @@ impl_Evolution_BookFactory_open_book (PortableServer_Servant        servant,
 static gboolean
 pas_book_factory_construct (PASBookFactory *factory)
 {
-	POA_Evolution_BookFactory  *servant;
+	POA_GNOME_Evolution_Addressbook_BookFactory  *servant;
 	CORBA_Environment           ev;
 	CORBA_Object                obj;
 
 	g_assert (factory != NULL);
 	g_assert (PAS_IS_BOOK_FACTORY (factory));
 
-	servant = (POA_Evolution_BookFactory *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Addressbook_BookFactory *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &pas_book_factory_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_BookFactory__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Addressbook_BookFactory__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -526,14 +526,14 @@ pas_book_factory_destroy (GtkObject *object)
 	GTK_OBJECT_CLASS (pas_book_factory_parent_class)->destroy (object);
 }
 
-static POA_Evolution_BookFactory__epv *
+static POA_GNOME_Evolution_Addressbook_BookFactory__epv *
 pas_book_factory_get_epv (void)
 {
-	POA_Evolution_BookFactory__epv *epv;
+	POA_GNOME_Evolution_Addressbook_BookFactory__epv *epv;
 
-	epv = g_new0 (POA_Evolution_BookFactory__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookFactory__epv, 1);
 
-	epv->open_book = impl_Evolution_BookFactory_open_book;
+	epv->openBook = impl_GNOME_Evolution_Addressbook_BookFactory_openBook;
 
 	return epv;
 	
@@ -543,7 +543,7 @@ static void
 pas_book_factory_corba_class_init (void)
 {
 	pas_book_factory_vepv.Bonobo_Unknown_epv         = bonobo_object_get_epv ();
-	pas_book_factory_vepv.Evolution_BookFactory_epv = pas_book_factory_get_epv ();
+	pas_book_factory_vepv.GNOME_Evolution_Addressbook_BookFactory_epv = pas_book_factory_get_epv ();
 }
 
 static void
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
index 94babf6280..12e46533a4 100644
--- a/addressbook/backend/pas/pas-book-view.c
+++ b/addressbook/backend/pas/pas-book-view.c
@@ -10,10 +10,10 @@
 #include "pas-book-view.h"
 
 static BonoboObjectClass *pas_book_view_parent_class;
-POA_Evolution_BookView__vepv pas_book_view_vepv;
+POA_GNOME_Evolution_Addressbook_BookView__vepv pas_book_view_vepv;
 
 struct _PASBookViewPrivate {
-	Evolution_BookViewListener  listener;
+	GNOME_Evolution_Addressbook_BookViewListener  listener;
 };
 
 /**
@@ -25,11 +25,11 @@ pas_book_view_notify_change (PASBookView                *book_view,
 {
 	CORBA_Environment ev;
 	gint i, length;
-	CORBA_sequence_Evolution_VCard card_sequence;
+	CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;
 
 	length = g_list_length((GList *) cards);
 
-	card_sequence._buffer = CORBA_sequence_Evolution_VCard_allocbuf(length);
+	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);
 	card_sequence._maximum = length;
 	card_sequence._length = length;
 
@@ -39,7 +39,7 @@ pas_book_view_notify_change (PASBookView                *book_view,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookViewListener_signal_card_changed (
+	GNOME_Evolution_Addressbook_BookViewListener_notifyCardChanged (
 		book_view->priv->listener, &card_sequence, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -71,8 +71,8 @@ pas_book_view_notify_remove (PASBookView                *book_view,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookViewListener_signal_card_removed (
-		book_view->priv->listener, (Evolution_CardId) id, &ev);
+	GNOME_Evolution_Addressbook_BookViewListener_notifyCardRemoved (
+		book_view->priv->listener, (GNOME_Evolution_Addressbook_CardId) id, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("pas_book_view_notify_remove: Exception signaling BookViewListener!\n");
@@ -90,11 +90,11 @@ pas_book_view_notify_add (PASBookView                *book_view,
 {
 	CORBA_Environment ev;
 	gint i, length;
-	CORBA_sequence_Evolution_VCard card_sequence;
+	CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;
 
 	length = g_list_length((GList *)cards);
 
-	card_sequence._buffer = CORBA_sequence_Evolution_VCard_allocbuf(length);
+	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);
 	card_sequence._maximum = length;
 	card_sequence._length = length;
 
@@ -104,7 +104,7 @@ pas_book_view_notify_add (PASBookView                *book_view,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookViewListener_signal_card_added (
+	GNOME_Evolution_Addressbook_BookViewListener_notifyCardAdded (
 		book_view->priv->listener, &card_sequence, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -132,7 +132,7 @@ pas_book_view_notify_complete (PASBookView *book_view)
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookViewListener_signal_sequence_complete (
+	GNOME_Evolution_Addressbook_BookViewListener_notifySequenceComplete (
 		book_view->priv->listener, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -150,7 +150,7 @@ pas_book_view_notify_status_message (PASBookView *book_view,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookViewListener_signal_status_message (
+	GNOME_Evolution_Addressbook_BookViewListener_notifyStatusMessage (
 		book_view->priv->listener, message, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -162,9 +162,9 @@ pas_book_view_notify_status_message (PASBookView *book_view,
 
 static gboolean
 pas_book_view_construct (PASBookView                *book_view,
-			 Evolution_BookViewListener  listener)
+			 GNOME_Evolution_Addressbook_BookViewListener  listener)
 {
-	POA_Evolution_BookView *servant;
+	POA_GNOME_Evolution_Addressbook_BookView *servant;
 	CORBA_Environment   ev;
 	CORBA_Object        obj;
 
@@ -172,12 +172,12 @@ pas_book_view_construct (PASBookView                *book_view,
 	g_assert (PAS_IS_BOOK_VIEW (book_view));
 	g_assert (listener  != CORBA_OBJECT_NIL);
 
-	servant = (POA_Evolution_BookView *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Addressbook_BookView *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &pas_book_view_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_BookView__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Addressbook_BookView__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -193,7 +193,7 @@ pas_book_view_construct (PASBookView                *book_view,
 		return FALSE;
 	}
 
-	Evolution_BookViewListener_ref (listener, &ev);
+	GNOME_Evolution_Addressbook_BookViewListener_ref (listener, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("Unable to ref listener object in pas-book-view.c\n");
 		CORBA_exception_free (&ev);
@@ -221,7 +221,7 @@ pas_book_view_construct (PASBookView                *book_view,
  * pas_book_view_new:
  */
 PASBookView *
-pas_book_view_new (Evolution_BookViewListener  listener)
+pas_book_view_new (GNOME_Evolution_Addressbook_BookViewListener  listener)
 {
 	PASBookView *book_view;
 
@@ -246,7 +246,7 @@ pas_book_view_destroy (GtkObject *object)
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookViewListener_unref (book_view->priv->listener, &ev);
+	GNOME_Evolution_Addressbook_BookViewListener_unref (book_view->priv->listener, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning("Unable to unref listener object in pas-book-view.c\n");
 		CORBA_exception_free (&ev);
@@ -269,12 +269,12 @@ pas_book_view_destroy (GtkObject *object)
 	GTK_OBJECT_CLASS (pas_book_view_parent_class)->destroy (object);	
 }
 
-static POA_Evolution_BookView__epv *
+static POA_GNOME_Evolution_Addressbook_BookView__epv *
 pas_book_view_get_epv (void)
 {
-	POA_Evolution_BookView__epv *epv;
+	POA_GNOME_Evolution_Addressbook_BookView__epv *epv;
 
-	epv = g_new0 (POA_Evolution_BookView__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookView__epv, 1);
 
 	return epv;
 	
@@ -284,7 +284,7 @@ static void
 pas_book_view_corba_class_init (void)
 {
 	pas_book_view_vepv.Bonobo_Unknown_epv     = bonobo_object_get_epv ();
-	pas_book_view_vepv.Evolution_BookView_epv = pas_book_view_get_epv ();
+	pas_book_view_vepv.GNOME_Evolution_Addressbook_BookView_epv = pas_book_view_get_epv ();
 }
 
 static void
diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
index df6aed5bbb..fb9e892dfd 100644
--- a/addressbook/backend/pas/pas-book-view.h
+++ b/addressbook/backend/pas/pas-book-view.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * A wrapper object which exports the Evolution_Book CORBA interface
+ * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
  * and which maintains a request queue.
  *
  * Author:
@@ -28,7 +28,7 @@ struct _PASBookView {
 struct _PASBookViewClass {
 	BonoboObjectClass parent_class;
 };
-PASBookView *pas_book_view_new                    (Evolution_BookViewListener  listener);
+PASBookView *pas_book_view_new                    (GNOME_Evolution_Addressbook_BookViewListener  listener);
 
 void         pas_book_view_notify_change          (PASBookView                *book_view,
 						   const GList                *cards);
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
index b1d2688b3f..6fded8301d 100644
--- a/addressbook/backend/pas/pas-book.c
+++ b/addressbook/backend/pas/pas-book.c
@@ -10,7 +10,7 @@
 #include "pas-book.h"
 
 static BonoboObjectClass *pas_book_parent_class;
-POA_Evolution_Book__vepv pas_book_vepv;
+POA_GNOME_Evolution_Addressbook_Book__vepv pas_book_vepv;
 
 enum {
 	REQUESTS_QUEUED,
@@ -21,7 +21,7 @@ static guint pas_book_signals [LAST_SIGNAL];
 
 struct _PASBookPrivate {
 	PASBackend             *backend;
-	Evolution_BookListener  listener;
+	GNOME_Evolution_Addressbook_BookListener  listener;
 	PASBookGetVCardFn       get_vcard;
 	PASBookCanWriteFn       can_write;
 	PASBookCanWriteCardFn   can_write_card;
@@ -106,7 +106,7 @@ pas_book_queue_get_cursor (PASBook *book, const char *search)
 }
 
 static void
-pas_book_queue_get_book_view (PASBook *book, const Evolution_BookViewListener listener, const char *search)
+pas_book_queue_get_book_view (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *search)
 {
 	PASRequest *req;
 	CORBA_Environment ev;
@@ -130,7 +130,7 @@ pas_book_queue_get_book_view (PASBook *book, const Evolution_BookViewListener li
 }
 
 static void
-pas_book_queue_get_changes (PASBook *book, const Evolution_BookViewListener listener, const char *change_id)
+pas_book_queue_get_changes (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *change_id)
 {
 	PASRequest *req;
 	CORBA_Environment ev;
@@ -165,9 +165,9 @@ pas_book_queue_check_connection (PASBook *book)
 }
 
 static CORBA_char *
-impl_Evolution_Book_get_vcard (PortableServer_Servant servant,
-			       const Evolution_CardId id,
-			       CORBA_Environment *ev)
+impl_GNOME_Evolution_Addressbook_Book_getVCard (PortableServer_Servant servant,
+						const GNOME_Evolution_Addressbook_CardId id,
+						CORBA_Environment *ev)
 {
 	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
 	char       *vcard;
@@ -181,7 +181,7 @@ impl_Evolution_Book_get_vcard (PortableServer_Servant servant,
 }
 
 static CORBA_boolean
-impl_Evolution_Book_can_write (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_Book_isWriteable (PortableServer_Servant servant,
 			       CORBA_Environment *ev)
 {
 	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -193,9 +193,9 @@ impl_Evolution_Book_can_write (PortableServer_Servant servant,
 }
 
 static CORBA_boolean
-impl_Evolution_Book_can_write_card (PortableServer_Servant servant,
-				    const Evolution_CardId id,
-				    CORBA_Environment *ev)
+impl_GNOME_Evolution_Addressbook_Book_isCardWriteable (PortableServer_Servant servant,
+						       const GNOME_Evolution_Addressbook_CardId id,
+						       CORBA_Environment *ev)
 {
 	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
 	CORBA_boolean retval;
@@ -206,8 +206,8 @@ impl_Evolution_Book_can_write_card (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Book_create_card (PortableServer_Servant servant,
-				 const Evolution_VCard vcard,
+impl_GNOME_Evolution_Addressbook_Book_addCard (PortableServer_Servant servant,
+				 const GNOME_Evolution_Addressbook_VCard vcard,
 				 CORBA_Environment *ev)
 {
 	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -216,8 +216,8 @@ impl_Evolution_Book_create_card (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Book_remove_card (PortableServer_Servant servant,
-				 const Evolution_CardId id,
+impl_GNOME_Evolution_Addressbook_Book_removeCard (PortableServer_Servant servant,
+				 const GNOME_Evolution_Addressbook_CardId id,
 				 CORBA_Environment *ev)
 {
 	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -226,8 +226,8 @@ impl_Evolution_Book_remove_card (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Book_modify_card (PortableServer_Servant servant,
-				 const Evolution_VCard vcard,
+impl_GNOME_Evolution_Addressbook_Book_modifyCard (PortableServer_Servant servant,
+				 const GNOME_Evolution_Addressbook_VCard vcard,
 				 CORBA_Environment *ev)
 {
 	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -236,7 +236,7 @@ impl_Evolution_Book_modify_card (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Book_get_cursor (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_Book_getCursor (PortableServer_Servant servant,
 				const CORBA_char *search,
 				CORBA_Environment *ev)
 {
@@ -246,8 +246,8 @@ impl_Evolution_Book_get_cursor (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Book_get_book_view (PortableServer_Servant servant,
-				   const Evolution_BookViewListener listener,
+impl_GNOME_Evolution_Addressbook_Book_getBookView (PortableServer_Servant servant,
+				   const GNOME_Evolution_Addressbook_BookViewListener listener,
 				   const CORBA_char *search,
 				   CORBA_Environment *ev)
 {
@@ -257,8 +257,8 @@ impl_Evolution_Book_get_book_view (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Book_get_changes (PortableServer_Servant servant,
-				 const Evolution_BookViewListener listener,
+impl_GNOME_Evolution_Addressbook_Book_getChanges (PortableServer_Servant servant,
+				 const GNOME_Evolution_Addressbook_BookViewListener listener,
 				 const CORBA_char *change_id,
 				 CORBA_Environment *ev)
 {
@@ -268,7 +268,7 @@ impl_Evolution_Book_get_changes (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Book_check_connection (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_Book_checkConnection (PortableServer_Servant servant,
 				      CORBA_Environment *ev)
 {
 	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -277,7 +277,7 @@ impl_Evolution_Book_check_connection (PortableServer_Servant servant,
 }
 
 static char *
-impl_Evolution_Book_get_static_capabilities (PortableServer_Servant servant,
+impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities (PortableServer_Servant servant,
 					     CORBA_Environment *ev)
 {
 	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
@@ -305,7 +305,7 @@ pas_book_get_backend (PASBook *book)
 /**
  * pas_book_get_listener:
  */
-Evolution_BookListener
+GNOME_Evolution_Addressbook_BookListener
 pas_book_get_listener (PASBook *book)
 {
 	g_return_val_if_fail (book != NULL,       CORBA_OBJECT_NIL);
@@ -357,19 +357,19 @@ pas_book_pop_request (PASBook *book)
  */
 void
 pas_book_respond_open (PASBook                           *book,
-		       Evolution_BookListener_CallStatus  status)
+		       GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
 {
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 
-	if (status == Evolution_BookListener_Success) {
-		Evolution_BookListener_respond_open_book (
+	if (status == GNOME_Evolution_Addressbook_BookListener_Success) {
+		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
 			book->priv->listener, status,
 			bonobo_object_corba_objref (BONOBO_OBJECT (book)),
 			&ev);
 	} else {
-		Evolution_BookListener_respond_open_book (
+		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
 			book->priv->listener, status,
 			CORBA_OBJECT_NIL, &ev);
 	}
@@ -388,14 +388,14 @@ pas_book_respond_open (PASBook                           *book,
  */
 void
 pas_book_respond_create (PASBook                           *book,
-			 Evolution_BookListener_CallStatus  status,
+			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
 			 const char                        *id)
 {
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookListener_respond_create_card (
+	GNOME_Evolution_Addressbook_BookListener_notifyCardCreated (
 		book->priv->listener, status, (char *)id, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -411,13 +411,13 @@ pas_book_respond_create (PASBook                           *book,
  */
 void
 pas_book_respond_remove (PASBook                           *book,
-			 Evolution_BookListener_CallStatus  status)
+			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
 {
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookListener_respond_remove_card (
+	GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved (
 		book->priv->listener, status, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -433,13 +433,13 @@ pas_book_respond_remove (PASBook                           *book,
  */
 void
 pas_book_respond_modify (PASBook                           *book,
-			 Evolution_BookListener_CallStatus  status)
+			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
 {
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookListener_respond_modify_card (
+	GNOME_Evolution_Addressbook_BookListener_notifyCardModified (
 		book->priv->listener, status, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -455,7 +455,7 @@ pas_book_respond_modify (PASBook                           *book,
  */
 void
 pas_book_respond_get_cursor (PASBook                           *book,
-			     Evolution_BookListener_CallStatus  status,
+			     GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
 			     PASCardCursor                     *cursor)
 {
 	CORBA_Environment ev;
@@ -465,7 +465,7 @@ pas_book_respond_get_cursor (PASBook                           *book,
 	
 	object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor));
 
-	Evolution_BookListener_respond_get_cursor (
+	GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested (
 		book->priv->listener, status, object, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -481,7 +481,7 @@ pas_book_respond_get_cursor (PASBook                           *book,
  */
 void
 pas_book_respond_get_book_view (PASBook                           *book,
-				Evolution_BookListener_CallStatus  status,
+				GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
 				PASBookView                       *book_view)
 {
 	CORBA_Environment ev;
@@ -491,7 +491,7 @@ pas_book_respond_get_book_view (PASBook                           *book,
 	
 	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
 
-	Evolution_BookListener_respond_get_view (
+	GNOME_Evolution_Addressbook_BookListener_notifyViewRequested (
 		book->priv->listener, status, object, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -507,7 +507,7 @@ pas_book_respond_get_book_view (PASBook                           *book,
  */
 void
 pas_book_respond_get_changes (PASBook                           *book,
-			      Evolution_BookListener_CallStatus  status,
+			      GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
 			      PASBookView                       *book_view)
 {
 	CORBA_Environment ev;
@@ -517,7 +517,7 @@ pas_book_respond_get_changes (PASBook                           *book,
 	
 	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
 
-	Evolution_BookListener_respond_get_changes (
+	GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested (
 		book->priv->listener, status, object, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -539,7 +539,7 @@ pas_book_report_connection (PASBook  *book,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_BookListener_report_connection_status (
+	GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus (
 		book->priv->listener, (CORBA_boolean) connected, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -553,12 +553,12 @@ pas_book_report_connection (PASBook  *book,
 static gboolean
 pas_book_construct (PASBook                *book,
 		    PASBackend             *backend,
-		    Evolution_BookListener  listener,
+		    GNOME_Evolution_Addressbook_BookListener  listener,
 		    PASBookGetVCardFn       get_vcard,
 		    PASBookCanWriteFn       can_write,
 		    PASBookCanWriteCardFn   can_write_card)
 {
-	POA_Evolution_Book *servant;
+	POA_GNOME_Evolution_Addressbook_Book *servant;
 	CORBA_Environment   ev;
 	CORBA_Object        obj;
 
@@ -569,12 +569,12 @@ pas_book_construct (PASBook                *book,
 	g_assert (can_write != NULL);
 	g_assert (can_write_card != NULL);
 
-	servant = (POA_Evolution_Book *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Addressbook_Book *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &pas_book_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_Book__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Addressbook_Book__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -615,7 +615,7 @@ pas_book_construct (PASBook                *book,
  */
 PASBook *
 pas_book_new (PASBackend             *backend,
-	      Evolution_BookListener  listener,
+	      GNOME_Evolution_Addressbook_BookListener  listener,
 	      PASBookGetVCardFn       get_vcard,
 	      PASBookCanWriteFn       can_write,
 	      PASBookCanWriteCardFn   can_write_card)
@@ -666,24 +666,24 @@ pas_book_destroy (GtkObject *object)
 	GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object);	
 }
 
-static POA_Evolution_Book__epv *
+static POA_GNOME_Evolution_Addressbook_Book__epv *
 pas_book_get_epv (void)
 {
-	POA_Evolution_Book__epv *epv;
+	POA_GNOME_Evolution_Addressbook_Book__epv *epv;
 
-	epv = g_new0 (POA_Evolution_Book__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_Addressbook_Book__epv, 1);
 
-	epv->get_vcard               = impl_Evolution_Book_get_vcard;
-	epv->can_write               = impl_Evolution_Book_can_write;
-	epv->can_write_card          = impl_Evolution_Book_can_write_card;
-	epv->create_card             = impl_Evolution_Book_create_card;
-	epv->remove_card             = impl_Evolution_Book_remove_card;
-	epv->modify_card             = impl_Evolution_Book_modify_card;
-	epv->check_connection        = impl_Evolution_Book_check_connection;
-	epv->get_static_capabilities = impl_Evolution_Book_get_static_capabilities;
-	epv->get_cursor              = impl_Evolution_Book_get_cursor;
-	epv->get_book_view           = impl_Evolution_Book_get_book_view;
-	epv->get_changes             = impl_Evolution_Book_get_changes;
+	epv->getVCard              = impl_GNOME_Evolution_Addressbook_Book_getVCard;
+	epv->isWriteable           = impl_GNOME_Evolution_Addressbook_Book_isWriteable;
+	epv->isCardWriteable       = impl_GNOME_Evolution_Addressbook_Book_isCardWriteable;
+	epv->addCard               = impl_GNOME_Evolution_Addressbook_Book_addCard;
+	epv->removeCard            = impl_GNOME_Evolution_Addressbook_Book_removeCard;
+	epv->modifyCard            = impl_GNOME_Evolution_Addressbook_Book_modifyCard;
+	epv->checkConnection       = impl_GNOME_Evolution_Addressbook_Book_checkConnection;
+	epv->getStaticCapabilities = impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities;
+	epv->getCursor             = impl_GNOME_Evolution_Addressbook_Book_getCursor;
+	epv->getBookView           = impl_GNOME_Evolution_Addressbook_Book_getBookView;
+	epv->getChanges            = impl_GNOME_Evolution_Addressbook_Book_getChanges;
 
 	return epv;
 	
@@ -693,7 +693,7 @@ static void
 pas_book_corba_class_init (void)
 {
 	pas_book_vepv.Bonobo_Unknown_epv  = bonobo_object_get_epv ();
-	pas_book_vepv.Evolution_Book_epv = pas_book_get_epv ();
+	pas_book_vepv.GNOME_Evolution_Addressbook_Book_epv = pas_book_get_epv ();
 }
 
 static void
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
index 68b0c60fda..3c7f5a2bde 100644
--- a/addressbook/backend/pas/pas-book.h
+++ b/addressbook/backend/pas/pas-book.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * A wrapper object which exports the Evolution_Book CORBA interface
+ * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
  * and which maintains a request queue.
  *
  * Author:
@@ -39,7 +39,7 @@ typedef struct {
 	char                      *vcard;
 	char                      *search;
 	char                      *change_id;
-	Evolution_BookViewListener listener;
+	GNOME_Evolution_Addressbook_BookViewListener listener;
 } PASRequest;
 
 struct _PASBook {
@@ -59,31 +59,31 @@ typedef gboolean (*PASBookCanWriteFn)     (PASBook *book);
 typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);
 
 PASBook                *pas_book_new                    (PASBackend                        *backend,
-							 Evolution_BookListener             listener,
+							 GNOME_Evolution_Addressbook_BookListener             listener,
 							 PASBookGetVCardFn                  get_vcard,
 							 PASBookCanWriteFn                  can_write,
 							 PASBookCanWriteCardFn              can_write_card);
 PASBackend             *pas_book_get_backend            (PASBook                           *book);
-Evolution_BookListener  pas_book_get_listener           (PASBook                           *book);
+GNOME_Evolution_Addressbook_BookListener  pas_book_get_listener           (PASBook                           *book);
 int                     pas_book_check_pending          (PASBook                           *book);
 PASRequest             *pas_book_pop_request            (PASBook                           *book);
 void                    pas_book_respond_open           (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status);
+							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
 void                    pas_book_respond_create         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
+							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
 							 const char                        *id);
 void                    pas_book_respond_remove         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status);
+							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
 void                    pas_book_respond_modify         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status);
+							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
 void                    pas_book_respond_get_cursor     (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
+							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
 							 PASCardCursor                     *cursor);
 void                    pas_book_respond_get_book_view  (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
+							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
 							 PASBookView                       *book_view);
 void                    pas_book_respond_get_changes    (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
+							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
 							 PASBookView                       *book_view);
 void                    pas_book_report_connection      (PASBook                           *book,
 							 gboolean                           connected);
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
index c2bbe1c9b0..a7f56275fc 100644
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ b/addressbook/backend/pas/pas-card-cursor.c
@@ -25,7 +25,7 @@ static BonoboObjectClass *parent_class;
 /*
  * The VEPV for the CardCursor object
  */
-static POA_Evolution_CardCursor__vepv cursor_vepv;
+static POA_GNOME_Evolution_Addressbook_CardCursor__vepv cursor_vepv;
 
 /*
  * Implemented GtkObject::destroy
@@ -77,18 +77,18 @@ impl_pas_card_cursor_get_nth (PortableServer_Servant  servant,
  * If you want users to derive classes from your implementation
  * you need to support this method.
  */
-POA_Evolution_CardCursor__epv *
+POA_GNOME_Evolution_Addressbook_CardCursor__epv *
 pas_card_cursor_get_epv (void)
 {
-	POA_Evolution_CardCursor__epv *epv;
+	POA_GNOME_Evolution_Addressbook_CardCursor__epv *epv;
 
-	epv = g_new0 (POA_Evolution_CardCursor__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_Addressbook_CardCursor__epv, 1);
 
 	/*
 	 * This is the method invoked by CORBA
 	 */
-	epv->get_length = impl_pas_card_cursor_get_length;
-	epv->get_nth    = impl_pas_card_cursor_get_nth;
+	epv->count  = impl_pas_card_cursor_get_length;
+	epv->getNth = impl_pas_card_cursor_get_nth;
 
 	return epv;
 }
@@ -97,7 +97,7 @@ static void
 init_pas_card_cursor_corba_class (void)
 {
 	cursor_vepv.Bonobo_Unknown_epv       = bonobo_object_get_epv ();
-	cursor_vepv.Evolution_CardCursor_epv = pas_card_cursor_get_epv ();
+	cursor_vepv.GNOME_Evolution_Addressbook_CardCursor_epv = pas_card_cursor_get_epv ();
 }
 
 static void
@@ -146,7 +146,7 @@ pas_card_cursor_get_type (void)
 
 PASCardCursor *
 pas_card_cursor_construct (PASCardCursor           *cursor,
-			   Evolution_CardCursor     corba_cursor,
+			   GNOME_Evolution_Addressbook_CardCursor     corba_cursor,
 			   PASCardCursorLengthFunc  get_length,
 			   PASCardCursorNthFunc     get_nth,
 			   gpointer data)
@@ -178,17 +178,17 @@ pas_card_cursor_construct (PASCardCursor           *cursor,
  * This routine creates the ORBit CORBA server and initializes the
  * CORBA side of things
  */
-static Evolution_CardCursor
+static GNOME_Evolution_Addressbook_CardCursor
 create_cursor (BonoboObject *cursor)
 {
-	POA_Evolution_CardCursor *servant;
+	POA_GNOME_Evolution_Addressbook_CardCursor *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_CardCursor *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Addressbook_CardCursor *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &cursor_vepv;
 
 	CORBA_exception_init (&ev);
-	POA_Evolution_CardCursor__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Addressbook_CardCursor__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION){
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -200,7 +200,7 @@ create_cursor (BonoboObject *cursor)
 	/*
 	 * Activates the CORBA object.
 	 */
-	return (Evolution_CardCursor) bonobo_object_activate_servant (cursor, servant);
+	return (GNOME_Evolution_Addressbook_CardCursor) bonobo_object_activate_servant (cursor, servant);
 }
 
 PASCardCursor *
@@ -209,7 +209,7 @@ pas_card_cursor_new (PASCardCursorLengthFunc  get_length,
 		     gpointer data)
 {
 	PASCardCursor *cursor;
-	Evolution_CardCursor corba_cursor;
+	GNOME_Evolution_Addressbook_CardCursor corba_cursor;
 
 	cursor = gtk_type_new (pas_card_cursor_get_type ());
 	corba_cursor = create_cursor (BONOBO_OBJECT (cursor));
diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h
index 300e3e3ce1..d7d19ecebd 100644
--- a/addressbook/backend/pas/pas-card-cursor.h
+++ b/addressbook/backend/pas/pas-card-cursor.h
@@ -37,13 +37,13 @@ PASCardCursor *pas_card_cursor_new       (PASCardCursorLengthFunc  get_length,
 				          PASCardCursorNthFunc     get_nth,
 					  gpointer data);
 PASCardCursor *pas_card_cursor_construct (PASCardCursor           *cursor,
-					  Evolution_CardCursor     corba_cursor,
+					  GNOME_Evolution_Addressbook_CardCursor     corba_cursor,
 					  PASCardCursorLengthFunc  get_length,
 					  PASCardCursorNthFunc     get_nth,
 					  gpointer data);
 
 GtkType        pas_card_cursor_get_type  (void);
-POA_Evolution_CardCursor__epv *
+POA_GNOME_Evolution_Addressbook_CardCursor__epv *
                pas_card_cursor_get_epv   (void);
 
 /* Fetching cards. */
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 5b52b8337b..59737c5b6e 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -90,7 +90,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 
 static void
 owner_unset_cb (EvolutionShellComponent *shell_component,
-		Evolution_Shell shell_interface,
+		GNOME_Evolution_Shell shell_interface,
 		gpointer user_data)
 {
 	owner_count --;
diff --git a/addressbook/gui/component/e-ldap-storage.c b/addressbook/gui/component/e-ldap-storage.c
index 518de69e0d..2dc443140d 100644
--- a/addressbook/gui/component/e-ldap-storage.c
+++ b/addressbook/gui/component/e-ldap-storage.c
@@ -75,7 +75,7 @@ setup_ldap_storage (EvolutionShellComponent *shell_component,
 		    const char *evolution_homedir)
 {
 	EvolutionShellClient *shell_client;
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_Shell corba_shell;
 
 	shell_client = evolution_shell_component_get_owner (shell_component);
 	if (shell_client == CORBA_OBJECT_NIL) {
diff --git a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
index 2bc8154daf..c38d714cf4 100644
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
@@ -10,6 +10,7 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 module Addressbook {
 
@@ -24,14 +25,15 @@ module Addressbook {
 		exception DuplicateID {};
 		exception SectionNotFound {};
 
-		void add_section (in string id, in string title)
+		void addSection (in string id, in string title)
 			raises (DuplicateID);
 
-		Bonobo::Control get_entry_for_section (in string section_id)
+		Bonobo::Control getEntryBySection (in string section_id)
 			raises (SectionNotFound);
 
-		void activate_dialog (in string section_id);
+		void activateDialog (in string section_id);
 	};
 
 };
 };
+};
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 7c5d2672b0..b1685f9ef0 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -12,8 +12,8 @@ IDL_GENERATED = \
 Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h
 
 $(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		-I $(srcdir) $(srcdir)/Evolution-Addressbook-SelectNames.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
+		$(srcdir)/Evolution-Addressbook-SelectNames.idl
 
 oafdir = $(datadir)/oaf
 oaf_DATA = evolution-addressbook-select-names.oafinfo
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index 1a0bd450f0..d6f0e10f05 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -98,20 +98,20 @@ entry_set_property_fn (BonoboPropertyBag *bag,
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
+static POA_GNOME_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
 
-static POA_Evolution_Addressbook_SelectNames *
+static POA_GNOME_Evolution_Addressbook_SelectNames *
 create_servant (void)
 {
-	POA_Evolution_Addressbook_SelectNames *servant;
+	POA_GNOME_Evolution_Addressbook_SelectNames *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &SelectNames_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -162,7 +162,7 @@ impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,
 	if (entry_widget == NULL) {
 		CORBA_exception_set (ev,
 				     CORBA_USER_EXCEPTION,
-				     ex_Evolution_Addressbook_SelectNames_SectionNotFound,
+				     ex_GNOME_Evolution_Addressbook_SelectNames_SectionNotFound,
 				     NULL);
 		return CORBA_OBJECT_NIL;
 	}
@@ -216,8 +216,8 @@ impl_destroy (GtkObject *object)
 static void
 corba_class_init ()
 {
-	POA_Evolution_Addressbook_SelectNames__vepv *vepv;
-	POA_Evolution_Addressbook_SelectNames__epv *epv;
+	POA_GNOME_Evolution_Addressbook_SelectNames__vepv *vepv;
+	POA_GNOME_Evolution_Addressbook_SelectNames__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -225,14 +225,14 @@ corba_class_init ()
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_Addressbook_SelectNames__epv, 1);
-	epv->add_section           = impl_SelectNames_add_section;
-	epv->get_entry_for_section = impl_SelectNames_get_entry_for_section;
-	epv->activate_dialog       = impl_SelectNames_activate_dialog;
+	epv = g_new0 (POA_GNOME_Evolution_Addressbook_SelectNames__epv, 1);
+	epv->addSection        = impl_SelectNames_add_section;
+	epv->getEntryBySection = impl_SelectNames_get_entry_for_section;
+	epv->activateDialog    = impl_SelectNames_activate_dialog;
 
 	vepv = &SelectNames_vepv;
 	vepv->Bonobo_Unknown_epv                    = bonobo_object_get_epv ();
-	vepv->Evolution_Addressbook_SelectNames_epv = epv;
+	vepv->GNOME_Evolution_Addressbook_SelectNames_epv = epv;
 }
 
 static void
@@ -263,7 +263,7 @@ init (ESelectNamesBonobo *select_names)
 
 void
 e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
-				 Evolution_Addressbook_SelectNames corba_object)
+				 GNOME_Evolution_Addressbook_SelectNames corba_object)
 {
 	g_return_if_fail (select_names != NULL);
 	g_return_if_fail (E_IS_SELECT_NAMES_BONOBO (select_names));
@@ -274,8 +274,8 @@ e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
 ESelectNamesBonobo *
 e_select_names_bonobo_new (void)
 {
-	POA_Evolution_Addressbook_SelectNames *servant;
-	Evolution_Addressbook_SelectNames corba_object;
+	POA_GNOME_Evolution_Addressbook_SelectNames *servant;
+	GNOME_Evolution_Addressbook_SelectNames corba_object;
 	ESelectNamesBonobo *select_names;
 
 	servant = create_servant ();
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h
index 4531c1e024..87fbfa0fab 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.h
@@ -61,7 +61,7 @@ struct _ESelectNamesBonoboClass {
 
 GtkType             e_select_names_bonobo_get_type   (void);
 void                e_select_names_bonobo_construct  (ESelectNamesBonobo *select_names,
-						      Evolution_Addressbook_SelectNames corba_object);
+						      GNOME_Evolution_Addressbook_SelectNames corba_object);
 ESelectNamesBonobo *e_select_names_bonobo_new        (void);
 
 #ifdef __cplusplus
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 91a3b049ed..182c1c9a90 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-10  Michael Meeks  <michael@helixcode.com>
+
+	* gui/Makefile.am ($(IDL_GENERATED)): sort include order.
+
+	* pcs/Makefile.am (idl_flags): ditto.
+
 2000-11-10  JP Rosevear  <jpr@helixcode.com>
 
 	* conduits/calendar/calendar-conduit.c (for_each_modified): Inc the
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 3e7daf80c4..39d59defe2 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -43,13 +43,13 @@ struct _CalClientPrivate {
 	LoadState load_state;
 
 	/* The calendar factory we are contacting */
-	Evolution_Calendar_CalFactory factory;
+	GNOME_Evolution_Calendar_CalFactory factory;
 
 	/* Our calendar listener */
 	CalListener *listener;
 
 	/* The calendar client interface object we are contacting */
-	Evolution_Calendar_Cal cal;
+	GNOME_Evolution_Calendar_Cal cal;
 };
 
 
@@ -229,7 +229,7 @@ destroy_cal (CalClient *client)
 		return;
 
 	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_unref (priv->cal, &ev);
+	GNOME_Evolution_Calendar_Cal_unref (priv->cal, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION)
 		g_message ("destroy_cal(): could not unref the calendar client interface object");
 
@@ -278,14 +278,14 @@ cal_client_destroy (GtkObject *object)
 /* Handle the cal_loaded signal from the listener */
 static void
 cal_loaded_cb (CalListener *listener,
-	       Evolution_Calendar_Listener_LoadStatus status,
-	       Evolution_Calendar_Cal cal,
+	       GNOME_Evolution_Calendar_Listener_LoadStatus status,
+	       GNOME_Evolution_Calendar_Cal cal,
 	       gpointer data)
 {
 	CalClient *client;
 	CalClientPrivate *priv;
 	CORBA_Environment ev;
-	Evolution_Calendar_Cal cal_copy;
+	GNOME_Evolution_Calendar_Cal cal_copy;
 	CalClientLoadStatus client_status;
 
 	client = CAL_CLIENT (data);
@@ -296,7 +296,7 @@ cal_loaded_cb (CalListener *listener,
 	client_status = CAL_CLIENT_LOAD_ERROR;
 
 	switch (status) {
-	case Evolution_Calendar_Listener_SUCCESS:
+	case GNOME_Evolution_Calendar_Listener_SUCCESS:
 		CORBA_exception_init (&ev);
 		cal_copy = CORBA_Object_duplicate (cal, &ev);
 		if (ev._major != CORBA_NO_EXCEPTION) {
@@ -312,15 +312,15 @@ cal_loaded_cb (CalListener *listener,
 		client_status = CAL_CLIENT_LOAD_SUCCESS;
 		goto out;
 
-	case Evolution_Calendar_Listener_ERROR:
+	case GNOME_Evolution_Calendar_Listener_ERROR:
 		client_status = CAL_CLIENT_LOAD_ERROR;
 		goto error;
 
-	case Evolution_Calendar_Listener_IN_USE:
+	case GNOME_Evolution_Calendar_Listener_IN_USE:
 		client_status = CAL_CLIENT_LOAD_IN_USE;
 		goto error;
 
-	case Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:
+	case GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:
 		client_status = CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED;
 		goto error;
 
@@ -344,7 +344,7 @@ cal_loaded_cb (CalListener *listener,
 
 /* Handle the obj_updated signal from the listener */
 static void
-obj_updated_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
+obj_updated_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)
 {
 	CalClient *client;
 
@@ -354,7 +354,7 @@ obj_updated_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, g
 
 /* Handle the obj_removed signal from the listener */
 static void
-obj_removed_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
+obj_removed_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)
 {
 	CalClient *client;
 
@@ -378,7 +378,7 @@ CalClient *
 cal_client_construct (CalClient *client)
 {
 	CalClientPrivate *priv;
-	Evolution_Calendar_CalFactory factory, factory_copy;
+	GNOME_Evolution_Calendar_CalFactory factory, factory_copy;
 	CORBA_Environment ev;
 	int result;
 
@@ -388,7 +388,7 @@ cal_client_construct (CalClient *client)
 
 	priv = client->priv;
 
-	factory = (Evolution_Calendar_CalFactory) oaf_activate_from_id (
+	factory = (GNOME_Evolution_Calendar_CalFactory) oaf_activate_from_id (
 		"OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554",
 		OAF_FLAG_NO_LOCAL, NULL, &ev);
 
@@ -450,7 +450,7 @@ static gboolean
 load_or_create (CalClient *client, const char *str_uri, gboolean load)
 {
 	CalClientPrivate *priv;
-	Evolution_Calendar_Listener corba_listener;
+	GNOME_Evolution_Calendar_Listener corba_listener;
 	CORBA_Environment ev;
 
 	g_return_val_if_fail (client != NULL, FALSE);
@@ -477,7 +477,7 @@ load_or_create (CalClient *client, const char *str_uri, gboolean load)
 			    GTK_SIGNAL_FUNC (obj_removed_cb),
 			    client);
 
-	corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (
+	corba_listener = (GNOME_Evolution_Calendar_Listener) bonobo_object_corba_objref (
 		BONOBO_OBJECT (priv->listener));
 
 	CORBA_exception_init (&ev);
@@ -485,9 +485,9 @@ load_or_create (CalClient *client, const char *str_uri, gboolean load)
 	priv->load_state = LOAD_STATE_LOADING;
 
 	if (load)
-		Evolution_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
+		GNOME_Evolution_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
 	else
-		Evolution_Calendar_CalFactory_create (priv->factory, str_uri, corba_listener, &ev);
+		GNOME_Evolution_Calendar_CalFactory_create (priv->factory, str_uri, corba_listener, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("load_or_create(): load/create request failed");
@@ -558,12 +558,12 @@ cal_client_is_loaded (CalClient *client)
 }
 
 /* Converts our representation of a calendar component type into its CORBA representation */
-static Evolution_Calendar_CalObjType
+static GNOME_Evolution_Calendar_CalObjType
 corba_obj_type (CalObjType type)
 {
-	return (((type & CALOBJ_TYPE_EVENT) ? Evolution_Calendar_TYPE_EVENT : 0)
-		| ((type & CALOBJ_TYPE_TODO) ? Evolution_Calendar_TYPE_TODO : 0)
-		| ((type & CALOBJ_TYPE_JOURNAL) ? Evolution_Calendar_TYPE_JOURNAL : 0));
+	return (((type & CALOBJ_TYPE_EVENT) ? GNOME_Evolution_Calendar_TYPE_EVENT : 0)
+		| ((type & CALOBJ_TYPE_TODO) ? GNOME_Evolution_Calendar_TYPE_TODO : 0)
+		| ((type & CALOBJ_TYPE_JOURNAL) ? GNOME_Evolution_Calendar_TYPE_JOURNAL : 0));
 }
 
 /**
@@ -593,7 +593,7 @@ cal_client_get_n_objects (CalClient *client, CalObjType type)
 	t = corba_obj_type (type);
 
 	CORBA_exception_init (&ev);
-	n = Evolution_Calendar_Cal_get_n_objects (priv->cal, t, &ev);
+	n = GNOME_Evolution_Calendar_Cal_countObjects (priv->cal, t, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_get_n_objects(): could not get the number of objects");
@@ -621,7 +621,7 @@ cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
 {
 	CalClientPrivate *priv;
 	CORBA_Environment ev;
-	Evolution_Calendar_CalObj calobj_str;
+	GNOME_Evolution_Calendar_CalObj calobj_str;
 	CalClientGetStatus retval;
 	icalcomponent *icalcomp;
 
@@ -638,10 +638,10 @@ cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
 	*comp = NULL;
 
 	CORBA_exception_init (&ev);
-	calobj_str = Evolution_Calendar_Cal_get_object (priv->cal, (char *) uid, &ev);
+	calobj_str = GNOME_Evolution_Calendar_Cal_getObject (priv->cal, (char *) uid, &ev);
 
 	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
+	    && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
 		goto out;
 	else if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_get_object(): could not get the object");
@@ -676,7 +676,7 @@ cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
 
 /* Builds an UID list out of a CORBA UID sequence */
 static GList *
-build_uid_list (Evolution_Calendar_CalObjUIDSeq *seq)
+build_uid_list (GNOME_Evolution_Calendar_CalObjUIDSeq *seq)
 {
 	GList *uids;
 	int i;
@@ -704,7 +704,7 @@ cal_client_get_uids (CalClient *client, CalObjType type)
 {
 	CalClientPrivate *priv;
 	CORBA_Environment ev;
-	Evolution_Calendar_CalObjUIDSeq *seq;
+	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
 	int t;
 	GList *uids;
 
@@ -718,7 +718,7 @@ cal_client_get_uids (CalClient *client, CalObjType type)
 
 	CORBA_exception_init (&ev);
 
-	seq = Evolution_Calendar_Cal_get_uids (priv->cal, t, &ev);
+	seq = GNOME_Evolution_Calendar_Cal_getUIds (priv->cal, t, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_get_uids(): could not get the list of UIDs");
 		CORBA_exception_free (&ev);
@@ -735,7 +735,7 @@ cal_client_get_uids (CalClient *client, CalObjType type)
 
 /* Builds a GList of CalObjChange structures from the CORBA sequence */
 static GList *
-build_change_list (Evolution_Calendar_CalObjChangeSeq *seq)
+build_change_list (GNOME_Evolution_Calendar_CalObjChangeSeq *seq)
 {
 	GList *list;
 	int i;
@@ -743,7 +743,7 @@ build_change_list (Evolution_Calendar_CalObjChangeSeq *seq)
 	/* Create the list in reverse order */
 	list = NULL;
 	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalObjChange *corba_coc;
+		GNOME_Evolution_Calendar_CalObjChange *corba_coc;
 		CalObjChange *coc;
 
 		corba_coc = &seq->_buffer[i];
@@ -774,7 +774,7 @@ cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since)
 {
 	CalClientPrivate *priv;
 	CORBA_Environment ev;
-	Evolution_Calendar_CalObjChangeSeq *seq;
+	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
 	int t;
 	GList *changes;
 
@@ -787,7 +787,7 @@ cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since)
 	t = corba_obj_type (type);
 	CORBA_exception_init (&ev);
 
-	seq = Evolution_Calendar_Cal_get_changed_uids (priv->cal, t, since, &ev);
+	seq = GNOME_Evolution_Calendar_Cal_getChangedUIds (priv->cal, t, since, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_get_changed_uids(): could not get the list of changes");
 		CORBA_exception_free (&ev);
@@ -806,7 +806,7 @@ cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since)
 #if 0
 /* Builds a GList of CalObjInstance structures from the CORBA sequence */
 static GList *
-build_object_instance_list (Evolution_Calendar_CalObjInstanceSeq *seq)
+build_object_instance_list (GNOME_Evolution_Calendar_CalObjInstanceSeq *seq)
 {
 	GList *list;
 	int i;
@@ -815,7 +815,7 @@ build_object_instance_list (Evolution_Calendar_CalObjInstanceSeq *seq)
 
 	list = NULL;
 	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalObjInstance *corba_icoi;
+		GNOME_Evolution_Calendar_CalObjInstance *corba_icoi;
 		CalObjInstance *icoi;
 
 		corba_icoi = &seq->_buffer[i];
@@ -851,7 +851,7 @@ cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t star
 {
 	CalClientPrivate *priv;
 	CORBA_Environment ev;
-	Evolution_Calendar_CalObjUIDSeq *seq;
+	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
 	GList *uids;
 	int t;
 
@@ -868,7 +868,7 @@ cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t star
 
 	t = corba_obj_type (type);
 
-	seq = Evolution_Calendar_Cal_get_objects_in_range (priv->cal, t, start, end, &ev);
+	seq = GNOME_Evolution_Calendar_Cal_getObjectsInRange (priv->cal, t, start, end, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_get_objects_in_range(): could not get the objects");
 		CORBA_exception_free (&ev);
@@ -1186,7 +1186,7 @@ uncorba_alarm_type (Evolution_Calendar_AlarmType corba_type)
 
 /* Builds a GList of CalAlarmInstance structures from the CORBA sequence */
 static GList *
-build_alarm_instance_list (Evolution_Calendar_CalAlarmInstanceSeq *seq)
+build_alarm_instance_list (GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq)
 {
 	GList *list;
 	int i;
@@ -1195,7 +1195,7 @@ build_alarm_instance_list (Evolution_Calendar_CalAlarmInstanceSeq *seq)
 
 	list = NULL;
 	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalAlarmInstance *corba_ai;
+		GNOME_Evolution_Calendar_CalAlarmInstance *corba_ai;
 		CalAlarmInstance *ai;
 
 		corba_ai = &seq->_buffer[i];
@@ -1231,7 +1231,7 @@ cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)
 {
 	CalClientPrivate *priv;
 	CORBA_Environment ev;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
+	GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
 	GList *alarms;
 
 	g_return_val_if_fail (client != NULL, NULL);
@@ -1245,7 +1245,7 @@ cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)
 
 	CORBA_exception_init (&ev);
 
-	seq = Evolution_Calendar_Cal_get_alarms_in_range (priv->cal, start, end, &ev);
+	seq = GNOME_Evolution_Calendar_Cal_getAlarmsInRange (priv->cal, start, end, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_get_alarms_in_range(): could not get the alarm range");
 		CORBA_exception_free (&ev);
@@ -1279,7 +1279,7 @@ cal_client_get_alarms_for_object (CalClient *client, const char *uid,
 {
 	CalClientPrivate *priv;
 	CORBA_Environment ev;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
+	GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
 	gboolean retval;
 
 	g_return_val_if_fail (client != NULL, FALSE);
@@ -1298,9 +1298,9 @@ cal_client_get_alarms_for_object (CalClient *client, const char *uid,
 
 	CORBA_exception_init (&ev);
 
-	seq = Evolution_Calendar_Cal_get_alarms_for_object (priv->cal, (char *) uid, start, end, &ev);
+	seq = GNOME_Evolution_Calendar_Cal_getAlarmsForObject (priv->cal, (char *) uid, start, end, &ev);
 	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
+	    && strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
 		goto out;
 	else if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_get_alarms_for_object(): could not get the alarm range");
@@ -1354,11 +1354,11 @@ cal_client_update_object (CalClient *client, CalComponent *comp)
 	cal_component_get_uid (comp, &uid);
 
 	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_update_object (priv->cal, (char *) uid, obj_string, &ev);
+	GNOME_Evolution_Calendar_Cal_updateObject (priv->cal, (char *) uid, obj_string, &ev);
 	g_free (obj_string);
 
 	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_InvalidObject) == 0)
+	    strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_InvalidObject) == 0)
 		goto out;
 	else if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_update_object(): could not update the object");
@@ -1390,10 +1390,10 @@ cal_client_remove_object (CalClient *client, const char *uid)
 	retval = FALSE;
 
 	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_remove_object (priv->cal, (char *) uid, &ev);
+	GNOME_Evolution_Calendar_Cal_removeObject (priv->cal, (char *) uid, &ev);
 
 	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
+	    strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_Calendar_Cal_NotFound) == 0)
 		goto out;
 	else if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_client_remove_object(): could not remove the object");
diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c
index c5626fee9d..cf7442b0e9 100644
--- a/calendar/cal-client/cal-listener.c
+++ b/calendar/cal-client/cal-listener.c
@@ -28,7 +28,7 @@
 /* Private part of the CalListener structure */
 struct _CalListenerPrivate {
 	/* The calendar this listener refers to */
-	Evolution_Calendar_Cal cal;
+	GNOME_Evolution_Calendar_Cal cal;
 };
 
 
@@ -47,7 +47,7 @@ static void cal_listener_destroy (GtkObject *object);
 
 static void marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args);
 
-static POA_Evolution_Calendar_Listener__vepv cal_listener_vepv;
+static POA_GNOME_Evolution_Calendar_Listener__vepv cal_listener_vepv;
 
 static guint cal_listener_signals[LAST_SIGNAL];
 
@@ -92,7 +92,7 @@ static void
 init_cal_listener_corba_class (void)
 {
 	cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_listener_vepv.Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
+	cal_listener_vepv.GNOME_Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
 }
 
 /* Class initialization function for the calendar listener */
@@ -212,14 +212,14 @@ marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg
 /* Listener::cal_loaded method */
 static void
 Listener_cal_loaded (PortableServer_Servant servant,
-		     Evolution_Calendar_Listener_LoadStatus status,
-		     Evolution_Calendar_Cal cal,
+		     GNOME_Evolution_Calendar_Listener_LoadStatus status,
+		     GNOME_Evolution_Calendar_Cal cal,
 		     CORBA_Environment *ev)
 {
 	CalListener *listener;
 	CalListenerPrivate *priv;
 	CORBA_Environment aev;
-	Evolution_Calendar_Cal cal_copy;
+	GNOME_Evolution_Calendar_Cal cal_copy;
 
 	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
 	priv = listener->priv;
@@ -248,7 +248,7 @@ Listener_cal_loaded (PortableServer_Servant servant,
 /* Listener::obj_updated method */
 static void
 Listener_obj_updated (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjUID uid,
+		      GNOME_Evolution_Calendar_CalObjUID uid,
 		      CORBA_Environment *ev)
 {
 	CalListener *listener;
@@ -261,7 +261,7 @@ Listener_obj_updated (PortableServer_Servant servant,
 /* Listener::obj_removed method */
 static void
 Listener_obj_removed (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjUID uid,
+		      GNOME_Evolution_Calendar_CalObjUID uid,
 		      CORBA_Environment *ev)
 {
 	CalListener *listener;
@@ -279,15 +279,15 @@ Listener_obj_removed (PortableServer_Servant servant,
  *
  * Return value: A newly-allocated EPV.
  **/
-POA_Evolution_Calendar_Listener__epv *
+POA_GNOME_Evolution_Calendar_Listener__epv *
 cal_listener_get_epv (void)
 {
-	POA_Evolution_Calendar_Listener__epv *epv;
+	POA_GNOME_Evolution_Calendar_Listener__epv *epv;
 
-	epv = g_new0 (POA_Evolution_Calendar_Listener__epv, 1);
-	epv->cal_loaded = Listener_cal_loaded;
-	epv->obj_updated = Listener_obj_updated;
-	epv->obj_removed = Listener_obj_removed;
+	epv = g_new0 (POA_GNOME_Evolution_Calendar_Listener__epv, 1);
+	epv->notifyCalLoaded  = Listener_cal_loaded;
+	epv->notifyObjUpdated = Listener_obj_updated;
+	epv->notifyObjRemoved = Listener_obj_removed;
 	return epv;
 }
 
@@ -304,7 +304,7 @@ cal_listener_get_epv (void)
  * Return value: the same object as the @listener argument.
  **/
 CalListener *
-cal_listener_construct (CalListener *listener, Evolution_Calendar_Listener corba_listener)
+cal_listener_construct (CalListener *listener, GNOME_Evolution_Calendar_Listener corba_listener)
 {
 	g_return_val_if_fail (listener != NULL, NULL);
 	g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);
@@ -323,20 +323,20 @@ cal_listener_construct (CalListener *listener, Evolution_Calendar_Listener corba
  * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
  * failure.
  **/
-Evolution_Calendar_Listener
+GNOME_Evolution_Calendar_Listener
 cal_listener_corba_object_create (BonoboObject *object)
 {
-	POA_Evolution_Calendar_Listener *servant;
+	POA_GNOME_Evolution_Calendar_Listener *servant;
 	CORBA_Environment ev;
 
 	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
 	g_return_val_if_fail (IS_CAL_LISTENER (object), CORBA_OBJECT_NIL);
 
-	servant = (POA_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &cal_listener_vepv;
 
 	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -344,7 +344,7 @@ cal_listener_corba_object_create (BonoboObject *object)
 	}
 
 	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
+	return (GNOME_Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
 }
 
 /**
@@ -361,7 +361,7 @@ cal_listener_new (void)
 {
 	CalListener *listener;
 	CORBA_Environment ev;
-	Evolution_Calendar_Listener corba_listener;
+	GNOME_Evolution_Calendar_Listener corba_listener;
 	gboolean result;
 
 	listener = gtk_type_new (CAL_LISTENER_TYPE);
@@ -390,7 +390,7 @@ cal_listener_new (void)
  * 
  * Return value: The calendar that the listener is watching.
  **/
-Evolution_Calendar_Cal
+GNOME_Evolution_Calendar_Cal
 cal_listener_get_calendar (CalListener *listener)
 {
 	CalListenerPrivate *priv;
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
index b4eda6c2d6..1a12f07ca2 100644
--- a/calendar/cal-client/cal-listener.h
+++ b/calendar/cal-client/cal-listener.h
@@ -55,24 +55,24 @@ struct _CalListenerClass {
 	/* Notification signals */
 
 	void (* cal_loaded) (CalListener *listener,
-			     Evolution_Calendar_Listener_LoadStatus status,
-			     Evolution_Calendar_Cal cal);
-	void (* obj_updated) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
-	void (* obj_removed) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
+			     GNOME_Evolution_Calendar_Listener_LoadStatus status,
+			     GNOME_Evolution_Calendar_Cal cal);
+	void (* obj_updated) (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid);
+	void (* obj_removed) (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid);
 };
 
 GtkType cal_listener_get_type (void);
 
 CalListener *cal_listener_construct (CalListener *listener,
-				     Evolution_Calendar_Listener corba_listener);
+				     GNOME_Evolution_Calendar_Listener corba_listener);
 
-Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
+GNOME_Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
 
 CalListener *cal_listener_new (void);
 
-Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
+GNOME_Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
 
-POA_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
+POA_GNOME_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
 
 
 
diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
index f8e0795590..bd61419d04 100644
--- a/calendar/gui/Evolution-Composer.h
+++ b/calendar/gui/Evolution-Composer.h
@@ -15,352 +15,335 @@ extern "C"
 
 /** typedefs **/
 #include <bonobo/Bonobo.h>
-#if !defined(ORBIT_DECL_Evolution_Composer) && !defined(_Evolution_Composer_defined)
-#define ORBIT_DECL_Evolution_Composer 1
-#define _Evolution_Composer_defined 1
-#define Evolution_Composer__free CORBA_Object__free
-   typedef CORBA_Object Evolution_Composer;
-   extern CORBA_unsigned_long Evolution_Composer__classid;
-#if !defined(TC_IMPL_TC_Evolution_Composer_0)
-#define TC_IMPL_TC_Evolution_Composer_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_5 't'
-#define TC_IMPL_TC_Evolution_Composer_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_15 's'
-#define TC_IMPL_TC_Evolution_Composer_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_17 'r'
-   extern const struct CORBA_TypeCode_struct TC_Evolution_Composer_struct;
-#define TC_Evolution_Composer ((CORBA_TypeCode)&TC_Evolution_Composer_struct)
+#if !defined(ORBIT_DECL_GNOME_Evolution_Composer) && !defined(_GNOME_Evolution_Composer_defined)
+#define ORBIT_DECL_GNOME_Evolution_Composer 1
+#define _GNOME_Evolution_Composer_defined 1
+#define GNOME_Evolution_Composer__free CORBA_Object__free
+   typedef CORBA_Object GNOME_Evolution_Composer;
+   extern CORBA_unsigned_long GNOME_Evolution_Composer__classid;
+#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_0)
+#define TC_IMPL_TC_GNOME_Evolution_Composer_0 'E'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_1 'v'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_2 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_3 'l'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_4 'u'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_5 't'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_6 'i'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_7 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_8 'n'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_9 '_'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_10 'C'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_11 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_12 'm'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_13 'p'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_14 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_15 's'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_16 'e'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_GNOME_Evolution_Composer_struct;
+#define TC_GNOME_Evolution_Composer ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_struct)
 #endif
 #endif
-#if !defined(_Evolution_Composer_Recipient_defined)
-#define _Evolution_Composer_Recipient_defined 1
+#if !defined(_GNOME_Evolution_Composer_Recipient_defined)
+#define _GNOME_Evolution_Composer_Recipient_defined 1
    typedef struct
    {
       CORBA_char *name;
       CORBA_char *address;
    }
-   Evolution_Composer_Recipient;
+   GNOME_Evolution_Composer_Recipient;
 
-#if !defined(TC_IMPL_TC_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_17 'r'
+#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0)
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0 'E'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_1 'v'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_2 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_3 'l'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_4 'u'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_5 't'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_6 'i'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_7 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_8 'n'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_9 '_'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_10 'C'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_11 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_12 'm'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_13 'p'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_14 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_15 's'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_16 'e'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_17 'r'
    extern const struct CORBA_TypeCode_struct
-      TC_Evolution_Composer_Recipient_struct;
-#define TC_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_Evolution_Composer_Recipient_struct)
+      TC_GNOME_Evolution_Composer_Recipient_struct;
+#define TC_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_Recipient_struct)
 #endif
-   extern Evolution_Composer_Recipient
-      *Evolution_Composer_Recipient__alloc(void);
-   extern gpointer Evolution_Composer_Recipient__free(gpointer mem,
-						      gpointer dat,
-						      CORBA_boolean free_strings);	/* ORBit internal use */
+   extern GNOME_Evolution_Composer_Recipient
+      *GNOME_Evolution_Composer_Recipient__alloc(void);
+   extern gpointer GNOME_Evolution_Composer_Recipient__free(gpointer mem,
+							    gpointer dat,
+							    CORBA_boolean free_strings);	/* ORBit internal use */
 #endif
-#if !defined(ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_Evolution_Composer_Recipient_defined)
-#define ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient 1
-#define _CORBA_sequence_Evolution_Composer_Recipient_defined 1
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_5 't'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_15 's'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
+#if !defined(ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined)
+#define ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient 1
+#define _CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined 1
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
+#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
    typedef struct
    {
       CORBA_unsigned_long _maximum,
        _length;
-      Evolution_Composer_Recipient *_buffer;
+      GNOME_Evolution_Composer_Recipient *_buffer;
       CORBA_boolean _release;
    }
-   CORBA_sequence_Evolution_Composer_Recipient;
-#if !defined(TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
+   CORBA_sequence_GNOME_Evolution_Composer_Recipient;
+#if !defined(TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0)
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
+#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
    extern const struct CORBA_TypeCode_struct
-      TC_CORBA_sequence_Evolution_Composer_Recipient_struct;
-#define TC_CORBA_sequence_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_Evolution_Composer_Recipient_struct)
+      TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct;
+#define TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct)
 #endif
-   extern CORBA_sequence_Evolution_Composer_Recipient
-      *CORBA_sequence_Evolution_Composer_Recipient__alloc(void);
-   extern gpointer CORBA_sequence_Evolution_Composer_Recipient__free(gpointer
-								     mem,
-								     gpointer
-								     dat,
-								     CORBA_boolean free_strings);	/* ORBit internal use */
-   Evolution_Composer_Recipient
-      *CORBA_sequence_Evolution_Composer_Recipient_allocbuf
+   extern CORBA_sequence_GNOME_Evolution_Composer_Recipient
+      *CORBA_sequence_GNOME_Evolution_Composer_Recipient__alloc(void);
+   extern gpointer
+      CORBA_sequence_GNOME_Evolution_Composer_Recipient__free(gpointer mem,
+							      gpointer dat,
+							      CORBA_boolean free_strings);	/* ORBit internal use */
+   GNOME_Evolution_Composer_Recipient
+      *CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf
       (CORBA_unsigned_long len);
 #endif
-#if !defined(_Evolution_Composer_RecipientList_defined)
-#define _Evolution_Composer_RecipientList_defined 1
-   typedef CORBA_sequence_Evolution_Composer_Recipient
-      Evolution_Composer_RecipientList;
-#if !defined(TC_IMPL_TC_Evolution_Composer_RecipientList_0)
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_5 't'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_15 's'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_17 'r'
+#if !defined(_GNOME_Evolution_Composer_RecipientList_defined)
+#define _GNOME_Evolution_Composer_RecipientList_defined 1
+   typedef CORBA_sequence_GNOME_Evolution_Composer_Recipient
+      GNOME_Evolution_Composer_RecipientList;
+#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0)
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0 'E'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_1 'v'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_2 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_3 'l'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_4 'u'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_5 't'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_6 'i'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_7 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_8 'n'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_9 '_'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_10 'C'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_11 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_12 'm'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_13 'p'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_14 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_15 's'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_16 'e'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_17 'r'
    extern const struct CORBA_TypeCode_struct
-      TC_Evolution_Composer_RecipientList_struct;
-#define TC_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_Evolution_Composer_RecipientList_struct)
+      TC_GNOME_Evolution_Composer_RecipientList_struct;
+#define TC_GNOME_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_RecipientList_struct)
 #endif
-   extern Evolution_Composer_RecipientList
-      *Evolution_Composer_RecipientList__alloc(void);
-   extern gpointer Evolution_Composer_RecipientList__free(gpointer mem,
-							  gpointer dat,
-							  CORBA_boolean free_strings);	/* ORBit internal use */
+   extern GNOME_Evolution_Composer_RecipientList
+      *GNOME_Evolution_Composer_RecipientList__alloc(void);
+   extern gpointer GNOME_Evolution_Composer_RecipientList__free(gpointer mem,
+								gpointer dat,
+								CORBA_boolean free_strings);	/* ORBit internal use */
 #endif
-#define ex_Evolution_Composer_CouldNotParse "IDL:Evolution/Composer/CouldNotParse:1.0"
-   void _ORBIT_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer *
-							  _ORBIT_recv_buffer,
-							  CORBA_Environment *
-							  ev);
-   void _ORBIT_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
-							_ORBIT_send_buffer,
-							CORBA_Environment *
-							ev);
-#if !defined(_Evolution_Composer_CouldNotParse_defined)
-#define _Evolution_Composer_CouldNotParse_defined 1
+#define ex_GNOME_Evolution_Composer_CouldNotParse "IDL:GNOME/Evolution/Composer/CouldNotParse:1.0"
+   void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer
+								*
+								_ORBIT_recv_buffer,
+								CORBA_Environment
+								* ev);
+   void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
+							      _ORBIT_send_buffer,
+							      CORBA_Environment
+							      * ev);
+#if !defined(_GNOME_Evolution_Composer_CouldNotParse_defined)
+#define _GNOME_Evolution_Composer_CouldNotParse_defined 1
    typedef struct
    {
       int dummy;
    }
-   Evolution_Composer_CouldNotParse;
+   GNOME_Evolution_Composer_CouldNotParse;
 
-#if !defined(TC_IMPL_TC_Evolution_Composer_CouldNotParse_0)
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_5 't'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_15 's'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_17 'r'
+#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0)
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0 'E'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_1 'v'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_2 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_3 'l'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_4 'u'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_5 't'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_6 'i'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_7 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_8 'n'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_9 '_'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_10 'C'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_11 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_12 'm'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_13 'p'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_14 'o'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_15 's'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_16 'e'
+#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_17 'r'
    extern const struct CORBA_TypeCode_struct
-      TC_Evolution_Composer_CouldNotParse_struct;
-#define TC_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_Evolution_Composer_CouldNotParse_struct)
+      TC_GNOME_Evolution_Composer_CouldNotParse_struct;
+#define TC_GNOME_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_CouldNotParse_struct)
 #endif
-#define Evolution_Composer_CouldNotParse__alloc() NULL
-   extern gpointer Evolution_Composer_CouldNotParse__free(gpointer mem,
-							  gpointer dat,
-							  CORBA_boolean free_strings);	/* ORBit internal use */
+#define GNOME_Evolution_Composer_CouldNotParse__alloc() NULL
+   extern gpointer GNOME_Evolution_Composer_CouldNotParse__free(gpointer mem,
+								gpointer dat,
+								CORBA_boolean free_strings);	/* ORBit internal use */
 #endif
 
 /** POA structures **/
    typedef struct
    {
       void *_private;
-      void (*set_headers) (PortableServer_Servant _servant,
-			   const Evolution_Composer_RecipientList * to,
-			   const Evolution_Composer_RecipientList * cc,
-			   const Evolution_Composer_RecipientList * bcc,
-			   const CORBA_char * subject,
-			   CORBA_Environment * ev);
-      void (*set_body_text) (PortableServer_Servant _servant,
-			     const CORBA_char * body, CORBA_Environment * ev);
-      void (*attach_MIME) (PortableServer_Servant _servant,
-			   const CORBA_char * data, CORBA_Environment * ev);
-      void (*attach_data) (PortableServer_Servant _servant,
-			   const CORBA_char * content_type,
-			   const CORBA_char * filename,
-			   const CORBA_char * description,
-			   const CORBA_boolean show_inline,
-			   const CORBA_char * data, CORBA_Environment * ev);
+      void (*setHeaders) (PortableServer_Servant _servant,
+			  const GNOME_Evolution_Composer_RecipientList * to,
+			  const GNOME_Evolution_Composer_RecipientList * cc,
+			  const GNOME_Evolution_Composer_RecipientList * bcc,
+			  const CORBA_char * subject, CORBA_Environment * ev);
+      void (*setBodyText) (PortableServer_Servant _servant,
+			   const CORBA_char * body, CORBA_Environment * ev);
+      void (*attachMIME) (PortableServer_Servant _servant,
+			  const CORBA_char * data, CORBA_Environment * ev);
+      void (*attachData) (PortableServer_Servant _servant,
+			  const CORBA_char * content_type,
+			  const CORBA_char * filename,
+			  const CORBA_char * description,
+			  const CORBA_boolean show_inline,
+			  const CORBA_char * data, CORBA_Environment * ev);
       void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);
    }
-   POA_Evolution_Composer__epv;
+   POA_GNOME_Evolution_Composer__epv;
    typedef struct
    {
       PortableServer_ServantBase__epv *_base_epv;
       POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
-      POA_Evolution_Composer__epv *Evolution_Composer_epv;
+      POA_GNOME_Evolution_Composer__epv *GNOME_Evolution_Composer_epv;
    }
-   POA_Evolution_Composer__vepv;
+   POA_GNOME_Evolution_Composer__vepv;
    typedef struct
    {
       void *_private;
-      POA_Evolution_Composer__vepv *vepv;
+      POA_GNOME_Evolution_Composer__vepv *vepv;
    }
-   POA_Evolution_Composer;
-   extern void POA_Evolution_Composer__init(PortableServer_Servant servant,
-					    CORBA_Environment * ev);
-   extern void POA_Evolution_Composer__fini(PortableServer_Servant servant,
-					    CORBA_Environment * ev);
+   POA_GNOME_Evolution_Composer;
+   extern void POA_GNOME_Evolution_Composer__init(PortableServer_Servant
+						  servant,
+						  CORBA_Environment * ev);
+   extern void POA_GNOME_Evolution_Composer__fini(PortableServer_Servant
+						  servant,
+						  CORBA_Environment * ev);
 
 /** prototypes **/
-#define Evolution_Composer_ref Bonobo_Unknown_ref
-#define Evolution_Composer_unref Bonobo_Unknown_unref
-#define Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
-   void Evolution_Composer_set_headers(Evolution_Composer _obj,
-				       const Evolution_Composer_RecipientList
-				       * to,
-				       const Evolution_Composer_RecipientList
-				       * cc,
-				       const Evolution_Composer_RecipientList
-				       * bcc, const CORBA_char * subject,
-				       CORBA_Environment * ev);
-   void Evolution_Composer_set_body_text(Evolution_Composer _obj,
-					 const CORBA_char * body,
-					 CORBA_Environment * ev);
-   void Evolution_Composer_attach_MIME(Evolution_Composer _obj,
-				       const CORBA_char * data,
-				       CORBA_Environment * ev);
-   void Evolution_Composer_attach_data(Evolution_Composer _obj,
-				       const CORBA_char * content_type,
-				       const CORBA_char * filename,
-				       const CORBA_char * description,
-				       const CORBA_boolean show_inline,
-				       const CORBA_char * data,
-				       CORBA_Environment * ev);
-   void Evolution_Composer_show(Evolution_Composer _obj,
-				CORBA_Environment * ev);
+#define GNOME_Evolution_Composer_ref Bonobo_Unknown_ref
+#define GNOME_Evolution_Composer_unref Bonobo_Unknown_unref
+#define GNOME_Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
+   void GNOME_Evolution_Composer_setHeaders(GNOME_Evolution_Composer _obj,
+					    const
+					    GNOME_Evolution_Composer_RecipientList
+					    * to,
+					    const
+					    GNOME_Evolution_Composer_RecipientList
+					    * cc,
+					    const
+					    GNOME_Evolution_Composer_RecipientList
+					    * bcc, const CORBA_char * subject,
+					    CORBA_Environment * ev);
+   void GNOME_Evolution_Composer_setBodyText(GNOME_Evolution_Composer _obj,
+					     const CORBA_char * body,
+					     CORBA_Environment * ev);
+   void GNOME_Evolution_Composer_attachMIME(GNOME_Evolution_Composer _obj,
+					    const CORBA_char * data,
+					    CORBA_Environment * ev);
+   void GNOME_Evolution_Composer_attachData(GNOME_Evolution_Composer _obj,
+					    const CORBA_char * content_type,
+					    const CORBA_char * filename,
+					    const CORBA_char * description,
+					    const CORBA_boolean show_inline,
+					    const CORBA_char * data,
+					    CORBA_Environment * ev);
+   void GNOME_Evolution_Composer_show(GNOME_Evolution_Composer _obj,
+				      CORBA_Environment * ev);
 
-   void _ORBIT_skel_Evolution_Composer_set_headers(POA_Evolution_Composer *
-						   _ORBIT_servant,
-						   GIOPRecvBuffer *
-						   _ORBIT_recv_buffer,
-						   CORBA_Environment * ev,
-						   void (*_impl_set_headers)
-						   (PortableServer_Servant
-						    _servant,
-						    const
-						    Evolution_Composer_RecipientList
-						    * to,
-						    const
-						    Evolution_Composer_RecipientList
-						    * cc,
-						    const
-						    Evolution_Composer_RecipientList
-						    * bcc,
-						    const CORBA_char *
-						    subject,
-						    CORBA_Environment * ev));
-   void _ORBIT_skel_Evolution_Composer_set_body_text(POA_Evolution_Composer *
-						     _ORBIT_servant,
-						     GIOPRecvBuffer *
-						     _ORBIT_recv_buffer,
-						     CORBA_Environment * ev,
-						     void
-						     (*_impl_set_body_text)
-						     (PortableServer_Servant
-						      _servant,
-						      const CORBA_char * body,
-						      CORBA_Environment *
-						      ev));
-   void _ORBIT_skel_Evolution_Composer_attach_MIME(POA_Evolution_Composer *
-						   _ORBIT_servant,
-						   GIOPRecvBuffer *
-						   _ORBIT_recv_buffer,
-						   CORBA_Environment * ev,
-						   void (*_impl_attach_MIME)
-						   (PortableServer_Servant
-						    _servant,
-						    const CORBA_char * data,
-						    CORBA_Environment * ev));
-   void _ORBIT_skel_Evolution_Composer_attach_data(POA_Evolution_Composer *
-						   _ORBIT_servant,
-						   GIOPRecvBuffer *
-						   _ORBIT_recv_buffer,
-						   CORBA_Environment * ev,
-						   void (*_impl_attach_data)
-						   (PortableServer_Servant
-						    _servant,
-						    const CORBA_char *
-						    content_type,
-						    const CORBA_char *
-						    filename,
-						    const CORBA_char *
-						    description,
-						    const CORBA_boolean
-						    show_inline,
-						    const CORBA_char * data,
-						    CORBA_Environment * ev));
-   void _ORBIT_skel_Evolution_Composer_show(POA_Evolution_Composer *
-					    _ORBIT_servant,
-					    GIOPRecvBuffer *
-					    _ORBIT_recv_buffer,
-					    CORBA_Environment * ev,
-					    void (*_impl_show)
-					    (PortableServer_Servant _servant,
-					     CORBA_Environment * ev));
+   void
+      _ORBIT_skel_GNOME_Evolution_Composer_setHeaders
+      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
+       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
+       void (*_impl_setHeaders) (PortableServer_Servant _servant,
+				 const GNOME_Evolution_Composer_RecipientList
+				 * to,
+				 const GNOME_Evolution_Composer_RecipientList
+				 * cc,
+				 const GNOME_Evolution_Composer_RecipientList
+				 * bcc, const CORBA_char * subject,
+				 CORBA_Environment * ev));
+   void
+      _ORBIT_skel_GNOME_Evolution_Composer_setBodyText
+      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
+       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
+       void (*_impl_setBodyText) (PortableServer_Servant _servant,
+				  const CORBA_char * body,
+				  CORBA_Environment * ev));
+   void
+      _ORBIT_skel_GNOME_Evolution_Composer_attachMIME
+      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
+       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
+       void (*_impl_attachMIME) (PortableServer_Servant _servant,
+				 const CORBA_char * data,
+				 CORBA_Environment * ev));
+   void
+      _ORBIT_skel_GNOME_Evolution_Composer_attachData
+      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
+       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
+       void (*_impl_attachData) (PortableServer_Servant _servant,
+				 const CORBA_char * content_type,
+				 const CORBA_char * filename,
+				 const CORBA_char * description,
+				 const CORBA_boolean show_inline,
+				 const CORBA_char * data,
+				 CORBA_Environment * ev));
+   void _ORBIT_skel_GNOME_Evolution_Composer_show(POA_GNOME_Evolution_Composer
+						  * _ORBIT_servant,
+						  GIOPRecvBuffer *
+						  _ORBIT_recv_buffer,
+						  CORBA_Environment * ev,
+						  void (*_impl_show)
+						  (PortableServer_Servant
+						   _servant,
+						   CORBA_Environment * ev));
 #ifdef __cplusplus
 }
 #endif				/* __cplusplus */
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 724594780d..331c0c68ee 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -10,8 +10,8 @@ IDL_GENERATED =                 \
         Evolution-Composer-stubs.c
 
 $(IDL_GENERATED): $(IDLS) 
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
-                -I . $(srcdir)/../../composer/Evolution-Composer.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
+                $(srcdir)/../../composer/Evolution-Composer.idl
 
 SUBDIRS = dialogs
 
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 2376cdb5b5..5d4ca06a74 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -235,10 +235,10 @@ static void
 send_itip_reply (EItipControlPrivate *priv)
 {
 	BonoboObjectClient *bonobo_server;
-	Evolution_Composer composer_server;
+	GNOME_Evolution_Composer composer_server;
 	CORBA_Environment ev;
-	Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	Evolution_Composer_Recipient *recipient;
+	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
+	GNOME_Evolution_Composer_Recipient *recipient;
 	CORBA_char *subject;
 	CalComponentText caltext;
 	CORBA_char *content_type, *filename, *description, *attach_data;
@@ -256,10 +256,10 @@ send_itip_reply (EItipControlPrivate *priv)
 
 	/* Now I have to make a CORBA sequence that represents a recipient list with
 	   one item, for the organizer. */
-	to_list = Evolution_Composer_RecipientList__alloc ();
+	to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
 	to_list->_maximum = 1;
 	to_list->_length = 1; 
-	to_list->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (1);
+	to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (1);
 
 	recipient = &(to_list->_buffer[0]);
 	recipient->name = CORBA_string_alloc (0);  /* FIXME: we may want an actual name here. */
@@ -267,16 +267,16 @@ send_itip_reply (EItipControlPrivate *priv)
 	recipient->address = CORBA_string_alloc (strlen (priv->organizer));
 	strcpy (recipient->address, priv->organizer);
 
-	cc_list = Evolution_Composer_RecipientList__alloc ();
+	cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
 	cc_list->_maximum = cc_list->_length = 0;
-	bcc_list = Evolution_Composer_RecipientList__alloc ();
+	bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
 	bcc_list->_maximum = bcc_list->_length = 0;
 
 	cal_component_get_summary (priv->cal_comp, &caltext);
 	subject = CORBA_string_alloc (strlen (caltext.value));
 	strcpy (subject, caltext.value);
 	
-	Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &ev);
+	GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
 		CORBA_exception_free (&ev);
@@ -331,10 +331,10 @@ send_itip_reply (EItipControlPrivate *priv)
 
 	}
 	
-	Evolution_Composer_attach_data (composer_server, 
-					content_type, filename, description,
-					show_inline, attach_data,
-					&ev);
+	GNOME_Evolution_Composer_attachData (composer_server, 
+					     content_type, filename, description,
+					     show_inline, attach_data,
+					     &ev);
 	
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
@@ -342,7 +342,7 @@ send_itip_reply (EItipControlPrivate *priv)
 		return;
 	}
 
-	Evolution_Composer_show (composer_server, &ev);
+	GNOME_Evolution_Composer_show (composer_server, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
index cf1cffee52..daf5c73035 100644
--- a/calendar/gui/e-meeting-edit.c
+++ b/calendar/gui/e-meeting-edit.c
@@ -517,10 +517,10 @@ static void
 send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
 {
 	BonoboObjectClient *bonobo_server;
-	Evolution_Composer composer_server;
+	GNOME_Evolution_Composer composer_server;
 	CORBA_Environment ev;
-	Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	Evolution_Composer_Recipient *recipient;
+	GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
+	GNOME_Evolution_Composer_Recipient *recipient;
 	gchar *cell_text;
 	CORBA_char *subject;
 	gint cntr;
@@ -542,10 +542,10 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
 
 	/* All right, now I have to convert my list of recipients into one of those
 	   CORBA sequences. */
-	to_list = Evolution_Composer_RecipientList__alloc ();
+	to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
 	to_list->_maximum = priv->numentries;
 	to_list->_length = priv->numentries; 
-	to_list->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (priv->numentries);
+	to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (priv->numentries);
 
 	for (cntr = 0; cntr < priv->numentries; cntr++) {
 		gtk_clist_get_text (GTK_CLIST (priv->attendee_list),
@@ -560,16 +560,16 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
 		strcpy (recipient->address, cell_text);
 	}
 
-	cc_list = Evolution_Composer_RecipientList__alloc ();
+	cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
 	cc_list->_maximum = cc_list->_length = 0;
-	bcc_list = Evolution_Composer_RecipientList__alloc ();
+	bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
 	bcc_list->_maximum = bcc_list->_length = 0;
 
 	cal_component_get_summary (priv->comp, &caltext);
 	subject = CORBA_string_alloc (strlen (caltext.value));
 	strcpy (subject, caltext.value);
 
-	Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &ev);
+	GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
 		CORBA_exception_free (&ev);
@@ -635,7 +635,7 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
 		fclose (fp);
 	}
 
-	Evolution_Composer_attach_data (composer_server, 
+	GNOME_Evolution_Composer_attachData (composer_server, 
 					content_type, filename, description,
 					show_inline, attach_data,
 					&ev);
@@ -646,7 +646,7 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv)
 		return;
 	}
 	
-	Evolution_Composer_show (composer_server, &ev);
+	GNOME_Evolution_Composer_show (composer_server, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl
index ab80ff8702..7969357e9a 100644
--- a/calendar/idl/evolution-calendar.idl
+++ b/calendar/idl/evolution-calendar.idl
@@ -12,6 +12,7 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 
 module Calendar {
@@ -93,45 +94,48 @@ module Calendar {
 		readonly attribute string uri;
 
 		/* Gets the number of objects of the specified types */
-		long get_n_objects (in CalObjType type);
+		long countObjects (in CalObjType type);
 
 		/* Gets an object based on its URI */
-		CalObj get_object (in CalObjUID uid)
+		CalObj getObject (in CalObjUID uid)
 			raises (NotFound);
 
 		/* Gets a list of UIDs based on object type */
-		CalObjUIDSeq get_uids (in CalObjType type);
+		CalObjUIDSeq getUIds (in CalObjType type);
 
-		/* Gets a list of UIDs that changed based on object type */
-		CalObjChangeSeq get_changed_uids (in CalObjType type, in Time_t since);
+		/* Gets a list of UIds that changed based on object type */
+		CalObjChangeSeq getChangedUIds (in CalObjType type, in Time_t since);
 
 		/* Gets a list of objects that occur or recur in the specified time range */
-		CalObjUIDSeq get_objects_in_range (in CalObjType type, 
-						   in Time_t start, in Time_t end)
+		CalObjUIDSeq getObjectsInRange (in CalObjType type, 
+						in Time_t start, in Time_t end)
 			raises (InvalidRange);
 
-		/* Gets the objects whose alarms trigger in the specified time
+		/*
+		 * Gets the objects whose alarms trigger in the specified time
 		 * range.
 		 */
-		CalAlarmInstanceSeq get_alarms_in_range (in Time_t start, in Time_t end)
+		CalAlarmInstanceSeq getAlarmsInRange (in Time_t start, in Time_t end)
 			raises (InvalidRange);
 
-		/* Gets the alarms for the specified object that trigger in the
+		/*
+		 * Gets the alarms for the specified object that trigger in the
 		 * specified time range.
 		 */
-		CalAlarmInstanceSeq get_alarms_for_object (in CalObjUID uid,
-							   in Time_t start, in Time_t end)
+		CalAlarmInstanceSeq getAlarmsForObject (in CalObjUID uid,
+							in Time_t start, in Time_t end)
 			raises (NotFound, InvalidRange);
 
 
-		/* Updates an object by adding it if it does not exist or by
+		/*
+		 * Updates an object by adding it if it does not exist or by
 		 * changing an existing one.
 		 */
-		void update_object (in CalObjUID uid, in CalObj calobj)
+		void updateObject (in CalObjUID uid, in CalObj calobj)
 			raises (InvalidObject);
 
 		/* Removes an object */
-		void remove_object (in CalObjUID uid)
+		void removeObject (in CalObjUID uid)
 			raises (NotFound);
 	};
 
@@ -150,13 +154,13 @@ module Calendar {
 		/* Called from a CalFactory when a calendar is initially loaded
 		 * or created.  The listener must remember the cal object.
 		 */
-		void cal_loaded (in LoadStatus status, in Cal cal);
+		void notifyCalLoaded (in LoadStatus status, in Cal cal);
 
 		/* Called from a Calendar when an object is added or changed */
-		void obj_updated (in CalObjUID uid);
+		void notifyObjUpdated (in CalObjUID uid);
 
 		/* Called from a Calendar when an object is removed */
-		void obj_removed (in CalObjUID uid);
+		void notifyObjRemoved (in CalObjUID uid);
 	};
 
 	/* A calendar factory, can load and create calendars */
@@ -174,5 +178,6 @@ module Calendar {
 };
 
 };
+};
 
 #endif
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index 5ca12eff6e..984dcde86a 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -16,7 +16,7 @@ CORBA_GENERATED =				\
 idls =						\
 	$(srcdir)/../idl/evolution-calendar.idl
 
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
+idl_flags = -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
 
 $(CORBA_GENERATED): $(idls)
 	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c
index a67f8b777f..3834c34e62 100644
--- a/calendar/pcs/cal-factory.c
+++ b/calendar/pcs/cal-factory.c
@@ -51,7 +51,7 @@ static void cal_factory_class_init (CalFactoryClass *class);
 static void cal_factory_init (CalFactory *factory);
 static void cal_factory_destroy (GtkObject *object);
 
-static POA_Evolution_Calendar_CalFactory__vepv cal_factory_vepv;
+static POA_GNOME_Evolution_Calendar_CalFactory__vepv cal_factory_vepv;
 
 static BonoboObjectClass *parent_class;
 
@@ -96,7 +96,7 @@ static void
 init_cal_factory_corba_class (void)
 {
 	cal_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_factory_vepv.Evolution_Calendar_CalFactory_epv = cal_factory_get_epv ();
+	cal_factory_vepv.GNOME_Evolution_Calendar_CalFactory_epv = cal_factory_get_epv ();
 }
 
 /* Class initialization function for the calendar factory */
@@ -203,17 +203,17 @@ cal_factory_destroy (GtkObject *object)
 typedef struct {
 	CalFactory *factory;
 	char *uri;
-	Evolution_Calendar_Listener listener;
+	GNOME_Evolution_Calendar_Listener listener;
 } LoadCreateJobData;
 
 /* Queues a load or create request */
 static void
-queue_load_create_job (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener,
+queue_load_create_job (CalFactory *factory, const char *uri, GNOME_Evolution_Calendar_Listener listener,
 		       JobFunc func)
 {
 	LoadCreateJobData *jd;
 	CORBA_Environment ev;
-	Evolution_Calendar_Listener listener_copy;
+	GNOME_Evolution_Calendar_Listener listener_copy;
 	gboolean result;
 
 	g_assert (uri != NULL);
@@ -321,7 +321,7 @@ add_backend (CalFactory *factory, GnomeVFSURI *uri, CalBackend *backend)
  * MethodNotSupported error code.
  */
 static CalBackend *
-launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
+launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, GNOME_Evolution_Calendar_Listener listener)
 {
 	CalFactoryPrivate *priv;
 	char *method;
@@ -339,9 +339,9 @@ launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calenda
 		CORBA_Environment ev;
 
 		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (
+		GNOME_Evolution_Calendar_Listener_notifyCalLoaded (
 			listener,
-			Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED,
+			GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED,
 			CORBA_OBJECT_NIL,
 			&ev);
 
@@ -361,7 +361,7 @@ launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calenda
 
 /* Loads a calendar backend and puts it in the factory's backend hash table */
 static CalBackend *
-load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
+load_backend (CalFactory *factory, GnomeVFSURI *uri, GNOME_Evolution_Calendar_Listener listener)
 {
 	CalFactoryPrivate *priv;
 	CalBackend *backend;
@@ -385,8 +385,8 @@ load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener
 		gtk_object_unref (GTK_OBJECT (backend));
 
 		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
+		GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener,
+							GNOME_Evolution_Calendar_Listener_ERROR,
 							CORBA_OBJECT_NIL,
 							&ev);
 
@@ -404,7 +404,7 @@ load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener
 
 /* Creates a calendar backend and puts it in the factory's backend hash table */
 static CalBackend *
-create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
+create_backend (CalFactory *factory, GnomeVFSURI *uri, GNOME_Evolution_Calendar_Listener listener)
 {
 	CalFactoryPrivate *priv;
 	CalBackend *backend;
@@ -423,8 +423,8 @@ create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listen
 		CORBA_Environment ev;
 
 		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
+		GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener,
+							GNOME_Evolution_Calendar_Listener_ERROR,
 							CORBA_OBJECT_NIL,
 							&ev);
 
@@ -444,7 +444,7 @@ create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listen
  * object.
  */
 static void
-add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calendar_Listener listener)
+add_calendar_client (CalFactory *factory, CalBackend *backend, GNOME_Evolution_Calendar_Listener listener)
 {
 	Cal *cal;
 	CORBA_Environment ev;
@@ -454,8 +454,8 @@ add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calenda
 		g_message ("add_calendar_client(): could not create the calendar client interface");
 
 		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
+		GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener,
+							GNOME_Evolution_Calendar_Listener_ERROR,
 							CORBA_OBJECT_NIL,
 							&ev);
 		if (ev._major != CORBA_NO_EXCEPTION)
@@ -468,8 +468,8 @@ add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calenda
 	cal_backend_add_cal (backend, cal);
 
 	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_cal_loaded (listener,
-						Evolution_Calendar_Listener_SUCCESS,
+	GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener,
+						GNOME_Evolution_Calendar_Listener_SUCCESS,
 						bonobo_object_corba_objref (BONOBO_OBJECT (cal)),
 						&ev);
 
@@ -488,7 +488,7 @@ load_fn (gpointer data)
 	LoadCreateJobData *jd;
 	CalFactory *factory;
 	GnomeVFSURI *uri;
-	Evolution_Calendar_Listener listener;
+	GNOME_Evolution_Calendar_Listener listener;
 	CalBackend *backend;
 	CORBA_Environment ev;
 
@@ -506,8 +506,8 @@ load_fn (gpointer data)
 
 	if (!uri) {
 		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
+		GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener,
+							GNOME_Evolution_Calendar_Listener_ERROR,
 							CORBA_OBJECT_NIL,
 							&ev);
 
@@ -548,7 +548,7 @@ create_fn (gpointer data)
 	LoadCreateJobData *jd;
 	CalFactory *factory;
 	GnomeVFSURI *uri;
-	Evolution_Calendar_Listener listener;
+	GNOME_Evolution_Calendar_Listener listener;
 	CalBackend *backend;
 	CORBA_Environment ev;
 
@@ -566,8 +566,8 @@ create_fn (gpointer data)
 
 	if (!uri) {
 		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
+		GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener,
+							GNOME_Evolution_Calendar_Listener_ERROR,
 							CORBA_OBJECT_NIL,
 							&ev);
 
@@ -584,8 +584,8 @@ create_fn (gpointer data)
 
 	if (backend) {
 		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_IN_USE,
+		GNOME_Evolution_Calendar_Listener_notifyCalLoaded (listener,
+							GNOME_Evolution_Calendar_Listener_IN_USE,
 							CORBA_OBJECT_NIL,
 							&ev);
 
@@ -624,7 +624,7 @@ create_fn (gpointer data)
 static void
 CalFactory_load (PortableServer_Servant servant,
 		 const CORBA_char *uri,
-		 Evolution_Calendar_Listener listener,
+		 GNOME_Evolution_Calendar_Listener listener,
 		 CORBA_Environment *ev)
 {
 	CalFactory *factory;
@@ -640,7 +640,7 @@ CalFactory_load (PortableServer_Servant servant,
 
 	if (ev2._major != CORBA_NO_EXCEPTION || result) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_CalFactory_NilListener,
+				     ex_GNOME_Evolution_Calendar_CalFactory_NilListener,
 				     NULL);
 
 		CORBA_exception_free (&ev2);
@@ -655,7 +655,7 @@ CalFactory_load (PortableServer_Servant servant,
 static void
 CalFactory_create (PortableServer_Servant servant,
 		   const CORBA_char *uri,
-		   Evolution_Calendar_Listener listener,
+		   GNOME_Evolution_Calendar_Listener listener,
 		   CORBA_Environment *ev)
 {
 	CalFactory *factory;
@@ -675,12 +675,12 @@ CalFactory_create (PortableServer_Servant servant,
  *
  * Return value: A newly-allocated EPV.
  **/
-POA_Evolution_Calendar_CalFactory__epv *
+POA_GNOME_Evolution_Calendar_CalFactory__epv *
 cal_factory_get_epv (void)
 {
-	POA_Evolution_Calendar_CalFactory__epv *epv;
+	POA_GNOME_Evolution_Calendar_CalFactory__epv *epv;
 
-	epv = g_new0 (POA_Evolution_Calendar_CalFactory__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_Calendar_CalFactory__epv, 1);
 	epv->load = CalFactory_load;
 	epv->create = CalFactory_create;
 
@@ -700,7 +700,7 @@ cal_factory_get_epv (void)
  * Return value: The same object as the @factory argument.
  **/
 CalFactory *
-cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory)
+cal_factory_construct (CalFactory *factory, GNOME_Evolution_Calendar_CalFactory corba_factory)
 {
 	g_return_val_if_fail (factory != NULL, NULL);
 	g_return_val_if_fail (IS_CAL_FACTORY (factory), NULL);
@@ -719,20 +719,20 @@ cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_
  * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
  * failure.
  **/
-Evolution_Calendar_CalFactory
+GNOME_Evolution_Calendar_CalFactory
 cal_factory_corba_object_create (BonoboObject *object)
 {
-	POA_Evolution_Calendar_CalFactory *servant;
+	POA_GNOME_Evolution_Calendar_CalFactory *servant;
 	CORBA_Environment ev;
 
 	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
 	g_return_val_if_fail (IS_CAL_FACTORY (object), CORBA_OBJECT_NIL);
 
-	servant = (POA_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &cal_factory_vepv;
 
 	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_CalFactory__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Calendar_CalFactory__init ((PortableServer_Servant) servant, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_factory_corba_object_create(): could not init the servant");
@@ -742,7 +742,7 @@ cal_factory_corba_object_create (BonoboObject *object)
 	}
 
 	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant);
+	return (GNOME_Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant);
 }
 
 /**
@@ -759,7 +759,7 @@ cal_factory_new (void)
 {
 	CalFactory *factory;
 	CORBA_Environment ev;
-	Evolution_Calendar_CalFactory corba_factory;
+	GNOME_Evolution_Calendar_CalFactory corba_factory;
 	gboolean retval;
 
 	factory = gtk_type_new (CAL_FACTORY_TYPE);
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
index 9405a05ef8..5e61d26ab5 100644
--- a/calendar/pcs/cal-factory.h
+++ b/calendar/pcs/cal-factory.h
@@ -59,8 +59,8 @@ struct _CalFactoryClass {
 
 GtkType cal_factory_get_type (void);
 
-CalFactory *cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory);
-Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);
+CalFactory *cal_factory_construct (CalFactory *factory, GNOME_Evolution_Calendar_CalFactory corba_factory);
+GNOME_Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);
 
 CalFactory *cal_factory_new (void);
 
@@ -68,7 +68,7 @@ void cal_factory_register_method (CalFactory *factory, const char *method, GtkTy
 
 int cal_factory_get_n_backends (CalFactory *factory);
 
-POA_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (void);
+POA_GNOME_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (void);
 
 
 
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 35d98abd64..8383d135fb 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -31,7 +31,7 @@ struct _CalPrivate {
 	CalBackend *backend;
 
 	/* Listener on the client we notify */
-	Evolution_Calendar_Listener listener;
+	GNOME_Evolution_Calendar_Listener listener;
 };
 
 
@@ -40,7 +40,7 @@ static void cal_class_init (CalClass *class);
 static void cal_init (Cal *cal);
 static void cal_destroy (GtkObject *object);
 
-static POA_Evolution_Calendar_Cal__vepv cal_vepv;
+static POA_GNOME_Evolution_Calendar_Cal__vepv cal_vepv;
 
 static BonoboObjectClass *parent_class;
 
@@ -83,7 +83,7 @@ static void
 init_cal_corba_class (void)
 {
 	cal_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_vepv.Evolution_Calendar_Cal_epv = cal_get_epv ();
+	cal_vepv.GNOME_Evolution_Calendar_Cal_epv = cal_get_epv ();
 }
 
 /* Class initialization function for the calendar */
@@ -172,17 +172,17 @@ Cal_get_uri (PortableServer_Servant servant,
  * representation.
  */
 static CalObjType
-uncorba_obj_type (Evolution_Calendar_CalObjType type)
+uncorba_obj_type (GNOME_Evolution_Calendar_CalObjType type)
 {
-	return (((type & Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
-		| ((type & Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
-		| ((type & Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));
+	return (((type & GNOME_Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
+		| ((type & GNOME_Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
+		| ((type & GNOME_Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));
 }
 
 /* Cal::get_n_objects method */
 static CORBA_long
 Cal_get_n_objects (PortableServer_Servant servant,
-		   Evolution_Calendar_CalObjType type,
+		   GNOME_Evolution_Calendar_CalObjType type,
 		   CORBA_Environment *ev)
 {
 	Cal *cal;
@@ -199,9 +199,9 @@ Cal_get_n_objects (PortableServer_Servant servant,
 }
 
 /* Cal::get_object method */
-static Evolution_Calendar_CalObj
+static GNOME_Evolution_Calendar_CalObj
 Cal_get_object (PortableServer_Servant servant,
-		const Evolution_Calendar_CalObjUID uid,
+		const GNOME_Evolution_Calendar_CalObjUID uid,
 		CORBA_Environment *ev)
 {
 	Cal *cal;
@@ -221,25 +221,25 @@ Cal_get_object (PortableServer_Servant servant,
 		return calobj_copy;
 	} else {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
+				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
 				     NULL);
 		return NULL;
 	}
 }
 
-static Evolution_Calendar_CalObjUIDSeq *
+static GNOME_Evolution_Calendar_CalObjUIDSeq *
 build_uid_seq (GList *uids)
 {
-	Evolution_Calendar_CalObjUIDSeq *seq;
+	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
 	GList *l;
 	int n, i;
 
 	n = g_list_length (uids);
 
-	seq = Evolution_Calendar_CalObjUIDSeq__alloc ();
+	seq = GNOME_Evolution_Calendar_CalObjUIDSeq__alloc ();
 	CORBA_sequence_set_release (seq, TRUE);
 	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjUID_allocbuf (n);
+	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_allocbuf (n);
 
 	/* Fill the sequence */
 
@@ -254,15 +254,15 @@ build_uid_seq (GList *uids)
 }
 
 /* Cal::get_uids method */
-static Evolution_Calendar_CalObjUIDSeq *
+static GNOME_Evolution_Calendar_CalObjUIDSeq *
 Cal_get_uids (PortableServer_Servant servant,
-	      Evolution_Calendar_CalObjType type,
+	      GNOME_Evolution_Calendar_CalObjType type,
 	      CORBA_Environment *ev)
 {
 	Cal *cal;
 	CalPrivate *priv;
 	GList *uids;
-	Evolution_Calendar_CalObjUIDSeq *seq;
+	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
 	int t;
 
 	cal = CAL (bonobo_object_from_servant (servant));
@@ -278,24 +278,24 @@ Cal_get_uids (PortableServer_Servant servant,
 	return seq;
 }
 
-static Evolution_Calendar_CalObjChangeSeq *
+static GNOME_Evolution_Calendar_CalObjChangeSeq *
 build_change_seq (GList *changes)
 {
 	GList *l;
 	int n, i;
-	Evolution_Calendar_CalObjChangeSeq *seq;
+	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
 
 	n = g_list_length (changes);
 
-	seq = Evolution_Calendar_CalObjChangeSeq__alloc ();
+	seq = GNOME_Evolution_Calendar_CalObjChangeSeq__alloc ();
 	CORBA_sequence_set_release (seq, TRUE);
 	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjChange_allocbuf (n);
+	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjChange_allocbuf (n);
 
 	/* Fill the sequence */
 	for (i = 0, l = changes; l; i++, l = l->next) {
 		CalObjChange *c;
-		Evolution_Calendar_CalObjChange *corba_c;
+		GNOME_Evolution_Calendar_CalObjChange *corba_c;
 
 		c = l->data;
 		corba_c = &seq->_buffer[i];
@@ -308,16 +308,16 @@ build_change_seq (GList *changes)
 }
 
 /* Cal::get_changed_uids method */
-static Evolution_Calendar_CalObjChangeSeq *
+static GNOME_Evolution_Calendar_CalObjChangeSeq *
 Cal_get_changed_uids (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjType type,
-		      Evolution_Calendar_Time_t since,
+		      GNOME_Evolution_Calendar_CalObjType type,
+		      GNOME_Evolution_Calendar_Time_t since,
 		      CORBA_Environment *ev)
 {
 	Cal *cal;
 	CalPrivate *priv;
 	GList *changes;
-	Evolution_Calendar_CalObjChangeSeq *seq;
+	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
 	int t;
 	time_t s;
 
@@ -336,18 +336,18 @@ Cal_get_changed_uids (PortableServer_Servant servant,
 }
 
 /* Cal::get_objects_in_range method */
-static Evolution_Calendar_CalObjUIDSeq *
+static GNOME_Evolution_Calendar_CalObjUIDSeq *
 Cal_get_objects_in_range (PortableServer_Servant servant,
-			  Evolution_Calendar_CalObjType type,
-			  Evolution_Calendar_Time_t start,
-			  Evolution_Calendar_Time_t end,
+			  GNOME_Evolution_Calendar_CalObjType type,
+			  GNOME_Evolution_Calendar_Time_t start,
+			  GNOME_Evolution_Calendar_Time_t end,
 			  CORBA_Environment *ev)
 {
 	Cal *cal;
 	CalPrivate *priv;
 	int t;
 	time_t t_start, t_end;
-	Evolution_Calendar_CalObjUIDSeq *seq;
+	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;
 	GList *uids;
 
 	cal = CAL (bonobo_object_from_servant (servant));
@@ -359,7 +359,7 @@ Cal_get_objects_in_range (PortableServer_Servant servant,
 
 	if (t_start > t_end || t_start == -1 || t_end == -1) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
+				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
 				     NULL);
 		return NULL;
 	}
@@ -398,25 +398,25 @@ corba_alarm_type (enum AlarmType type)
 #endif
 
 /* Builds a CORBA sequence of alarm instances from a CalAlarmInstance list. */
-static Evolution_Calendar_CalAlarmInstanceSeq *
+static GNOME_Evolution_Calendar_CalAlarmInstanceSeq *
 build_alarm_instance_seq (GList *alarms)
 {
 	GList *l;
 	int n, i;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
+	GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
 
 	n = g_list_length (alarms);
 
-	seq = Evolution_Calendar_CalAlarmInstanceSeq__alloc ();
+	seq = GNOME_Evolution_Calendar_CalAlarmInstanceSeq__alloc ();
 	CORBA_sequence_set_release (seq, TRUE);
 	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalAlarmInstance_allocbuf (n);
+	seq->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalAlarmInstance_allocbuf (n);
 
 	/* Fill the sequence */
 
 	for (i = 0, l = alarms; l; i++, l = l->next) {
 		CalAlarmInstance *ai;
-		Evolution_Calendar_CalAlarmInstance *corba_ai;
+		GNOME_Evolution_Calendar_CalAlarmInstance *corba_ai;
 
 		ai = l->data;
 		corba_ai = &seq->_buffer[i];
@@ -433,16 +433,16 @@ build_alarm_instance_seq (GList *alarms)
 }
 
 /* Cal::get_alarms_in_range method */
-static Evolution_Calendar_CalAlarmInstanceSeq *
+static GNOME_Evolution_Calendar_CalAlarmInstanceSeq *
 Cal_get_alarms_in_range (PortableServer_Servant servant,
-			 Evolution_Calendar_Time_t start,
-			 Evolution_Calendar_Time_t end,
+			 GNOME_Evolution_Calendar_Time_t start,
+			 GNOME_Evolution_Calendar_Time_t end,
 			 CORBA_Environment *ev)
 {
 	Cal *cal;
 	CalPrivate *priv;
 	time_t t_start, t_end;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
+	GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
 	GList *alarms;
 
 	cal = CAL (bonobo_object_from_servant (servant));
@@ -453,7 +453,7 @@ Cal_get_alarms_in_range (PortableServer_Servant servant,
 
 	if (t_start > t_end || t_start == -1 || t_end == -1) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
+				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
 				     NULL);
 		return NULL;
 	}
@@ -468,17 +468,17 @@ Cal_get_alarms_in_range (PortableServer_Servant servant,
 }
 
 /* Cal::get_alarms_for_object method */
-static Evolution_Calendar_CalAlarmInstanceSeq *
+static GNOME_Evolution_Calendar_CalAlarmInstanceSeq *
 Cal_get_alarms_for_object (PortableServer_Servant servant,
-			   const Evolution_Calendar_CalObjUID uid,
-			   Evolution_Calendar_Time_t start,
-			   Evolution_Calendar_Time_t end,
+			   const GNOME_Evolution_Calendar_CalObjUID uid,
+			   GNOME_Evolution_Calendar_Time_t start,
+			   GNOME_Evolution_Calendar_Time_t end,
 			   CORBA_Environment *ev)
 {
 	Cal *cal;
 	CalPrivate *priv;
 	time_t t_start, t_end;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
+	GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq;
 	GList *alarms;
 	gboolean result;
 
@@ -490,7 +490,7 @@ Cal_get_alarms_for_object (PortableServer_Servant servant,
 
 	if (t_start > t_end || t_start == -1 || t_end == -1) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
+				     ex_GNOME_Evolution_Calendar_Cal_InvalidRange,
 				     NULL);
 		return NULL;
 	}
@@ -498,7 +498,7 @@ Cal_get_alarms_for_object (PortableServer_Servant servant,
 	result = cal_backend_get_alarms_for_object (priv->backend, uid, t_start, t_end, &alarms);
 	if (!result) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
+				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
 				     NULL);
 		return NULL;
 	}
@@ -512,8 +512,8 @@ Cal_get_alarms_for_object (PortableServer_Servant servant,
 /* Cal::update_object method */
 static void
 Cal_update_object (PortableServer_Servant servant,
-		   const Evolution_Calendar_CalObjUID uid,
-		   const Evolution_Calendar_CalObj calobj,
+		   const GNOME_Evolution_Calendar_CalObjUID uid,
+		   const GNOME_Evolution_Calendar_CalObj calobj,
 		   CORBA_Environment *ev)
 {
 	Cal *cal;
@@ -524,14 +524,14 @@ Cal_update_object (PortableServer_Servant servant,
 
 	if (!cal_backend_update_object (priv->backend, uid, calobj))
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidObject,
+				     ex_GNOME_Evolution_Calendar_Cal_InvalidObject,
 				     NULL);
 }
 
 /* Cal::remove_object method */
 static void
 Cal_remove_object (PortableServer_Servant servant,
-		   const Evolution_Calendar_CalObjUID uid,
+		   const GNOME_Evolution_Calendar_CalObjUID uid,
 		   CORBA_Environment *ev)
 {
 	Cal *cal;
@@ -542,7 +542,7 @@ Cal_remove_object (PortableServer_Servant servant,
 
 	if (!cal_backend_remove_object (priv->backend, uid))
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
+				     ex_GNOME_Evolution_Calendar_Cal_NotFound,
 				     NULL);
 }
 
@@ -554,22 +554,22 @@ Cal_remove_object (PortableServer_Servant servant,
  *
  * Return value: A newly-allocated EPV.
  **/
-POA_Evolution_Calendar_Cal__epv *
+POA_GNOME_Evolution_Calendar_Cal__epv *
 cal_get_epv (void)
 {
-	POA_Evolution_Calendar_Cal__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Calendar_Cal__epv, 1);
-	epv->_get_uri = Cal_get_uri;
-	epv->get_n_objects = Cal_get_n_objects;
-	epv->get_object = Cal_get_object;
-	epv->get_uids = Cal_get_uids;
-	epv->get_changed_uids = Cal_get_changed_uids;
-	epv->get_objects_in_range = Cal_get_objects_in_range;
-	epv->get_alarms_in_range = Cal_get_alarms_in_range;
-	epv->get_alarms_for_object = Cal_get_alarms_for_object;
-	epv->update_object = Cal_update_object;
-	epv->remove_object = Cal_remove_object;
+	POA_GNOME_Evolution_Calendar_Cal__epv *epv;
+
+	epv = g_new0 (POA_GNOME_Evolution_Calendar_Cal__epv, 1);
+	epv->_get_uri     = Cal_get_uri;
+	epv->countObjects = Cal_get_n_objects;
+	epv->getObject    = Cal_get_object;
+	epv->getUIds      = Cal_get_uids;
+	epv->getChangedUIds     = Cal_get_changed_uids;
+	epv->getObjectsInRange  = Cal_get_objects_in_range;
+	epv->getAlarmsInRange   = Cal_get_alarms_in_range;
+	epv->getAlarmsForObject = Cal_get_alarms_for_object;
+	epv->updateObject = Cal_update_object;
+	epv->removeObject = Cal_remove_object;
 
 	return epv;
 }
@@ -591,9 +591,9 @@ cal_get_epv (void)
  **/
 Cal *
 cal_construct (Cal *cal,
-	       Evolution_Calendar_Cal corba_cal,
+	       GNOME_Evolution_Calendar_Cal corba_cal,
 	       CalBackend *backend,
-	       Evolution_Calendar_Listener listener)
+	       GNOME_Evolution_Calendar_Listener listener)
 {
 	CalPrivate *priv;
 	CORBA_Environment ev;
@@ -632,20 +632,20 @@ cal_construct (Cal *cal,
  * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
  * failure.
  **/
-Evolution_Calendar_Cal
+GNOME_Evolution_Calendar_Cal
 cal_corba_object_create (BonoboObject *object)
 {
-	POA_Evolution_Calendar_Cal *servant;
+	POA_GNOME_Evolution_Calendar_Cal *servant;
 	CORBA_Environment ev;
 
 	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
 	g_return_val_if_fail (IS_CAL (object), CORBA_OBJECT_NIL);
 
-	servant = (POA_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &cal_vepv;
 
 	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("cal_corba_object_create(): could not init the servant");
 		g_free (servant);
@@ -654,7 +654,7 @@ cal_corba_object_create (BonoboObject *object)
 	}
 
 	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant);
+	return (GNOME_Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant);
 }
 
 /**
@@ -669,10 +669,10 @@ cal_corba_object_create (BonoboObject *object)
  * if its corresponding CORBA object could not be created.
  **/
 Cal *
-cal_new (CalBackend *backend, Evolution_Calendar_Listener listener)
+cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener)
 {
 	Cal *cal, *retval;
-	Evolution_Calendar_Cal corba_cal;
+	GNOME_Evolution_Calendar_Cal corba_cal;
 	CORBA_Environment ev;
 	gboolean ret;
 
@@ -725,7 +725,7 @@ cal_notify_update (Cal *cal, const char *uid)
 	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
 
 	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_obj_updated (priv->listener, (char *) uid, &ev);
+	GNOME_Evolution_Calendar_Listener_notifyObjUpdated (priv->listener, (char *) uid, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION)
 		g_message ("cal_notify_update(): could not notify the listener "
@@ -756,7 +756,7 @@ cal_notify_remove (Cal *cal, const char *uid)
 	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
 
 	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_obj_removed (priv->listener, (char *) uid, &ev);
+	GNOME_Evolution_Calendar_Listener_notifyObjRemoved (priv->listener, (char *) uid, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION)
 		g_message ("cal_notify_remove(): could not notify the listener "
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
index 2b17278573..d4c9f02650 100644
--- a/calendar/pcs/cal.h
+++ b/calendar/pcs/cal.h
@@ -53,17 +53,17 @@ struct _CalClass {
 GtkType cal_get_type (void);
 
 Cal *cal_construct (Cal *cal,
-		    Evolution_Calendar_Cal corba_cal,
+		    GNOME_Evolution_Calendar_Cal corba_cal,
 		    CalBackend *backend,
-		    Evolution_Calendar_Listener listener);
-Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object);
+		    GNOME_Evolution_Calendar_Listener listener);
+GNOME_Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object);
 
-Cal *cal_new (CalBackend *backend, Evolution_Calendar_Listener listener);
+Cal *cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener);
 
 void cal_notify_update (Cal *cal, const char *uid);
 void cal_notify_remove (Cal *cal, const char *uid);
 
-POA_Evolution_Calendar_Cal__epv *cal_get_epv (void);
+POA_GNOME_Evolution_Calendar_Cal__epv *cal_get_epv (void);
 
 
 
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 42d0c9e0ed..a9b3305f3f 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-10  Michael Meeks  <michael@helixcode.com>
+
+	* Makefile.am ($(HTML_EDITOR_GENERATED)): rearrnace
+	includes.
+
 2000-11-10  Larry Ewing  <lewing@helixcode.com>
 
 	* e-msg-composer.c (build_message): set the HTML charset to utf-8
diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl
index 1e3701a594..3fcda3873e 100644
--- a/composer/Evolution-Composer.idl
+++ b/composer/Evolution-Composer.idl
@@ -10,6 +10,7 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 	
 	interface Composer : Bonobo::Unknown {
@@ -20,7 +21,7 @@ module Evolution {
 		typedef sequence<Recipient> RecipientList;
 
 		/**
-		 * set_headers:
+		 * setHeaders:
 		 * @to: the "To" recipients
 		 * @cc: the "CC" recipients
 		 * @bcc: the "Bcc" recipients
@@ -30,31 +31,31 @@ module Evolution {
 		 * @bcc may be an empty list, and @subject may be an
 		 * empty string.
 		 **/
-		void set_headers (in RecipientList to, in RecipientList cc,
-				  in RecipientList bcc, in string subject);
+		void setHeaders (in RecipientList to, in RecipientList cc,
+				 in RecipientList bcc, in string subject);
 
 		/**
-		 * set_body_text:
+		 * setBodyText:
 		 * @body: the body
 		 *
 		 * Sets the text in the body of the composer to
 		 * the given UTF-8 plain text.
 		 **/
-		void set_body_text (in string body);
+		void setBodyText (in string body);
 
 		/**
-		 * attach_MIME:
+		 * attachMIME:
 		 * @data: the attachment data
 		 *
 		 * This adds an attachment to the composer. @data
 		 * should be a fully-formed MIME body part.
 		 **/
 		exception CouldNotParse {};
-		void attach_MIME (in string data)
+		void attachMIME (in string data)
 			raises (CouldNotParse);
 
 		/**
-		 * attach_data:
+		 * attachData:
 		 * @content_type: the Content-Type header
 		 * @filename: the suggested filename, or ""
 		 * @description: a description of the data, or ""
@@ -76,11 +77,11 @@ module Evolution {
 		 * all of the MIME headers yourself and use
 		 * add_attachment ().
 		 **/
-		void attach_data (in string content_type,
-				  in string filename,
-				  in string description,
-				  in boolean show_inline,
-				  in string data);
+		void attachData (in string content_type,
+				 in string filename,
+				 in string description,
+				 in boolean show_inline,
+				 in string data);
 
 
 		/**
@@ -92,3 +93,4 @@ module Evolution {
 		void show ();
 	};
 };
+};
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 144c3f85a8..d281725a83 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -19,11 +19,11 @@ HTML_EDITOR_GENERATED =		\
 selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
 
 $(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		-I $(selectnamesdir) -I . $(srcdir)/Composer.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
+		-I $(selectnamesdir)  $(srcdir)/Composer.idl
 
 $(HTML_EDITOR_GENERATED): $(GTK_HTML_EDITOR_IDL)
-	$(ORBIT_IDL) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL)
+	$(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL)
 
 ##
 
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index a73d69c733..1cd999c11f 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -44,7 +44,7 @@
 #define SELECT_NAMES_OAFID "OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
 
 struct _EMsgComposerHdrsPrivate {
-	Evolution_Addressbook_SelectNames corba_select_names;
+	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
 
 	/* Total number of headers that we have.  */
 	guint num_hdrs;
@@ -119,7 +119,7 @@ address_button_clicked_cb (GtkButton *button,
 	CORBA_exception_init (&ev);
 
 	/* FIXME: Section ID */
-	Evolution_Addressbook_SelectNames_activate_dialog (priv->corba_select_names, "", &ev);
+	GNOME_Evolution_Addressbook_SelectNames_activateDialog (priv->corba_select_names, "", &ev);
 
 	CORBA_exception_free (&ev);
 }
@@ -183,7 +183,7 @@ create_addressbook_entry (EMsgComposerHdrs *hdrs,
 			  const char *name)
 {
 	EMsgComposerHdrsPrivate *priv;
-	Evolution_Addressbook_SelectNames corba_select_names;
+	GNOME_Evolution_Addressbook_SelectNames corba_select_names;
 	Bonobo_Control corba_control;
 	GtkWidget *control_widget;
 	CORBA_Environment ev;
@@ -193,13 +193,13 @@ create_addressbook_entry (EMsgComposerHdrs *hdrs,
 
 	CORBA_exception_init (&ev);
 
-	Evolution_Addressbook_SelectNames_add_section (corba_select_names, name, name, &ev);
+	GNOME_Evolution_Addressbook_SelectNames_addSection (corba_select_names, name, name, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
 		return NULL;
 	}
 
-	corba_control = Evolution_Addressbook_SelectNames_get_entry_for_section (corba_select_names, name, &ev);
+	corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (corba_select_names, name, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index f39482336c..c0e86ca227 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -38,12 +38,12 @@ static void (*postpone_cb) (EMsgComposer *, gpointer);
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_Composer__vepv Composer_vepv;
+static POA_GNOME_Evolution_Composer__vepv Composer_vepv;
 
 static GList *
-corba_recipientlist_to_glist (const Evolution_Composer_RecipientList *cl)
+corba_recipientlist_to_glist (const GNOME_Evolution_Composer_RecipientList *cl)
 {
-	Evolution_Composer_Recipient *recip;
+	GNOME_Evolution_Composer_Recipient *recip;
 	GList *gl = NULL;
 	char *str;
 	int i;
@@ -79,9 +79,9 @@ free_recipient_glist (GList *gl)
 
 static void
 impl_Composer_set_headers (PortableServer_Servant servant,
-			   const Evolution_Composer_RecipientList *to,
-			   const Evolution_Composer_RecipientList *cc,
-			   const Evolution_Composer_RecipientList *bcc,
+			   const GNOME_Evolution_Composer_RecipientList *to,
+			   const GNOME_Evolution_Composer_RecipientList *cc,
+			   const GNOME_Evolution_Composer_RecipientList *bcc,
 			   const CORBA_char *subject,
 			   CORBA_Environment *ev)
 {
@@ -140,7 +140,7 @@ impl_Composer_attach_MIME (PortableServer_Servant servant,
 
 	if (status == -1) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Composer_CouldNotParse,
+				     ex_GNOME_Evolution_Composer_CouldNotParse,
 				     NULL);
 		return;
 	}
@@ -193,17 +193,17 @@ impl_Composer_show (PortableServer_Servant servant,
 	gtk_widget_show (GTK_WIDGET (composer->composer));
 }
 
-POA_Evolution_Composer__epv *
+POA_GNOME_Evolution_Composer__epv *
 evolution_composer_get_epv (void)
 {
-	POA_Evolution_Composer__epv *epv;
+	POA_GNOME_Evolution_Composer__epv *epv;
 
-	epv = g_new0 (POA_Evolution_Composer__epv, 1);
-	epv->set_headers = impl_Composer_set_headers;
-	epv->set_body_text = impl_Composer_set_body_text;
-	epv->attach_MIME = impl_Composer_attach_MIME;
-	epv->attach_data = impl_Composer_attach_data;
-	epv->show = impl_Composer_show;
+	epv = g_new0 (POA_GNOME_Evolution_Composer__epv, 1);
+	epv->setHeaders  = impl_Composer_set_headers;
+	epv->setBodyText = impl_Composer_set_body_text;
+	epv->attachMIME  = impl_Composer_attach_MIME;
+	epv->attachData  = impl_Composer_attach_data;
+	epv->show        = impl_Composer_show;
 
 	return epv;
 }
@@ -233,7 +233,7 @@ class_init (EvolutionComposerClass *klass)
 	parent_class = gtk_type_class (bonobo_object_get_type ());
 
 	Composer_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	Composer_vepv.Evolution_Composer_epv = evolution_composer_get_epv ();
+	Composer_vepv.GNOME_Evolution_Composer_epv = evolution_composer_get_epv ();
 }
 
 static void
@@ -249,7 +249,7 @@ init (EvolutionComposer *composer)
 
 void
 evolution_composer_construct (EvolutionComposer *composer,
-			      Evolution_Composer corba_object)
+			      GNOME_Evolution_Composer corba_object)
 {
 	g_return_if_fail (composer != NULL);
 	g_return_if_fail (EVOLUTION_IS_COMPOSER (composer));
@@ -262,15 +262,15 @@ EvolutionComposer *
 evolution_composer_new (void)
 {
 	EvolutionComposer *new;
-	POA_Evolution_Composer *servant;
+	POA_GNOME_Evolution_Composer *servant;
 	CORBA_Environment ev;
-	Evolution_Composer corba_object;
+	GNOME_Evolution_Composer corba_object;
 
-	servant = (POA_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &Composer_vepv;
 
 	CORBA_exception_init (&ev);
-	POA_Evolution_Composer__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Composer__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h
index 6f248dae22..65f3f246d2 100644
--- a/composer/evolution-composer.h
+++ b/composer/evolution-composer.h
@@ -53,11 +53,11 @@ struct _EvolutionComposerClass {
 	BonoboObjectClass parent_class;
 };
 
-POA_Evolution_Composer__epv *evolution_composer_get_epv            (void);
+POA_GNOME_Evolution_Composer__epv *evolution_composer_get_epv            (void);
 
 GtkType            evolution_composer_get_type     (void);
 void               evolution_composer_construct    (EvolutionComposer *,
-						    Evolution_Composer);
+						    GNOME_Evolution_Composer);
 EvolutionComposer *evolution_composer_new          (void);
 
 void               evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index 5b3f147dfd..b580823455 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -32,8 +32,8 @@ COMPOSER_GENERATED = \
 Composer-impl.o: Composer.h
 
 $(COMPOSER_GENERATED):
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		-I$(srcdir) $(top_srcdir)/composer/Composer.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
+		$(top_srcdir)/composer/Composer.idl
 
 evolution_executive_summary_SOURCES =		\
 	$(COMPOSER_GENERATED)		\
diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
index 9af99c7e67..ad381fb51a 100644
--- a/executive-summary/component/component-factory.c
+++ b/executive-summary/component/component-factory.c
@@ -60,7 +60,7 @@ create_view (EvolutionShellComponent *shell_component,
 	     void *closure)
 {
   EvolutionShellClient *shell_client;
-  Evolution_Shell corba_shell;
+  GNOME_Evolution_Shell corba_shell;
   BonoboControl *control;
 
   if (g_strcasecmp (folder_type, "executive-summary") != 0)
@@ -84,7 +84,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	      const char *evolution_homedir,
 	      gpointer user_data)
 {
-  Evolution_Shell corba_shell;
+  GNOME_Evolution_Shell corba_shell;
 
   evolution_dir = g_strdup (evolution_homedir);
 
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index 79105c18a0..5ff8a54dc9 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -121,7 +121,7 @@ control_activate_cb (BonoboControl *control,
 	ESummary *summary;
 	BonoboUIComponent *ui_component;
 	Bonobo_ControlFrame control_frame;
-	Evolution_ShellView shell_view_interface;
+	GNOME_Evolution_ShellView shell_view_interface;
 	CORBA_Environment ev;
 
 	ui_component = bonobo_control_get_ui_component (control);
@@ -269,7 +269,7 @@ e_summary_factory_embed_service_from_id (ESummary *esummary,
 
 BonoboControl *
 e_summary_factory_new_control (const char *uri,
-			       const Evolution_Shell shell)
+			       const GNOME_Evolution_Shell shell)
 {
   BonoboControl *control;
   GtkWidget *esummary;
diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h
index 175988a78c..4c704e46ee 100644
--- a/executive-summary/component/e-summary-factory.h
+++ b/executive-summary/component/e-summary-factory.h
@@ -28,7 +28,7 @@
 #include "e-summary.h"
 
 BonoboControl *e_summary_factory_new_control (const char *uri,
-					      const Evolution_Shell shell);
+					      const GNOME_Evolution_Shell shell);
 void e_summary_factory_embed_service_from_id (ESummary *esummary,
 					      const char *obj_id);
 
diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
index c07a3efc99..9dfff28713 100644
--- a/executive-summary/component/e-summary-url.c
+++ b/executive-summary/component/e-summary-url.c
@@ -443,8 +443,8 @@ e_summary_url_mail_compose (ESummary *esummary,
 {
 	CORBA_Object composer;
 	CORBA_Environment ev;
-	Evolution_Composer_RecipientList *to, *cc, *bcc;
-	Evolution_Composer_Recipient *recipient;
+	GNOME_Evolution_Composer_RecipientList *to, *cc, *bcc;
+	GNOME_Evolution_Composer_Recipient *recipient;
 	char *address, *proto;
 	CORBA_char *subject;
 	
@@ -467,30 +467,30 @@ e_summary_url_mail_compose (ESummary *esummary,
 			address = (char *) url;
 	}
 
-	to = Evolution_Composer_RecipientList__alloc ();
+	to = GNOME_Evolution_Composer_RecipientList__alloc ();
 	to->_length = 1;
 	to->_maximum = 1;
-	to->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (to->_maximum);
+	to->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to->_maximum);
 	
 	recipient = to->_buffer;
 	recipient->name = CORBA_string_dup ("");
 	recipient->address = CORBA_string_dup (address?address:"");
 	
 	/* FIXME: Get these out of the URL */
-	cc = Evolution_Composer_RecipientList__alloc ();
+	cc = GNOME_Evolution_Composer_RecipientList__alloc ();
 	cc->_length = 0;
 	cc->_maximum = 0;
-	cc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
+	cc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
 	
-	bcc = Evolution_Composer_RecipientList__alloc ();
+	bcc = GNOME_Evolution_Composer_RecipientList__alloc ();
 	bcc->_length = 0;
 	bcc->_maximum = 0;
-	bcc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
+	bcc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
 	
 	subject = CORBA_string_dup ("");
 	
 	CORBA_exception_init (&ev);
-	Evolution_Composer_set_headers (composer, to, cc, bcc, subject, &ev);
+	GNOME_Evolution_Composer_setHeaders (composer, to, cc, bcc, subject, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
 		CORBA_free (to);
@@ -501,7 +501,7 @@ e_summary_url_mail_compose (ESummary *esummary,
 	CORBA_free (to);
 	
 	CORBA_exception_init (&ev);  
-	Evolution_Composer_show (composer, &ev);
+	GNOME_Evolution_Composer_show (composer, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
 		g_warning ("%s(%d): Error showing composer", __FUNCTION__, __LINE__);
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
index dca8f98f0f..46ea9cbae1 100644
--- a/executive-summary/component/e-summary.c
+++ b/executive-summary/component/e-summary.c
@@ -45,8 +45,8 @@ extern char *evolution_dir;
 static GtkObjectClass *e_summary_parent_class;
 
 struct _ESummaryPrivate {
-	Evolution_Shell shell;
-	Evolution_ShellView shell_view_interface;
+	GNOME_Evolution_Shell shell;
+	GNOME_Evolution_ShellView shell_view_interface;
 
 	GtkWidget *html_scroller;
 	GtkWidget *html;
@@ -214,7 +214,7 @@ E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init,
 	     e_summary_init, PARENT_TYPE);
 
 GtkWidget *
-e_summary_new (const Evolution_Shell shell)
+e_summary_new (const GNOME_Evolution_Shell shell)
 {
 	ESummary *esummary;
 	ESummaryPrivate *priv;
@@ -546,7 +546,7 @@ e_summary_view_from_id (ESummary *esummary,
 
 void
 e_summary_set_shell_view_interface (ESummary *summary,
-				    Evolution_ShellView svi)
+				    GNOME_Evolution_ShellView svi)
 {
 	ESummaryPrivate *priv;
 
@@ -558,14 +558,14 @@ e_summary_set_shell_view_interface (ESummary *summary,
 	priv->shell_view_interface = svi;
 }
 
-/* Wrappers for Evolution_ShellView */
+/* Wrappers for GNOME_Evolution_ShellView */
 void
 e_summary_set_message (ESummary *esummary,
 		       const char *message,
 		       gboolean busy)
 {
 	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
+	GNOME_Evolution_ShellView svi;
 	CORBA_Environment ev;
 
 	g_return_if_fail (esummary != NULL);
@@ -579,9 +579,9 @@ e_summary_set_message (ESummary *esummary,
 
 	CORBA_exception_init (&ev);
 	if (message != NULL)
-		Evolution_ShellView_set_message (svi, message, busy, &ev);
+		GNOME_Evolution_ShellView_setMessage (svi, message, busy, &ev);
 	else 
-		Evolution_ShellView_set_message (svi, "", busy, &ev);
+		GNOME_Evolution_ShellView_setMessage (svi, "", busy, &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -589,7 +589,7 @@ void
 e_summary_unset_message (ESummary *esummary)
 {
 	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
+	GNOME_Evolution_ShellView svi;
 	CORBA_Environment ev;
 
 	g_return_if_fail (esummary != NULL);
@@ -602,7 +602,7 @@ e_summary_unset_message (ESummary *esummary)
 		return;
 
 	CORBA_exception_init (&ev);
-	Evolution_ShellView_unset_message (svi, &ev);
+	GNOME_Evolution_ShellView_unsetMessage (svi, &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -611,7 +611,7 @@ e_summary_change_current_view (ESummary *esummary,
 			       const char *uri)
 {
 	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
+	GNOME_Evolution_ShellView svi;
 	CORBA_Environment ev;
 
 	g_return_if_fail (esummary != NULL);
@@ -624,7 +624,7 @@ e_summary_change_current_view (ESummary *esummary,
 		return;
 
 	CORBA_exception_init (&ev);
-	Evolution_ShellView_change_current_view (svi, uri, &ev);
+	GNOME_Evolution_ShellView_changeCurrentView (svi, uri, &ev);
 	CORBA_exception_free (&ev);
 }
 
@@ -633,7 +633,7 @@ e_summary_set_title (ESummary *esummary,
 		     const char *title)
 {
 	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
+	GNOME_Evolution_ShellView svi;
 	CORBA_Environment ev;
 
 	g_return_if_fail (esummary != NULL);
@@ -646,7 +646,7 @@ e_summary_set_title (ESummary *esummary,
 		return;
 
 	CORBA_exception_init (&ev);
-	Evolution_ShellView_set_title (svi, title, &ev);
+	GNOME_Evolution_ShellView_setTitle (svi, title, &ev);
 	CORBA_exception_free (&ev);
 }
 
diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h
index f68575d76c..2e930cd692 100644
--- a/executive-summary/component/e-summary.h
+++ b/executive-summary/component/e-summary.h
@@ -61,7 +61,7 @@ struct _ESummaryClass {
 };
 
 GtkType e_summary_get_type (void);
-GtkWidget *e_summary_new (const Evolution_Shell shell);
+GtkWidget *e_summary_new (const GNOME_Evolution_Shell shell);
 int e_summary_rebuild_page (ESummary *esummary);
 void e_summary_add_html_service (ESummary *esummary,
 				 ExecutiveSummary *summary,
@@ -89,7 +89,7 @@ void e_summary_add_service (ESummary *esummary,
 ExecutiveSummaryComponentView * e_summary_view_from_id (ESummary *esummary,
 							int id);
 void e_summary_set_shell_view_interface (ESummary *summary,
-					 Evolution_ShellView svi);
+					 GNOME_Evolution_ShellView svi);
 void e_summary_set_message (ESummary *esummary,
 			    const char *message,
 			    gboolean busy);
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am
index 09b19f6bc9..cbe9d99a55 100644
--- a/executive-summary/evolution-services/Makefile.am
+++ b/executive-summary/evolution-services/Makefile.am
@@ -31,8 +31,8 @@ IDLS = \
 	$(srcdir)/../idl/SummaryComponent.idl
 
 $(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		-I$(srcdir) $(srcdir)/../idl/Executive-Summary.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
+		$(srcdir)/../idl/Executive-Summary.idl
 
 libevolution_services_la_SOURCES =		\
 	$(IDL_GENERATED)		\
diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c
index 88796d1753..145e385c1a 100644
--- a/executive-summary/evolution-services/executive-summary-client.c
+++ b/executive-summary/evolution-services/executive-summary-client.c
@@ -98,13 +98,13 @@ executive_summary_client_set_title (ExecutiveSummaryClient *client,
 				    int id,
 				    const char *title)
 {
-	Evolution_Summary summary;
+	GNOME_Evolution_Summary_ViewFrame summary;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 
-	Evolution_Summary_set_title (summary, id, title, &ev);
+	GNOME_Evolution_Summary_ViewFrame_setTitle (summary, id, title, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error setting title to %s:%s", title, CORBA_exception_id (&ev));
@@ -118,13 +118,13 @@ executive_summary_client_set_icon (ExecutiveSummaryClient *client,
 				   int id,
 				   const char *icon)
 {
-	Evolution_Summary summary;
+	GNOME_Evolution_Summary_ViewFrame summary;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 
-	Evolution_Summary_set_icon (summary, id, icon, &ev);
+	GNOME_Evolution_Summary_ViewFrame_setIcon (summary, id, icon, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error setting icon to %s:%s", icon, CORBA_exception_id (&ev));
@@ -137,13 +137,13 @@ void
 executive_summary_client_flash (ExecutiveSummaryClient *client,
 				int id)
 {
-	Evolution_Summary summary;
+	GNOME_Evolution_Summary_ViewFrame summary;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 
-	Evolution_Summary_flash (summary, id, &ev);
+	GNOME_Evolution_Summary_ViewFrame_flash (summary, id, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error flashing");
@@ -157,13 +157,13 @@ executive_summary_client_update (ExecutiveSummaryClient *client,
 				 int id,
 				 const char *html)
 {
-	Evolution_Summary summary;
+	GNOME_Evolution_Summary_ViewFrame summary;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 
-	Evolution_Summary_update_component (summary, id, html, &ev);
+	GNOME_Evolution_Summary_ViewFrame_updateComponent (summary, id, html, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error updating the component");
 	}
diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c
index ecd806af52..5d13a39e6d 100644
--- a/executive-summary/evolution-services/executive-summary-component-client.c
+++ b/executive-summary/evolution-services/executive-summary-component-client.c
@@ -128,8 +128,8 @@ void
 executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,
 					      ExecutiveSummary *summary)
 {
-	Evolution_SummaryComponent component;
-	Evolution_Summary corba_object;
+	GNOME_Evolution_Summary_Component component;
+	GNOME_Evolution_Summary_ViewFrame corba_object;
 	CORBA_Environment ev;
 
 	g_return_if_fail (client != NULL);
@@ -142,7 +142,7 @@ executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *c
 	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (summary));
 
 	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	Evolution_SummaryComponent_set_owner (component, corba_object, &ev);
+	GNOME_Evolution_Summary_Component_setOwner (component, corba_object, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error setting owner");
@@ -155,7 +155,7 @@ executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *c
 void
 executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client)
 {
-	Evolution_SummaryComponent component;
+	GNOME_Evolution_Summary_Component component;
 	CORBA_Environment ev;
 
 	g_return_if_fail (client != NULL);
@@ -164,7 +164,7 @@ executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient
 	CORBA_exception_init (&ev);
 	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 	
-	Evolution_SummaryComponent_unset_owner (component, &ev);
+	GNOME_Evolution_Summary_Component_unsetOwner (component, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error unsetting owner");
@@ -180,7 +180,7 @@ executive_summary_component_client_supports (ExecutiveSummaryComponentClient *cl
 					     gboolean *bonobo,
 					     gboolean *html)
 {
-	Evolution_SummaryComponent component;
+	GNOME_Evolution_Summary_Component component;
 	CORBA_Environment ev;
 
 	g_return_if_fail (client != NULL);
@@ -189,7 +189,7 @@ executive_summary_component_client_supports (ExecutiveSummaryComponentClient *cl
 	CORBA_exception_init (&ev);
 	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 
-	Evolution_SummaryComponent_supports (component, bonobo, html, &ev);
+	GNOME_Evolution_Summary_Component_supports (component, bonobo, html, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error checking supports");
@@ -205,7 +205,7 @@ executive_summary_component_client_create_view (ExecutiveSummaryComponentClient
 						int id)
 {
 	ExecutiveSummaryComponentView *view;
-	Evolution_SummaryComponent component;
+	GNOME_Evolution_Summary_Component component;
 	char *html, *title, *icon;
 	Bonobo_Control control;
 	BonoboControl *bc;
@@ -222,8 +222,8 @@ executive_summary_component_client_create_view (ExecutiveSummaryComponentClient
 
 	/* Get all the details about the view */
 	g_print ("In %s\n", __FUNCTION__);
-	ret_id = Evolution_SummaryComponent_create_view (component, id, &control, 
-							 &html, &title, &icon, &ev);
+	ret_id = GNOME_Evolution_Summary_Component_createView (component, id, &control, 
+							       &html, &title, &icon, &ev);
 	g_print ("Out %s\n", __FUNCTION__);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error creating view");
@@ -254,7 +254,7 @@ executive_summary_component_client_create_html_view (ExecutiveSummaryComponentCl
 						     char **icon)
 {
 	CORBA_char *ret_html;
-	Evolution_SummaryComponent component;
+	GNOME_Evolution_Summary_Component component;
 	CORBA_Environment ev;
 
 	g_return_val_if_fail (client != NULL, NULL);
@@ -264,7 +264,7 @@ executive_summary_component_client_create_html_view (ExecutiveSummaryComponentCl
 	CORBA_exception_init (&ev);
 	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 
-	ret_html = Evolution_SummaryComponent_create_html_view (component, title, icon, &ev);
+	ret_html = GNOME_Evolution_Summary_Component_create_html_view (component, title, icon, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error creating HTML view");
@@ -281,7 +281,7 @@ executive_summary_component_client_create_html_view (ExecutiveSummaryComponentCl
 void
 executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client)
 {
-	Evolution_SummaryComponent component;
+	GNOME_Evolution_Summary_Component component;
 	CORBA_Environment ev;
 
 	g_return_if_fail (client != NULL);
@@ -289,7 +289,7 @@ executive_summary_component_client_configure (ExecutiveSummaryComponentClient *c
 
 	CORBA_exception_init (&ev);
 	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	Evolution_SummaryComponent_configure (component, &ev);
+	GNOME_Evolution_Summary_Component_configure (component, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error configuring service");
@@ -308,7 +308,7 @@ executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient
 						 ExecutiveSummaryComponentView *view) 
 {
 	int id;
-	Evolution_SummaryComponent component;
+	GNOME_Evolution_Summary_Component component;
 	CORBA_Environment ev;
 
 	g_return_if_fail (client != NULL);
@@ -320,7 +320,7 @@ executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient
 
 	CORBA_exception_init (&ev);
 	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	Evolution_SummaryComponent_destroy_view (component, id, &ev);
+	GNOME_Evolution_Summary_Component_destroyView (component, id, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Error destroying view #%d", id);
diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c
index c07afc498a..ba0c3b7832 100644
--- a/executive-summary/evolution-services/executive-summary-component.c
+++ b/executive-summary/evolution-services/executive-summary-component.c
@@ -56,19 +56,19 @@ struct _ExecutiveSummaryComponentPrivate {
 };
 
 /* CORBA interface */
-static POA_Evolution_SummaryComponent__vepv SummaryComponent_vepv;
+static POA_GNOME_Evolution_Summary_Component__vepv SummaryComponent_vepv;
 
-static POA_Evolution_SummaryComponent *
+static POA_GNOME_Evolution_Summary_Component *
 create_servant (void)
 {
-	POA_Evolution_SummaryComponent *servant;
+	POA_GNOME_Evolution_Summary_Component *servant;
 	CORBA_Environment ev;
 	
-	servant = (POA_Evolution_SummaryComponent *)g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Summary_Component *)g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &SummaryComponent_vepv;
 	
 	CORBA_exception_init (&ev);
-	POA_Evolution_SummaryComponent__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Summary_Component__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -82,7 +82,7 @@ create_servant (void)
 
 #if 0
 static void
-impl_Evolution_SummaryComponent_supports (PortableServer_Servant servant,
+impl_GNOME_Evolution_Summary_Component_supports (PortableServer_Servant servant,
 					  CORBA_boolean *html,
 					  CORBA_boolean *bonobo,
 					  CORBA_Environment *ev)
@@ -101,15 +101,15 @@ impl_Evolution_SummaryComponent_supports (PortableServer_Servant servant,
 #endif
 
 static void
-impl_Evolution_SummaryComponent_set_owner (PortableServer_Servant servant,
-					   Evolution_Summary summary,
+impl_GNOME_Evolution_Summary_Component_set_owner (PortableServer_Servant servant,
+					   GNOME_Evolution_Summary_ViewFrame summary,
 					   CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
 	ExecutiveSummaryComponent *component;
 	ExecutiveSummaryComponentPrivate *priv;
 	ExecutiveSummaryClient *client;
-	Evolution_Summary summary_duplicate;
+	GNOME_Evolution_Summary_ViewFrame summary_duplicate;
 
 	bonobo_object = bonobo_object_from_servant (servant);
 	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
@@ -125,7 +125,7 @@ impl_Evolution_SummaryComponent_set_owner (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_SummaryComponent_unset_owner (PortableServer_Servant servant,
+impl_GNOME_Evolution_Summary_Component_unset_owner (PortableServer_Servant servant,
 					     CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
@@ -144,7 +144,7 @@ impl_Evolution_SummaryComponent_unset_owner (PortableServer_Servant servant,
 }
 
 static CORBA_long
-impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant,
+impl_GNOME_Evolution_Summary_Component_create_view (PortableServer_Servant servant,
 					     CORBA_long id,
 					     Bonobo_Control *control,
 					     CORBA_char **html,
@@ -193,7 +193,7 @@ impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant,
 
 #if 0
 static CORBA_char *
-impl_Evolution_SummaryComponent_create_html_view (PortableServer_Servant servant,
+impl_GNOME_Evolution_Summary_Component_create_html_view (PortableServer_Servant servant,
 						  CORBA_char **title,
 						  CORBA_char **icon,
 						  CORBA_Environment *ev)
@@ -225,7 +225,7 @@ impl_Evolution_SummaryComponent_create_html_view (PortableServer_Servant servant
 #endif	
 
 static void
-impl_Evolution_SummaryComponent_destroy_view (PortableServer_Servant servant,
+impl_GNOME_Evolution_Summary_Component_destroy_view (PortableServer_Servant servant,
 					      CORBA_long id,
 					      CORBA_Environment *ev)
 {
@@ -250,7 +250,7 @@ impl_Evolution_SummaryComponent_destroy_view (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_SummaryComponent_configure (PortableServer_Servant servant,
+impl_GNOME_Evolution_Summary_Component_configure (PortableServer_Servant servant,
 					   CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
@@ -296,8 +296,8 @@ executive_summary_component_destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_SummaryComponent__vepv *vepv;
-	POA_Evolution_SummaryComponent__epv *epv;
+	POA_GNOME_Evolution_Summary_Component__vepv *vepv;
+	POA_GNOME_Evolution_Summary_Component__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 	
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -305,17 +305,17 @@ corba_class_init (void)
 	base_epv->finalize = NULL;
 	base_epv->default_POA = NULL;
 	
-	epv = g_new0 (POA_Evolution_SummaryComponent__epv, 1);
-	epv->set_owner = impl_Evolution_SummaryComponent_set_owner;
-	epv->unset_owner = impl_Evolution_SummaryComponent_unset_owner;
-	epv->create_view = impl_Evolution_SummaryComponent_create_view;
-	epv->destroy_view = impl_Evolution_SummaryComponent_destroy_view;
-	epv->configure = impl_Evolution_SummaryComponent_configure;
+	epv = g_new0 (POA_GNOME_Evolution_Summary_Component__epv, 1);
+	epv->setOwner    = impl_GNOME_Evolution_Summary_Component_set_owner;
+	epv->unsetOwner  = impl_GNOME_Evolution_Summary_Component_unset_owner;
+	epv->createView  = impl_GNOME_Evolution_Summary_Component_create_view;
+	epv->destroyView = impl_GNOME_Evolution_Summary_Component_destroy_view;
+	epv->configure   = impl_GNOME_Evolution_Summary_Component_configure;
 	
 	vepv = &SummaryComponent_vepv;
 	vepv->_base_epv = base_epv;
 	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->Evolution_SummaryComponent_epv = epv;
+	vepv->GNOME_Evolution_Summary_Component_epv = epv;
 }
 
 static void
@@ -350,7 +350,7 @@ executive_summary_component_init (ExecutiveSummaryComponent *component)
 
 static void
 executive_summary_component_construct (ExecutiveSummaryComponent *component,
-				       Evolution_SummaryComponent corba_object,
+				       GNOME_Evolution_Summary_Component corba_object,
 				       EvolutionServicesCreateViewFn create_view,
 				       EvolutionServicesConfigureFn configure,
 				       void *closure)
@@ -376,8 +376,8 @@ executive_summary_component_new (EvolutionServicesCreateViewFn create_view,
 				 void *closure)
 {
 	ExecutiveSummaryComponent *component;
-	POA_Evolution_SummaryComponent *servant;
-	Evolution_SummaryComponent corba_object;
+	POA_GNOME_Evolution_Summary_Component *servant;
+	GNOME_Evolution_Summary_Component corba_object;
 	
 	servant = create_servant ();
 	if (servant == NULL)
diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c
index f8a0f7ecf8..1f717cc0b4 100644
--- a/executive-summary/evolution-services/executive-summary.c
+++ b/executive-summary/evolution-services/executive-summary.c
@@ -54,20 +54,20 @@ struct _ExecutiveSummaryPrivate {
 };
 
 /* CORBA interface implementation */
-static POA_Evolution_Summary__vepv Summary_vepv;
+static POA_GNOME_Evolution_Summary_ViewFrame__vepv Summary_vepv;
 
-static POA_Evolution_Summary *
+static POA_GNOME_Evolution_Summary_ViewFrame *
 create_servant (void)
 {
-	POA_Evolution_Summary *servant;
+	POA_GNOME_Evolution_Summary_ViewFrame *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_Summary *)g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Summary_ViewFrame *)g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &Summary_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_Summary__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Summary_ViewFrame__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -80,7 +80,7 @@ create_servant (void)
 }
 
 static void
-impl_Evolution_Summary_set_title (PortableServer_Servant servant,
+impl_GNOME_Evolution_Summary_ViewFrame_setTitle (PortableServer_Servant servant,
 				  CORBA_long id,
 				  const CORBA_char *title,
 				  CORBA_Environment *ev)
@@ -96,7 +96,7 @@ impl_Evolution_Summary_set_title (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Summary_set_icon (PortableServer_Servant servant,
+impl_GNOME_Evolution_Summary_ViewFrame_setIcon (PortableServer_Servant servant,
 				 CORBA_long id,
 				 const CORBA_char *title,
 				 CORBA_Environment *ev)
@@ -112,9 +112,9 @@ impl_Evolution_Summary_set_icon (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Summary_flash (PortableServer_Servant servant,
-			      CORBA_long id,
-			      CORBA_Environment *ev)
+impl_GNOME_Evolution_Summary_ViewFrame_flash (PortableServer_Servant servant,
+					      CORBA_long id,
+					      CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
 	ExecutiveSummary *summary;
@@ -126,10 +126,10 @@ impl_Evolution_Summary_flash (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Summary_update_component (PortableServer_Servant servant,
-					 CORBA_long id,
-					 CORBA_char *html,
-					 CORBA_Environment *ev)
+impl_GNOME_Evolution_Summary_ViewFrame_updateComponent (PortableServer_Servant servant,
+							const CORBA_long id,
+							const CORBA_char *html,
+							CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
 	ExecutiveSummary *summary;
@@ -163,8 +163,8 @@ executive_summary_destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_Summary__vepv *vepv;
-	POA_Evolution_Summary__epv *epv;
+	POA_GNOME_Evolution_Summary_ViewFrame__vepv *vepv;
+	POA_GNOME_Evolution_Summary_ViewFrame__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 	
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -172,16 +172,16 @@ corba_class_init (void)
 	base_epv->finalize = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_Summary__epv, 1);
-	epv->set_title = impl_Evolution_Summary_set_title;
-	epv->set_icon = impl_Evolution_Summary_set_icon;
-	epv->flash = impl_Evolution_Summary_flash;
-	epv->update_component = impl_Evolution_Summary_update_component;
+	epv = g_new0 (POA_GNOME_Evolution_Summary_ViewFrame__epv, 1);
+	epv->setTitle        = impl_GNOME_Evolution_Summary_ViewFrame_setTitle;
+	epv->setIcon         = impl_GNOME_Evolution_Summary_ViewFrame_setIcon;
+	epv->flash           = impl_GNOME_Evolution_Summary_ViewFrame_flash;
+	epv->updateComponent = impl_GNOME_Evolution_Summary_ViewFrame_updateComponent;
 
 	vepv = &Summary_vepv;
 	vepv->_base_epv = base_epv;
 	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->Evolution_Summary_epv = epv;
+	vepv->GNOME_Evolution_Summary_ViewFrame_epv = epv;
 }
 
 static void
@@ -245,7 +245,7 @@ E_MAKE_TYPE (executive_summary, "ExecutiveSummary", ExecutiveSummary,
 
 void
 executive_summary_construct (ExecutiveSummary *es,
-			     Evolution_Summary corba_object)
+			     GNOME_Evolution_Summary_ViewFrame corba_object)
 {
 	bonobo_object_construct (BONOBO_OBJECT (es), corba_object);
 }
@@ -253,8 +253,8 @@ executive_summary_construct (ExecutiveSummary *es,
 BonoboObject *
 executive_summary_new (void)
 {
-	POA_Evolution_Summary *servant;
-	Evolution_Summary corba_object;
+	POA_GNOME_Evolution_Summary_ViewFrame *servant;
+	GNOME_Evolution_Summary_ViewFrame corba_object;
 	ExecutiveSummary *es;
 
 	servant = create_servant ();
diff --git a/executive-summary/evolution-services/executive-summary.h b/executive-summary/evolution-services/executive-summary.h
index 4f6b959a9c..23765044f4 100644
--- a/executive-summary/evolution-services/executive-summary.h
+++ b/executive-summary/evolution-services/executive-summary.h
@@ -48,20 +48,20 @@ struct _ExecutiveSummaryClass {
 	BonoboObjectClass parent_class;
 
 	void (* update) (ExecutiveSummary *summary,
-			 const Evolution_SummaryComponent component,
+			 const GNOME_Evolution_Summary_Component component,
 			 const char *html);
 	void (* set_title) (ExecutiveSummary *summary,
-			    const Evolution_SummaryComponent component,
+			    const GNOME_Evolution_Summary_Component component,
 			    const char *title);
 	void (* set_icon) (ExecutiveSummary *summary,
-			   const Evolution_SummaryComponent component,
+			   const GNOME_Evolution_Summary_Component component,
 			   const char *icon);
 	void (* flash) (ExecutiveSummary *summary,
-			const Evolution_SummaryComponent component);
+			const GNOME_Evolution_Summary_Component component);
 };
 
 GtkType executive_summary_get_type (void);
 void executive_summary_construct (ExecutiveSummary *es,
-				  Evolution_Summary corba_object);
+				  GNOME_Evolution_Summary_ViewFrame corba_object);
 BonoboObject *executive_summary_new (void);
 #endif
diff --git a/executive-summary/idl/Summary.idl b/executive-summary/idl/Summary.idl
index 76f98dd537..04b89187e0 100644
--- a/executive-summary/idl/Summary.idl
+++ b/executive-summary/idl/Summary.idl
@@ -10,24 +10,26 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
-	interface Summary: Bonobo::Unknown {
+module Summary {
+	interface ViewFrame: Bonobo::Unknown {
 		exception NoSubWindow {};
 		
 		/**
-		 * set_title:
+		 * setTitle:
 		 * @component: The SummaryComponent whose window to set the title.
 		 * @title: The title.
 		 *
 		 * Sets the title of the subwindow that displays @component
 		 * to @title
 		 */
-		void set_title (in long id, 
-				in string title)
+		void setTitle (in long id, 
+			       in string title)
 			raises (NoSubWindow);
 
-		void set_icon (in long id,
-			       in string icon)
+		void setIcon (in long id,
+			      in string icon)
 			raises (NoSubWindow);
 
 		/**
@@ -40,15 +42,17 @@ module Evolution {
 			raises (NoSubWindow);
 
 		/**
-		 * update_html_component:
+		 * updateComponent:
 		 * @component: The SummaryComponent that owns a subwindow.
 		 * @html: The new html that defines a component.
 		 *
 		 * Requests that the html that displays @component is changed
 		 * to @html.
 		 */
-		void update_component (in long id,
-				       in string html)
+		void updateComponent (in long id,
+				      in string html)
 			raises (NoSubWindow);
 	};
 };
+};
+};
diff --git a/executive-summary/idl/SummaryComponent.idl b/executive-summary/idl/SummaryComponent.idl
index 1c60314fb2..fbfd58800a 100644
--- a/executive-summary/idl/SummaryComponent.idl
+++ b/executive-summary/idl/SummaryComponent.idl
@@ -12,28 +12,30 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
-	interface Summary;
+module Summary {
+	interface ViewFrame;
 
-	interface SummaryComponent: Bonobo::Unknown {
+	interface Component: Bonobo::Unknown {
 
 		/**
-		 * set_owner:
+		 * setOwner:
 		 * @summary: A Summary object.
 		 *
 		 * Sets the owner of the component.
 		 */
-		void set_owner (in Summary owner);
+		void setOwner (in ViewFrame owner);
 
 		/**
-		 * unset_owner:
+		 * unsetOwner:
 		 *
 		 * Unsets the owner of the component.
 		 */
-		void unset_owner ();
+		void unsetOwner ();
 
 		/**
-		 * create_view:
+		 * createView:
 		 * @control: A Bonobo_Control
 		 * @html: HTML of the view.
 		 * @title: Title of the view.
@@ -42,19 +44,19 @@ module Evolution {
 		 * Creates a summary of the data that the component has.
 		 * Returns: The ID of the view.
 		 */
-		long create_view (in long id,
-				  out Bonobo::Control control,
-		                  out string html,
-				  out string title,
-			          out string icon);
+		long createView (in long id,
+				 out Bonobo::Control control,
+				 out string html,
+				 out string title,
+				 out string icon);
 
 		/**
-		 * destroy_view:
+		 * destroyView:
 		 * @id: ID of the view to be destroyed.
 		 *
 		 * Tells a service that a view has been destroyed.
 		 */
-		void destroy_view (in long id);
+		void destroyView (in long id);
 
 		/**
 		 * configure:
@@ -65,3 +67,5 @@ module Evolution {
 
 	};
 };
+};
+};
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 73c56c9880..f8472b82ba 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-10  Michael Meeks  <michael@helixcode.com>
+
+	* Makefile.am ($(EVOLUTION_MAIL_CORBA_GENERATED)): sort include order.
+
 2000-11-09  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* subscribe-dialog.glade[.h]: New glade file for possibly using to
diff --git a/mail/Mail.idl b/mail/Mail.idl
index 1d12a39c5c..14e17b3993 100644
--- a/mail/Mail.idl
+++ b/mail/Mail.idl
@@ -9,12 +9,13 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 	
 	interface MessageList : Bonobo::Unknown {
 		
-		void select_message (in long message_number);
-		void open_message   (in long message_number);
+		void selectMessage (in long message_number);
+		void openMessage   (in long message_number);
 	};
 	
 	/*
@@ -24,7 +25,8 @@ module Evolution {
 	 * Bonobo Properties
 	 */
 	interface FolderBrowser : Bonobo::Unknown {
-		MessageList get_message_list ();
+		MessageList getMessageList ();
 	};
 };
+};
 
diff --git a/mail/Makefile.am b/mail/Makefile.am
index b28ec287c4..828db23433 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -143,7 +143,8 @@ glade_messages = \
 iconsdir = $(datadir)/images/evolution
 
 $(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl 
-	$(ORBIT_IDL) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` -I `$(GNOME_CONFIG) --datadir`/idl -I $(srcdir) $(srcdir)/Mail.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \
+	-I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mail.idl
 
 EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA) $(glade_messages)
 
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 014c4b8e3b..111718b5e2 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -77,7 +77,7 @@ create_view (EvolutionShellComponent *shell_component,
 	     void *closure)
 {
 	EvolutionShellClient *shell_client;
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_Shell corba_shell;
 	BonoboControl *control;
 	GtkWidget *folder_browser_widget;
 
@@ -105,7 +105,7 @@ static void
 create_folder (EvolutionShellComponent *shell_component,
 	       const char *physical_uri,
 	       const char *type,
-	       const Evolution_ShellComponentListener listener,
+	       const GNOME_Evolution_ShellComponentListener listener,
 	       void *closure)
 {
 	mail_do_create_folder (listener, physical_uri, type);
@@ -118,7 +118,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	      gpointer user_data)
 {
 	GSList *sources;
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_Shell corba_shell;
 
 	g_print ("evolution-mail: Yeeeh! We have an owner!\n");	/* FIXME */
 	
@@ -253,7 +253,7 @@ create_vfolder_storage (EvolutionShellComponent *shell_component)
 
 static void
 add_storage (const char *uri, CamelService *store,
-	     Evolution_Shell corba_shell, CamelException *ex)
+	     GNOME_Evolution_Shell corba_shell, CamelException *ex)
 {
 	EvolutionStorage *storage;
 	EvolutionStorageResult res;
@@ -282,7 +282,7 @@ add_storage (const char *uri, CamelService *store,
 }
 
 void
-mail_load_storages (Evolution_Shell corba_shell, GSList *sources)
+mail_load_storages (GNOME_Evolution_Shell corba_shell, GSList *sources)
 {
 	CamelException ex;
 	MailConfigService *svc;
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index ea0bde946d..71a57b8d9b 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -206,7 +206,7 @@ control_destroy_cb (BonoboControl *control,
 
 BonoboControl *
 folder_browser_factory_new_control (const char *uri,
-				    const Evolution_Shell shell)
+				    const GNOME_Evolution_Shell shell)
 {
 	BonoboControl *control;
 	GtkWidget *folder_browser;
diff --git a/mail/folder-browser-factory.h b/mail/folder-browser-factory.h
index b47913a66a..d2d35d38b7 100644
--- a/mail/folder-browser-factory.h
+++ b/mail/folder-browser-factory.h
@@ -15,7 +15,7 @@
 #include "Evolution.h"
 
 BonoboControl *folder_browser_factory_new_control       (const char            *uri,
-							 const Evolution_Shell  shell);
+							 const GNOME_Evolution_Shell  shell);
 GList         *folder_browser_factory_get_control_list  (void);
 
 #endif /* _FOLDER_BROWSER_FACTORY_H */
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 3a2162be42..d8989cdbeb 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -739,7 +739,7 @@ my_folder_browser_init (GtkObject *object)
 }
 
 GtkWidget *
-folder_browser_new (const Evolution_Shell shell)
+folder_browser_new (const GNOME_Evolution_Shell shell)
 {
 	static int serial = 0;
 	CORBA_Environment ev;
diff --git a/mail/folder-browser.h b/mail/folder-browser.h
index 7ddc9a1954..490088c639 100644
--- a/mail/folder-browser.h
+++ b/mail/folder-browser.h
@@ -27,7 +27,7 @@ struct  _FolderBrowser {
 	
 	BonoboPropertyBag *properties;
 	
-	Evolution_Shell shell;
+	GNOME_Evolution_Shell shell;
 	
 	/* This is a kludge for the toolbar problem. */
 	int serial;
@@ -65,7 +65,7 @@ struct fb_ondemand_closure {
 };
 
 GtkType    folder_browser_get_type             (void);
-GtkWidget *folder_browser_new                  (const Evolution_Shell  shell);
+GtkWidget *folder_browser_new                  (const GNOME_Evolution_Shell  shell);
 
 gboolean   folder_browser_set_uri              (FolderBrowser         *folder_browser,
 						const char            *uri);
diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c
index 15099d8332..0c6d9c7a74 100644
--- a/mail/mail-config-gui.c
+++ b/mail/mail-config-gui.c
@@ -142,7 +142,7 @@ typedef struct
 
 typedef struct
 {
-	Evolution_Shell shell;
+	GNOME_Evolution_Shell shell;
 	GladeXML *gui;
 	GtkWidget *dialog;
 	GtkWidget *druid;
@@ -156,7 +156,7 @@ typedef struct
 
 typedef struct
 {
-	Evolution_Shell shell;
+	GNOME_Evolution_Shell shell;
 	GladeXML *gui;
 	GtkWidget *dialog;
 	GtkWidget *clistIdentities;
@@ -1570,7 +1570,7 @@ mail_druid_finish (GnomeDruidPage *page, GnomeDruid *druid,
 }
 
 void
-mail_config_druid (Evolution_Shell shell)
+mail_config_druid (GNOME_Evolution_Shell shell)
 {
 	MailDruidDialog *dialog;
 	GnomeDruidPageStart *spage;
@@ -2019,7 +2019,7 @@ mail_config_close (GnomePropertyBox *property_box, MailDialog *dialog)
 }
 	
 void
-mail_config (Evolution_Shell shell)
+mail_config (GNOME_Evolution_Shell shell)
 {
 	MailDialog *dialog;
 	GladeXML *gui;
diff --git a/mail/mail-config-gui.h b/mail/mail-config-gui.h
index c8cbb33207..a6809e3cf3 100644
--- a/mail/mail-config-gui.h
+++ b/mail/mail-config-gui.h
@@ -25,7 +25,7 @@
 
 #include "shell/Evolution.h"
 
-void mail_config (Evolution_Shell shell);
-void mail_config_druid (Evolution_Shell shell);
+void mail_config (GNOME_Evolution_Shell shell);
+void mail_config_druid (GNOME_Evolution_Shell shell);
 
 #endif
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 35f6b51e96..b256e1b4f0 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -666,6 +666,7 @@ mail_html_write (GtkHTML *html, GtkHTMLStream *stream,
 	va_start (ap, format);
 	buf = g_strdup_vprintf (format, ap);
 	va_end (ap);
+	printf ("Writing html '%s'\n", buf);
 	gtk_html_write (html, stream, buf, strlen (buf));
 	g_free (buf);
 }
@@ -686,6 +687,7 @@ mail_text_write (GtkHTML *html, GtkHTMLStream *stream,
 				   E_TEXT_TO_HTML_CONVERT_NL |
 				   E_TEXT_TO_HTML_CONVERT_SPACES);
 	gtk_html_write (html, stream, "<tt>", 4);
+	printf ("Writing text '%s'\n", htmltext);
 	gtk_html_write (html, stream, htmltext, strlen (htmltext));
 	gtk_html_write (html, stream, "</tt>", 5);
 	g_free (htmltext);
diff --git a/mail/mail-local.c b/mail/mail-local.c
index ab2c4eba09..57d8a4e68c 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -457,7 +457,7 @@ local_reconfigure_folder(FolderBrowser *fb)
 typedef struct {
 	CamelStore parent_object;	
 
-	Evolution_LocalStorage corba_local_storage;
+	GNOME_Evolution_LocalStorage corba_local_storage;
 	EvolutionStorageListener *local_storage_listener;
 
 	char *local_path;
@@ -636,12 +636,12 @@ local_folder_changed (CamelObject *object, gpointer event_data,
 		if (unread > 0) {
 			display = g_strdup_printf ("%s (%d)",
 						   local_folder->name, unread);
-			Evolution_LocalStorage_update_folder (
+			GNOME_Evolution_LocalStorage_updateFolder (
 				local_folder->local_store->corba_local_storage,
 				local_folder->path, display, TRUE, &ev);
 			g_free (display);
 		} else {
-			Evolution_LocalStorage_update_folder (
+			GNOME_Evolution_LocalStorage_updateFolder (
 				local_folder->local_store->corba_local_storage,
 				local_folder->path, local_folder->name,
 				FALSE, &ev);
@@ -702,7 +702,7 @@ static const mail_operation_spec op_register_folder =
 static void
 local_storage_new_folder_cb (EvolutionStorageListener *storage_listener,
 			     const char *path,
-			     const Evolution_Folder *folder,
+			     const GNOME_Evolution_Folder *folder,
 			     void *data)
 {
 	MailLocalStore *local_store = data;
@@ -789,7 +789,7 @@ mail_local_storage_startup (EvolutionShellClient *shellclient,
 			    const char *evolution_path)
 {
 	MailLocalStore *local_store;
-	Evolution_StorageListener corba_local_storage_listener;
+	GNOME_Evolution_StorageListener corba_local_storage_listener;
 	CORBA_Environment ev;
 
 	/* Register with Camel to handle file: URLs */
@@ -841,7 +841,7 @@ mail_local_storage_startup (EvolutionShellClient *shellclient,
 	local_store->folders = g_hash_table_new (g_str_hash, g_str_equal);
 
 	CORBA_exception_init (&ev);
-	Evolution_Storage_add_listener (local_store->corba_local_storage,
+	GNOME_Evolution_Storage_addListener (local_store->corba_local_storage,
 					corba_local_storage_listener, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Cannot add a listener to the Local Storage.");
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 34afb6a130..b334614c8e 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1734,7 +1734,7 @@ mail_do_load_folder (FolderBrowser *fb, const char *url)
 
 typedef struct create_folder_input_s
 {
-	Evolution_ShellComponentListener listener;
+	GNOME_Evolution_ShellComponentListener listener;
 	char *uri;
 	char *type;
 }
@@ -1742,7 +1742,7 @@ create_folder_input_t;
 
 typedef struct create_folder_data_s
 {
-	Evolution_ShellComponentListener_Result result;
+	GNOME_Evolution_ShellComponentListener_Result result;
 }
 create_folder_data_t;
 
@@ -1769,7 +1769,7 @@ do_create_folder (gpointer in_data, gpointer op_data, CamelException *ex)
 
 	if (strcmp (input->type, "mail") != 0)
 		data->result =
-			Evolution_ShellComponentListener_UNSUPPORTED_TYPE;
+			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE;
 	else {
 		camel_url = g_strdup_printf ("mbox://%s", input->uri);
 		/* FIXME: supply a way to make indexes optional */
@@ -1780,10 +1780,10 @@ do_create_folder (gpointer in_data, gpointer op_data, CamelException *ex)
 
 		if (!camel_exception_is_set (ex)) {
 			camel_object_unref (CAMEL_OBJECT (folder));
-			data->result = Evolution_ShellComponentListener_OK;
+			data->result = GNOME_Evolution_ShellComponentListener_OK;
 		} else {
 			data->result =
-				Evolution_ShellComponentListener_INVALID_URI;
+				GNOME_Evolution_ShellComponentListener_INVALID_URI;
 		}
 	}
 }
@@ -1798,7 +1798,7 @@ cleanup_create_folder (gpointer in_data, gpointer op_data,
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
-	Evolution_ShellComponentListener_report_result (input->listener,
+	GNOME_Evolution_ShellComponentListener_notifyResult (input->listener,
 							data->result, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION)
 		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
@@ -1821,7 +1821,7 @@ static const mail_operation_spec op_create_folder = {
 };
 
 void
-mail_do_create_folder (const Evolution_ShellComponentListener listener,
+mail_do_create_folder (const GNOME_Evolution_ShellComponentListener listener,
 		       const char *uri, const char *type)
 {
 	CORBA_Environment ev;
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index d6cb7a2cc0..262cfcfc18 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -61,7 +61,7 @@ void mail_do_forward_message (CamelMimeMessage *basis, CamelFolder *source,
 			      GPtrArray *uids,	/*array of allocated gchar *, will all be freed */
 			      EMsgComposer *composer);
 void mail_do_load_folder (FolderBrowser *fb, const char *url);
-void mail_do_create_folder (const Evolution_ShellComponentListener listener,
+void mail_do_create_folder (const GNOME_Evolution_ShellComponentListener listener,
 			    const char *uri, const char *type);
 void mail_do_sync_folder (CamelFolder *folder);
 void mail_do_display_message (MessageList *ml, MailDisplay *md, const char *uid,
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index cc66b60ce2..588576e872 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -1025,11 +1025,11 @@ block_release (block_info_t *info)
 
 /* FIXME FIXME FIXME This is a totally evil hack.  */
 
-static Evolution_ShellView
+static GNOME_Evolution_ShellView
 retrieve_shell_view_interface_from_control (BonoboControl *control)
 {
 	Bonobo_ControlFrame control_frame;
-	Evolution_ShellView shell_view_interface;
+	GNOME_Evolution_ShellView shell_view_interface;
 	CORBA_Environment ev;
 
 	control_frame = bonobo_control_get_control_frame (control);
@@ -1062,7 +1062,7 @@ update_active_views (void)
 	controls = folder_browser_factory_get_control_list ();
 	for (p = controls; p != NULL; p = p->next) {
 		BonoboControl *control;
-		Evolution_ShellView shell_view_interface;
+		GNOME_Evolution_ShellView shell_view_interface;
 		CORBA_Environment ev;
 
 		control = BONOBO_CONTROL (p->data);
@@ -1076,15 +1076,15 @@ update_active_views (void)
 
 		if (shell_view_interface != CORBA_OBJECT_NIL) {
 			if (current_message == NULL && ! busy) {
-				Evolution_ShellView_unset_message (shell_view_interface, &ev);
+				GNOME_Evolution_ShellView_unsetMessage (shell_view_interface, &ev);
 			} else {
 				if (current_message == NULL)
-					Evolution_ShellView_set_message (shell_view_interface,
+					GNOME_Evolution_ShellView_setMessage (shell_view_interface,
 									 "",
 									 busy,
 									 &ev);
 				else
-					Evolution_ShellView_set_message (shell_view_interface,
+					GNOME_Evolution_ShellView_setMessage (shell_view_interface,
 									 current_message,
 									 busy,
 									 &ev);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 5bdac810cc..d97e907d0f 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -131,7 +131,7 @@ void
 vfolder_create_storage(EvolutionShellComponent *shell_component)
 {
 	EvolutionShellClient *shell_client;
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_Shell corba_shell;
 	EvolutionStorage *storage;
 	char *user, *system;
 
diff --git a/mail/mail.h b/mail/mail.h
index 481c031585..9a897d52f1 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -64,6 +64,6 @@ GtkWidget *mail_view_create (CamelFolder *source, const char *uid, CamelMimeMess
 
 /* component factory for lack of a better place */
 /*takes a GSList of MailConfigServices */
-void mail_load_storages (Evolution_Shell corba_shell, GSList *sources);
+void mail_load_storages (GNOME_Evolution_Shell corba_shell, GSList *sources);
 /* used in the subscribe dialog code */
 EvolutionStorage *mail_lookup_storage (CamelStore *store);
diff --git a/mail/message-list.c b/mail/message-list.c
index d28021f77e..b1fcd8843f 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -82,7 +82,7 @@
 #define PARENT_TYPE (bonobo_object_get_type ())
 
 static BonoboObjectClass *message_list_parent_class;
-static POA_Evolution_MessageList__vepv evolution_message_list_vepv;
+static POA_GNOME_Evolution_MessageList__vepv evolution_message_list_vepv;
 
 static void on_cursor_change_cmd (ETableScrolled *table, int row, gpointer user_data);
 static gint on_click (ETableScrolled *table, gint row, gint col, GdkEvent *event, MessageList *list);
@@ -1077,15 +1077,15 @@ MessageList_open_message (PortableServer_Servant _servant,
 	printf ("FIXME: open message method\n");
 }
 
-static POA_Evolution_MessageList__epv *
+static POA_GNOME_Evolution_MessageList__epv *
 evolution_message_list_get_epv (void)
 {
-	POA_Evolution_MessageList__epv *epv;
+	POA_GNOME_Evolution_MessageList__epv *epv;
 
-	epv = g_new0 (POA_Evolution_MessageList__epv, 1);
+	epv = g_new0 (POA_GNOME_Evolution_MessageList__epv, 1);
 
-	epv->select_message = MessageList_select_message;
-	epv->open_message   = MessageList_open_message;
+	epv->selectMessage = MessageList_select_message;
+	epv->openMessage   = MessageList_open_message;
 
 	return epv;
 }
@@ -1094,7 +1094,7 @@ static void
 message_list_corba_class_init (void)
 {
 	evolution_message_list_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	evolution_message_list_vepv.Evolution_MessageList_epv = evolution_message_list_get_epv ();
+	evolution_message_list_vepv.GNOME_Evolution_MessageList_epv = evolution_message_list_get_epv ();
 }
 
 /*
@@ -1123,22 +1123,22 @@ message_list_class_init (GtkObjectClass *object_class)
 }
 
 static void
-message_list_construct (MessageList *message_list, Evolution_MessageList corba_message_list)
+message_list_construct (MessageList *message_list, GNOME_Evolution_MessageList corba_message_list)
 {
 	bonobo_object_construct (BONOBO_OBJECT (message_list), corba_message_list);
 }
 
-static Evolution_MessageList
+static GNOME_Evolution_MessageList
 create_corba_message_list (BonoboObject *object)
 {
-	POA_Evolution_MessageList *servant;
+	POA_GNOME_Evolution_MessageList *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_MessageList *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_MessageList *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &evolution_message_list_vepv;
 
 	CORBA_exception_init (&ev);
-	POA_Evolution_MessageList__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_MessageList__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION){
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -1146,13 +1146,13 @@ create_corba_message_list (BonoboObject *object)
 	}
 
 	CORBA_exception_free (&ev);
-	return (Evolution_MessageList) bonobo_object_activate_servant (object, servant);
+	return (GNOME_Evolution_MessageList) bonobo_object_activate_servant (object, servant);
 }
 
 BonoboObject *
 message_list_new (void)
 {
-	Evolution_MessageList corba_object;
+	GNOME_Evolution_MessageList corba_object;
 	MessageList *message_list;
 
 	message_list = gtk_type_new (message_list_get_type ());
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index 7f198181de..a361f9ad26 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -1155,7 +1155,7 @@ subscribe_dialog_init (GtkObject *object)
 }
 
 static void
-subscribe_dialog_construct (GtkObject *object, Evolution_Shell shell)
+subscribe_dialog_construct (GtkObject *object, GNOME_Evolution_Shell shell)
 {
 	SubscribeDialog *sc = SUBSCRIBE_DIALOG (object);
 
@@ -1173,7 +1173,7 @@ subscribe_dialog_construct (GtkObject *object, Evolution_Shell shell)
 }
 
 GtkWidget *
-subscribe_dialog_new (Evolution_Shell shell)
+subscribe_dialog_new (GNOME_Evolution_Shell shell)
 {
 	SubscribeDialog *subscribe_dialog;
 
diff --git a/mail/subscribe-dialog.h b/mail/subscribe-dialog.h
index 4e1c5a2b49..34267efafd 100644
--- a/mail/subscribe-dialog.h
+++ b/mail/subscribe-dialog.h
@@ -41,7 +41,7 @@
 struct  _SubscribeDialog {
 	GtkObject parent;
 
-	Evolution_Shell           shell;
+	GNOME_Evolution_Shell           shell;
 
 	GtkWidget                *app;
 
@@ -72,6 +72,6 @@ typedef struct {
 } SubscribeDialogClass;
 
 GtkType    subscribe_dialog_get_type             (void);
-GtkWidget *subscribe_dialog_new                  (Evolution_Shell shell);
+GtkWidget *subscribe_dialog_new                  (GNOME_Evolution_Shell shell);
 
 #endif /* _SUBSCRIBE_DIALOG_H_ */
diff --git a/mail/test-mail.c b/mail/test-mail.c
index 917f2a2a2a..48bfbd507a 100644
--- a/mail/test-mail.c
+++ b/mail/test-mail.c
@@ -29,7 +29,7 @@ create_container (void)
 	gtk_widget_show (GTK_WIDGET (window));
 
 	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (BONOBO_WINDOW (window), container);
+	bonobo_ui_container_set_win (container, BONOBO_WINDOW (window));
 
 	control = bonobo_widget_new_control (
 		"OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45",
diff --git a/po/ChangeLog b/po/ChangeLog
index 488d6588c2..4e019da0ee 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-06  Michael Meeks  <michael@helixcode.com>
+
+	* update.pl (GenHeaders, GeneratePot): Kill abortive
+	glade file translation code. It can't cope with line
+	breaks in the node content!
+
 2000-11-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian translation.
diff --git a/po/update.pl b/po/update.pl
index e7fc4a4253..6727ce7788 100755
--- a/po/update.pl
+++ b/po/update.pl
@@ -220,11 +220,11 @@ sub GenHeaders{
            # Find .glade.h files in POTFILES.in and generate
            # the files with help from the ui-extract.pl script
            #--------------------------------------------------
-           elsif ($_=~ /(.*)(\.glade)/o){
-              $filename = "../$1.glade";
-              $xmlfiles="perl \.\/ui-extract.pl --update $filename";
-              system($xmlfiles);  
-           }
+#           elsif ($_=~ /(.*)(\.glade)/o){
+#              $filename = "../$1.glade";
+#              $xmlfiles="perl \.\/ui-extract.pl --update $filename";
+#              system($xmlfiles);  
+#           }
        }
        close FILE;
 
@@ -291,10 +291,10 @@ sub GeneratePot{
 
            # Delete header files coming from glade files
            #--------------------------------------------
-           elsif ($_=~ /(.*)(\.glade)/o){
-               $filename = "../$1.glade.h";
-               unlink($filename);
-           }
+#           elsif ($_=~ /(.*)(\.glade)/o){
+#               $filename = "../$1.glade.h";
+#               unlink($filename);
+#           }
        }
        close FILE;
     }
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 27db093018..2fc012e223 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-06  Michael Meeks  <michael@helixcode.com>
+
+	* e-shell-view.c (unrealize): remove.
+	(e_shell_view_construct): ditto.
+
 2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
 
 	* e-shell-view.c: Make the panes of the EPaned not shrinkable
diff --git a/shell/Evolution-LocalStorage.idl b/shell/Evolution-LocalStorage.idl
index 4ca81670e4..04d04c7150 100644
--- a/shell/Evolution-LocalStorage.idl
+++ b/shell/Evolution-LocalStorage.idl
@@ -10,6 +10,7 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 	interface LocalStorage : Evolution::Storage {
 		/**
@@ -22,8 +23,9 @@ module Evolution {
 		 * Set the name to display for the folder at the specified
 		 * @path.
 		 */
-		void update_folder (in string path,
-				    in string display_name,
-				    in boolean highlighted);
+		void updateFolder (in string path,
+				   in string display_name,
+				   in boolean highlighted);
 	};
 };
+};
diff --git a/shell/Evolution-Session.idl b/shell/Evolution-Session.idl
index 855f1c03ea..6e842e421c 100644
--- a/shell/Evolution-Session.idl
+++ b/shell/Evolution-Session.idl
@@ -10,30 +10,32 @@
 
 #include <Bonobo.h>
 
+module GNOME {
 module Evolution {
 
 	interface Session : Bonobo::Unknown {
 		exception Failed {};
 
 		/**
-		 * save_configuration:
+		 * saveConfiguration:
 		 * @prefix: A configuration path prefix.
 		 *
 		 * Save the current configuration at the specified @prefix.
 		 * The component can use any path starting by @prefix for its
 		 * keys.
 		 */
-		void save_configuration (in string prefix)
+		void saveConfiguration (in string prefix)
 			raises (Failed);
 
 		/**
-		 * load_configuration:
+		 * loadConfiguration:
 		 * @prefix: A configuration path prefix.
 		 *
 		 * Load the saved configuration at the specified @prefix.
 		 */
-		void load_configuration (in string prefix)
+		void loadConfiguration (in string prefix)
 			raises (Failed);
 	};
 	
 };
+};
diff --git a/shell/Evolution-Shell.idl b/shell/Evolution-Shell.idl
index 0102ba09ec..7a06d902d4 100644
--- a/shell/Evolution-Shell.idl
+++ b/shell/Evolution-Shell.idl
@@ -10,6 +10,7 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 	interface ShellComponent;
 
@@ -20,7 +21,7 @@ module Evolution {
 		exception Busy {};
 
 		/**
-		 * get_component_for_type:
+		 * getComponentByType:
 		 * @type: name of a valid folder type
 		 *
 		 * Get the shell component associated with a specific folder type.
@@ -28,13 +29,13 @@ module Evolution {
 		 * Return value: the Evolution::ShellComponent interface for the component that
 		 * handles @type.
 		 */
-		ShellComponent get_component_for_type (in string type)
+		ShellComponent getComponentByType (in string type)
 			raises (NotFound);
 
 		typedef sequence<string> FolderTypeList;
 
 		/**
-		 * user_select_folder:
+		 * selectUserFolder:
 		 * @listener: a listener interface to report the answer of the user.
 		 * @title: title for the folder selector dialog
 		 * @default_folder: physical or `evolution:' URI for the folder that must be
@@ -46,14 +47,14 @@ module Evolution {
 		 * folder by using the "New..." button.  The dialog only lets the user choose
 		 * a folder whose type is listed in @possible_types.
 		 */
-		void user_select_folder (in FolderSelectionListener listener,
+		void selectUserFolder (in FolderSelectionListener listener,
 					 in string title,
 					 in string default_folder,
 					 in FolderTypeList possible_types)
 			raises (Busy);
 
 		/**
-		 * get_local_storage:
+		 * getLocalStorage:
 		 *
 		 * Get the interface to the local storage.
 		 *
@@ -62,21 +63,22 @@ module Evolution {
 		 *
 		 * Return value: the `Evolution::LocalStorage' interface for
 		 * the local storage.  */
-		LocalStorage get_local_storage ();
+		LocalStorage getLocalStorage ();
 
 		/**
-		 * create_storage_set_view:
+		 * createStorageSetView:
 		 *
 		 * Create a control for the storage set view.  This control
 		 * will also implement the `Evolution::StorageSetView' interface.
 		 *
 		 * Return value: the newly created control.
 		 */
-		Bonobo::Control create_storage_set_view ();
+		Bonobo::Control createStorageSetView ();
 	};
 
 	interface FolderSelectionListener {
-		void selected (in string uri, in string physical_uri);
-		void cancel ();
+		void notifySelected (in string uri, in string physical_uri);
+		void notifyCanceled ();
 	};
 };
+};
diff --git a/shell/Evolution-ShellComponent.idl b/shell/Evolution-ShellComponent.idl
index 106ec0d571..592245481e 100644
--- a/shell/Evolution-ShellComponent.idl
+++ b/shell/Evolution-ShellComponent.idl
@@ -10,6 +10,7 @@
 
 #include <Bonobo.h>
 
+module GNOME {
 module Evolution {
 	interface Shell;
 
@@ -28,12 +29,12 @@ module Evolution {
 		/* FIXME: Can we use an attribute here?  */
 		exception AlreadyOwned {};
 
-		void set_owner (in Shell shell, in string evolution_homedir)
+		void setOwner (in Shell shell, in string evolution_homedir)
 			raises (AlreadyOwned);
 
 		exception NotOwned {};
 
-		void unset_owner ()
+		void unsetOwner ()
 			raises (NotOwned);
 
 		/* FIXME: We might want more exceptions here.  */
@@ -41,23 +42,24 @@ module Evolution {
 		exception UnsupportedType {};
 		exception InternalError {};
 
-		Bonobo::Control create_view (in string physical_uri,
-					     in string type)
+		Bonobo::Control createView (in string physical_uri,
+					    in string type)
 			raises (NotFound, UnsupportedType, InternalError);
 
 		exception Busy {};
 
-		void async_create_folder (in ShellComponentListener listener,
-					  in string physical_uri,
-					  in string type)
+		void addFolderAsync (in ShellComponentListener listener,
+				     in string physical_uri,
+				     in string type)
 			raises (Busy);
-		void async_remove_folder (in ShellComponentListener listener,
-					  in string physical_uri)
+
+		void removeFolderAsync (in ShellComponentListener listener,
+					in string physical_uri)
 			raises (Busy);
 
-		void populate_folder_context_menu (in Bonobo::UIContainer uih,
-						   in string physical_uri,
-						   in string type);
+		void populateFolderContextMenu (in Bonobo::UIContainer uih,
+						in string physical_uri,
+						in string type);
 	};
 
 	interface ShellComponentListener {
@@ -72,6 +74,7 @@ module Evolution {
 			NO_SPACE
 		};
 
-		void report_result (in Result result);
+		void notifyResult (in Result result);
 	};
 };
+};
diff --git a/shell/Evolution-ShellView.idl b/shell/Evolution-ShellView.idl
index d155b3397c..75734a155c 100644
--- a/shell/Evolution-ShellView.idl
+++ b/shell/Evolution-ShellView.idl
@@ -10,11 +10,14 @@
 
 #include <Bonobo.idl>
 
+module GNOME {
 module Evolution {
 	interface ShellView : Bonobo::Unknown {
-		void set_message (in string message, in boolean busy);
-		void unset_message ();
-		void change_current_view (in string uri);
-		void set_title (in string title);
+		void setMessage        (in string message,
+					in boolean busy);
+		void unsetMessage      ();
+		void changeCurrentView (in string uri);
+		void setTitle          (in string title);
 	};
 };
+};
diff --git a/shell/Evolution-Storage.idl b/shell/Evolution-Storage.idl
index 5aadf8eb19..ab0aa64fa6 100644
--- a/shell/Evolution-Storage.idl
+++ b/shell/Evolution-Storage.idl
@@ -10,6 +10,7 @@
 
 #include <Bonobo.h>
 
+module GNOME {
 module Evolution {
 	struct Folder {
 		string type;
@@ -28,10 +29,10 @@ module Evolution {
 
 		attribute string name;
 
-		void add_listener (in StorageListener listener)
+		void addListener    (in StorageListener listener)
 			raises (AlreadyListening);
 
-		void remove_listener (in StorageListener listener)
+		void removeListener (in StorageListener listener)
 			raises (NotFound);
 	};
 
@@ -39,18 +40,20 @@ module Evolution {
 		exception Exists {};
 		exception NotFound {};
 
-		void destroyed ();
+		void notifyDestroyed ();
 
 		/* FIXME exceptions don't make much sense here...  */
 
-		void new_folder (in string path, in Folder folder)
+		void notifyFolderCreated (in string  path,
+					  in Folder  folder)
 			raises (Exists);
-
-		void update_folder (in string path, in string display_name,
-				    in boolean highlighted)
+		
+		void notifyFolderUpdated (in string  path,
+					  in string  display_name,
+					  in boolean highlighted)
 			raises (NotFound);
 
-		void removed_folder (in string path)
+		void notifyFolderRemoved (in string  path)
 			raises (NotFound);
 	};
 
@@ -58,10 +61,11 @@ module Evolution {
 		exception Exists {};
 		exception NotFound {};
 
-		StorageListener register_storage (in Storage storage, in string name)
+		StorageListener addStorage (in Storage storage, in string name)
 			raises (Exists);
 
-		void unregister_storage (in string name)
+		void removeStorageByName (in string name)
 			raises (NotFound);
 	};
 };
+};
diff --git a/shell/Evolution-StorageSetView.idl b/shell/Evolution-StorageSetView.idl
index 3d95b075be..43b05fe860 100644
--- a/shell/Evolution-StorageSetView.idl
+++ b/shell/Evolution-StorageSetView.idl
@@ -10,10 +10,11 @@
 
 #include <Bonoob.idl>
 
+module GNOME {
 module Evolution {
 	interface StorageSetViewListener {
-		void folder_selected (in string uri);
-		void storage_selected (in string uri);
+		void notifyFolderSelected  (in string uri);
+		void notifyStorageSelected (in string uri);
 	};
 
 	/* FIXME: Maybe we should have a generic Bonobo::Listener interface.  */
@@ -21,11 +22,13 @@ module Evolution {
 		exception AlreadyListening {};
 		exception NotFound {};
 
-		attribute boolean show_folders;
+		attribute boolean showFolders;
 
-		void add_listener (in StorageSetViewListener listener)
+		void addListener    (in StorageSetViewListener listener)
 			raises (AlreadyListening);
-		void remove_listener (in StorageSetViewListener listener)
+
+		void removeListener (in StorageSetViewListener listener)
 			raises (NotFound);
 	};
 };
+};
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 97205112ff..a642493448 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -38,8 +38,8 @@ IDL_GENERATED = \
 Evolution-impl.o: Evolution.h
 
 $(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		-I$(srcdir) $(srcdir)/Evolution.idl
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
+		$(srcdir)/Evolution.idl
 
 # Shell library
 
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 4ec951a81c..89638fa14c 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -81,12 +81,12 @@ component_new (const char *id,
 static void
 component_free (Component *component)
 {
-	Evolution_ShellComponent corba_shell_component;
+	GNOME_Evolution_ShellComponent corba_shell_component;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 	corba_shell_component = bonobo_object_corba_objref (BONOBO_OBJECT (component->client));
-	Evolution_ShellComponent_unset_owner (corba_shell_component, &ev);
+	GNOME_Evolution_ShellComponent_unsetOwner (corba_shell_component, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION)
 		g_warning ("Cannot unregister component -- %s", component->id);
 	else
@@ -131,9 +131,9 @@ register_component (EComponentRegistry *component_registry,
 		    const char *id)
 {
 	EComponentRegistryPrivate *priv;
-	Evolution_ShellComponent component_corba_interface;
-	Evolution_Shell shell_corba_interface;
-	Evolution_FolderTypeList *supported_types;
+	GNOME_Evolution_ShellComponent component_corba_interface;
+	GNOME_Evolution_Shell shell_corba_interface;
+	GNOME_Evolution_FolderTypeList *supported_types;
 	Component *component;
 	EvolutionShellComponentClient *client;
 	CORBA_Environment ev;
@@ -158,7 +158,7 @@ register_component (EComponentRegistry *component_registry,
 	component_corba_interface = bonobo_object_corba_objref (BONOBO_OBJECT (client));
 	shell_corba_interface = bonobo_object_corba_objref (BONOBO_OBJECT (priv->shell));
 
-	supported_types = Evolution_ShellComponent__get_supported_types (component_corba_interface, &ev);
+	supported_types = GNOME_Evolution_ShellComponent__get_supported_types (component_corba_interface, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION || supported_types->_length == 0) {
 		bonobo_object_unref (BONOBO_OBJECT (client));
 		CORBA_exception_free (&ev);
@@ -171,7 +171,7 @@ register_component (EComponentRegistry *component_registry,
 	g_hash_table_insert (priv->component_id_to_component, component->id, component);
 
 	for (i = 0; i < supported_types->_length; i++) {
-		const Evolution_FolderType *type;
+		const GNOME_Evolution_FolderType *type;
 
 		type = supported_types->_buffer + i;
 
diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c
index a1881f10dd..b0c4a34d74 100644
--- a/shell/e-corba-storage-registry.c
+++ b/shell/e-corba-storage-registry.c
@@ -42,20 +42,20 @@ struct _ECorbaStorageRegistryPrivate {
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_StorageRegistry__vepv storage_registry_vepv;
+static POA_GNOME_Evolution_StorageRegistry__vepv storage_registry_vepv;
 
-static POA_Evolution_StorageRegistry *
+static POA_GNOME_Evolution_StorageRegistry *
 create_servant (void)
 {
-	POA_Evolution_StorageRegistry *servant;
+	POA_GNOME_Evolution_StorageRegistry *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_StorageRegistry *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_StorageRegistry *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &storage_registry_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_StorageRegistry__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_StorageRegistry__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -67,9 +67,9 @@ create_servant (void)
 	return servant;
 }
 
-static Evolution_StorageListener
+static GNOME_Evolution_StorageListener
 impl_StorageRegistry_register_storage (PortableServer_Servant servant,
-				       const Evolution_Storage storage_interface,
+				       const GNOME_Evolution_Storage storage_interface,
 				       const CORBA_char *name,
 				       CORBA_Environment *ev)
 {
@@ -77,7 +77,7 @@ impl_StorageRegistry_register_storage (PortableServer_Servant servant,
 	ECorbaStorageRegistry *storage_registry;
 	ECorbaStorageRegistryPrivate *priv;
 	EStorage *storage;
-	Evolution_StorageListener listener_interface;
+	GNOME_Evolution_StorageListener listener_interface;
 
 	g_print ("Shell: Registering storage -- %s\n", name);
 
@@ -90,7 +90,7 @@ impl_StorageRegistry_register_storage (PortableServer_Servant servant,
 	if (! e_storage_set_add_storage (priv->storage_set, storage)) {
 		CORBA_exception_set (ev,
 				     CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageRegistry_Exists,
+				     ex_GNOME_Evolution_StorageRegistry_Exists,
 				     NULL);
 		return CORBA_OBJECT_NIL;
 	}
@@ -120,7 +120,7 @@ impl_StorageRegistry_unregister_storage (PortableServer_Servant servant,
 	storage = e_storage_set_get_storage (priv->storage_set, name);
 	if (storage == NULL) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageRegistry_NotFound,
+				     ex_GNOME_Evolution_StorageRegistry_NotFound,
 				     NULL);
 		return;
 	}
@@ -155,8 +155,8 @@ destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_StorageRegistry__vepv *vepv;
-	POA_Evolution_StorageRegistry__epv *epv;
+	POA_GNOME_Evolution_StorageRegistry__vepv *vepv;
+	POA_GNOME_Evolution_StorageRegistry__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -164,14 +164,14 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_StorageRegistry__epv, 1);
-	epv->register_storage   = impl_StorageRegistry_register_storage;
-	epv->unregister_storage = impl_StorageRegistry_unregister_storage;
+	epv = g_new0 (POA_GNOME_Evolution_StorageRegistry__epv, 1);
+	epv->addStorage          = impl_StorageRegistry_register_storage;
+	epv->removeStorageByName = impl_StorageRegistry_unregister_storage;
 
 	vepv = &storage_registry_vepv;
 	vepv->_base_epv                     = base_epv;
 	vepv->Bonobo_Unknown_epv            = bonobo_object_get_epv ();
-	vepv->Evolution_StorageRegistry_epv = epv;
+	vepv->GNOME_Evolution_StorageRegistry_epv = epv;
 }
 
 static void
@@ -201,7 +201,7 @@ init (ECorbaStorageRegistry *corba_storage_registry)
 
 void
 e_corba_storage_registry_construct (ECorbaStorageRegistry *corba_storage_registry,
-				    Evolution_StorageRegistry corba_object,
+				    GNOME_Evolution_StorageRegistry corba_object,
 				    EStorageSet *storage_set)
 {
 	ECorbaStorageRegistryPrivate *priv;
@@ -222,8 +222,8 @@ ECorbaStorageRegistry *
 e_corba_storage_registry_new (EStorageSet *storage_set)
 {
 	ECorbaStorageRegistry *corba_storage_registry;
-	POA_Evolution_StorageRegistry *servant;
-	Evolution_StorageRegistry corba_object;
+	POA_GNOME_Evolution_StorageRegistry *servant;
+	GNOME_Evolution_StorageRegistry corba_object;
 
 	g_return_val_if_fail (storage_set != NULL, NULL);
 	g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
diff --git a/shell/e-corba-storage-registry.h b/shell/e-corba-storage-registry.h
index baf689c551..e9bbd5997b 100644
--- a/shell/e-corba-storage-registry.h
+++ b/shell/e-corba-storage-registry.h
@@ -62,7 +62,7 @@ struct _ECorbaStorageRegistryClass {
 
 GtkType                e_corba_storage_registry_get_type   (void);
 void                   e_corba_storage_registry_construct  (ECorbaStorageRegistry     *corba_storage_registry,
-							    Evolution_StorageRegistry  corba_object,
+							    GNOME_Evolution_StorageRegistry  corba_object,
 							    EStorageSet               *storage_set);
 ECorbaStorageRegistry *e_corba_storage_registry_new        (EStorageSet               *storage_set);
 
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index c6a3a99cdc..9b571d04f6 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -42,21 +42,21 @@ typedef struct _StorageListenerServant StorageListenerServant;
 struct _ECorbaStoragePrivate {
 	char *name;
 
-	Evolution_Storage storage_interface;
+	GNOME_Evolution_Storage storage_interface;
 
 	/* The Evolution::StorageListener interface we expose.  */
 
-	Evolution_StorageListener storage_listener_interface;
+	GNOME_Evolution_StorageListener storage_listener_interface;
 	StorageListenerServant *storage_listener_servant;
 };
 
 
 /* Implementation of the CORBA Evolution::StorageListener interface.  */
 
-static POA_Evolution_StorageListener__vepv storage_listener_vepv;
+static POA_GNOME_Evolution_StorageListener__vepv storage_listener_vepv;
 
 struct _StorageListenerServant {
-	POA_Evolution_StorageListener servant;
+	POA_GNOME_Evolution_StorageListener servant;
 	EStorage *storage;
 };
 
@@ -95,7 +95,7 @@ impl_StorageListener_destroy (PortableServer_Servant servant,
 static void
 impl_StorageListener_new_folder (PortableServer_Servant servant,
 				 const CORBA_char *path,
-				 const Evolution_Folder *folder,
+				 const GNOME_Evolution_Folder *folder,
 				 CORBA_Environment *ev)
 {
 	StorageListenerServant *storage_listener_servant;
@@ -116,7 +116,7 @@ impl_StorageListener_new_folder (PortableServer_Servant servant,
 		g_print ("Cannot register folder -- %s %s\n", path, folder->display_name);
 		CORBA_exception_set (ev,
 				     CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageListener_Exists,
+				     ex_GNOME_Evolution_StorageListener_Exists,
 				     NULL);
 		gtk_object_unref (GTK_OBJECT (e_folder));
 		return;
@@ -143,7 +143,7 @@ impl_StorageListener_update_folder (PortableServer_Servant servant,
 	if (e_folder == NULL) {
 		CORBA_exception_set (ev,
 				     CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageListener_NotFound,
+				     ex_GNOME_Evolution_StorageListener_NotFound,
 				     NULL);
 		return;
 	}
@@ -168,7 +168,7 @@ impl_StorageListener_removed_folder (PortableServer_Servant servant,
 	if (! e_storage_removed_folder (storage, path))
 		CORBA_exception_set (ev,
 				     CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageListener_NotFound,
+				     ex_GNOME_Evolution_StorageListener_NotFound,
 				     NULL);
 }
 
@@ -178,7 +178,7 @@ setup_storage_listener (ECorbaStorage *corba_storage)
 {
 	StorageListenerServant *servant;
 	ECorbaStoragePrivate *priv;
-	Evolution_StorageListener storage_listener_interface;
+	GNOME_Evolution_StorageListener storage_listener_interface;
 	CORBA_Environment ev;
 
 	priv = corba_storage->priv;
@@ -187,7 +187,7 @@ setup_storage_listener (ECorbaStorage *corba_storage)
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_StorageListener__init (servant, &ev);
+	POA_GNOME_Evolution_StorageListener__init (servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION)
 		goto error;
 
@@ -243,7 +243,7 @@ destroy (GtkObject *object)
 							      &ev);
 		PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
 
-		POA_Evolution_StorageListener__fini (priv->storage_listener_servant, &ev);
+		POA_GNOME_Evolution_StorageListener__fini (priv->storage_listener_servant, &ev);
 		CORBA_free (object_id);
 	}
 
@@ -273,8 +273,8 @@ get_name (EStorage *storage)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_StorageListener__vepv *vepv;
-	POA_Evolution_StorageListener__epv *epv;
+	POA_GNOME_Evolution_StorageListener__vepv *vepv;
+	POA_GNOME_Evolution_StorageListener__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -282,14 +282,14 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_StorageListener__epv, 1);
-	epv->new_folder     = impl_StorageListener_new_folder;
-	epv->update_folder  = impl_StorageListener_update_folder;
-	epv->removed_folder = impl_StorageListener_removed_folder;
+	epv = g_new0 (POA_GNOME_Evolution_StorageListener__epv, 1);
+	epv->notifyFolderCreated = impl_StorageListener_new_folder;
+	epv->notifyFolderUpdated = impl_StorageListener_update_folder;
+	epv->notifyFolderRemoved = impl_StorageListener_removed_folder;
 
 	vepv = &storage_listener_vepv;
 	vepv->_base_epv                     = base_epv;
-	vepv->Evolution_StorageListener_epv = epv;
+	vepv->GNOME_Evolution_StorageListener_epv = epv;
 }
 
 static void
@@ -325,7 +325,7 @@ init (ECorbaStorage *corba_storage)
 /* FIXME: OK to have a boolean construct function?  */
 void
 e_corba_storage_construct (ECorbaStorage *corba_storage,
-			   const Evolution_Storage storage_interface,
+			   const GNOME_Evolution_Storage storage_interface,
 			   const char *name)
 {
 	ECorbaStoragePrivate *priv;
@@ -357,7 +357,7 @@ e_corba_storage_construct (ECorbaStorage *corba_storage,
 }
 
 EStorage *
-e_corba_storage_new (const Evolution_Storage storage_interface,
+e_corba_storage_new (const GNOME_Evolution_Storage storage_interface,
 		     const char *name)
 {
 	EStorage *new;
@@ -373,7 +373,7 @@ e_corba_storage_new (const Evolution_Storage storage_interface,
 }
 
 
-const Evolution_StorageListener
+const GNOME_Evolution_StorageListener
 e_corba_storage_get_StorageListener (ECorbaStorage *corba_storage)
 {
 	g_return_val_if_fail (corba_storage != NULL, NULL);
diff --git a/shell/e-corba-storage.h b/shell/e-corba-storage.h
index 99ab23e97e..f37d41ad71 100644
--- a/shell/e-corba-storage.h
+++ b/shell/e-corba-storage.h
@@ -61,13 +61,13 @@ struct _ECorbaStorageClass {
 
 GtkType   e_corba_storage_get_type   (void);
 void      e_corba_storage_construct  (ECorbaStorage           *corba_storage,
-				      const Evolution_Storage  storage_interface,
+				      const GNOME_Evolution_Storage  storage_interface,
 				      const char              *name);
-EStorage *e_corba_storage_new        (const Evolution_Storage  storage_interface,
+EStorage *e_corba_storage_new        (const GNOME_Evolution_Storage  storage_interface,
 				      const char              *name);
 
 /* FIXME: I don't like this call.  */
-const Evolution_StorageListener  e_corba_storage_get_StorageListener  (ECorbaStorage *corba_storage);
+const GNOME_Evolution_StorageListener  e_corba_storage_get_StorageListener  (ECorbaStorage *corba_storage);
 
 #ifdef __cplusplus
 }
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 852a6e2945..8da09893e5 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -650,11 +650,11 @@ e_local_storage_get_base_path (ELocalStorage *local_storage)
 }
 
 
-const Evolution_LocalStorage
+const GNOME_Evolution_LocalStorage
 e_local_storage_get_corba_interface (ELocalStorage *local_storage)
 {
 	ELocalStoragePrivate *priv;
-	Evolution_LocalStorage corba_interface;
+	GNOME_Evolution_LocalStorage corba_interface;
 
 	g_return_val_if_fail (local_storage != NULL, NULL);
 	g_return_val_if_fail (E_IS_LOCAL_STORAGE (local_storage), NULL);
diff --git a/shell/e-local-storage.h b/shell/e-local-storage.h
index 4abb72077c..a7cb520ba1 100644
--- a/shell/e-local-storage.h
+++ b/shell/e-local-storage.h
@@ -66,7 +66,7 @@ EStorage                     *e_local_storage_open                 (EFolderTypeR
 								    const char          *base_path);
 const char                   *e_local_storage_get_base_path        (ELocalStorage       *storage);
 
-const Evolution_LocalStorage  e_local_storage_get_corba_interface  (ELocalStorage       *storage);
+const GNOME_Evolution_LocalStorage  e_local_storage_get_corba_interface  (ELocalStorage       *storage);
 
 #ifdef __cplusplus
 }
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 0e68595fe9..9480dcac60 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -580,19 +580,6 @@ destroy (GtkObject *object)
 	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
-/* Unrealize handler */
-static void
-unrealize (GtkWidget *widget)
-{
-	/* We flush so that all the destroy window requests for foreign windows
-	 * get sent over the X wire.  Hopefully this will diminish the chance of
-	 * hitting the CORBA (sync) vs. Xlib (async) race conditions.  This is
-	 * not the complete fix, which should actually be put in Bonobo and
-	 * completed.  FIXME.
-	 */
-	gdk_flush ();
-}
-
 static  int
 delete_event (GtkWidget *widget,
 	      GdkEventAny *event)
@@ -850,8 +837,6 @@ e_shell_view_construct (EShellView *shell_view,
 	}		
 
 	window = GTK_OBJECT (view);
-	gtk_signal_connect_after (window, "unrealize",
-				  (GtkSignalFunc) unrealize, NULL);
 
 	gtk_signal_connect (window, "delete_event",
 			    (GtkSignalFunc) delete_event, NULL);
@@ -1185,7 +1170,7 @@ get_control_for_uri (EShellView *shell_view,
 	EFolder *folder;
 	EvolutionShellComponentClient *handler_client;
 	Bonobo_Control corba_control;
-	Evolution_ShellComponent handler;
+	GNOME_Evolution_ShellComponent handler;
 	const char *path;
 	const char *folder_type;
 	GtkWidget *control;
@@ -1225,7 +1210,7 @@ get_control_for_uri (EShellView *shell_view,
 
 	CORBA_exception_init (&ev);
 
-	corba_control = Evolution_ShellComponent_create_view (handler, e_folder_get_physical_uri (folder),
+	corba_control = GNOME_Evolution_ShellComponent_createView (handler, e_folder_get_physical_uri (folder),
 							      folder_type, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ad6e2c1336..f9b42ba8e5 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -96,14 +96,14 @@ static void
 folder_selection_dialog_cancelled_cb (EShellFolderSelectionDialog *folder_selection_dialog,
 				      void *data)
 {
-	Evolution_FolderSelectionListener listener;
+	GNOME_Evolution_FolderSelectionListener listener;
 	CORBA_Environment ev;
 
 	listener = gtk_object_get_data (GTK_OBJECT (folder_selection_dialog), "corba_listener");
 
 	CORBA_exception_init (&ev);
 
-	Evolution_FolderSelectionListener_cancel (listener, &ev);
+	GNOME_Evolution_FolderSelectionListener_notifyCanceled (listener, &ev);
 
 	CORBA_exception_free (&ev);
 
@@ -117,7 +117,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_
 {
 	CORBA_Environment ev;
 	EShell *shell;
-	Evolution_FolderSelectionListener listener;
+	GNOME_Evolution_FolderSelectionListener listener;
 	EStorageSet *storage_set;
 	EFolder *folder;
 	char *uri;
@@ -138,7 +138,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_
 	else
 		physical_uri = e_folder_get_physical_uri (folder);
 
-	Evolution_FolderSelectionListener_selected (listener, uri, physical_uri, &ev);
+	GNOME_Evolution_FolderSelectionListener_notifySelected (listener, uri, physical_uri, &ev);
 	g_free (uri);
 
 	CORBA_exception_free (&ev);
@@ -149,20 +149,20 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_Shell__vepv shell_vepv;
+static POA_GNOME_Evolution_Shell__vepv shell_vepv;
 
-static POA_Evolution_Shell *
+static POA_GNOME_Evolution_Shell *
 create_servant (void)
 {
-	POA_Evolution_Shell *servant;
+	POA_GNOME_Evolution_Shell *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_Shell *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Shell *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &shell_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_Shell__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Shell__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -174,7 +174,7 @@ create_servant (void)
 	return servant;
 }
 
-static Evolution_ShellComponent
+static GNOME_Evolution_ShellComponent
 impl_Shell_get_component_for_type (PortableServer_Servant servant,
 				   const CORBA_char *type,
 				   CORBA_Environment *ev)
@@ -182,7 +182,7 @@ impl_Shell_get_component_for_type (PortableServer_Servant servant,
 	BonoboObject *bonobo_object;
 	EvolutionShellComponentClient *handler;
 	EFolderTypeRegistry *folder_type_registry;
-	Evolution_ShellComponent corba_component;
+	GNOME_Evolution_ShellComponent corba_component;
 	EShell *shell;
 
 	bonobo_object = bonobo_object_from_servant (servant);
@@ -192,7 +192,7 @@ impl_Shell_get_component_for_type (PortableServer_Servant servant,
 	handler = e_folder_type_registry_get_handler_for_type (folder_type_registry, type);
 
 	if (handler == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Evolution_Shell_NotFound, NULL);
+		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_NotFound, NULL);
 		return CORBA_OBJECT_NIL;
 	}
 
@@ -206,9 +206,9 @@ static void
 corba_listener_destroy_notify (void *data)
 {
 	CORBA_Environment ev;
-	Evolution_FolderSelectionListener listener_interface;
+	GNOME_Evolution_FolderSelectionListener listener_interface;
 
-	listener_interface = (Evolution_FolderSelectionListener) data;
+	listener_interface = (GNOME_Evolution_FolderSelectionListener) data;
 
 	CORBA_exception_init (&ev);
 	CORBA_Object_release (listener_interface, &ev);
@@ -217,15 +217,15 @@ corba_listener_destroy_notify (void *data)
 
 static void
 impl_Shell_user_select_folder (PortableServer_Servant servant,
-			       const Evolution_FolderSelectionListener listener,
+			       const GNOME_Evolution_FolderSelectionListener listener,
 			       const CORBA_char *title,
 			       const CORBA_char *default_folder,
-			       const Evolution_Shell_FolderTypeList *corba_allowed_types,
+			       const GNOME_Evolution_Shell_FolderTypeList *corba_allowed_types,
 			       CORBA_Environment *ev)
 {
 	GtkWidget *folder_selection_dialog;
 	BonoboObject *bonobo_object;
-	Evolution_FolderSelectionListener listener_duplicate;
+	GNOME_Evolution_FolderSelectionListener listener_duplicate;
 	EShell *shell;
 	const char **allowed_types;
 	int i;
@@ -255,13 +255,13 @@ impl_Shell_user_select_folder (PortableServer_Servant servant,
 	gtk_widget_show (folder_selection_dialog);
 }
 
-static Evolution_LocalStorage
+static GNOME_Evolution_LocalStorage
 impl_Shell_get_local_storage (PortableServer_Servant servant,
 			      CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
-	Evolution_LocalStorage local_storage_interface;
-	Evolution_LocalStorage copy_of_local_storage_interface;
+	GNOME_Evolution_LocalStorage local_storage_interface;
+	GNOME_Evolution_LocalStorage copy_of_local_storage_interface;
 	EShell *shell;
 	EShellPrivate *priv;
 
@@ -443,7 +443,7 @@ setup_components (EShell *shell,
 static void
 set_owner_on_components (EShell *shell)
 {
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_Shell corba_shell;
 	EShellPrivate *priv;
 	const char *local_directory;
 	GList *id_list;
@@ -570,8 +570,8 @@ destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_Shell__vepv *vepv;
-	POA_Evolution_Shell__epv *epv;
+	POA_GNOME_Evolution_Shell__vepv *vepv;
+	POA_GNOME_Evolution_Shell__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -579,15 +579,15 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_Shell__epv, 1);
-	epv->get_component_for_type  = impl_Shell_get_component_for_type;
-	epv->user_select_folder      = impl_Shell_user_select_folder;
-	epv->get_local_storage       = impl_Shell_get_local_storage;
-	epv->create_storage_set_view = impl_Shell_create_storage_set_view;
+	epv = g_new0 (POA_GNOME_Evolution_Shell__epv, 1);
+	epv->getComponentByType   = impl_Shell_get_component_for_type;
+	epv->selectUserFolder     = impl_Shell_user_select_folder;
+	epv->getLocalStorage      = impl_Shell_get_local_storage;
+	epv->createStorageSetView = impl_Shell_create_storage_set_view;
 
 	vepv = &shell_vepv;
 	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->Evolution_Shell_epv = epv;
+	vepv->GNOME_Evolution_Shell_epv = epv;
 }
 
 static void
@@ -647,7 +647,7 @@ init (EShell *shell)
  **/
 void
 e_shell_construct (EShell *shell,
-		   Evolution_Shell corba_object,
+		   GNOME_Evolution_Shell corba_object,
 		   const char *local_directory,
 		   gboolean show_splash)
 {
@@ -729,8 +729,8 @@ e_shell_new (const char *local_directory,
 {
 	EShell *new;
 	EShellPrivate *priv;
-	Evolution_Shell corba_object;
-	POA_Evolution_Shell *servant;
+	GNOME_Evolution_Shell corba_object;
+	POA_GNOME_Evolution_Shell *servant;
 
 	g_return_val_if_fail (local_directory != NULL, NULL);
 	g_return_val_if_fail (*local_directory != '\0', NULL);
@@ -903,7 +903,7 @@ save_settings_for_component (EShell *shell,
 			     EvolutionShellComponentClient *client)
 {
 	Bonobo_Unknown unknown_interface;
-	Evolution_Session session_interface;
+	GNOME_Evolution_Session session_interface;
 	CORBA_Environment ev;
 	char *prefix;
 	gboolean retval;
@@ -920,7 +920,7 @@ save_settings_for_component (EShell *shell,
 	}
 
 	prefix = g_strconcat ("/apps/Evolution/Shell/Components/", id, NULL);
-	Evolution_Session_save_configuration (session_interface, prefix, &ev);
+	GNOME_Evolution_Session_saveConfiguration (session_interface, prefix, &ev);
 
 	if (ev._major == CORBA_NO_EXCEPTION)
 		retval = TRUE;
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 17444967a1..4eb5c2c462 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -66,7 +66,7 @@ struct _EShellClass {
 
 GtkType              e_shell_get_type                  (void);
 void                 e_shell_construct                 (EShell          *shell,
-							Evolution_Shell  corba_object,
+							GNOME_Evolution_Shell  corba_object,
 							const char      *local_directory,
 							gboolean         show_splash);
 
diff --git a/shell/evolution-local-storage.c b/shell/evolution-local-storage.c
index d1460488df..cec05b91fc 100644
--- a/shell/evolution-local-storage.c
+++ b/shell/evolution-local-storage.c
@@ -50,10 +50,10 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_LocalStorage__vepv LocalStorage_vepv;
+static POA_GNOME_Evolution_LocalStorage__vepv LocalStorage_vepv;
 
 static void
-impl_Evolution_LocalStorage_update_folder (PortableServer_Servant servant,
+impl_GNOME_Evolution_LocalStorage_updateFolder (PortableServer_Servant servant,
 					   const CORBA_char *path,
 					   const CORBA_char *display_name,
 					   CORBA_boolean highlighted,
@@ -68,18 +68,18 @@ impl_Evolution_LocalStorage_update_folder (PortableServer_Servant servant,
 	gtk_signal_emit (GTK_OBJECT (local_storage), signals[UPDATE_FOLDER], path, display_name, highlighted);
 }
 
-static POA_Evolution_LocalStorage *
+static POA_GNOME_Evolution_LocalStorage *
 create_servant (void)
 {
-	POA_Evolution_LocalStorage *servant;
+	POA_GNOME_Evolution_LocalStorage *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_LocalStorage *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_LocalStorage *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &LocalStorage_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_LocalStorage__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_LocalStorage__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -112,7 +112,7 @@ impl_destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_LocalStorage__vepv *vepv;
+	POA_GNOME_Evolution_LocalStorage__vepv *vepv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -122,8 +122,8 @@ corba_class_init (void)
 
 	vepv = &LocalStorage_vepv;
 	vepv->Bonobo_Unknown_epv         = bonobo_object_get_epv ();
-	vepv->Evolution_Storage_epv      = evolution_storage_get_epv ();
-	vepv->Evolution_LocalStorage_epv = evolution_local_storage_get_epv ();
+	vepv->GNOME_Evolution_Storage_epv      = evolution_storage_get_epv ();
+	vepv->GNOME_Evolution_LocalStorage_epv = evolution_local_storage_get_epv ();
 }
 
 static void
@@ -163,20 +163,20 @@ init (EvolutionLocalStorage *local_storage)
 }
 
 
-POA_Evolution_LocalStorage__epv *
+POA_GNOME_Evolution_LocalStorage__epv *
 evolution_local_storage_get_epv (void)
 {
-	POA_Evolution_LocalStorage__epv *epv;
+	POA_GNOME_Evolution_LocalStorage__epv *epv;
 
-	epv = g_new0 (POA_Evolution_LocalStorage__epv, 1);
-	epv->update_folder = impl_Evolution_LocalStorage_update_folder;
+	epv = g_new0 (POA_GNOME_Evolution_LocalStorage__epv, 1);
+	epv->updateFolder = impl_GNOME_Evolution_LocalStorage_updateFolder;
 
 	return epv;
 }
 
 void
 evolution_local_storage_construct (EvolutionLocalStorage *local_storage,
-				   Evolution_LocalStorage corba_object,
+				   GNOME_Evolution_LocalStorage corba_object,
 				   const char *name)
 {
 	g_return_if_fail (local_storage != NULL);
@@ -192,8 +192,8 @@ EvolutionLocalStorage *
 evolution_local_storage_new (const char *name)
 {
 	EvolutionLocalStorage *new;
-	POA_Evolution_LocalStorage *servant;
-	Evolution_LocalStorage corba_object;
+	POA_GNOME_Evolution_LocalStorage *servant;
+	GNOME_Evolution_LocalStorage corba_object;
 
 	g_return_val_if_fail (name != NULL, NULL);
 	g_return_val_if_fail (name[0] != '\0', NULL);
diff --git a/shell/evolution-local-storage.h b/shell/evolution-local-storage.h
index a97b0b7e81..33872ad60b 100644
--- a/shell/evolution-local-storage.h
+++ b/shell/evolution-local-storage.h
@@ -64,11 +64,11 @@ struct _EvolutionLocalStorageClass {
 };
 
 
-POA_Evolution_LocalStorage__epv *evolution_local_storage_get_epv    (void);
+POA_GNOME_Evolution_LocalStorage__epv *evolution_local_storage_get_epv    (void);
 
 GtkType                          evolution_local_storage_get_type   (void);
 void                             evolution_local_storage_construct  (EvolutionLocalStorage  *local_storage,
-								     Evolution_LocalStorage  corba_object,
+								     GNOME_Evolution_LocalStorage  corba_object,
 								     const char             *name);
 EvolutionLocalStorage           *evolution_local_storage_new        (const char             *name);
 
diff --git a/shell/evolution-session.c b/shell/evolution-session.c
index a53d98243f..d512ab1656 100644
--- a/shell/evolution-session.c
+++ b/shell/evolution-session.c
@@ -70,7 +70,7 @@ impl_destroy (GtkObject *object)
 /* CORBA interface implementation.  */
 
 static void
-impl_Evolution_Session_save_configuration (PortableServer_Servant servant,
+impl_GNOME_Evolution_Session_saveConfiguration (PortableServer_Servant servant,
 					   const CORBA_char *prefix,
 					   CORBA_Environment *ev)
 {
@@ -81,7 +81,7 @@ impl_Evolution_Session_save_configuration (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_Session_load_configuration (PortableServer_Servant servant,
+impl_GNOME_Evolution_Session_loadConfiguration (PortableServer_Servant servant,
 					   const CORBA_char *prefix,
 					   CORBA_Environment *ev)
 {
@@ -94,13 +94,13 @@ impl_Evolution_Session_load_configuration (PortableServer_Servant servant,
 
 /* Initialization.  */
 
-static POA_Evolution_Session__vepv Evolution_Session_vepv;
+static POA_GNOME_Evolution_Session__vepv GNOME_Evolution_Session_vepv;
 
 static void
 corba_class_init (void)
 {
-	POA_Evolution_Session__vepv *vepv;
-	POA_Evolution_Session__epv *epv;
+	POA_GNOME_Evolution_Session__vepv *vepv;
+	POA_GNOME_Evolution_Session__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -108,14 +108,14 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_Session__epv, 1);
-	epv->save_configuration = impl_Evolution_Session_save_configuration;
-	epv->load_configuration = impl_Evolution_Session_load_configuration;
+	epv = g_new0 (POA_GNOME_Evolution_Session__epv, 1);
+	epv->saveConfiguration = impl_GNOME_Evolution_Session_saveConfiguration;
+	epv->loadConfiguration = impl_GNOME_Evolution_Session_loadConfiguration;
 
-	vepv = &Evolution_Session_vepv;
+	vepv = &GNOME_Evolution_Session_vepv;
 	vepv->_base_epv             = base_epv;
 	vepv->Bonobo_Unknown_epv    = bonobo_object_get_epv ();
-	vepv->Evolution_Session_epv = epv;
+	vepv->GNOME_Evolution_Session_epv = epv;
 }
 
 static void
@@ -161,18 +161,18 @@ init (EvolutionSession *session)
 }
 
 
-static Evolution_Session
+static GNOME_Evolution_Session
 create_corba_session (BonoboObject *object)
 {
-	POA_Evolution_Session *servant;
+	POA_GNOME_Evolution_Session *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_Session *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Evolution_Session_vepv;
+	servant = (POA_GNOME_Evolution_Session *) g_new0 (BonoboObjectServant, 1);
+	servant->vepv = &GNOME_Evolution_Session_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_Session__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Session__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION){
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -180,7 +180,7 @@ create_corba_session (BonoboObject *object)
 	}
 
 	CORBA_exception_free (&ev);
-	return (Evolution_Session) bonobo_object_activate_servant (object, servant);
+	return (GNOME_Evolution_Session) bonobo_object_activate_servant (object, servant);
 }
 
 void
@@ -197,7 +197,7 @@ EvolutionSession *
 evolution_session_new (void)
 {
 	EvolutionSession *session;
-	Evolution_Session corba_session;
+	GNOME_Evolution_Session corba_session;
 
 	session = gtk_type_new (evolution_session_get_type ());
 
diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c
index 7e32883439..f5cc3ef15c 100644
--- a/shell/evolution-shell-client.c
+++ b/shell/evolution-shell-client.c
@@ -43,12 +43,12 @@ static BonoboObjectClientClass *parent_class = NULL;
 /* Easy-to-use wrapper for Evolution::user_select_folder.  */
 
 static PortableServer_ServantBase__epv FolderSelectionListener_base_epv;
-static POA_Evolution_FolderSelectionListener__epv FolderSelectionListener_epv;
-static POA_Evolution_FolderSelectionListener__vepv FolderSelectionListener_vepv;
+static POA_GNOME_Evolution_FolderSelectionListener__epv FolderSelectionListener_epv;
+static POA_GNOME_Evolution_FolderSelectionListener__vepv FolderSelectionListener_vepv;
 static gboolean FolderSelectionListener_vtables_initialized = FALSE;
 
 struct _FolderSelectionListenerServant {
-	POA_Evolution_FolderSelectionListener servant;
+	POA_GNOME_Evolution_FolderSelectionListener servant;
 	char **uri_return;
 	char **physical_uri_return;
 };
@@ -97,21 +97,21 @@ init_FolderSelectionListener_vtables (void)
 	FolderSelectionListener_base_epv.finalize    = NULL;
 	FolderSelectionListener_base_epv.default_POA = NULL;
 
-	FolderSelectionListener_epv.selected = impl_FolderSelectionListener_selected;
-	FolderSelectionListener_epv.cancel = impl_FolderSelectionListener_cancel;
+	FolderSelectionListener_epv.notifySelected = impl_FolderSelectionListener_selected;
+	FolderSelectionListener_epv.notifyCanceled = impl_FolderSelectionListener_cancel;
 
 	FolderSelectionListener_vepv._base_epv                             = &FolderSelectionListener_base_epv;
-	FolderSelectionListener_vepv.Evolution_FolderSelectionListener_epv = &FolderSelectionListener_epv;
+	FolderSelectionListener_vepv.GNOME_Evolution_FolderSelectionListener_epv = &FolderSelectionListener_epv;
 		
 	FolderSelectionListener_vtables_initialized = TRUE;
 }
 
-static Evolution_FolderSelectionListener
+static GNOME_Evolution_FolderSelectionListener
 create_folder_selection_listener_interface (char **result,
 					    char **uri_return,
 					    char **physical_uri_return)
 {
-	Evolution_FolderSelectionListener corba_interface;
+	GNOME_Evolution_FolderSelectionListener corba_interface;
 	CORBA_Environment ev;
 	FolderSelectionListenerServant *servant;
 	PortableServer_Servant listener_servant;
@@ -128,7 +128,7 @@ create_folder_selection_listener_interface (char **result,
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_FolderSelectionListener__init (listener_servant, &ev);
+	POA_GNOME_Evolution_FolderSelectionListener__init (listener_servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free(servant);
 		return CORBA_OBJECT_NIL;
@@ -167,10 +167,10 @@ user_select_folder (EvolutionShellClient *shell_client,
 		    char **uri_return,
 		    char **physical_uri_return)
 {
-	Evolution_FolderSelectionListener listener_interface;
-	Evolution_Shell corba_shell;
+	GNOME_Evolution_FolderSelectionListener listener_interface;
+	GNOME_Evolution_Shell corba_shell;
 	CORBA_Environment ev;
-	Evolution_Shell_FolderTypeList corba_type_list;
+	GNOME_Evolution_Shell_FolderTypeList corba_type_list;
 	int num_possible_types;
 	char *result;
 
@@ -191,7 +191,7 @@ user_select_folder (EvolutionShellClient *shell_client,
 	corba_type_list._maximum = num_possible_types;
 	corba_type_list._buffer  = (CORBA_char **) possible_types;
 
-	Evolution_Shell_user_select_folder (corba_shell, listener_interface,
+	GNOME_Evolution_Shell_selectUserFolder (corba_shell, listener_interface,
 					    title, default_folder, &corba_type_list,
 					    &ev);
 
@@ -264,7 +264,7 @@ init (EvolutionShellClient *shell_client)
  **/
 void
 evolution_shell_client_construct (EvolutionShellClient *shell_client,
-				  Evolution_Shell corba_shell)
+				  GNOME_Evolution_Shell corba_shell)
 {
 	g_return_if_fail (shell_client != NULL);
 	g_return_if_fail (EVOLUTION_IS_SHELL_CLIENT (shell_client));
@@ -282,7 +282,7 @@ evolution_shell_client_construct (EvolutionShellClient *shell_client,
  * Return value: A pointer to the Evolution::Shell client BonoboObject.
  **/
 EvolutionShellClient *
-evolution_shell_client_new (Evolution_Shell corba_shell)
+evolution_shell_client_new (GNOME_Evolution_Shell corba_shell)
 {
 	EvolutionShellClient *shell_client;
 
@@ -339,11 +339,11 @@ evolution_shell_client_user_select_folder (EvolutionShellClient *shell_client,
  * Return value: a pointer to the CORBA object implementing the local storage
  * in the shell associated with @shell_client.
  **/
-Evolution_LocalStorage
+GNOME_Evolution_LocalStorage
 evolution_shell_client_get_local_storage (EvolutionShellClient *shell_client)
 {
-	Evolution_Shell corba_shell;
-	Evolution_LocalStorage corba_local_storage;
+	GNOME_Evolution_Shell corba_shell;
+	GNOME_Evolution_LocalStorage corba_local_storage;
 	CORBA_Environment ev;
 
 	g_return_val_if_fail (shell_client != NULL, CORBA_OBJECT_NIL);
@@ -355,7 +355,7 @@ evolution_shell_client_get_local_storage (EvolutionShellClient *shell_client)
 	if (corba_shell == CORBA_OBJECT_NIL)
 		return CORBA_OBJECT_NIL;
 
-	corba_local_storage = Evolution_Shell_get_local_storage (corba_shell, &ev);
+	corba_local_storage = GNOME_Evolution_Shell_getLocalStorage (corba_shell, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
 		return CORBA_OBJECT_NIL;
diff --git a/shell/evolution-shell-client.h b/shell/evolution-shell-client.h
index 151f18f9b7..0a2ee67ab8 100644
--- a/shell/evolution-shell-client.h
+++ b/shell/evolution-shell-client.h
@@ -61,8 +61,8 @@ struct _EvolutionShellClientClass {
 
 GtkType                 evolution_shell_client_get_type            (void);
 void                    evolution_shell_client_construct           (EvolutionShellClient  *shell_client,
-								    Evolution_Shell        corba_shell);
-EvolutionShellClient   *evolution_shell_client_new                 (Evolution_Shell        shell);
+								    GNOME_Evolution_Shell        corba_shell);
+EvolutionShellClient   *evolution_shell_client_new                 (GNOME_Evolution_Shell        shell);
 
 void                    evolution_shell_client_user_select_folder  (EvolutionShellClient  *shell_client,
 								    const char            *title,
@@ -71,7 +71,7 @@ void                    evolution_shell_client_user_select_folder  (EvolutionShe
 								    char                 **uri_return,
 								    char                 **physical_uri_return);
 
-Evolution_LocalStorage  evolution_shell_client_get_local_storage   (EvolutionShellClient  *shell_client);
+GNOME_Evolution_LocalStorage  evolution_shell_client_get_local_storage   (EvolutionShellClient  *shell_client);
 
 #ifdef __cplusplus
 }
diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
index 26b2733620..6a96bc3b33 100644
--- a/shell/evolution-shell-component-client.c
+++ b/shell/evolution-shell-component-client.c
@@ -45,7 +45,7 @@ struct _EvolutionShellComponentClientPrivate {
 	EvolutionShellComponentClientCallback callback;
 	void *callback_data;
 
-	Evolution_ShellComponentListener listener_interface;
+	GNOME_Evolution_ShellComponentListener listener_interface;
 	PortableServer_Servant listener_servant;
 };
 
@@ -63,17 +63,17 @@ corba_exception_to_result (const CORBA_Environment *ev)
 		return EVOLUTION_SHELL_COMPONENT_OK;
 
 	if (ev->_major == CORBA_USER_EXCEPTION) {
-		if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_AlreadyOwned) == 0)
+		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_AlreadyOwned) == 0)
 			return EVOLUTION_SHELL_COMPONENT_ALREADYOWNED;
-		if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_NotOwned) == 0)
+		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_NotOwned) == 0)
 			return EVOLUTION_SHELL_COMPONENT_NOTOWNED;
-		if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_NotFound) == 0)
+		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_NotFound) == 0)
 			return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-		if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_UnsupportedType) == 0)
+		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_UnsupportedType) == 0)
 			return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-		if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_InternalError) == 0)
+		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_InternalError) == 0)
 			return EVOLUTION_SHELL_COMPONENT_INTERNALERROR;
-		if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_Busy) == 0)
+		if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_Busy) == 0)
 			return EVOLUTION_SHELL_COMPONENT_BUSY;
 
 		return EVOLUTION_SHELL_COMPONENT_UNKNOWNERROR;
@@ -105,7 +105,7 @@ dispatch_callback (EvolutionShellComponentClient *shell_component_client,
 
 	oid = PortableServer_POA_servant_to_id (bonobo_poa (), priv->listener_servant, &ev);
 	PortableServer_POA_deactivate_object (bonobo_poa (), oid, &ev);
-	POA_Evolution_ShellComponentListener__fini (priv->listener_servant, &ev);
+	POA_GNOME_Evolution_ShellComponentListener__fini (priv->listener_servant, &ev);
 	CORBA_free (oid);
 
 	CORBA_Object_release (priv->listener_interface, &ev);
@@ -128,12 +128,12 @@ dispatch_callback (EvolutionShellComponentClient *shell_component_client,
 /* CORBA listener interface implementation.  */
 
 static PortableServer_ServantBase__epv            ShellComponentListener_base_epv;
-static POA_Evolution_ShellComponentListener__epv  ShellComponentListener_epv;
-static POA_Evolution_ShellComponentListener__vepv ShellComponentListener_vepv;
+static POA_GNOME_Evolution_ShellComponentListener__epv  ShellComponentListener_epv;
+static POA_GNOME_Evolution_ShellComponentListener__vepv ShellComponentListener_vepv;
 static gboolean ShellComponentListener_vepv_initialized = FALSE;
 
 struct _ShellComponentListenerServant {
-	POA_Evolution_ShellComponentListener servant;
+	POA_GNOME_Evolution_ShellComponentListener servant;
 	EvolutionShellComponentClient *component_client;
 };
 typedef struct _ShellComponentListenerServant ShellComponentListenerServant;
@@ -148,22 +148,22 @@ component_client_from_ShellComponentListener_servant (PortableServer_Servant ser
 }
 
 static EvolutionShellComponentResult
-result_from_async_corba_result (Evolution_ShellComponentListener_Result async_corba_result)
+result_from_async_corba_result (GNOME_Evolution_ShellComponentListener_Result async_corba_result)
 {
 	switch (async_corba_result) {
-	case Evolution_ShellComponentListener_OK:
+	case GNOME_Evolution_ShellComponentListener_OK:
 		return EVOLUTION_SHELL_COMPONENT_OK;
-	case Evolution_ShellComponentListener_UNSUPPORTED_OPERATION:
+	case GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION:
 		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDOPERATION;
-	case Evolution_ShellComponentListener_EXISTS:
+	case GNOME_Evolution_ShellComponentListener_EXISTS:
 		return EVOLUTION_SHELL_COMPONENT_EXISTS;
-	case Evolution_ShellComponentListener_INVALID_URI:
+	case GNOME_Evolution_ShellComponentListener_INVALID_URI:
 		return EVOLUTION_SHELL_COMPONENT_INVALIDURI;
-	case Evolution_ShellComponentListener_PERMISSION_DENIED:
+	case GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED:
 		return EVOLUTION_SHELL_COMPONENT_PERMISSIONDENIED;
-	case Evolution_ShellComponentListener_HAS_SUBFOLDERS:
+	case GNOME_Evolution_ShellComponentListener_HAS_SUBFOLDERS:
 		return EVOLUTION_SHELL_COMPONENT_HASSUBFOLDERS;
-	case Evolution_ShellComponentListener_NO_SPACE:
+	case GNOME_Evolution_ShellComponentListener_NO_SPACE:
 		return EVOLUTION_SHELL_COMPONENT_NOSPACE;
 	default:
 		return EVOLUTION_SHELL_COMPONENT_UNKNOWNERROR;
@@ -172,7 +172,7 @@ result_from_async_corba_result (Evolution_ShellComponentListener_Result async_co
 
 static void
 impl_ShellComponentListener_report_result (PortableServer_Servant servant,
-					   const Evolution_ShellComponentListener_Result result,
+					   const GNOME_Evolution_ShellComponentListener_Result result,
 					   CORBA_Environment *ev)
 {
 	EvolutionShellComponentClient *component_client;
@@ -188,10 +188,10 @@ ShellComponentListener_vepv_initialize (void)
 	ShellComponentListener_base_epv.finalize = NULL;
 	ShellComponentListener_base_epv.default_POA = NULL;
 
-	ShellComponentListener_epv.report_result = impl_ShellComponentListener_report_result;
+	ShellComponentListener_epv.notifyResult = impl_ShellComponentListener_report_result;
 
 	ShellComponentListener_vepv._base_epv = & ShellComponentListener_base_epv;
-	ShellComponentListener_vepv.Evolution_ShellComponentListener_epv = & ShellComponentListener_epv;
+	ShellComponentListener_vepv.GNOME_Evolution_ShellComponentListener_epv = & ShellComponentListener_epv;
 
 	ShellComponentListener_vepv_initialized = TRUE;
 }
@@ -222,7 +222,7 @@ create_listener_interface (EvolutionShellComponentClient *shell_component_client
 {
 	EvolutionShellComponentClientPrivate *priv;
 	PortableServer_Servant listener_servant;
-	Evolution_ShellComponentListener corba_interface;
+	GNOME_Evolution_ShellComponentListener corba_interface;
 	CORBA_Environment ev;
 
 	priv = shell_component_client->priv;
@@ -231,7 +231,7 @@ create_listener_interface (EvolutionShellComponentClient *shell_component_client
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_ShellComponentListener__init (listener_servant, &ev);
+	POA_GNOME_Evolution_ShellComponentListener__init (listener_servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		free_ShellComponentListener_servant (listener_servant);
 		return;
@@ -349,7 +349,7 @@ evolution_shell_component_client_new (const char *id)
 
 EvolutionShellComponentResult
 evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell_component_client,
-					    Evolution_Shell shell,
+					    GNOME_Evolution_Shell shell,
 					    const char *evolution_homedir)
 {
 	EvolutionShellComponentResult result;
@@ -361,7 +361,7 @@ evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell
 
 	CORBA_exception_init (&ev);
 
-	Evolution_ShellComponent_set_owner (bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)),
+	GNOME_Evolution_ShellComponent_setOwner (bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)),
 					    shell, evolution_homedir, &ev);
 
 	result = corba_exception_to_result (&ev);
@@ -373,10 +373,10 @@ evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell
 
 EvolutionShellComponentResult
 evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *shell_component_client,
-					      Evolution_Shell shell)
+					      GNOME_Evolution_Shell shell)
 {
 	EvolutionShellComponentResult result;
-	Evolution_ShellComponent corba_component;
+	GNOME_Evolution_ShellComponent corba_component;
 	CORBA_Environment ev;
 
 	RETURN_ERROR_IF_FAIL (shell_component_client != NULL);
@@ -387,7 +387,7 @@ evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *she
 
 	corba_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client));
 
-	Evolution_ShellComponent_unset_owner (corba_component, &ev);
+	GNOME_Evolution_ShellComponent_unsetOwner (corba_component, &ev);
 
 	result = corba_exception_to_result (&ev);
 
@@ -405,7 +405,7 @@ evolution_shell_component_client_create_view (EvolutionShellComponentClient *she
 {
 	EvolutionShellComponentResult result;
 	CORBA_Environment ev;
-	Evolution_ShellComponent corba_component;
+	GNOME_Evolution_ShellComponent corba_component;
 	Bonobo_Control corba_control;
 
 	RETURN_ERROR_IF_FAIL (shell_component_client != NULL);
@@ -419,7 +419,7 @@ evolution_shell_component_client_create_view (EvolutionShellComponentClient *she
 	CORBA_exception_init (&ev);
 
 	corba_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client));
-	corba_control = Evolution_ShellComponent_create_view (corba_component, physical_uri, type_string, &ev);
+	corba_control = GNOME_Evolution_ShellComponent_createView (corba_component, physical_uri, type_string, &ev);
 
 	result = corba_exception_to_result (&ev);
 
@@ -449,7 +449,7 @@ evolution_shell_component_client_async_create_folder (EvolutionShellComponentCli
 						      void *data)
 {
 	EvolutionShellComponentClientPrivate *priv;
-	Evolution_ShellComponent corba_shell_component;
+	GNOME_Evolution_ShellComponent corba_shell_component;
 	CORBA_Environment ev;
 
 	g_return_if_fail (shell_component_client != NULL);
@@ -474,10 +474,10 @@ evolution_shell_component_client_async_create_folder (EvolutionShellComponentCli
 	priv->callback      = callback;
 	priv->callback_data = data;
 
-	Evolution_ShellComponent_async_create_folder (corba_shell_component,
-						      priv->listener_interface,
-						      physical_uri, type,
-						      &ev);
+	GNOME_Evolution_ShellComponent_addFolderAsync (corba_shell_component,
+						       priv->listener_interface,
+						       physical_uri, type,
+						       &ev);
 
 	CORBA_exception_free (&ev);
 }
@@ -499,7 +499,7 @@ evolution_shell_component_client_populate_folder_context_menu (EvolutionShellCom
 {
 	Bonobo_UIContainer corba_uih;
 	EvolutionShellComponentClientPrivate *priv;
-	Evolution_ShellComponent corba_shell_component;
+	GNOME_Evolution_ShellComponent corba_shell_component;
 	CORBA_Environment ev;
 
 	g_return_if_fail (shell_component_client != NULL);
@@ -514,7 +514,7 @@ evolution_shell_component_client_populate_folder_context_menu (EvolutionShellCom
 	corba_shell_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client));
 	corba_uih = bonobo_object_corba_objref (BONOBO_OBJECT (uih));
 
-	Evolution_ShellComponent_populate_folder_context_menu (corba_shell_component,
+	GNOME_Evolution_ShellComponent_populateFolderContextMenu (corba_shell_component,
 							       corba_uih,
 							       physical_uri,
 							       type,
diff --git a/shell/evolution-shell-component-client.h b/shell/evolution-shell-component-client.h
index 1a0eab5cd7..621e5cda49 100644
--- a/shell/evolution-shell-component-client.h
+++ b/shell/evolution-shell-component-client.h
@@ -67,10 +67,10 @@ EvolutionShellComponentClient *evolution_shell_component_client_new        (cons
 
 /* Synchronous operations.  */
 EvolutionShellComponentResult  evolution_shell_component_client_set_owner    (EvolutionShellComponentClient  *shell_component_client,
-									      Evolution_Shell                 shell,
+									      GNOME_Evolution_Shell                 shell,
 									      const char                     *evolution_homedir);
 EvolutionShellComponentResult  evolution_shell_component_client_unset_owner  (EvolutionShellComponentClient  *shell_component_client,
-									      Evolution_Shell                 shell);
+									      GNOME_Evolution_Shell                 shell);
 EvolutionShellComponentResult  evolution_shell_component_client_create_view  (EvolutionShellComponentClient  *shell_component_client,
 									      BonoboUIComponent                *uih,
 									      const char                     *physical_uri,
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index 8e149f11fb..790bbb7d3c 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -61,20 +61,20 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_ShellComponent__vepv ShellComponent_vepv;
+static POA_GNOME_Evolution_ShellComponent__vepv ShellComponent_vepv;
 
-static POA_Evolution_ShellComponent *
+static POA_GNOME_Evolution_ShellComponent *
 create_servant (void)
 {
-	POA_Evolution_ShellComponent *servant;
+	POA_GNOME_Evolution_ShellComponent *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_ShellComponent *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_ShellComponent *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &ShellComponent_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_ShellComponent__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_ShellComponent__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -86,14 +86,14 @@ create_servant (void)
 	return servant;
 }
 
-static Evolution_FolderTypeList *
+static GNOME_Evolution_FolderTypeList *
 impl_ShellComponent__get_supported_types (PortableServer_Servant servant,
 					  CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
 	EvolutionShellComponent *shell_component;
 	EvolutionShellComponentPrivate *priv;
-	Evolution_FolderTypeList *folder_type_list;
+	GNOME_Evolution_FolderTypeList *folder_type_list;
 	unsigned int i;
 	GList *p;
 
@@ -101,13 +101,13 @@ impl_ShellComponent__get_supported_types (PortableServer_Servant servant,
 	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
 	priv = shell_component->priv;
 
-	folder_type_list = Evolution_FolderTypeList__alloc ();
+	folder_type_list = GNOME_Evolution_FolderTypeList__alloc ();
 	folder_type_list->_length = g_list_length (priv->folder_types);
 	folder_type_list->_maximum = folder_type_list->_length;
-	folder_type_list->_buffer = CORBA_sequence_Evolution_FolderType_allocbuf (folder_type_list->_maximum);
+	folder_type_list->_buffer = CORBA_sequence_GNOME_Evolution_FolderType_allocbuf (folder_type_list->_maximum);
 
 	for (p = priv->folder_types, i = 0; p != NULL; p = p->next, i++) {
-		Evolution_FolderType *corba_folder_type;
+		GNOME_Evolution_FolderType *corba_folder_type;
 		EvolutionShellComponentFolderType *folder_type;
 
 		folder_type = (EvolutionShellComponentFolderType *) p->data;
@@ -122,14 +122,14 @@ impl_ShellComponent__get_supported_types (PortableServer_Servant servant,
 
 static void
 impl_ShellComponent_set_owner (PortableServer_Servant servant,
-			       const Evolution_Shell shell,
+			       const GNOME_Evolution_Shell shell,
 			       const CORBA_char *evolution_homedir,
 			       CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
 	EvolutionShellComponent *shell_component;
 	EvolutionShellComponentPrivate *priv;
-	Evolution_Shell shell_duplicate;
+	GNOME_Evolution_Shell shell_duplicate;
 
 	bonobo_object = bonobo_object_from_servant (servant);
 	shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
@@ -137,7 +137,7 @@ impl_ShellComponent_set_owner (PortableServer_Servant servant,
 
 	if (priv->owner_client != NULL) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_ShellComponent_AlreadyOwned, NULL);
+				     ex_GNOME_Evolution_ShellComponent_AlreadyOwned, NULL);
 		return;
 	}
 
@@ -163,7 +163,7 @@ impl_ShellComponent_unset_owner (PortableServer_Servant servant,
 
 	if (priv->owner_client == NULL) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_ShellComponent_NotOwned, NULL);
+				     ex_GNOME_Evolution_ShellComponent_NotOwned, NULL);
 		return;
 	}
 
@@ -196,17 +196,17 @@ impl_ShellComponent_create_view (PortableServer_Servant servant,
 		switch (result) {
 		case EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE:
 			CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-					     ex_Evolution_ShellComponent_UnsupportedType,
+					     ex_GNOME_Evolution_ShellComponent_UnsupportedType,
 					     NULL);
 			break;
 		case EVOLUTION_SHELL_COMPONENT_INTERNALERROR:
 			CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-					     ex_Evolution_ShellComponent_InternalError,
+					     ex_GNOME_Evolution_ShellComponent_InternalError,
 					     NULL);
 			break;
 		default:
 			CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-					     ex_Evolution_ShellComponent_NotFound,
+					     ex_GNOME_Evolution_ShellComponent_NotFound,
 					     NULL);
 		}
 
@@ -218,7 +218,7 @@ impl_ShellComponent_create_view (PortableServer_Servant servant,
 
 static void
 impl_ShellComponent_async_create_folder (PortableServer_Servant servant,
-					 const Evolution_ShellComponentListener listener,
+					 const GNOME_Evolution_ShellComponentListener listener,
 					 const CORBA_char *physical_uri,
 					 const CORBA_char *type,
 					 CORBA_Environment *ev)
@@ -232,8 +232,8 @@ impl_ShellComponent_async_create_folder (PortableServer_Servant servant,
 	priv = shell_component->priv;
 
 	if (priv->create_folder_fn == NULL) {
-		Evolution_ShellComponentListener_report_result (listener,
-								Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
+		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
+								GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
 								ev);
 		return;
 	}
@@ -243,7 +243,7 @@ impl_ShellComponent_async_create_folder (PortableServer_Servant servant,
 
 static void
 impl_ShellComponent_async_remove_folder (PortableServer_Servant servant,
-					 const Evolution_ShellComponentListener listener,
+					 const GNOME_Evolution_ShellComponentListener listener,
 					 const CORBA_char *physical_uri,
 					 CORBA_Environment *ev)
 {
@@ -256,8 +256,8 @@ impl_ShellComponent_async_remove_folder (PortableServer_Servant servant,
 	priv = shell_component->priv;
 
 	if (priv->remove_folder_fn == NULL) {
-		Evolution_ShellComponentListener_report_result (listener,
-								Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
+		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
+								GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
 								ev);
 		return;
 	}
@@ -337,8 +337,8 @@ destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_ShellComponent__vepv *vepv;
-	POA_Evolution_ShellComponent__epv *epv;
+	POA_GNOME_Evolution_ShellComponent__vepv *vepv;
+	POA_GNOME_Evolution_ShellComponent__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -346,19 +346,19 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_ShellComponent__epv, 1);
-	epv->_get_supported_types         = impl_ShellComponent__get_supported_types;
-	epv->set_owner                    = impl_ShellComponent_set_owner;
-	epv->unset_owner                  = impl_ShellComponent_unset_owner;
-	epv->create_view                  = impl_ShellComponent_create_view;
-	epv->async_create_folder          = impl_ShellComponent_async_create_folder;
-	epv->async_remove_folder          = impl_ShellComponent_async_remove_folder;
-	epv->populate_folder_context_menu = impl_ShellComponent_populate_folder_context_menu;
+	epv = g_new0 (POA_GNOME_Evolution_ShellComponent__epv, 1);
+	epv->_get_supported_types      = impl_ShellComponent__get_supported_types;
+	epv->setOwner                  = impl_ShellComponent_set_owner;
+	epv->unsetOwner                = impl_ShellComponent_unset_owner;
+	epv->createView                = impl_ShellComponent_create_view;
+	epv->addFolderAsync            = impl_ShellComponent_async_create_folder;
+	epv->removeFolderAsync         = impl_ShellComponent_async_remove_folder;
+	epv->populateFolderContextMenu = impl_ShellComponent_populate_folder_context_menu;
 
 	vepv = &ShellComponent_vepv;
 	vepv->_base_epv                    = base_epv;
 	vepv->Bonobo_Unknown_epv           = bonobo_object_get_epv ();
-	vepv->Evolution_ShellComponent_epv = epv;
+	vepv->GNOME_Evolution_ShellComponent_epv = epv;
 }
 
 static void
@@ -416,7 +416,7 @@ init (EvolutionShellComponent *shell_component)
 void
 evolution_shell_component_construct (EvolutionShellComponent *shell_component,
 				     const EvolutionShellComponentFolderType folder_types[],
-				     Evolution_ShellComponent corba_object,
+				     GNOME_Evolution_ShellComponent corba_object,
 				     EvolutionShellComponentCreateViewFn create_view_fn,
 				     EvolutionShellComponentCreateFolderFn create_folder_fn,
 				     EvolutionShellComponentRemoveFolderFn remove_folder_fn,
@@ -468,8 +468,8 @@ evolution_shell_component_new (const EvolutionShellComponentFolderType folder_ty
 			       void *closure)
 {
 	EvolutionShellComponent *new;
-	POA_Evolution_ShellComponent *servant;
-	Evolution_ShellComponent corba_object;
+	POA_GNOME_Evolution_ShellComponent *servant;
+	GNOME_Evolution_ShellComponent corba_object;
 
 	servant = create_servant ();
 	if (servant == NULL)
diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h
index bceb6a47cf..8b627deebe 100644
--- a/shell/evolution-shell-component.h
+++ b/shell/evolution-shell-component.h
@@ -81,11 +81,11 @@ typedef EvolutionShellComponentResult (* EvolutionShellComponentCreateViewFn)
 typedef void (* EvolutionShellComponentCreateFolderFn) (EvolutionShellComponent *shell_component,
 						        const char *physical_uri,
 						        const char *type,
-						        const Evolution_ShellComponentListener listener,
+						        const GNOME_Evolution_ShellComponentListener listener,
 						        void *closure);
 typedef void (* EvolutionShellComponentRemoveFolderFn) (EvolutionShellComponent *shell_component,
 						        const char *physical_uri,
-						        const Evolution_ShellComponentListener listener,
+						        const GNOME_Evolution_ShellComponentListener listener,
 						        void *closure);
 typedef void (* EvolutionShellComponentPopulateFolderContextMenu) (EvolutionShellComponent *shell_component,
 								   BonoboUIComponent *uic,
@@ -120,7 +120,7 @@ struct _EvolutionShellComponentClass {
 GtkType                  evolution_shell_component_get_type   (void);
 void                     evolution_shell_component_construct  (EvolutionShellComponent                          *shell_component,
 							       const EvolutionShellComponentFolderType           folder_types[],
-							       Evolution_ShellComponent                          corba_object,
+							       GNOME_Evolution_ShellComponent                          corba_object,
 							       EvolutionShellComponentCreateViewFn               create_view_fn,
 							       EvolutionShellComponentCreateFolderFn             create_folder_fn,
 							       EvolutionShellComponentRemoveFolderFn             remove_folder_fn,
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
index c9fbb74ba8..9e001f6957 100644
--- a/shell/evolution-shell-view.c
+++ b/shell/evolution-shell-view.c
@@ -52,19 +52,19 @@ static int signals[LAST_SIGNAL] = { 0 };
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_ShellView__vepv ShellView_vepv;
+static POA_GNOME_Evolution_ShellView__vepv ShellView_vepv;
 
-static POA_Evolution_ShellView *
+static POA_GNOME_Evolution_ShellView *
 create_servant (void)
 {
-	POA_Evolution_ShellView *servant;
+	POA_GNOME_Evolution_ShellView *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_ShellView *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_ShellView *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &ShellView_vepv;
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_ShellView__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_ShellView__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -142,8 +142,8 @@ destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_ShellView__vepv *vepv;
-	POA_Evolution_ShellView__epv *epv;
+	POA_GNOME_Evolution_ShellView__vepv *vepv;
+	POA_GNOME_Evolution_ShellView__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -151,16 +151,16 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_ShellView__epv, 1);
-	epv->set_message         = impl_ShellView_set_message;
-	epv->unset_message       = impl_ShellView_unset_message;
-	epv->change_current_view = impl_ShellView_change_current_view;
-	epv->set_title           = impl_ShellView_set_title;
+	epv = g_new0 (POA_GNOME_Evolution_ShellView__epv, 1);
+	epv->setMessage        = impl_ShellView_set_message;
+	epv->unsetMessage      = impl_ShellView_unset_message;
+	epv->changeCurrentView = impl_ShellView_change_current_view;
+	epv->setTitle          = impl_ShellView_set_title;
 
 	vepv = &ShellView_vepv;
 	vepv->_base_epv               = base_epv;
 	vepv->Bonobo_Unknown_epv      = bonobo_object_get_epv ();
-	vepv->Evolution_ShellView_epv = epv;
+	vepv->GNOME_Evolution_ShellView_epv = epv;
 }
 
 static void
@@ -235,7 +235,7 @@ init (EvolutionShellView *shell_view)
  **/
 void
 evolution_shell_view_construct (EvolutionShellView *shell_view,
-				Evolution_ShellView corba_object)
+				GNOME_Evolution_ShellView corba_object)
 {
 	g_return_if_fail (shell_view != NULL);
 	g_return_if_fail (EVOLUTION_IS_SHELL_VIEW (shell_view));
@@ -253,8 +253,8 @@ evolution_shell_view_construct (EvolutionShellView *shell_view,
 EvolutionShellView *
 evolution_shell_view_new (void)
 {
-	POA_Evolution_ShellView *servant;
-	Evolution_ShellView corba_object;
+	POA_GNOME_Evolution_ShellView *servant;
+	GNOME_Evolution_ShellView corba_object;
 	EvolutionShellView *new;
 
 	servant = create_servant ();
diff --git a/shell/evolution-shell-view.h b/shell/evolution-shell-view.h
index 546a1a9640..928d22b4c8 100644
--- a/shell/evolution-shell-view.h
+++ b/shell/evolution-shell-view.h
@@ -67,8 +67,8 @@ struct _EvolutionShellViewClass {
 
 
 GtkType             evolution_shell_view_get_type   (void);
-void                evolution_shell_view_construct  (EvolutionShellView  *shell_view,
-						     Evolution_ShellView  corba_object);
+void                evolution_shell_view_construct  (EvolutionShellView       *shell_view,
+						     GNOME_Evolution_ShellView corba_object);
 EvolutionShellView *evolution_shell_view_new        (void);
 
 #ifdef __cplusplus
diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c
index d841987ba7..7dd8b9ac88 100644
--- a/shell/evolution-storage-listener.c
+++ b/shell/evolution-storage-listener.c
@@ -37,7 +37,7 @@
 static GtkObjectClass *parent_class = NULL;
 
 struct _EvolutionStorageListenerPrivate {
-	Evolution_StorageListener corba_objref;
+	GNOME_Evolution_StorageListener corba_objref;
 	EvolutionStorageListenerServant *servant;
 };
 
@@ -54,7 +54,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 /* Evolution::StorageListener implementation.  */
 
-static POA_Evolution_StorageListener__vepv my_Evolution_StorageListener_vepv;
+static POA_GNOME_Evolution_StorageListener__vepv my_GNOME_Evolution_StorageListener_vepv;
 
 static EvolutionStorageListener *
 gtk_object_from_servant (PortableServer_Servant servant)
@@ -66,7 +66,7 @@ gtk_object_from_servant (PortableServer_Servant servant)
 }
 
 static void
-impl_Evolution_StorageListener_destroyed (PortableServer_Servant servant,
+impl_GNOME_Evolution_StorageListener_notifyDestroyed (PortableServer_Servant servant,
 					  CORBA_Environment *ev)
 {
 	EvolutionStorageListener *listener;
@@ -79,9 +79,9 @@ impl_Evolution_StorageListener_destroyed (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_StorageListener_new_folder (PortableServer_Servant servant,
+impl_GNOME_Evolution_StorageListener_notifyFolderCreated (PortableServer_Servant servant,
 					   const CORBA_char *path,
-					   const Evolution_Folder *folder,
+					   const GNOME_Evolution_Folder *folder,
 					   CORBA_Environment *ev)
 {
 	EvolutionStorageListener *listener;
@@ -94,7 +94,7 @@ impl_Evolution_StorageListener_new_folder (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_StorageListener_update_folder (PortableServer_Servant servant,
+impl_GNOME_Evolution_StorageListener_notifyFolderUpdated (PortableServer_Servant servant,
 					      const CORBA_char *path,
 					      const CORBA_char *display_name,
 					      CORBA_boolean highlighted,
@@ -111,7 +111,7 @@ impl_Evolution_StorageListener_update_folder (PortableServer_Servant servant,
 }
 
 static void
-impl_Evolution_StorageListener_removed_folder (PortableServer_Servant servant,
+impl_GNOME_Evolution_StorageListener_removed_folder (PortableServer_Servant servant,
 					       const CORBA_char *path,
 					       CORBA_Environment *ev)
 {
@@ -128,16 +128,16 @@ static EvolutionStorageListenerServant *
 create_servant (EvolutionStorageListener *listener)
 {
 	EvolutionStorageListenerServant *servant;
-	POA_Evolution_StorageListener *corba_servant;
+	POA_GNOME_Evolution_StorageListener *corba_servant;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 
 	servant = g_new0 (EvolutionStorageListenerServant, 1);
-	corba_servant = (POA_Evolution_StorageListener *) servant;
+	corba_servant = (POA_GNOME_Evolution_StorageListener *) servant;
 
-	corba_servant->vepv = &my_Evolution_StorageListener_vepv;
-	POA_Evolution_StorageListener__init ((PortableServer_Servant) corba_servant, &ev);
+	corba_servant->vepv = &my_GNOME_Evolution_StorageListener_vepv;
+	POA_GNOME_Evolution_StorageListener__init ((PortableServer_Servant) corba_servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -151,11 +151,11 @@ create_servant (EvolutionStorageListener *listener)
 	return servant;
 }
 
-static Evolution_StorageListener
+static GNOME_Evolution_StorageListener
 activate_servant (EvolutionStorageListener *listener,
-		  POA_Evolution_StorageListener *servant)
+		  POA_GNOME_Evolution_StorageListener *servant)
 {
-	Evolution_StorageListener corba_object;
+	GNOME_Evolution_StorageListener corba_object;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
@@ -199,7 +199,7 @@ impl_destroy (GtkObject *object)
 		PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
 		CORBA_free (object_id);
 
-		POA_Evolution_StorageListener__fini (priv->servant, &ev);
+		POA_GNOME_Evolution_StorageListener__fini (priv->servant, &ev);
 	}
 
 	CORBA_exception_free (&ev);
@@ -213,8 +213,8 @@ impl_destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_StorageListener__vepv *vepv;
-	POA_Evolution_StorageListener__epv *epv;
+	POA_GNOME_Evolution_StorageListener__vepv *vepv;
+	POA_GNOME_Evolution_StorageListener__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -222,15 +222,15 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_StorageListener__epv, 1);
-	epv->destroyed      = impl_Evolution_StorageListener_destroyed;
-	epv->new_folder     = impl_Evolution_StorageListener_new_folder;
-	epv->update_folder  = impl_Evolution_StorageListener_update_folder;
-	epv->removed_folder = impl_Evolution_StorageListener_removed_folder;
+	epv = g_new0 (POA_GNOME_Evolution_StorageListener__epv, 1);
+	epv->notifyDestroyed     = impl_GNOME_Evolution_StorageListener_notifyDestroyed;
+	epv->notifyFolderCreated = impl_GNOME_Evolution_StorageListener_notifyFolderCreated;
+	epv->notifyFolderUpdated = impl_GNOME_Evolution_StorageListener_notifyFolderUpdated;
+	epv->notifyFolderRemoved = impl_GNOME_Evolution_StorageListener_removed_folder;
 
-	vepv = & my_Evolution_StorageListener_vepv;
+	vepv = & my_GNOME_Evolution_StorageListener_vepv;
 	vepv->_base_epv                     = base_epv;
-	vepv->Evolution_StorageListener_epv = epv;
+	vepv->GNOME_Evolution_StorageListener_epv = epv;
 }
 
 static void
@@ -296,7 +296,7 @@ init (EvolutionStorageListener *storage_listener)
 
 void
 evolution_storage_listener_construct (EvolutionStorageListener *listener,
-				      Evolution_StorageListener corba_objref)
+				      GNOME_Evolution_StorageListener corba_objref)
 {
 	EvolutionStorageListenerPrivate *priv;
 
@@ -317,13 +317,13 @@ evolution_storage_listener_new (void)
 {
 	EvolutionStorageListener *new;
 	EvolutionStorageListenerPrivate *priv;
-	Evolution_StorageListener corba_objref;
+	GNOME_Evolution_StorageListener corba_objref;
 
 	new = gtk_type_new (evolution_storage_listener_get_type ());
 	priv = new->priv;
 
 	priv->servant = create_servant (new);
-	corba_objref = activate_servant (new, (POA_Evolution_StorageListener *) priv->servant);
+	corba_objref = activate_servant (new, (POA_GNOME_Evolution_StorageListener *) priv->servant);
 
 	evolution_storage_listener_construct (new, corba_objref);
 
@@ -340,7 +340,7 @@ evolution_storage_listener_new (void)
  * 
  * Return value: A pointer to the CORBA object reference.
  **/
-Evolution_StorageListener
+GNOME_Evolution_StorageListener
 evolution_storage_listener_corba_objref (EvolutionStorageListener *listener)
 {
 	EvolutionStorageListenerPrivate *priv;
diff --git a/shell/evolution-storage-listener.h b/shell/evolution-storage-listener.h
index 50a1ef7f72..bb3067621a 100644
--- a/shell/evolution-storage-listener.h
+++ b/shell/evolution-storage-listener.h
@@ -61,7 +61,7 @@ struct _EvolutionStorageListenerClass {
 	void (* destroyed)       (EvolutionStorageListener *storage_listener);
 	void (* new_folder)      (EvolutionStorageListener *storage_listener,
 				  const char *path,
-				  const Evolution_Folder *folder);
+				  const GNOME_Evolution_Folder *folder);
 	void (* update_folder)   (EvolutionStorageListener *storage_listener,
 				  const char *path,
 				  const char *display_name);
@@ -71,7 +71,7 @@ struct _EvolutionStorageListenerClass {
 
 
 struct _EvolutionStorageListenerServant {
-	POA_Evolution_StorageListener servant_placeholder;
+	POA_GNOME_Evolution_StorageListener servant_placeholder;
 	EvolutionStorageListener *gtk_object;
 };
 typedef struct _EvolutionStorageListenerServant EvolutionStorageListenerServant;
@@ -79,10 +79,10 @@ typedef struct _EvolutionStorageListenerServant EvolutionStorageListenerServant;
 
 GtkType                    evolution_storage_listener_get_type      (void);
 void                       evolution_storage_listener_construct     (EvolutionStorageListener  *listener,
-								     Evolution_StorageListener  corba_objref);
+								     GNOME_Evolution_StorageListener  corba_objref);
 EvolutionStorageListener  *evolution_storage_listener_new           (void);
 
-Evolution_StorageListener  evolution_storage_listener_corba_objref  (EvolutionStorageListener *listener);
+GNOME_Evolution_StorageListener  evolution_storage_listener_corba_objref  (EvolutionStorageListener *listener);
 
 #ifdef __cplusplus
 }
diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c
index a6b6d89f8e..e7f73b5e0a 100644
--- a/shell/evolution-storage-set-view-listener.c
+++ b/shell/evolution-storage-set-view-listener.c
@@ -37,7 +37,7 @@
 static GtkObjectClass *parent_class = NULL;
 
 struct _EvolutionStorageSetViewListenerPrivate {
-	Evolution_StorageSetViewListener corba_listener;
+	GNOME_Evolution_StorageSetViewListener corba_listener;
 	EvolutionStorageSetViewListenerServant *servant;
 };
 
@@ -51,7 +51,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 /* Evolution::StorageSetViewListener implementation.  */
 
-static POA_Evolution_StorageSetViewListener__vepv my_Evolution_StorageSetViewListener_vepv;
+static POA_GNOME_Evolution_StorageSetViewListener__vepv my_GNOME_Evolution_StorageSetViewListener_vepv;
 
 static EvolutionStorageSetViewListener *
 gtk_object_from_servant (PortableServer_Servant servant)
@@ -63,7 +63,7 @@ gtk_object_from_servant (PortableServer_Servant servant)
 }
 
 static void
-impl_Evolution_StorageSetViewListener_folder_selected (PortableServer_Servant servant,
+impl_GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (PortableServer_Servant servant,
 						       const CORBA_char *uri,
 						       CORBA_Environment *ev)
 {
@@ -75,7 +75,7 @@ impl_Evolution_StorageSetViewListener_folder_selected (PortableServer_Servant se
 }
 
 static void
-impl_Evolution_StorageSetViewListener_storage_selected (PortableServer_Servant servant,
+impl_GNOME_Evolution_StorageSetViewListener_notifyStorageSelected (PortableServer_Servant servant,
 							const CORBA_char *uri,
 							CORBA_Environment *ev)
 {
@@ -90,16 +90,16 @@ static EvolutionStorageSetViewListenerServant *
 create_servant (EvolutionStorageSetViewListener *listener)
 {
 	EvolutionStorageSetViewListenerServant *servant;
-	POA_Evolution_StorageSetViewListener *corba_servant;
+	POA_GNOME_Evolution_StorageSetViewListener *corba_servant;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 
 	servant = g_new0 (EvolutionStorageSetViewListenerServant, 1);
-	corba_servant = (POA_Evolution_StorageSetViewListener *) servant;
+	corba_servant = (POA_GNOME_Evolution_StorageSetViewListener *) servant;
 
-	corba_servant->vepv = &my_Evolution_StorageSetViewListener_vepv;
-	POA_Evolution_StorageSetViewListener__init ((PortableServer_Servant) corba_servant, &ev);
+	corba_servant->vepv = &my_GNOME_Evolution_StorageSetViewListener_vepv;
+	POA_GNOME_Evolution_StorageSetViewListener__init ((PortableServer_Servant) corba_servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -113,11 +113,11 @@ create_servant (EvolutionStorageSetViewListener *listener)
 	return servant;
 }
 
-static Evolution_StorageSetViewListener
+static GNOME_Evolution_StorageSetViewListener
 activate_servant (EvolutionStorageSetViewListener *listener,
-		  POA_Evolution_StorageSetViewListener *servant)
+		  POA_GNOME_Evolution_StorageSetViewListener *servant)
 {
-	Evolution_StorageSetViewListener corba_object;
+	GNOME_Evolution_StorageSetViewListener corba_object;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
@@ -159,7 +159,7 @@ impl_destroy (GtkObject *object)
 		PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
 		CORBA_free (object_id);
 
-		POA_Evolution_StorageSetViewListener__fini (priv->servant, &ev);
+		POA_GNOME_Evolution_StorageSetViewListener__fini (priv->servant, &ev);
 	}
 
 	CORBA_exception_free (&ev);
@@ -174,8 +174,8 @@ impl_destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_StorageSetViewListener__vepv *vepv;
-	POA_Evolution_StorageSetViewListener__epv *epv;
+	POA_GNOME_Evolution_StorageSetViewListener__vepv *vepv;
+	POA_GNOME_Evolution_StorageSetViewListener__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -183,13 +183,13 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_StorageSetViewListener__epv, 1);
-	epv->folder_selected = impl_Evolution_StorageSetViewListener_folder_selected;
-	epv->storage_selected = impl_Evolution_StorageSetViewListener_storage_selected;
+	epv = g_new0 (POA_GNOME_Evolution_StorageSetViewListener__epv, 1);
+	epv->notifyFolderSelected  = impl_GNOME_Evolution_StorageSetViewListener_notifyFolderSelected;
+	epv->notifyStorageSelected = impl_GNOME_Evolution_StorageSetViewListener_notifyStorageSelected;
 
-	vepv = & my_Evolution_StorageSetViewListener_vepv;
+	vepv = & my_GNOME_Evolution_StorageSetViewListener_vepv;
 	vepv->_base_epv                            = base_epv;
-	vepv->Evolution_StorageSetViewListener_epv = epv;
+	vepv->GNOME_Evolution_StorageSetViewListener_epv = epv;
 }
 
 static void
@@ -237,7 +237,7 @@ init (EvolutionStorageSetViewListener *storage_set_view_listener)
 
 void
 evolution_storage_set_view_listener_construct (EvolutionStorageSetViewListener *listener,
-					       Evolution_StorageSetViewListener corba_listener)
+					       GNOME_Evolution_StorageSetViewListener corba_listener)
 {
 	EvolutionStorageSetViewListenerPrivate *priv;
 
@@ -259,20 +259,20 @@ evolution_storage_set_view_listener_new (void)
 {
 	EvolutionStorageSetViewListener *new;
 	EvolutionStorageSetViewListenerPrivate *priv;
-	Evolution_StorageSetViewListener corba_listener;
+	GNOME_Evolution_StorageSetViewListener corba_listener;
 
 	new = gtk_type_new (evolution_storage_set_view_listener_get_type ());
 	priv = new->priv;
 
 	priv->servant = create_servant (new);
-	corba_listener = activate_servant (new, (POA_Evolution_StorageSetViewListener *) priv->servant);
+	corba_listener = activate_servant (new, (POA_GNOME_Evolution_StorageSetViewListener *) priv->servant);
 
 	evolution_storage_set_view_listener_construct (new, corba_listener);
 
 	return new;
 }
 
-Evolution_StorageSetViewListener
+GNOME_Evolution_StorageSetViewListener
 evolution_storage_set_view_listener_corba_objref (EvolutionStorageSetViewListener *listener)
 {
 	EvolutionStorageSetViewListenerPrivate *priv;
diff --git a/shell/evolution-storage-set-view-listener.h b/shell/evolution-storage-set-view-listener.h
index 662acc8f4c..334072a55e 100644
--- a/shell/evolution-storage-set-view-listener.h
+++ b/shell/evolution-storage-set-view-listener.h
@@ -61,7 +61,7 @@ struct _EvolutionStorageSetViewListenerClass {
 
 
 struct _EvolutionStorageSetViewListenerServant {
-	POA_Evolution_StorageSetViewListener servant_placeholder;
+	POA_GNOME_Evolution_StorageSetViewListener servant_placeholder;
 	EvolutionStorageSetViewListener *gtk_object;
 };
 typedef struct _EvolutionStorageSetViewListenerServant EvolutionStorageSetViewListenerServant;
@@ -69,10 +69,10 @@ typedef struct _EvolutionStorageSetViewListenerServant EvolutionStorageSetViewLi
 
 GtkType                          evolution_storage_set_view_listener_get_type      (void);
 void                             evolution_storage_set_view_listener_construct     (EvolutionStorageSetViewListener  *listener,
-										    Evolution_StorageSetViewListener  corba_objref);
+										    GNOME_Evolution_StorageSetViewListener  corba_objref);
 EvolutionStorageSetViewListener *evolution_storage_set_view_listener_new           (void);
 
-Evolution_StorageSetViewListener evolution_storage_set_view_listener_corba_objref  (EvolutionStorageSetViewListener *listener);
+GNOME_Evolution_StorageSetViewListener evolution_storage_set_view_listener_corba_objref  (EvolutionStorageSetViewListener *listener);
 
 #ifdef __cplusplus
 }
diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c
index 70892c686d..1fcac0bc01 100644
--- a/shell/evolution-storage-set-view.c
+++ b/shell/evolution-storage-set-view.c
@@ -54,12 +54,12 @@ storage_set_view_widget_folder_selected_cb (EStorageSetView *storage_set_view_wi
 
 	for (p = priv->listeners; p != NULL; p = p->next) {
 		CORBA_Environment ev;
-		Evolution_StorageSetViewListener listener;
+		GNOME_Evolution_StorageSetViewListener listener;
 
 		CORBA_exception_init (&ev);
 
-		listener = (Evolution_StorageSetViewListener) p->data;
-		Evolution_StorageSetViewListener_folder_selected (listener, uri, &ev);
+		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
+		GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (listener, uri, &ev);
 
 		/* FIXME: What if we fail?  */
 
@@ -81,12 +81,12 @@ storage_set_view_widget_storage_selected_cb (EStorageSetView *storage_set_view_w
 
 	for (p = priv->listeners; p != NULL; p = p->next) {
 		CORBA_Environment ev;
-		Evolution_StorageSetViewListener listener;
+		GNOME_Evolution_StorageSetViewListener listener;
 
 		CORBA_exception_init (&ev);
 
-		listener = (Evolution_StorageSetViewListener) p->data;
-		Evolution_StorageSetViewListener_storage_selected (listener, uri, &ev);
+		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
+		GNOME_Evolution_StorageSetViewListener_notifyStorageSelected (listener, uri, &ev);
 
 		/* FIXME: What if we fail?  */
 
@@ -98,7 +98,7 @@ storage_set_view_widget_storage_selected_cb (EStorageSetView *storage_set_view_w
 /* Listener handling.  */
 
 static GList *
-find_listener_in_list (Evolution_StorageSetViewListener listener,
+find_listener_in_list (GNOME_Evolution_StorageSetViewListener listener,
 		       GList *list)
 {
 	CORBA_Environment ev;
@@ -107,9 +107,9 @@ find_listener_in_list (Evolution_StorageSetViewListener listener,
 	CORBA_exception_init (&ev);
 
 	for (p = list; p != NULL; p = p->next) {
-		Evolution_StorageSetViewListener listener_item;
+		GNOME_Evolution_StorageSetViewListener listener_item;
 
-		listener_item = (Evolution_StorageSetViewListener) p->data;
+		listener_item = (GNOME_Evolution_StorageSetViewListener) p->data;
 		if (CORBA_Object_is_equivalent (listener, listener_item, &ev))
 			break;
 	}
@@ -121,12 +121,12 @@ find_listener_in_list (Evolution_StorageSetViewListener listener,
 
 static gboolean
 add_listener (EvolutionStorageSetView *storage_set_view,
-	      Evolution_StorageSetViewListener listener)
+	      GNOME_Evolution_StorageSetViewListener listener)
 {
 	EvolutionStorageSetViewPrivate *priv;
 	CORBA_Environment ev;
 	const char *current_uri;
-	Evolution_StorageSetViewListener copy_of_listener;
+	GNOME_Evolution_StorageSetViewListener copy_of_listener;
 
 	priv = storage_set_view->priv;
 
@@ -145,7 +145,7 @@ add_listener (EvolutionStorageSetView *storage_set_view,
 
 	current_uri = e_storage_set_view_get_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view_widget));
 	if (current_uri != NULL)
-		Evolution_StorageSetViewListener_folder_selected (listener, current_uri, &ev);
+		GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (listener, current_uri, &ev);
 
 	CORBA_exception_free (&ev);
 
@@ -154,7 +154,7 @@ add_listener (EvolutionStorageSetView *storage_set_view,
 
 static gboolean
 remove_listener (EvolutionStorageSetView *storage_set_view,
-		 Evolution_StorageSetViewListener listener)
+		 GNOME_Evolution_StorageSetViewListener listener)
 {
 	EvolutionStorageSetViewPrivate *priv;
 	GList *listener_node;
@@ -178,20 +178,20 @@ remove_listener (EvolutionStorageSetView *storage_set_view,
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_StorageSetView__vepv StorageSetView_vepv;
+static POA_GNOME_Evolution_StorageSetView__vepv StorageSetView_vepv;
 
-static POA_Evolution_StorageSetView *
+static POA_GNOME_Evolution_StorageSetView *
 create_servant (void)
 {
-	POA_Evolution_StorageSetView *servant;
+	POA_GNOME_Evolution_StorageSetView *servant;
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
 
-	servant = (POA_Evolution_StorageSetView *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_StorageSetView *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &StorageSetView_vepv;
 
-	POA_Evolution_StorageSetView__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_StorageSetView__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		servant = NULL;
@@ -204,7 +204,7 @@ create_servant (void)
 
 static void
 impl_StorageSetView_add_listener (PortableServer_Servant servant,
-				  const Evolution_StorageSetViewListener listener,
+				  const GNOME_Evolution_StorageSetViewListener listener,
 				  CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
@@ -215,12 +215,12 @@ impl_StorageSetView_add_listener (PortableServer_Servant servant,
 
 	if (! add_listener (storage_set_view, listener))
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageSetView_AlreadyListening, NULL);
+				     ex_GNOME_Evolution_StorageSetView_AlreadyListening, NULL);
 }
 
 static void
 impl_StorageSetView_remove_listener (PortableServer_Servant servant,
-				     const Evolution_StorageSetViewListener listener,
+				     const GNOME_Evolution_StorageSetViewListener listener,
 				     CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
@@ -231,7 +231,7 @@ impl_StorageSetView_remove_listener (PortableServer_Servant servant,
 
 	if (! remove_listener (storage_set_view, listener))
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_StorageSetView_NotFound, NULL);
+				     ex_GNOME_Evolution_StorageSetView_NotFound, NULL);
 }
 
 static CORBA_boolean
@@ -285,9 +285,9 @@ impl_destroy (GtkObject *object)
 	CORBA_exception_init (&ev);
 
 	for (p = priv->listeners; p != NULL; p = p->next) {
-		Evolution_StorageSetViewListener listener;
+		GNOME_Evolution_StorageSetViewListener listener;
 
-		listener = (Evolution_StorageSetViewListener) p->data;
+		listener = (GNOME_Evolution_StorageSetViewListener) p->data;
 		CORBA_Object_release (listener, &ev);
 	}
 
@@ -303,8 +303,8 @@ impl_destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_StorageSetView__vepv *vepv;
-	POA_Evolution_StorageSetView__epv *epv;
+	POA_GNOME_Evolution_StorageSetView__vepv *vepv;
+	POA_GNOME_Evolution_StorageSetView__epv *epv;
 	PortableServer_ServantBase__epv *base_epv;
 
 	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
@@ -312,16 +312,16 @@ corba_class_init (void)
 	base_epv->finalize    = NULL;
 	base_epv->default_POA = NULL;
 
-	epv = g_new0 (POA_Evolution_StorageSetView__epv, 1);
-	epv->add_listener    = impl_StorageSetView_add_listener;
-	epv->remove_listener = impl_StorageSetView_remove_listener;
-	epv->_set_show_folders = impl_StorageSetView__set_show_folders;
-	epv->_get_show_folders = impl_StorageSetView__get_show_folders;
+	epv = g_new0 (POA_GNOME_Evolution_StorageSetView__epv, 1);
+	epv->addListener      = impl_StorageSetView_add_listener;
+	epv->removeListener   = impl_StorageSetView_remove_listener;
+	epv->_set_showFolders = impl_StorageSetView__set_show_folders;
+	epv->_get_showFolders = impl_StorageSetView__get_show_folders;
 
 	vepv = &StorageSetView_vepv;
 	vepv->_base_epv                    = base_epv;
 	vepv->Bonobo_Unknown_epv           = bonobo_object_get_epv ();
-	vepv->Evolution_StorageSetView_epv = epv;
+	vepv->GNOME_Evolution_StorageSetView_epv = epv;
 }
 
 static void
@@ -352,7 +352,7 @@ init (EvolutionStorageSetView *storage_set_view)
 
 void
 evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view,
-				      Evolution_StorageSetView corba_object,
+				      GNOME_Evolution_StorageSetView corba_object,
 				      EStorageSetView *storage_set_view_widget)
 {
 	EvolutionStorageSetViewPrivate *priv;
@@ -379,8 +379,8 @@ evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view,
 EvolutionStorageSetView *
 evolution_storage_set_view_new (EStorageSetView *storage_set_view_widget)
 {
-	POA_Evolution_StorageSetView *servant;
-	Evolution_StorageSetView corba_object;
+	POA_GNOME_Evolution_StorageSetView *servant;
+	GNOME_Evolution_StorageSetView corba_object;
 	EvolutionStorageSetView *new;
 
 	g_return_val_if_fail (storage_set_view_widget != NULL, NULL);
diff --git a/shell/evolution-storage-set-view.h b/shell/evolution-storage-set-view.h
index 1f3a9f84bf..36f7c99f63 100644
--- a/shell/evolution-storage-set-view.h
+++ b/shell/evolution-storage-set-view.h
@@ -59,7 +59,7 @@ struct _EvolutionStorageSetViewClass {
 
 GtkType                  evolution_storage_set_view_get_type   (void);
 void                     evolution_storage_set_view_construct  (EvolutionStorageSetView  *storage_set_view,
-								Evolution_StorageSetView  corba_object,
+								GNOME_Evolution_StorageSetView  corba_object,
 								EStorageSetView          *storage_set_view_widget);
 EvolutionStorageSetView *evolution_storage_set_view_new        (EStorageSetView          *storage_set_view_widget);
 
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index f9127c56c0..6f67a71471 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -56,25 +56,25 @@ list_through_listener_foreach (EFolderTree *tree,
 			       void *data,
 			       void *closure)
 {
-	const Evolution_Folder *corba_folder;
-	Evolution_StorageListener corba_listener;
+	const GNOME_Evolution_Folder *corba_folder;
+	GNOME_Evolution_StorageListener corba_listener;
 	CORBA_Environment ev;
 
-	corba_folder = (Evolution_Folder *) data;
-	corba_listener = (Evolution_StorageListener) closure;
+	corba_folder = (GNOME_Evolution_Folder *) data;
+	corba_listener = (GNOME_Evolution_StorageListener) closure;
 
 	/* The root folder has no data.  */
 	if (corba_folder == NULL)
 		return;
 	
 	CORBA_exception_init (&ev);
-	Evolution_StorageListener_new_folder (corba_listener, path, corba_folder, &ev);
+	GNOME_Evolution_StorageListener_notifyFolderCreated (corba_listener, path, corba_folder, &ev);
 	CORBA_exception_free (&ev);
 }
 
 static void
 list_through_listener (EvolutionStorage *storage,
-		       Evolution_StorageListener listener,
+		       GNOME_Evolution_StorageListener listener,
 		       CORBA_Environment *ev)
 {
 	EvolutionStoragePrivate *priv;
@@ -87,7 +87,7 @@ list_through_listener (EvolutionStorage *storage,
 }
 
 static GList *
-find_listener_in_list (const Evolution_StorageListener listener,
+find_listener_in_list (const GNOME_Evolution_StorageListener listener,
 		       GList *list)
 {
 	CORBA_Environment ev;
@@ -96,9 +96,9 @@ find_listener_in_list (const Evolution_StorageListener listener,
 	CORBA_exception_init (&ev);
 
 	for (p = list; p != NULL; p = p->next) {
-		Evolution_StorageListener listener_item;
+		GNOME_Evolution_StorageListener listener_item;
 
-		listener_item = (Evolution_StorageListener) p->data;
+		listener_item = (GNOME_Evolution_StorageListener) p->data;
 
 		if (CORBA_Object_is_equivalent (listener_item, listener, &ev) && ev._major == CORBA_NO_EXCEPTION)
 			return p;
@@ -111,10 +111,10 @@ find_listener_in_list (const Evolution_StorageListener listener,
 
 static gboolean
 add_listener (EvolutionStorage *storage,
-	      const Evolution_StorageListener listener)
+	      const GNOME_Evolution_StorageListener listener)
 {
 	EvolutionStoragePrivate *priv;
-	Evolution_StorageListener listener_copy;
+	GNOME_Evolution_StorageListener listener_copy;
 	CORBA_Environment ev;
 
 	priv = storage->priv;
@@ -147,7 +147,7 @@ add_listener (EvolutionStorage *storage,
 
 static gboolean
 remove_listener (EvolutionStorage *storage,
-		 const Evolution_StorageListener listener)
+		 const GNOME_Evolution_StorageListener listener)
 {
 	EvolutionStoragePrivate *priv;
 	CORBA_Environment ev;
@@ -177,29 +177,29 @@ folder_destroy_notify (EFolderTree *tree,
 		       void *data,
 		       void *closure)
 {
-	Evolution_Folder *corba_folder;
+	GNOME_Evolution_Folder *corba_folder;
 
-	corba_folder = (Evolution_Folder *) data;
+	corba_folder = (GNOME_Evolution_Folder *) data;
 	CORBA_free (data);
 }
 
 
 /* CORBA interface implementation.  */
 
-static POA_Evolution_Storage__vepv Storage_vepv;
+static POA_GNOME_Evolution_Storage__vepv Storage_vepv;
 
-static POA_Evolution_Storage *
+static POA_GNOME_Evolution_Storage *
 create_servant (void)
 {
-	POA_Evolution_Storage *servant;
+	POA_GNOME_Evolution_Storage *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_Evolution_Storage *) g_new0 (BonoboObjectServant, 1);
+	servant = (POA_GNOME_Evolution_Storage *) g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &Storage_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_Evolution_Storage__init ((PortableServer_Servant) servant, &ev);
+	POA_GNOME_Evolution_Storage__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_free (servant);
 		CORBA_exception_free (&ev);
@@ -228,7 +228,7 @@ impl_Storage__get_name (PortableServer_Servant servant,
 
 static void
 impl_Storage_add_listener (PortableServer_Servant servant,
-			   const Evolution_StorageListener listener,
+			   const GNOME_Evolution_StorageListener listener,
 			   CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
@@ -238,12 +238,12 @@ impl_Storage_add_listener (PortableServer_Servant servant,
 	storage = EVOLUTION_STORAGE (bonobo_object);
 
 	if (! add_listener (storage, listener))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Evolution_Storage_AlreadyListening, NULL);
+		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Storage_AlreadyListening, NULL);
 }
 
 static void
 impl_Storage_remove_listener (PortableServer_Servant servant,
-			      const Evolution_StorageListener listener,
+			      const GNOME_Evolution_StorageListener listener,
 			      CORBA_Environment *ev)
 {
 	BonoboObject *bonobo_object;
@@ -253,7 +253,7 @@ impl_Storage_remove_listener (PortableServer_Servant servant,
 	storage = EVOLUTION_STORAGE (bonobo_object);
 
 	if (! remove_listener (storage, listener))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Evolution_Storage_NotFound, NULL);
+		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Storage_NotFound, NULL);
 }
 
 
@@ -278,11 +278,11 @@ destroy (GtkObject *object)
 	CORBA_exception_init (&ev);
 
 	for (p = priv->corba_storage_listeners; p != NULL; p = p->next) {
-		Evolution_StorageListener listener;
+		GNOME_Evolution_StorageListener listener;
 
 		listener = p->data;
 
-		Evolution_StorageListener_destroyed (listener, &ev);
+		GNOME_Evolution_StorageListener_notifyDestroyed (listener, &ev);
 
 		/* (This is not a Bonobo object, so no unref.)  */
 		CORBA_Object_release (listener, &ev);
@@ -301,7 +301,7 @@ destroy (GtkObject *object)
 static void
 corba_class_init (void)
 {
-	POA_Evolution_Storage__vepv *vepv;
+	POA_GNOME_Evolution_Storage__vepv *vepv;
 
 	PortableServer_ServantBase__epv *base_epv;
 
@@ -312,7 +312,7 @@ corba_class_init (void)
 
 	vepv = &Storage_vepv;
 	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->Evolution_Storage_epv = evolution_storage_get_epv ();
+	vepv->GNOME_Evolution_Storage_epv = evolution_storage_get_epv ();
 }
 
 static void
@@ -342,22 +342,22 @@ init (EvolutionStorage *storage)
 }
 
 
-POA_Evolution_Storage__epv *
+POA_GNOME_Evolution_Storage__epv *
 evolution_storage_get_epv (void)
 {
-	POA_Evolution_Storage__epv *epv;
+	POA_GNOME_Evolution_Storage__epv *epv;
 
-	epv = g_new0 (POA_Evolution_Storage__epv, 1);
-	epv->_get_name       = impl_Storage__get_name;
-	epv->add_listener    = impl_Storage_add_listener;
-	epv->remove_listener = impl_Storage_remove_listener;
+	epv = g_new0 (POA_GNOME_Evolution_Storage__epv, 1);
+	epv->_get_name      = impl_Storage__get_name;
+	epv->addListener    = impl_Storage_add_listener;
+	epv->removeListener = impl_Storage_remove_listener;
 
 	return epv;
 }
 
 void
 evolution_storage_construct (EvolutionStorage *storage,
-			     Evolution_Storage corba_object,
+			     GNOME_Evolution_Storage corba_object,
 			     const char *name)
 {
 	EvolutionStoragePrivate *priv;
@@ -378,8 +378,8 @@ EvolutionStorage *
 evolution_storage_new (const char *name)
 {
 	EvolutionStorage *new;
-	POA_Evolution_Storage *servant;
-	Evolution_Storage corba_object;
+	POA_GNOME_Evolution_Storage *servant;
+	GNOME_Evolution_Storage corba_object;
 
 	g_return_val_if_fail (name != NULL, NULL);
 	g_return_val_if_fail (name[0] != '\0', NULL);
@@ -398,11 +398,11 @@ evolution_storage_new (const char *name)
 
 EvolutionStorageResult
 evolution_storage_register (EvolutionStorage *evolution_storage,
-			    Evolution_StorageRegistry corba_storage_registry)
+			    GNOME_Evolution_StorageRegistry corba_storage_registry)
 {
 	EvolutionStorageResult result;
-	Evolution_StorageListener corba_storage_listener;
-	Evolution_Storage corba_storage;
+	GNOME_Evolution_StorageListener corba_storage_listener;
+	GNOME_Evolution_Storage corba_storage;
 	EvolutionStoragePrivate *priv;
 	CORBA_Environment ev;
 
@@ -421,7 +421,7 @@ evolution_storage_register (EvolutionStorage *evolution_storage,
 	CORBA_exception_init (&ev);
 
 	corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (evolution_storage));
-	corba_storage_listener = Evolution_StorageRegistry_register_storage (corba_storage_registry,
+	corba_storage_listener = GNOME_Evolution_StorageRegistry_addStorage (corba_storage_registry,
 									     corba_storage,
 									     priv->name, &ev);
 
@@ -431,7 +431,7 @@ evolution_storage_register (EvolutionStorage *evolution_storage,
 	} else {
 		if (ev._major != CORBA_USER_EXCEPTION)
 			result = EVOLUTION_STORAGE_ERROR_CORBA;
-		else if (strcmp (CORBA_exception_id (&ev), ex_Evolution_StorageRegistry_Exists) == 0)
+		else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageRegistry_Exists) == 0)
 			result = EVOLUTION_STORAGE_ERROR_EXISTS;
 		else
 			result = EVOLUTION_STORAGE_ERROR_GENERIC;
@@ -444,9 +444,9 @@ evolution_storage_register (EvolutionStorage *evolution_storage,
 
 EvolutionStorageResult
 evolution_storage_register_on_shell (EvolutionStorage *evolution_storage,
-				     Evolution_Shell corba_shell)
+				     GNOME_Evolution_Shell corba_shell)
 {
-	Evolution_StorageRegistry corba_storage_registry;
+	GNOME_Evolution_StorageRegistry corba_storage_registry;
 	EvolutionStorageResult result;
 	CORBA_Environment ev;
 
@@ -486,9 +486,9 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage,
 			      const char *description,
 			      gboolean highlighted)
 {
-	EvolutionStorageResult result;
+	EvolutionStorageResult   result;
 	EvolutionStoragePrivate *priv;
-	Evolution_Folder *corba_folder;
+	GNOME_Evolution_Folder  *corba_folder;
 	CORBA_Environment ev;
 	GList *p;
 
@@ -508,7 +508,7 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage,
 
 	CORBA_exception_init (&ev);
 
-	corba_folder = Evolution_Folder__alloc ();
+	corba_folder = GNOME_Evolution_Folder__alloc ();
 	corba_folder->display_name = CORBA_string_dup (display_name);
 	corba_folder->description  = CORBA_string_dup (description);
 	corba_folder->type         = CORBA_string_dup (type);
@@ -518,17 +518,17 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage,
 	result = EVOLUTION_STORAGE_OK;
 
 	for (p = priv->corba_storage_listeners; p != NULL; p = p->next) {
-		Evolution_StorageListener listener;
+		GNOME_Evolution_StorageListener listener;
 
 		listener = p->data;
-		Evolution_StorageListener_new_folder (listener, path, corba_folder, &ev);
+		GNOME_Evolution_StorageListener_notifyFolderCreated (listener, path, corba_folder, &ev);
 
 		if (ev._major == CORBA_NO_EXCEPTION)
 			continue;
 
 		if (ev._major != CORBA_USER_EXCEPTION)
 			result = EVOLUTION_STORAGE_ERROR_CORBA;
-		else if (strcmp (CORBA_exception_id (&ev), ex_Evolution_StorageListener_Exists) == 0)
+		else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_Exists) == 0)
 			result = EVOLUTION_STORAGE_ERROR_EXISTS;
 		else
 			result = EVOLUTION_STORAGE_ERROR_GENERIC;
@@ -555,7 +555,7 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage,
 	EvolutionStoragePrivate *priv;
 	CORBA_Environment ev;
 	GList *p;
-	Evolution_Folder *corba_folder;
+	GNOME_Evolution_Folder *corba_folder;
 
 	g_return_val_if_fail (evolution_storage != NULL,
 			      EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER);
@@ -574,17 +574,17 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage,
 	result = EVOLUTION_STORAGE_OK;
 
 	for (p = priv->corba_storage_listeners; p != NULL; p = p->next) {
-		Evolution_StorageListener listener;
+		GNOME_Evolution_StorageListener listener;
 
 		listener = p->data;
-		Evolution_StorageListener_update_folder (listener, path, display_name, highlighted, &ev);
+		GNOME_Evolution_StorageListener_notifyFolderUpdated (listener, path, display_name, highlighted, &ev);
 
 		if (ev._major != CORBA_NO_EXCEPTION)
 			continue;
 
 		if (ev._major != CORBA_USER_EXCEPTION)
 			result = EVOLUTION_STORAGE_ERROR_CORBA;
-		else if (strcmp (CORBA_exception_id (&ev), ex_Evolution_StorageListener_NotFound) == 0)
+		else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_NotFound) == 0)
 			result = EVOLUTION_STORAGE_ERROR_NOTFOUND;
 		else
 			result = EVOLUTION_STORAGE_ERROR_GENERIC;
@@ -633,17 +633,17 @@ evolution_storage_removed_folder (EvolutionStorage *evolution_storage,
 	result = EVOLUTION_STORAGE_OK;
 
 	for (p = priv->corba_storage_listeners; p != NULL; p = p->next) {
-		Evolution_StorageListener listener;
+		GNOME_Evolution_StorageListener listener;
 
 		listener = p->data;
-		Evolution_StorageListener_removed_folder (listener, path, &ev);
+		GNOME_Evolution_StorageListener_notifyFolderRemoved (listener, path, &ev);
 
 		if (ev._major != CORBA_NO_EXCEPTION)
 			continue;
 
 		if (ev._major != CORBA_USER_EXCEPTION)
 			result = EVOLUTION_STORAGE_ERROR_CORBA;
-		else if (strcmp (CORBA_exception_id (&ev), ex_Evolution_StorageListener_NotFound) == 0)
+		else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_NotFound) == 0)
 			result = EVOLUTION_STORAGE_ERROR_NOTFOUND;
 		else
 			result = EVOLUTION_STORAGE_ERROR_GENERIC;
diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h
index 91b34c4efe..b59dea931c 100644
--- a/shell/evolution-storage.h
+++ b/shell/evolution-storage.h
@@ -72,18 +72,18 @@ struct _EvolutionStorageClass {
 };
 
 
-POA_Evolution_Storage__epv *evolution_storage_get_epv            (void);
+POA_GNOME_Evolution_Storage__epv *evolution_storage_get_epv            (void);
 
 GtkType                     evolution_storage_get_type           (void);
 void                        evolution_storage_construct          (EvolutionStorage          *storage,
-								  Evolution_Storage          corba_object,
+								  GNOME_Evolution_Storage          corba_object,
 								  const char                *name);
 EvolutionStorage           *evolution_storage_new                (const char                *name);
 
 EvolutionStorageResult      evolution_storage_register           (EvolutionStorage          *storage,
-								  Evolution_StorageRegistry  corba_registry);
+								  GNOME_Evolution_StorageRegistry  corba_registry);
 EvolutionStorageResult      evolution_storage_register_on_shell  (EvolutionStorage          *evolution_storage,
-								  Evolution_Shell            corba_shell);
+								  GNOME_Evolution_Shell            corba_shell);
 EvolutionStorageResult      evolution_storage_new_folder         (EvolutionStorage          *evolution_storage,
 								  const char                *path,
 								  const char                *display_name,