3 files changed, 9 insertions, 9 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index a0207e1281..0d55297df1 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -983,7 +983,7 @@ do_popup_menu(EABView *view, GdkEvent *event)
 		e_selection_model_foreach(selection_model, get_card_1, contact_and_book);
 	}
 
-	ep = eab_popup_new("com.novell.evolution.addressbook.view.popup");
+	ep = eab_popup_new("org.gnome.evolution.addressbook.view.popup");
 	t = eab_popup_target_new_select(ep, view->book, !eab_model_editable(view->model), cards);
 	t->target.widget = (GtkWidget *)view;
 
diff --git a/addressbook/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c
index d398c769f2..d70caeb91a 100644
--- a/addressbook/gui/widgets/eab-menu.c
+++ b/addressbook/gui/widgets/eab-menu.c
@@ -176,13 +176,13 @@ eabm_standard_menu_factory(EMenu *emp, void *data)
 
 /*
 <e-plugin
-  class="com.ximian.mail.plugin.popup:1.0"
-  id="com.ximian.mail.plugin.popup.item:1.0"
+  class="org.gnome.mail.plugin.popup:1.0"
+  id="org.gnome.mail.plugin.popup.item:1.0"
   type="shlib"
   location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
   name="imap"
   description="IMAP4 and IMAP4v1 mail store">
-  <hook class="com.ximian.mail.popupMenu:1.0"
+  <hook class="org.gnome.mail.popupMenu:1.0"
         handler="HandlePopup">
   <menu id="any" target="select">
    <item
@@ -229,7 +229,7 @@ eabmph_class_init(EPluginHookClass *klass)
 	int i;
 
 	((GObjectClass *)klass)->finalize = eabmph_finalise;
-	((EPluginHookClass *)klass)->id = "com.novell.evolution.addressbook.bonobomenu:1.0";
+	((EPluginHookClass *)klass)->id = "org.gnome.evolution.addressbook.bonobomenu:1.0";
 
 	for (i=0;eabmph_targets[i].type;i++)
 		e_menu_hook_class_add_target_map((EMenuHookClass *)klass, &eabmph_targets[i]);
diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c
index 2a9a7e654b..9bda77d162 100644
--- a/addressbook/gui/widgets/eab-popup.c
+++ b/addressbook/gui/widgets/eab-popup.c
@@ -219,13 +219,13 @@ eab_popup_target_new_select_names(EABPopup *eabp, struct _ESelectNamesModel *mod
 
 /*
 <e-plugin
-  class="com.ximian.mail.plugin.popup:1.0"
-  id="com.ximian.mail.plugin.popup.iteab:1.0"
+  class="org.gnome.mail.plugin.popup:1.0"
+  id="org.gnome.mail.plugin.popup.iteab:1.0"
   type="shlib"
   location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
   name="imap"
   description="IMAP4 and IMAP4v1 mail store">
-  <hook class="com.ximian.mail.popupMenu:1.0"
+  <hook class="org.gnome.mail.popupMenu:1.0"
         handler="HandlePopup">
   <menu id="any" target="select">
    <iteab
@@ -284,7 +284,7 @@ eabph_class_init(EPluginHookClass *klass)
 	int i;
 
 	((GObjectClass *)klass)->finalize = eabph_finalise;
-	((EPluginHookClass *)klass)->id = "com.ximian.evolution.addressbook.popup:1.0";
+	((EPluginHookClass *)klass)->id = "org.gnome.evolution.addressbook.popup:1.0";
 
 	for (i=0;eabph_targets[i].type;i++)
 		e_popup_hook_class_add_target_map((EPopupHookClass *)klass, &eabph_targets[i]);