Tweak GSettings schemas.

- Don't use the term "eplugin" for modules.

- Use the term "plugin" instead of "eplugin" for plugins.

- Split SpamAssassin settings into a separate schema.

25 files changed, 113 insertions, 91 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index c703876e48..334de53f80 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,16 +17,17 @@ gsettings_SCHEMAS =							\
 	org.gnome.evolution.importer.gschema.xml			\
 	org.gnome.evolution.mail.gschema.xml				\
 	org.gnome.evolution.shell.gschema.xml				\
-	org.gnome.evolution.eplugin.attachment-reminder.gschema.xml	\
-	org.gnome.evolution.eplugin.autocontacts.gschema.xml		\
-	org.gnome.evolution.eplugin.bogo-junk.gschema.xml		\
-	org.gnome.evolution.eplugin.email-custom-header.gschema.xml	\
-	org.gnome.evolution.eplugin.external-editor.gschema.xml		\
-	org.gnome.evolution.eplugin.face-picture.gschema.xml		\
-	org.gnome.evolution.eplugin.itip.gschema.xml			\
-	org.gnome.evolution.eplugin.mail-notification.gschema.xml	\
-	org.gnome.evolution.eplugin.prefer-plain.gschema.xml		\
-	org.gnome.evolution.eplugin.templates.gschema.xml
+	org.gnome.evolution.bogofilter.gschema.xml			\
+	org.gnome.evolution.spamassassin.gschema.xml			\
+	org.gnome.evolution.plugin.attachment-reminder.gschema.xml	\
+	org.gnome.evolution.plugin.autocontacts.gschema.xml		\
+	org.gnome.evolution.plugin.email-custom-header.gschema.xml	\
+	org.gnome.evolution.plugin.external-editor.gschema.xml		\
+	org.gnome.evolution.plugin.face-picture.gschema.xml		\
+	org.gnome.evolution.plugin.itip.gschema.xml			\
+	org.gnome.evolution.plugin.mail-notification.gschema.xml	\
+	org.gnome.evolution.plugin.prefer-plain.gschema.xml		\
+	org.gnome.evolution.plugin.templates.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
diff --git a/data/evolution.convert b/data/evolution.convert
index 3d9179e5d1..46da5db91f 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -163,11 +163,6 @@ junk-empty-on-exit = /apps/evolution/mail/junk/empty_on_exit
 junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days
 junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook
 junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only
-junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only
-junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path
-junk-sa-spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary
-junk-sa-spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary
-junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon
 labels = /apps/evolution/mail/labels
 layout = /apps/evolution/mail/display/layout
 load-http-images = /apps/evolution/mail/display/load_http_images
@@ -233,10 +228,20 @@ vfolder-editor-height = /apps/evolution/mail/vfolder_editor_height
 vfolder-editor-maximized = /apps/evolution/mail/vfolder_editor_maximized
 vfolder-editor-width = /apps/evolution/mail/vfolder_editor_width
 
-[org.gnome.evolution.eplugin.attachment-reminder]
+[org.gnome.evolution.bogofilter]
+utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode
+
+[org.gnome.evolution.spamassassin]
+local-only = /apps/evolution/mail/junk/sa/local_only
+socket-path = "/apps/evolution/mail/junk/sa/socket_path
+spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary
+spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary
+use-daemon = /apps/evolution/mail/junk/sa/use_daemon
+
+[org.gnome.evolution.plugin.attachment-reminder]
 attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues
 
-[org.gnome.evolution.eplugin.autocontacts]
+[org.gnome.evolution.plugin.autocontacts]
 addressbook-source = /apps/evolution/autocontacts/addressbook_source
 auto-sync-gaim = /apps/evolution/autocontacts/auto_sync_gaim
 enable = /apps/evolution/autocontacts/enable_autocontacts
@@ -245,23 +250,20 @@ gaim-check-interval = /apps/evolution/autocontacts/gaim_check_interval
 gaim-last-sync-md5 = /apps/evolution/autocontacts/gaim_last_sync_md5
 gaim-last-sync-time = /apps/evolution/autocontacts/gaim_last_sync_time
 
-[org.gnome.evolution.eplugin.bogo-junk]
-utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode
-
-[org.gnome.evolution.eplugin.email-custom-header]
+[org.gnome.evolution.plugin.email-custom-header]
 custom-header = /apps/evolution/eplugin/email_custom_header/customHeader
 
-[org.gnome.evolution.eplugin.external-editor]
+[org.gnome.evolution.plugin.external-editor]
 command = /apps/evolution/eplugin/external-editor/editor-command
 launch-on-key-press = /apps/evolution/eplugin/external-editor/launch-on-key-press
 
-[org.gnome.evolution.eplugin.face-picture]
+[org.gnome.evolution.plugin.face-picture]
 insert-face-picture = /apps/evolution/eplugin/face/insert_by_default
 
-[org.gnome.evolution.eplugin.itip]
+[org.gnome.evolution.plugin.itip]
 delete-processed = /apps/evolution/itip/delete_processed
 
-[org.gnome.evolution.eplugin.mail-notification]
+[org.gnome.evolution.plugin.mail-notification]
 notify-dbus-enabled = /apps/evolution/eplugin/mail-notification/dbus-enabled
 notify-only-inbox = /apps/evolution/eplugin/mail-notification/notify-only-inbox
 notify-sound-beep = /apps/evolution/eplugin/mail-notification/sound-beep
@@ -272,9 +274,9 @@ notify-sound-use-theme = /apps/evolution/eplugin/mail-notification/sound-use-the
 notify-status-enabled = /apps/evolution/eplugin/mail-notification/status-enabled
 notify-status-notification = /apps/evolution/eplugin/mail-notification/status-notification
 
-[org.gnome.evolution.eplugin.prefer-plain]
+[org.gnome.evolution.plugin.prefer-plain]
 mode = /apps/evolution/eplugin/prefer_plain/mode"
 show-suppressed = /apps/evolution/eplugin/prefer_plain/show_suppressed
 
-[org.gnome.evolution.eplugin.templates]
+[org.gnome.evolution.plugin.templates]
 template-placeholders = /apps/evolution/mail/template_placeholders
diff --git a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in b/data/org.gnome.evolution.bogofilter.gschema.xml.in
index 84ad60a66c..25ada49b56 100644
--- a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in
+++ b/data/org.gnome.evolution.bogofilter.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.bogo-junk" path="/org/gnome/evolution/eplugin/bogo-junk/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.bogofilter" path="/org/gnome/evolution/bogofilter/">
     <key name="utf8-for-spam-filter" type="b">
       <default>true</default>
       <_summary>Convert mail messages to Unicode</_summary>
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 830894ca6d..fdd1e14947 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -520,31 +520,6 @@
       <_summary>The default plugin for Junk hook</_summary>
       <_description>This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins.</_description>
     </key>
-    <key name="junk-sa-local-only" type="b">
-      <default>true</default>
-      <_summary>Use only local spam tests.</_summary>
-      <_description>Use only the local spam tests (no DNS).</_description>
-    </key>
-    <key name="junk-sa-socket-path" type="s">
-      <default>''</default>
-      <_summary>Socket path for SpamAssassin</_summary>
-      <_description>Socket path for SpamAssassin</_description>
-    </key>
-    <key name="junk-sa-use-daemon" type="b">
-      <default>true</default>
-      <_summary>Use SpamAssassin daemon and client</_summary>
-      <_description>Use SpamAssassin daemon and client (spamc/spamd).</_description>
-    </key>
-    <key name="junk-sa-spamc-binary" type="s">
-      <default>'spamc'</default>
-      <_summary>SpamAssassin client binary</_summary>
-      <_description>SpamAssassin client binary</_description>
-    </key>
-    <key name="junk-sa-spamd-binary" type="s">
-      <default>'spamd'</default>
-      <_summary>SpamAssassin daemon binary</_summary>
-      <_description>SpamAssassin daemon binary</_description>
-    </key>
     <key name="junk-lookup-addressbook" type="b">
       <default>false</default>
       <_summary>Determines whether to lookup in address book for sender email</_summary>
diff --git a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in b/data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in
index 71fa2afaa7..51779d478d 100644
--- a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.attachment-reminder" path="/org/gnome/evolution/eplugin/attachment-reminder/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.attachment-reminder" path="/org/gnome/evolution/plugin/attachment-reminder/">
      <key name="attachment-reminder-clues" type="as">
       <default>['attachment','attaching','attached','enclosed']</default>
       <_summary>List of clues for the attachment reminder plugin to look for in a message body</_summary>
diff --git a/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in b/data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in
index f1ff4a12e2..7d9aefc9e9 100644
--- a/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.autocontacts" path="/org/gnome/evolution/eplugin/autocontacts/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.autocontacts" path="/org/gnome/evolution/plugin/autocontacts/">
     <key name="addressbook-source" type="s">
       <default>''</default>
       <_summary>Address book source</_summary>
diff --git a/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in b/data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in
index a82c18170d..87e526fdb1 100644
--- a/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.email-custom-header" path="/org/gnome/evolution/eplugin/email-custom-header/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.email-custom-header" path="/org/gnome/evolution/plugin/email-custom-header/">
     <key name="custom-header" type="as">
       <default>['Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret']</default>
       <_summary>List of Custom Headers</_summary>
diff --git a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in b/data/org.gnome.evolution.plugin.external-editor.gschema.xml.in
index 5ee175adf0..f69cc1bc4f 100644
--- a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.external-editor.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.external-editor" path="/org/gnome/evolution/eplugin/external-editor/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.external-editor" path="/org/gnome/evolution/plugin/external-editor/">
     <key name="command" type="s">
       <default>'gedit'</default>
       <_summary>Default External Editor</_summary>
diff --git a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in b/data/org.gnome.evolution.plugin.face-picture.gschema.xml.in
index a5430b7fdd..b7c7682c52 100644
--- a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.face-picture.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.face-picture" path="/org/gnome/evolution/eplugin/face-picture/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.face-picture" path="/org/gnome/evolution/plugin/face-picture/">
     <key name="insert-face-picture" type="b">
       <default>false</default>
       <_summary>Insert Face picture by default</_summary>
diff --git a/data/org.gnome.evolution.eplugin.itip.gschema.xml.in b/data/org.gnome.evolution.plugin.itip.gschema.xml.in
index 5e0e1d4567..af7513a5e3 100644
--- a/data/org.gnome.evolution.eplugin.itip.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.itip.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.itip" path="/org/gnome/evolution/eplugin/itip/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.itip" path="/org/gnome/evolution/plugin/itip/">
      <key name="delete-processed" type="b">
       <default>false</default>
       <_summary>Delete processed</_summary>
diff --git a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in
index 025971f32e..c49d8b0e07 100644
--- a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.mail-notification" path="/org/gnome/evolution/eplugin/mail-notification/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.mail-notification" path="/org/gnome/evolution/plugin/mail-notification/">
     <key name="notify-only-inbox" type="b">
       <default>true</default>
       <_summary>Notify new messages for Inbox only.</_summary>
diff --git a/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in b/data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in
index 6e9073da82..2cb7477a0d 100644
--- a/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.prefer-plain" path="/org/gnome/evolution/eplugin/prefer-plain/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.prefer-plain" path="/org/gnome/evolution/plugin/prefer-plain/">
     <key name="mode" type="s">
       <default>'normal'</default>
       <_summary>Mode to use when displaying mails</_summary>
diff --git a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in b/data/org.gnome.evolution.plugin.templates.gschema.xml.in
index 5fe07aab07..e0163ef8df 100644
--- a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in
+++ b/data/org.gnome.evolution.plugin.templates.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.templates" path="/org/gnome/evolution/eplugin/templates/">
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.templates" path="/org/gnome/evolution/plugin/templates/">
     <key name="template-placeholders" type="as">
       <default>['myphone=012345','myplace=Abcd','myname=Alice']</default>
       <_summary>List of keyword/value pairs for the Templates plugin to substitute in a message body.</_summary>
diff --git a/data/org.gnome.evolution.spamassassin.gschema.xml.in b/data/org.gnome.evolution.spamassassin.gschema.xml.in
new file mode 100644
index 0000000000..7a95d07a35
--- /dev/null
+++ b/data/org.gnome.evolution.spamassassin.gschema.xml.in
@@ -0,0 +1,29 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.spamassassin" path="/org/gnome/evolution/spamassassin/">
+    <key name="local-only" type="b">
+      <default>true</default>
+      <_summary>Use only local spam tests.</_summary>
+      <_description>Use only the local spam tests (no DNS).</_description>
+    </key>
+    <key name="socket-path" type="s">
+      <default>''</default>
+      <_summary>Socket path for SpamAssassin</_summary>
+      <_description>Socket path for SpamAssassin</_description>
+    </key>
+    <key name="use-daemon" type="b">
+      <default>true</default>
+      <_summary>Use SpamAssassin daemon and client</_summary>
+      <_description>Use SpamAssassin daemon and client (spamc/spamd).</_description>
+    </key>
+    <key name="spamc-binary" type="s">
+      <default>'spamc'</default>
+      <_summary>SpamAssassin client binary</_summary>
+      <_description>SpamAssassin client binary</_description>
+    </key>
+    <key name="spamd-binary" type="s">
+      <default>'spamd'</default>
+      <_summary>SpamAssassin daemon binary</_summary>
+      <_description>SpamAssassin daemon binary</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 2897b37ef6..0eceeea228 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1263,7 +1263,7 @@ em_utils_edit_message (EShell *shell,
 		gint i;
 		GSList *clue_list = NULL;
 
-		settings = g_settings_new ("org.gnome.evolution.eplugin.templates");
+		settings = g_settings_new ("org.gnome.evolution.plugin.templates");
 
 		/* Get the list from GSettings */
 		strv = g_settings_get_strv (settings, "template-placeholders");
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 0b6340296a..74c1d362ca 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -506,7 +506,7 @@ e_bogofilter_init (EBogofilter *extension)
 {
 	GSettings *settings;
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.bogo-junk");
+	settings = g_settings_new ("org.gnome.evolution.bogofilter");
 	g_settings_bind (
 		settings, "utf8-for-spam-filter",
 		G_OBJECT (extension), "convert-to-unicode",
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 7381e4a2ec..e722b0cc2e 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -1153,13 +1153,28 @@ e_spam_assassin_init (ESpamAssassin *extension)
 	 *     need to be properties anymore.  GConfBridge is
 	 *     just easier to deal with than GConfClient. */
 
-	settings = g_settings_new ("org.gnome.evolution.mail");
-
-	g_settings_bind (settings, "junk-sa-local-only", G_OBJECT (extension), "local-only", G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (settings, "junk-sa-spamc-binary", G_OBJECT (extension), "spamc-binary", G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (settings, "junk-sa-spamd-binary", G_OBJECT (extension), "spamd-binary", G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (settings, "junk-sa-socket-path", G_OBJECT (extension), "socket-path", G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (settings, "junk-sa-use-daemon", G_OBJECT (extension), "use-daemon", G_SETTINGS_BIND_DEFAULT);
+	settings = g_settings_new ("org.gnome.evolution.spamassassin");
+
+	g_settings_bind (
+		settings, "local-only",
+		G_OBJECT (extension), "local-only",
+		G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (
+		settings, "spamc-binary",
+		G_OBJECT (extension), "spamc-binary",
+		G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (
+		settings, "spamd-binary",
+		G_OBJECT (extension), "spamd-binary",
+		G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (
+		settings, "socket-path",
+		G_OBJECT (extension), "socket-path",
+		G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (
+		settings, "use-daemon",
+		G_OBJECT (extension), "use-daemon",
+		G_SETTINGS_BIND_DEFAULT);
 
 	g_object_unref (settings);
 
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 988d3aa290..9f2837d923 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -151,7 +151,7 @@ check_for_attachment_clues (gchar *msg)
 	gboolean ret_val = FALSE;
 	guint msg_length;
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.attachment-reminder");
+	settings = g_settings_new ("org.gnome.evolution.plugin.attachment-reminder");
 
 	/* Get the list from GSettings */
 	clue_list = g_settings_get_strv (settings, CONF_KEY_ATTACH_REMINDER_CLUES);
@@ -452,7 +452,7 @@ e_plugin_lib_get_configure_widget (EPlugin *plugin)
 	gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove);
 	gtk_widget_set_can_default (clue_remove, TRUE);
 
-	ui->settings = g_settings_new ("org.gnome.evolution.eplugin.attachment-reminder");
+	ui->settings = g_settings_new ("org.gnome.evolution.plugin.attachment-reminder");
 
 	ui->treeview = clue_treeview;
 
diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h
index 3bd8cce880..9104e0896b 100644
--- a/plugins/bbdb/bbdb.h
+++ b/plugins/bbdb/bbdb.h
@@ -22,7 +22,7 @@
 #define __BBDB_H__
 
 /* Where to store the config values */
-#define CONF_SCHEMA                     "org.gnome.evolution.eplugin.autocontacts" 
+#define CONF_SCHEMA                     "org.gnome.evolution.plugin.autocontacts" 
 #define CONF_KEY_ENABLE		        "enable"
 #define CONF_KEY_ENABLE_GAIM		"auto-sync-gaim"
 #define CONF_KEY_WHICH_ADDRESSBOOK	"addressbook-source"
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index d2d74797b8..7d67faa5b6 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -81,7 +81,7 @@ ee_editor_command_changed (GtkWidget *textbox)
 	d(printf ("\n\aeditor is : [%s] \n\a", editor));
 
 	/* GSettings access for every key-press. Sucky ? */
-	settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor");
+	settings = g_settings_new ("org.gnome.evolution.plugin.external-editor");
 	g_settings_set_string (settings, "command", editor);
 	g_object_unref (settings);
 }
@@ -95,7 +95,7 @@ ee_editor_immediate_launch_changed (GtkWidget *checkbox)
 	immediately = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
 	d(printf ("\n\aimmediate launch is : [%d] \n\a", immediately));
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor");
+	settings = g_settings_new ("org.gnome.evolution.plugin.external-editor");
 	g_settings_set_boolean (settings, "launch-on-key-press", immediately);
 	g_object_unref (settings);
 }
@@ -113,7 +113,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	textbox = gtk_entry_new ();
 	label = gtk_label_new (_("Command to be executed to launch the editor: "));
 	help = gtk_label_new (_("For Emacs use \"xemacs\"\nFor VI use \"gvim -f\""));
-	settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor");
+	settings = g_settings_new ("org.gnome.evolution.plugin.external-editor");
 
 	editor = g_settings_get_string (settings, "command");
 	if (editor) {
@@ -282,7 +282,7 @@ async_external_editor (EMsgComposer *composer)
 		return;
 	}
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor");
+	settings = g_settings_new ("org.gnome.evolution.plugin.external-editor");
 	editor_cmd = g_settings_get_string (settings, "command");
 	if (!editor_cmd) {
 		if (!(editor_cmd = g_strdup (g_getenv ("EDITOR"))) )
@@ -418,7 +418,7 @@ key_press_cb (GtkWidget *widget,
 		break;
 	}
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor");
+	settings = g_settings_new ("org.gnome.evolution.plugin.external-editor");
 	immediately = g_settings_get_boolean (settings, "launch-on-key-press");
 	g_object_unref (settings);
 	if (!immediately)
diff --git a/plugins/face/face.c b/plugins/face/face.c
index d344548e45..18a1a2d978 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -40,7 +40,7 @@
 static gboolean
 get_include_face_by_default (void)
 {
-	GSettings *settings = g_settings_new ("org.gnome.evolution.eplugin.face-picture");
+	GSettings *settings = g_settings_new ("org.gnome.evolution.plugin.face-picture");
 	gboolean res;
 
 	res = g_settings_get_boolean (settings, SETTINGS_KEY);
@@ -53,7 +53,7 @@ get_include_face_by_default (void)
 static void
 set_include_face_by_default (gboolean value)
 {
-	GSettings *settings = g_settings_new ("org.gnome.evolution.eplugin.face-picture");
+	GSettings *settings = g_settings_new ("org.gnome.evolution.plugin.face-picture");
 
 	g_settings_set_boolean (settings, SETTINGS_KEY, value);
 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index ba649ea5e3..e4f32010bd 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2906,7 +2906,7 @@ format_itip (EPlugin *ep,
 
 	em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object);
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.itip");
+	settings = g_settings_new ("org.gnome.evolution.plugin.itip");
 	puri->delete_message = g_settings_get_boolean (settings, CONF_KEY_DELETE);
 	puri->has_organizer = FALSE;
 	puri->no_reply_wanted = FALSE;
@@ -2952,7 +2952,7 @@ delete_toggled_cb (GtkWidget *widget,
 	GSettings *settings;
 	gboolean active;
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.itip");
+	settings = g_settings_new ("org.gnome.evolution.plugin.itip");
 	active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
 	g_settings_set_boolean (settings, CONF_KEY_DELETE, active);
 	g_object_unref (settings);
@@ -3055,7 +3055,7 @@ itip_formatter_page_factory (EPlugin *ep,
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Delete message after acting */
-	settings = g_settings_new ("org.gnome.evolution.eplugin.itip");
+	settings = g_settings_new ("org.gnome.evolution.plugin.itip");
 
 	check = gtk_check_button_new_with_mnemonic (_("_Delete message after acting"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), g_settings_get_boolean (settings, CONF_KEY_DELETE));
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index f389a2e678..481cf24c97 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -85,7 +85,7 @@ is_part_enabled (const gchar *key)
 	gboolean res = TRUE;
 	GSettings *settings;
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification");
+	settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification");
 
 	res = g_settings_get_boolean (settings, key);
 
@@ -538,7 +538,7 @@ sound_file_set_cb (GtkFileChooser *file_chooser,
 	gchar *file;
 	GSettings *settings;
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification");
+	settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification");
 	file = gtk_file_chooser_get_filename (file_chooser);
 
 	g_settings_set_string (settings, CONF_KEY_SOUND_FILE, (file != NULL) ? file : "");
@@ -580,7 +580,7 @@ sound_notify_idle_cb (gpointer user_data)
 
 	g_return_val_if_fail (data != NULL, FALSE);
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification");
+	settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification");
 	file = g_settings_get_string (settings, CONF_KEY_SOUND_FILE);
 
 	do_play_sound (
@@ -663,7 +663,7 @@ get_config_widget_sound (void)
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification");
+	settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification");
 
 	g_settings_bind (settings, CONF_KEY_ENABLED_SOUND, G_OBJECT (widget), "active", G_SETTINGS_BIND_DEFAULT);
 
@@ -772,7 +772,7 @@ get_cfg_widget (void)
 	GSettings *settings;
 	const gchar *text;
 
-	settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification");
+	settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification");
 
 	widget = gtk_vbox_new (FALSE, 12);
 	gtk_widget_show (widget);
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index 907e562c29..c46e903ec0 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -367,7 +367,7 @@ e_plugin_lib_enable (EPlugin *ep,
 
 	if (enable) {
 
-		epp_settings = g_settings_new ("org.gnome.evolution.eplugin.prefer-plain");
+		epp_settings = g_settings_new ("org.gnome.evolution.plugin.prefer-plain");
 		key = g_settings_get_string (epp_settings, "mode");
 		if (key) {
 			for (i = 0; i < G_N_ELEMENTS (epp_options); i++) {
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 4010eb7d5a..593e5ec73d 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -449,7 +449,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove);
 	gtk_widget_set_can_default (clue_remove, TRUE);
 
-	ui->settings = g_settings_new ("org.gnome.evolution.eplugin.templates");
+	ui->settings = g_settings_new ("org.gnome.evolution.plugin.templates");
 
 	ui->treeview = clue_treeview;