Merge pull request #3 from haxar/master

gsd to msd complete rename patch by NiceandGently

10 files changed, 258 insertions, 258 deletions

diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index 8396513..78737a0 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 gtkbuilderdir = $(pkgdatadir)
 gtkbuilder_DATA = 			\
-	gsd-a11y-preferences-dialog.ui	\
+	msd-a11y-preferences-dialog.ui	\
 	$(NULL)
 
 noinst_PROGRAMS =				\
@@ -10,8 +10,8 @@ noinst_PROGRAMS =				\
 	$(NULL)
 
 test_a11y_preferences_dialog_SOURCES =		\
-	gsd-a11y-preferences-dialog.c		\
-	gsd-a11y-preferences-dialog.h		\
+	msd-a11y-preferences-dialog.c		\
+	msd-a11y-preferences-dialog.h		\
 	test-a11y-preferences-dialog.c		\
 	$(NULL)
 
@@ -36,12 +36,12 @@ plugin_LTLIBRARIES = \
 	$(NULL)
 
 liba11y_keyboard_la_SOURCES = 		\
-	gsd-a11y-keyboard-plugin.h	\
-	gsd-a11y-keyboard-plugin.c	\
-	gsd-a11y-keyboard-manager.h	\
-	gsd-a11y-keyboard-manager.c	\
-	gsd-a11y-preferences-dialog.h	\
-	gsd-a11y-preferences-dialog.c	\
+	msd-a11y-keyboard-plugin.h	\
+	msd-a11y-keyboard-plugin.c	\
+	msd-a11y-keyboard-manager.h	\
+	msd-a11y-keyboard-manager.c	\
+	msd-a11y-preferences-dialog.h	\
+	msd-a11y-preferences-dialog.c	\
 	$(NULL)
 
 liba11y_keyboard_la_CPPFLAGS = \
@@ -56,7 +56,7 @@ liba11y_keyboard_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 liba11y_keyboard_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)		\
+	$(MSD_PLUGIN_LDFLAGS)		\
 	$(NULL)
 
 liba11y_keyboard_la_LIBADD  = 		\
@@ -84,4 +84,4 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h
deleted file mode 100644
index 4fb817f..0000000
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007 William Jon McCann <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __GSD_A11Y_KEYBOARD_MANAGER_H
-#define __GSD_A11Y_KEYBOARD_MANAGER_H
-
-#include <glib-object.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GSD_TYPE_A11Y_KEYBOARD_MANAGER         (gsd_a11y_keyboard_manager_get_type ())
-#define GSD_A11Y_KEYBOARD_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_A11Y_KEYBOARD_MANAGER, GsdA11yKeyboardManager))
-#define GSD_A11Y_KEYBOARD_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_A11Y_KEYBOARD_MANAGER, GsdA11yKeyboardManagerClass))
-#define GSD_IS_A11Y_KEYBOARD_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_A11Y_KEYBOARD_MANAGER))
-#define GSD_IS_A11Y_KEYBOARD_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_A11Y_KEYBOARD_MANAGER))
-#define GSD_A11Y_KEYBOARD_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_A11Y_KEYBOARD_MANAGER, GsdA11yKeyboardManagerClass))
-
-typedef struct GsdA11yKeyboardManagerPrivate GsdA11yKeyboardManagerPrivate;
-
-typedef struct
-{
-        GObject                     parent;
-        GsdA11yKeyboardManagerPrivate *priv;
-} GsdA11yKeyboardManager;
-
-typedef struct
-{
-        GObjectClass   parent_class;
-} GsdA11yKeyboardManagerClass;
-
-GType                   gsd_a11y_keyboard_manager_get_type            (void);
-
-GsdA11yKeyboardManager *gsd_a11y_keyboard_manager_new                 (void);
-gboolean                gsd_a11y_keyboard_manager_start               (GsdA11yKeyboardManager *manager,
-                                                                       GError                **error);
-void                    gsd_a11y_keyboard_manager_stop                (GsdA11yKeyboardManager *manager);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GSD_A11Y_KEYBOARD_MANAGER_H */
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c
index 668fddc..7505b14 100644
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+++ b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c
@@ -51,15 +51,15 @@
 #endif /* HAVE_LIBMATENOTIFY */
 
 #include "mate-settings-profile.h"
-#include "gsd-a11y-keyboard-manager.h"
-#include "gsd-a11y-preferences-dialog.h"
+#include "msd-a11y-keyboard-manager.h"
+#include "msd-a11y-preferences-dialog.h"
 
 #define CONFIG_ROOT "/desktop/mate/accessibility/keyboard"
 #define NOTIFICATION_TIMEOUT 30
 
-#define GSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_A11Y_KEYBOARD_MANAGER, GsdA11yKeyboardManagerPrivate))
+#define MSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_A11Y_KEYBOARD_MANAGER, MsdA11yKeyboardManagerPrivate))
 
-struct GsdA11yKeyboardManagerPrivate
+struct MsdA11yKeyboardManagerPrivate
 {
         int        xkbEventBase;
         gboolean   stickykeys_shortcut_val;
@@ -77,14 +77,14 @@ struct GsdA11yKeyboardManagerPrivate
 #endif /* HAVE_LIBMATENOTIFY */
 };
 
-static void     gsd_a11y_keyboard_manager_class_init  (GsdA11yKeyboardManagerClass *klass);
-static void     gsd_a11y_keyboard_manager_init        (GsdA11yKeyboardManager      *a11y_keyboard_manager);
-static void     gsd_a11y_keyboard_manager_finalize    (GObject             *object);
-static void     gsd_a11y_keyboard_manager_ensure_status_icon (GsdA11yKeyboardManager *manager);
-static void     set_server_from_mateconf (GsdA11yKeyboardManager *manager,
+static void     msd_a11y_keyboard_manager_class_init  (MsdA11yKeyboardManagerClass *klass);
+static void     msd_a11y_keyboard_manager_init        (MsdA11yKeyboardManager      *a11y_keyboard_manager);
+static void     msd_a11y_keyboard_manager_finalize    (GObject             *object);
+static void     msd_a11y_keyboard_manager_ensure_status_icon (MsdA11yKeyboardManager *manager);
+static void     set_server_from_mateconf (MsdA11yKeyboardManager *manager,
 				       MateConfClient            *client);
 
-G_DEFINE_TYPE (GsdA11yKeyboardManager, gsd_a11y_keyboard_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdA11yKeyboardManager, msd_a11y_keyboard_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
 
@@ -133,7 +133,7 @@ supports_xinput_devices (void)
 }
 
 static void
-set_devicepresence_handler (GsdA11yKeyboardManager *manager)
+set_devicepresence_handler (MsdA11yKeyboardManager *manager)
 {
         Display *display;
         XEventClass class_presence;
@@ -161,7 +161,7 @@ set_devicepresence_handler (GsdA11yKeyboardManager *manager)
 #endif
 
 static gboolean
-xkb_enabled (GsdA11yKeyboardManager *manager)
+xkb_enabled (MsdA11yKeyboardManager *manager)
 {
         gboolean have_xkb;
         int opcode, errorBase, major, minor;
@@ -178,7 +178,7 @@ xkb_enabled (GsdA11yKeyboardManager *manager)
 }
 
 static XkbDescRec *
-get_xkb_desc_rec (GsdA11yKeyboardManager *manager)
+get_xkb_desc_rec (MsdA11yKeyboardManager *manager)
 {
         XkbDescRec *desc;
         Status      status = Success;
@@ -265,7 +265,7 @@ set_ctrl_from_mateconf (XkbDescRec   *desc,
 }
 
 static void
-set_server_from_mateconf (GsdA11yKeyboardManager *manager,
+set_server_from_mateconf (MsdA11yKeyboardManager *manager,
                        MateConfClient            *client)
 {
         XkbDescRec      *desc;
@@ -404,7 +404,7 @@ set_server_from_mateconf (GsdA11yKeyboardManager *manager,
 }
 
 static gboolean
-ax_response_callback (GsdA11yKeyboardManager *manager,
+ax_response_callback (MsdA11yKeyboardManager *manager,
                       GtkWindow              *parent,
                       gint                    response_id,
                       guint                   revert_controls_mask,
@@ -475,7 +475,7 @@ ax_response_callback (GsdA11yKeyboardManager *manager,
 static void
 ax_stickykeys_response (GtkDialog              *dialog,
                         gint                    response_id,
-                        GsdA11yKeyboardManager *manager)
+                        MsdA11yKeyboardManager *manager)
 {
         if (ax_response_callback (manager, GTK_WINDOW (dialog),
                                   response_id, XkbStickyKeysMask,
@@ -487,7 +487,7 @@ ax_stickykeys_response (GtkDialog              *dialog,
 static void
 ax_slowkeys_response (GtkDialog              *dialog,
                       gint                    response_id,
-                      GsdA11yKeyboardManager *manager)
+                      MsdA11yKeyboardManager *manager)
 {
         if (ax_response_callback (manager, GTK_WINDOW (dialog),
                                   response_id, XkbSlowKeysMask,
@@ -497,7 +497,7 @@ ax_slowkeys_response (GtkDialog              *dialog,
 }
 
 static void
-maybe_show_status_icon (GsdA11yKeyboardManager *manager)
+maybe_show_status_icon (MsdA11yKeyboardManager *manager)
 {
         gboolean     show;
         MateConfClient *client;
@@ -510,14 +510,14 @@ maybe_show_status_icon (GsdA11yKeyboardManager *manager)
         if (!show && manager->priv->status_icon == NULL)
                 return;
 
-        gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+        msd_a11y_keyboard_manager_ensure_status_icon (manager);
         gtk_status_icon_set_visible (manager->priv->status_icon, show);
 }
 
 #ifdef HAVE_LIBMATENOTIFY
 static void
 on_notification_closed (NotifyNotification     *notification,
-                        GsdA11yKeyboardManager *manager)
+                        MsdA11yKeyboardManager *manager)
 {
         g_object_unref (manager->priv->notification);
         manager->priv->notification = NULL;
@@ -526,7 +526,7 @@ on_notification_closed (NotifyNotification     *notification,
 static void
 on_slow_keys_action (NotifyNotification     *notification,
                      const char             *action,
-                     GsdA11yKeyboardManager *manager)
+                     MsdA11yKeyboardManager *manager)
 {
         gboolean res;
         int      response_id;
@@ -552,7 +552,7 @@ on_slow_keys_action (NotifyNotification     *notification,
 static void
 on_sticky_keys_action (NotifyNotification     *notification,
                        const char             *action,
-                       GsdA11yKeyboardManager *manager)
+                       MsdA11yKeyboardManager *manager)
 {
         gboolean res;
         int      response_id;
@@ -578,7 +578,7 @@ on_sticky_keys_action (NotifyNotification     *notification,
 #endif /* HAVE_LIBMATENOTIFY */
 
 static gboolean
-ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
+ax_slowkeys_warning_post_bubble (MsdA11yKeyboardManager *manager,
                                  gboolean                enabled)
 {
 #ifdef HAVE_LIBMATENOTIFY
@@ -605,7 +605,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
                 notify_notification_close (manager->priv->notification, NULL);
         }
 
-        gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+        msd_a11y_keyboard_manager_ensure_status_icon (manager);
         manager->priv->notification = notify_notification_new (title,
                                                                message,
                                                                "preferences-desktop-accessibility",
@@ -634,7 +634,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
         error = NULL;
         res = notify_notification_show (manager->priv->notification, &error);
         if (! res) {
-                g_warning ("GsdA11yKeyboardManager: unable to show notification: %s", error->message);
+                g_warning ("MsdA11yKeyboardManager: unable to show notification: %s", error->message);
                 g_error_free (error);
                 notify_notification_close (manager->priv->notification, NULL);
         }
@@ -647,7 +647,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
 
 
 static void
-ax_slowkeys_warning_post_dialog (GsdA11yKeyboardManager *manager,
+ax_slowkeys_warning_post_dialog (MsdA11yKeyboardManager *manager,
                                  gboolean                enabled)
 {
         const char *title;
@@ -701,7 +701,7 @@ ax_slowkeys_warning_post_dialog (GsdA11yKeyboardManager *manager,
 }
 
 static void
-ax_slowkeys_warning_post (GsdA11yKeyboardManager *manager,
+ax_slowkeys_warning_post (MsdA11yKeyboardManager *manager,
                           gboolean                enabled)
 {
 
@@ -714,7 +714,7 @@ ax_slowkeys_warning_post (GsdA11yKeyboardManager *manager,
 }
 
 static gboolean
-ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
+ax_stickykeys_warning_post_bubble (MsdA11yKeyboardManager *manager,
                                    gboolean                enabled)
 {
 #ifdef HAVE_LIBMATENOTIFY
@@ -744,7 +744,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
                 notify_notification_close (manager->priv->notification, NULL);
         }
 
-        gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+        msd_a11y_keyboard_manager_ensure_status_icon (manager);
         manager->priv->notification = notify_notification_new (title,
                                                                message,
                                                                "preferences-desktop-accessibility",
@@ -773,7 +773,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
         error = NULL;
         res = notify_notification_show (manager->priv->notification, &error);
         if (! res) {
-                g_warning ("GsdA11yKeyboardManager: unable to show notification: %s", error->message);
+                g_warning ("MsdA11yKeyboardManager: unable to show notification: %s", error->message);
                 g_error_free (error);
                 notify_notification_close (manager->priv->notification, NULL);
         }
@@ -785,7 +785,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
 }
 
 static void
-ax_stickykeys_warning_post_dialog (GsdA11yKeyboardManager *manager,
+ax_stickykeys_warning_post_dialog (MsdA11yKeyboardManager *manager,
                                    gboolean                enabled)
 {
         const char *title;
@@ -842,7 +842,7 @@ ax_stickykeys_warning_post_dialog (GsdA11yKeyboardManager *manager,
 }
 
 static void
-ax_stickykeys_warning_post (GsdA11yKeyboardManager *manager,
+ax_stickykeys_warning_post (MsdA11yKeyboardManager *manager,
                             gboolean                enabled)
 {
 
@@ -855,7 +855,7 @@ ax_stickykeys_warning_post (GsdA11yKeyboardManager *manager,
 }
 
 static void
-set_mateconf_from_server (GsdA11yKeyboardManager *manager)
+set_mateconf_from_server (MsdA11yKeyboardManager *manager)
 {
         MateConfClient    *client;
         MateConfChangeSet *cs;
@@ -1003,7 +1003,7 @@ set_mateconf_from_server (GsdA11yKeyboardManager *manager)
 static GdkFilterReturn
 cb_xkb_event_filter (GdkXEvent              *xevent,
                      GdkEvent               *ignored1,
-                     GsdA11yKeyboardManager *manager)
+                     MsdA11yKeyboardManager *manager)
 {
         XEvent   *xev   = (XEvent *) xevent;
         XkbEvent *xkbEv = (XkbEvent *) xevent;
@@ -1031,14 +1031,14 @@ static void
 keyboard_callback (MateConfClient            *client,
                    guint                   cnxn_id,
                    MateConfEntry             *entry,
-                   GsdA11yKeyboardManager *manager)
+                   MsdA11yKeyboardManager *manager)
 {
         set_server_from_mateconf (manager, client);
         maybe_show_status_icon (manager);
 }
 
 static void
-register_config_callback (GsdA11yKeyboardManager  *manager,
+register_config_callback (MsdA11yKeyboardManager  *manager,
                           MateConfClient             *client,
                           const char              *path,
                           MateConfClientNotifyFunc    func,
@@ -1049,7 +1049,7 @@ register_config_callback (GsdA11yKeyboardManager  *manager,
 }
 
 static gboolean
-start_a11y_keyboard_idle_cb (GsdA11yKeyboardManager *manager)
+start_a11y_keyboard_idle_cb (MsdA11yKeyboardManager *manager)
 {
         guint        event_mask;
         MateConfClient *client;
@@ -1104,7 +1104,7 @@ start_a11y_keyboard_idle_cb (GsdA11yKeyboardManager *manager)
 
 
 gboolean
-gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager,
+msd_a11y_keyboard_manager_start (MsdA11yKeyboardManager *manager,
                                  GError                **error)
 {
         mate_settings_profile_start (NULL);
@@ -1117,7 +1117,7 @@ gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager,
 }
 
 static void
-restore_server_xkb_config (GsdA11yKeyboardManager *manager)
+restore_server_xkb_config (MsdA11yKeyboardManager *manager)
 {
         gdk_error_trap_push ();
         XkbSetControls (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
@@ -1142,9 +1142,9 @@ restore_server_xkb_config (GsdA11yKeyboardManager *manager)
 }
 
 void
-gsd_a11y_keyboard_manager_stop (GsdA11yKeyboardManager *manager)
+msd_a11y_keyboard_manager_stop (MsdA11yKeyboardManager *manager)
 {
-        GsdA11yKeyboardManagerPrivate *p = manager->priv;
+        MsdA11yKeyboardManagerPrivate *p = manager->priv;
 
         g_debug ("Stopping a11y_keyboard manager");
 
@@ -1182,14 +1182,14 @@ gsd_a11y_keyboard_manager_stop (GsdA11yKeyboardManager *manager)
 }
 
 static void
-gsd_a11y_keyboard_manager_set_property (GObject        *object,
+msd_a11y_keyboard_manager_set_property (GObject        *object,
                                         guint           prop_id,
                                         const GValue   *value,
                                         GParamSpec     *pspec)
 {
-        GsdA11yKeyboardManager *self;
+        MsdA11yKeyboardManager *self;
 
-        self = GSD_A11Y_KEYBOARD_MANAGER (object);
+        self = MSD_A11Y_KEYBOARD_MANAGER (object);
 
         switch (prop_id) {
         default:
@@ -1199,14 +1199,14 @@ gsd_a11y_keyboard_manager_set_property (GObject        *object,
 }
 
 static void
-gsd_a11y_keyboard_manager_get_property (GObject        *object,
+msd_a11y_keyboard_manager_get_property (GObject        *object,
                                         guint           prop_id,
                                         GValue         *value,
                                         GParamSpec     *pspec)
 {
-        GsdA11yKeyboardManager *self;
+        MsdA11yKeyboardManager *self;
 
-        self = GSD_A11Y_KEYBOARD_MANAGER (object);
+        self = MSD_A11Y_KEYBOARD_MANAGER (object);
 
         switch (prop_id) {
         default:
@@ -1216,16 +1216,16 @@ gsd_a11y_keyboard_manager_get_property (GObject        *object,
 }
 
 static GObject *
-gsd_a11y_keyboard_manager_constructor (GType                  type,
+msd_a11y_keyboard_manager_constructor (GType                  type,
                                        guint                  n_construct_properties,
                                        GObjectConstructParam *construct_properties)
 {
-        GsdA11yKeyboardManager      *a11y_keyboard_manager;
-        GsdA11yKeyboardManagerClass *klass;
+        MsdA11yKeyboardManager      *a11y_keyboard_manager;
+        MsdA11yKeyboardManagerClass *klass;
 
-        klass = GSD_A11Y_KEYBOARD_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_A11Y_KEYBOARD_MANAGER));
+        klass = MSD_A11Y_KEYBOARD_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_A11Y_KEYBOARD_MANAGER));
 
-        a11y_keyboard_manager = GSD_A11Y_KEYBOARD_MANAGER (G_OBJECT_CLASS (gsd_a11y_keyboard_manager_parent_class)->constructor (type,
+        a11y_keyboard_manager = MSD_A11Y_KEYBOARD_MANAGER (G_OBJECT_CLASS (msd_a11y_keyboard_manager_parent_class)->constructor (type,
                                                                                                       n_construct_properties,
                                                                                                       construct_properties));
 
@@ -1233,33 +1233,33 @@ gsd_a11y_keyboard_manager_constructor (GType                  type,
 }
 
 static void
-gsd_a11y_keyboard_manager_dispose (GObject *object)
+msd_a11y_keyboard_manager_dispose (GObject *object)
 {
-        GsdA11yKeyboardManager *a11y_keyboard_manager;
+        MsdA11yKeyboardManager *a11y_keyboard_manager;
 
-        a11y_keyboard_manager = GSD_A11Y_KEYBOARD_MANAGER (object);
+        a11y_keyboard_manager = MSD_A11Y_KEYBOARD_MANAGER (object);
 
-        G_OBJECT_CLASS (gsd_a11y_keyboard_manager_parent_class)->dispose (object);
+        G_OBJECT_CLASS (msd_a11y_keyboard_manager_parent_class)->dispose (object);
 }
 
 static void
-gsd_a11y_keyboard_manager_class_init (GsdA11yKeyboardManagerClass *klass)
+msd_a11y_keyboard_manager_class_init (MsdA11yKeyboardManagerClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->get_property = gsd_a11y_keyboard_manager_get_property;
-        object_class->set_property = gsd_a11y_keyboard_manager_set_property;
-        object_class->constructor = gsd_a11y_keyboard_manager_constructor;
-        object_class->dispose = gsd_a11y_keyboard_manager_dispose;
-        object_class->finalize = gsd_a11y_keyboard_manager_finalize;
+        object_class->get_property = msd_a11y_keyboard_manager_get_property;
+        object_class->set_property = msd_a11y_keyboard_manager_set_property;
+        object_class->constructor = msd_a11y_keyboard_manager_constructor;
+        object_class->dispose = msd_a11y_keyboard_manager_dispose;
+        object_class->finalize = msd_a11y_keyboard_manager_finalize;
 
-        g_type_class_add_private (klass, sizeof (GsdA11yKeyboardManagerPrivate));
+        g_type_class_add_private (klass, sizeof (MsdA11yKeyboardManagerPrivate));
 }
 
 static void
 on_preferences_dialog_response (GtkDialog              *dialog,
                                 int                     response,
-                                GsdA11yKeyboardManager *manager)
+                                MsdA11yKeyboardManager *manager)
 {
         g_signal_handlers_disconnect_by_func (dialog,
                                               on_preferences_dialog_response,
@@ -1271,10 +1271,10 @@ on_preferences_dialog_response (GtkDialog              *dialog,
 
 static void
 on_status_icon_activate (GtkStatusIcon          *status_icon,
-                         GsdA11yKeyboardManager *manager)
+                         MsdA11yKeyboardManager *manager)
 {
         if (manager->priv->preferences_dialog == NULL) {
-                manager->priv->preferences_dialog = gsd_a11y_preferences_dialog_new ();
+                manager->priv->preferences_dialog = msd_a11y_preferences_dialog_new ();
                 g_signal_connect (manager->priv->preferences_dialog,
                                   "response",
                                   G_CALLBACK (on_preferences_dialog_response),
@@ -1291,7 +1291,7 @@ on_status_icon_activate (GtkStatusIcon          *status_icon,
 }
 
 static void
-gsd_a11y_keyboard_manager_ensure_status_icon (GsdA11yKeyboardManager *manager)
+msd_a11y_keyboard_manager_ensure_status_icon (MsdA11yKeyboardManager *manager)
 {
         mate_settings_profile_start (NULL);
 
@@ -1308,9 +1308,9 @@ gsd_a11y_keyboard_manager_ensure_status_icon (GsdA11yKeyboardManager *manager)
 }
 
 static void
-gsd_a11y_keyboard_manager_init (GsdA11yKeyboardManager *manager)
+msd_a11y_keyboard_manager_init (MsdA11yKeyboardManager *manager)
 {
-        manager->priv = GSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE (manager);
+        manager->priv = MSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE (manager);
 
 #ifdef HAVE_LIBMATENOTIFY
         notify_init ("mate-settings-daemon");
@@ -1318,30 +1318,30 @@ gsd_a11y_keyboard_manager_init (GsdA11yKeyboardManager *manager)
 }
 
 static void
-gsd_a11y_keyboard_manager_finalize (GObject *object)
+msd_a11y_keyboard_manager_finalize (GObject *object)
 {
-        GsdA11yKeyboardManager *a11y_keyboard_manager;
+        MsdA11yKeyboardManager *a11y_keyboard_manager;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_A11Y_KEYBOARD_MANAGER (object));
+        g_return_if_fail (MSD_IS_A11Y_KEYBOARD_MANAGER (object));
 
-        a11y_keyboard_manager = GSD_A11Y_KEYBOARD_MANAGER (object);
+        a11y_keyboard_manager = MSD_A11Y_KEYBOARD_MANAGER (object);
 
         g_return_if_fail (a11y_keyboard_manager->priv != NULL);
 
-        G_OBJECT_CLASS (gsd_a11y_keyboard_manager_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_a11y_keyboard_manager_parent_class)->finalize (object);
 }
 
-GsdA11yKeyboardManager *
-gsd_a11y_keyboard_manager_new (void)
+MsdA11yKeyboardManager *
+msd_a11y_keyboard_manager_new (void)
 {
         if (manager_object != NULL) {
                 g_object_ref (manager_object);
         } else {
-                manager_object = g_object_new (GSD_TYPE_A11Y_KEYBOARD_MANAGER, NULL);
+                manager_object = g_object_new (MSD_TYPE_A11Y_KEYBOARD_MANAGER, NULL);
                 g_object_add_weak_pointer (manager_object,
                                            (gpointer *) &manager_object);
         }
 
-        return GSD_A11Y_KEYBOARD_MANAGER (manager_object);
+        return MSD_A11Y_KEYBOARD_MANAGER (manager_object);
 }
diff --git a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.h b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.h
new file mode 100644
index 0000000..1869cf4
--- /dev/null
+++ b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __MSD_A11Y_KEYBOARD_MANAGER_H
+#define __MSD_A11Y_KEYBOARD_MANAGER_H
+
+#include <glib-object.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MSD_TYPE_A11Y_KEYBOARD_MANAGER         (msd_a11y_keyboard_manager_get_type ())
+#define MSD_A11Y_KEYBOARD_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_A11Y_KEYBOARD_MANAGER, MsdA11yKeyboardManager))
+#define MSD_A11Y_KEYBOARD_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_A11Y_KEYBOARD_MANAGER, MsdA11yKeyboardManagerClass))
+#define MSD_IS_A11Y_KEYBOARD_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_A11Y_KEYBOARD_MANAGER))
+#define MSD_IS_A11Y_KEYBOARD_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_A11Y_KEYBOARD_MANAGER))
+#define MSD_A11Y_KEYBOARD_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_A11Y_KEYBOARD_MANAGER, MsdA11yKeyboardManagerClass))
+
+typedef struct MsdA11yKeyboardManagerPrivate MsdA11yKeyboardManagerPrivate;
+
+typedef struct
+{
+        GObject                     parent;
+        MsdA11yKeyboardManagerPrivate *priv;
+} MsdA11yKeyboardManager;
+
+typedef struct
+{
+        GObjectClass   parent_class;
+} MsdA11yKeyboardManagerClass;
+
+GType                   msd_a11y_keyboard_manager_get_type            (void);
+
+MsdA11yKeyboardManager *msd_a11y_keyboard_manager_new                 (void);
+gboolean                msd_a11y_keyboard_manager_start               (MsdA11yKeyboardManager *manager,
+                                                                       GError                **error);
+void                    msd_a11y_keyboard_manager_stop                (MsdA11yKeyboardManager *manager);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MSD_A11Y_KEYBOARD_MANAGER_H */
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-plugin.c b/plugins/a11y-keyboard/msd-a11y-keyboard-plugin.c
index 7846ba6..7eed1c4 100644
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-plugin.c
+++ b/plugins/a11y-keyboard/msd-a11y-keyboard-plugin.c
@@ -24,38 +24,38 @@
 #include <gmodule.h>
 
 #include "mate-settings-plugin.h"
-#include "gsd-a11y-keyboard-plugin.h"
-#include "gsd-a11y-keyboard-manager.h"
+#include "msd-a11y-keyboard-plugin.h"
+#include "msd-a11y-keyboard-manager.h"
 
-struct GsdA11yKeyboardPluginPrivate {
-        GsdA11yKeyboardManager *manager;
+struct MsdA11yKeyboardPluginPrivate {
+        MsdA11yKeyboardManager *manager;
 };
 
-#define GSD_A11Y_KEYBOARD_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_A11Y_KEYBOARD_PLUGIN, GsdA11yKeyboardPluginPrivate))
+#define MSD_A11Y_KEYBOARD_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_A11Y_KEYBOARD_PLUGIN, MsdA11yKeyboardPluginPrivate))
 
-MATE_SETTINGS_PLUGIN_REGISTER (GsdA11yKeyboardPlugin, gsd_a11y_keyboard_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdA11yKeyboardPlugin, msd_a11y_keyboard_plugin)
 
 static void
-gsd_a11y_keyboard_plugin_init (GsdA11yKeyboardPlugin *plugin)
+msd_a11y_keyboard_plugin_init (MsdA11yKeyboardPlugin *plugin)
 {
-        plugin->priv = GSD_A11Y_KEYBOARD_PLUGIN_GET_PRIVATE (plugin);
+        plugin->priv = MSD_A11Y_KEYBOARD_PLUGIN_GET_PRIVATE (plugin);
 
-        g_debug ("GsdA11yKeyboardPlugin initializing");
+        g_debug ("MsdA11yKeyboardPlugin initializing");
 
-        plugin->priv->manager = gsd_a11y_keyboard_manager_new ();
+        plugin->priv->manager = msd_a11y_keyboard_manager_new ();
 }
 
 static void
-gsd_a11y_keyboard_plugin_finalize (GObject *object)
+msd_a11y_keyboard_plugin_finalize (GObject *object)
 {
-        GsdA11yKeyboardPlugin *plugin;
+        MsdA11yKeyboardPlugin *plugin;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_A11Y_KEYBOARD_PLUGIN (object));
+        g_return_if_fail (MSD_IS_A11Y_KEYBOARD_PLUGIN (object));
 
-        g_debug ("GsdA11yKeyboardPlugin finalizing");
+        g_debug ("MsdA11yKeyboardPlugin finalizing");
 
-        plugin = GSD_A11Y_KEYBOARD_PLUGIN (object);
+        plugin = MSD_A11Y_KEYBOARD_PLUGIN (object);
 
         g_return_if_fail (plugin->priv != NULL);
 
@@ -63,7 +63,7 @@ gsd_a11y_keyboard_plugin_finalize (GObject *object)
                 g_object_unref (plugin->priv->manager);
         }
 
-        G_OBJECT_CLASS (gsd_a11y_keyboard_plugin_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_a11y_keyboard_plugin_parent_class)->finalize (object);
 }
 
 static void
@@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)
         g_debug ("Activating a11y_keyboard plugin");
 
         error = NULL;
-        res = gsd_a11y_keyboard_manager_start (GSD_A11Y_KEYBOARD_PLUGIN (plugin)->priv->manager, &error);
+        res = msd_a11y_keyboard_manager_start (MSD_A11Y_KEYBOARD_PLUGIN (plugin)->priv->manager, &error);
         if (! res) {
                 g_warning ("Unable to start a11y_keyboard manager: %s", error->message);
                 g_error_free (error);
@@ -86,19 +86,19 @@ static void
 impl_deactivate (MateSettingsPlugin *plugin)
 {
         g_debug ("Deactivating a11y_keyboard plugin");
-        gsd_a11y_keyboard_manager_stop (GSD_A11Y_KEYBOARD_PLUGIN (plugin)->priv->manager);
+        msd_a11y_keyboard_manager_stop (MSD_A11Y_KEYBOARD_PLUGIN (plugin)->priv->manager);
 }
 
 static void
-gsd_a11y_keyboard_plugin_class_init (GsdA11yKeyboardPluginClass *klass)
+msd_a11y_keyboard_plugin_class_init (MsdA11yKeyboardPluginClass *klass)
 {
         GObjectClass           *object_class = G_OBJECT_CLASS (klass);
         MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
 
-        object_class->finalize = gsd_a11y_keyboard_plugin_finalize;
+        object_class->finalize = msd_a11y_keyboard_plugin_finalize;
 
         plugin_class->activate = impl_activate;
         plugin_class->deactivate = impl_deactivate;
 
-        g_type_class_add_private (klass, sizeof (GsdA11yKeyboardPluginPrivate));
+        g_type_class_add_private (klass, sizeof (MsdA11yKeyboardPluginPrivate));
 }
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-plugin.h b/plugins/a11y-keyboard/msd-a11y-keyboard-plugin.h
index ebf246c..f4b8320 100644
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-plugin.h
+++ b/plugins/a11y-keyboard/msd-a11y-keyboard-plugin.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_A11Y_KEYBOARD_PLUGIN_H__
-#define __GSD_A11Y_KEYBOARD_PLUGIN_H__
+#ifndef __MSD_A11Y_KEYBOARD_PLUGIN_H__
+#define __MSD_A11Y_KEYBOARD_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -31,27 +31,27 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_A11Y_KEYBOARD_PLUGIN                (gsd_a11y_keyboard_plugin_get_type ())
-#define GSD_A11Y_KEYBOARD_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_A11Y_KEYBOARD_PLUGIN, GsdA11yKeyboardPlugin))
-#define GSD_A11Y_KEYBOARD_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_A11Y_KEYBOARD_PLUGIN, GsdA11yKeyboardPluginClass))
-#define GSD_IS_A11Y_KEYBOARD_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_A11Y_KEYBOARD_PLUGIN))
-#define GSD_IS_A11Y_KEYBOARD_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_A11Y_KEYBOARD_PLUGIN))
-#define GSD_A11Y_KEYBOARD_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_A11Y_KEYBOARD_PLUGIN, GsdA11yKeyboardPluginClass))
+#define MSD_TYPE_A11Y_KEYBOARD_PLUGIN                (msd_a11y_keyboard_plugin_get_type ())
+#define MSD_A11Y_KEYBOARD_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_A11Y_KEYBOARD_PLUGIN, MsdA11yKeyboardPlugin))
+#define MSD_A11Y_KEYBOARD_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_A11Y_KEYBOARD_PLUGIN, MsdA11yKeyboardPluginClass))
+#define MSD_IS_A11Y_KEYBOARD_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_A11Y_KEYBOARD_PLUGIN))
+#define MSD_IS_A11Y_KEYBOARD_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_A11Y_KEYBOARD_PLUGIN))
+#define MSD_A11Y_KEYBOARD_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_A11Y_KEYBOARD_PLUGIN, MsdA11yKeyboardPluginClass))
 
-typedef struct GsdA11yKeyboardPluginPrivate GsdA11yKeyboardPluginPrivate;
+typedef struct MsdA11yKeyboardPluginPrivate MsdA11yKeyboardPluginPrivate;
 
 typedef struct
 {
         MateSettingsPlugin    parent;
-        GsdA11yKeyboardPluginPrivate *priv;
-} GsdA11yKeyboardPlugin;
+        MsdA11yKeyboardPluginPrivate *priv;
+} MsdA11yKeyboardPlugin;
 
 typedef struct
 {
         MateSettingsPluginClass parent_class;
-} GsdA11yKeyboardPluginClass;
+} MsdA11yKeyboardPluginClass;
 
-GType   gsd_a11y_keyboard_plugin_get_type            (void) G_GNUC_CONST;
+GType   msd_a11y_keyboard_plugin_get_type            (void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
 G_MODULE_EXPORT GType register_mate_settings_plugin (GTypeModule *module);
@@ -60,4 +60,4 @@ G_MODULE_EXPORT GType register_mate_settings_plugin (GTypeModule *module);
 }
 #endif
 
-#endif /* __GSD_A11Y_KEYBOARD_PLUGIN_H__ */
+#endif /* __MSD_A11Y_KEYBOARD_PLUGIN_H__ */
diff --git a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
index 752ee18..a5db11c 100644
--- a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c
+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
@@ -34,16 +34,16 @@
 
 #include <mateconf/mateconf-client.h>
 
-#include "gsd-a11y-preferences-dialog.h"
+#include "msd-a11y-preferences-dialog.h"
 
 #define SM_DBUS_NAME      "org.mate.SessionManager"
 #define SM_DBUS_PATH      "/org/mate/SessionManager"
 #define SM_DBUS_INTERFACE "org.mate.SessionManager"
 
 
-#define GSD_A11Y_PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_A11Y_PREFERENCES_DIALOG, GsdA11yPreferencesDialogPrivate))
+#define MSD_A11Y_PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_A11Y_PREFERENCES_DIALOG, MsdA11yPreferencesDialogPrivate))
 
-#define GTKBUILDER_UI_FILE "gsd-a11y-preferences-dialog.ui"
+#define GTKBUILDER_UI_FILE "msd-a11y-preferences-dialog.ui"
 
 #define KEY_A11Y_DIR              "/desktop/mate/accessibility"
 #define KEY_STICKY_KEYS_ENABLED   KEY_A11Y_DIR "/keyboard/stickykeys_enable"
@@ -83,7 +83,7 @@
 
 #define HIGH_CONTRAST_THEME    "HighContrast"
 
-struct GsdA11yPreferencesDialogPrivate
+struct MsdA11yPreferencesDialogPrivate
 {
         GtkWidget *sticky_keys_checkbutton;
         GtkWidget *slow_keys_checkbutton;
@@ -97,21 +97,21 @@ struct GsdA11yPreferencesDialogPrivate
         GtkWidget *screen_magnifier_checkbutton;
 
         guint      a11y_dir_cnxn;
-        guint      gsd_a11y_dir_cnxn;
+        guint      msd_a11y_dir_cnxn;
 };
 
 enum {
         PROP_0,
 };
 
-static void     gsd_a11y_preferences_dialog_class_init  (GsdA11yPreferencesDialogClass *klass);
-static void     gsd_a11y_preferences_dialog_init        (GsdA11yPreferencesDialog      *a11y_preferences_dialog);
-static void     gsd_a11y_preferences_dialog_finalize    (GObject                       *object);
+static void     msd_a11y_preferences_dialog_class_init  (MsdA11yPreferencesDialogClass *klass);
+static void     msd_a11y_preferences_dialog_init        (MsdA11yPreferencesDialog      *a11y_preferences_dialog);
+static void     msd_a11y_preferences_dialog_finalize    (GObject                       *object);
 
-G_DEFINE_TYPE (GsdA11yPreferencesDialog, gsd_a11y_preferences_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (MsdA11yPreferencesDialog, msd_a11y_preferences_dialog, GTK_TYPE_DIALOG)
 
 static void
-gsd_a11y_preferences_dialog_set_property (GObject        *object,
+msd_a11y_preferences_dialog_set_property (GObject        *object,
                                           guint           prop_id,
                                           const GValue   *value,
                                           GParamSpec     *pspec)
@@ -124,7 +124,7 @@ gsd_a11y_preferences_dialog_set_property (GObject        *object,
 }
 
 static void
-gsd_a11y_preferences_dialog_get_property (GObject        *object,
+msd_a11y_preferences_dialog_get_property (GObject        *object,
                                           guint           prop_id,
                                           GValue         *value,
                                           GParamSpec     *pspec)
@@ -137,13 +137,13 @@ gsd_a11y_preferences_dialog_get_property (GObject        *object,
 }
 
 static GObject *
-gsd_a11y_preferences_dialog_constructor (GType                  type,
+msd_a11y_preferences_dialog_constructor (GType                  type,
                                          guint                  n_construct_properties,
                                          GObjectConstructParam *construct_properties)
 {
-        GsdA11yPreferencesDialog      *a11y_preferences_dialog;
+        MsdA11yPreferencesDialog      *a11y_preferences_dialog;
 
-        a11y_preferences_dialog = GSD_A11Y_PREFERENCES_DIALOG (G_OBJECT_CLASS (gsd_a11y_preferences_dialog_parent_class)->constructor (type,
+        a11y_preferences_dialog = MSD_A11Y_PREFERENCES_DIALOG (G_OBJECT_CLASS (msd_a11y_preferences_dialog_parent_class)->constructor (type,
                                                                                                                                        n_construct_properties,
                                                                                                                                        construct_properties));
 
@@ -151,27 +151,27 @@ gsd_a11y_preferences_dialog_constructor (GType                  type,
 }
 
 static void
-gsd_a11y_preferences_dialog_dispose (GObject *object)
+msd_a11y_preferences_dialog_dispose (GObject *object)
 {
-        G_OBJECT_CLASS (gsd_a11y_preferences_dialog_parent_class)->dispose (object);
+        G_OBJECT_CLASS (msd_a11y_preferences_dialog_parent_class)->dispose (object);
 }
 
 static void
-gsd_a11y_preferences_dialog_class_init (GsdA11yPreferencesDialogClass *klass)
+msd_a11y_preferences_dialog_class_init (MsdA11yPreferencesDialogClass *klass)
 {
         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->get_property = gsd_a11y_preferences_dialog_get_property;
-        object_class->set_property = gsd_a11y_preferences_dialog_set_property;
-        object_class->constructor = gsd_a11y_preferences_dialog_constructor;
-        object_class->dispose = gsd_a11y_preferences_dialog_dispose;
-        object_class->finalize = gsd_a11y_preferences_dialog_finalize;
+        object_class->get_property = msd_a11y_preferences_dialog_get_property;
+        object_class->set_property = msd_a11y_preferences_dialog_set_property;
+        object_class->constructor = msd_a11y_preferences_dialog_constructor;
+        object_class->dispose = msd_a11y_preferences_dialog_dispose;
+        object_class->finalize = msd_a11y_preferences_dialog_finalize;
 
-        g_type_class_add_private (klass, sizeof (GsdA11yPreferencesDialogPrivate));
+        g_type_class_add_private (klass, sizeof (MsdA11yPreferencesDialogPrivate));
 }
 
 static void
-on_response (GsdA11yPreferencesDialog *dialog,
+on_response (MsdA11yPreferencesDialog *dialog,
              gint                      response_id)
 {
         switch (response_id) {
@@ -293,7 +293,7 @@ config_get_large_print (gboolean *is_writable)
 
         g_object_unref (client);
 
-        g_debug ("GsdA11yPreferences: got x-dpi=%f user-dpi=%f", x_dpi, u_dpi);
+        g_debug ("MsdA11yPreferences: got x-dpi=%f user-dpi=%f", x_dpi, u_dpi);
 
         ret = (((double)DPI_FACTOR_LARGE * x_dpi) < u_dpi);
 
@@ -314,7 +314,7 @@ config_set_large_print (gboolean enabled)
                 x_dpi = get_dpi_from_x_server ();
                 u_dpi = (double)DPI_FACTOR_LARGER * x_dpi;
 
-                g_debug ("GsdA11yPreferences: setting x-dpi=%f user-dpi=%f", x_dpi, u_dpi);
+                g_debug ("MsdA11yPreferences: setting x-dpi=%f user-dpi=%f", x_dpi, u_dpi);
 
                 mateconf_client_set_float (client, KEY_FONT_DPI, u_dpi, NULL);
         } else {
@@ -501,62 +501,62 @@ config_set_at_screen_magnifier (gboolean enabled)
 
 static void
 on_sticky_keys_checkbutton_toggled (GtkToggleButton          *button,
-                                    GsdA11yPreferencesDialog *dialog)
+                                    MsdA11yPreferencesDialog *dialog)
 {
         config_set_sticky_keys (gtk_toggle_button_get_active (button));
 }
 
 static void
 on_bounce_keys_checkbutton_toggled (GtkToggleButton          *button,
-                                 GsdA11yPreferencesDialog *dialog)
+                                 MsdA11yPreferencesDialog *dialog)
 {
         config_set_bounce_keys (gtk_toggle_button_get_active (button));
 }
 
 static void
 on_slow_keys_checkbutton_toggled (GtkToggleButton          *button,
-                                  GsdA11yPreferencesDialog *dialog)
+                                  MsdA11yPreferencesDialog *dialog)
 {
         config_set_slow_keys (gtk_toggle_button_get_active (button));
 }
 
 static void
 on_high_contrast_checkbutton_toggled (GtkToggleButton          *button,
-                                      GsdA11yPreferencesDialog *dialog)
+                                      MsdA11yPreferencesDialog *dialog)
 {
         config_set_high_contrast (gtk_toggle_button_get_active (button));
 }
 
 static void
 on_at_screen_reader_checkbutton_toggled (GtkToggleButton          *button,
-                                         GsdA11yPreferencesDialog *dialog)
+                                         MsdA11yPreferencesDialog *dialog)
 {
         config_set_at_screen_reader (gtk_toggle_button_get_active (button));
 }
 
 static void
 on_at_screen_keyboard_checkbutton_toggled (GtkToggleButton          *button,
-                                           GsdA11yPreferencesDialog *dialog)
+                                           MsdA11yPreferencesDialog *dialog)
 {
         config_set_at_screen_keyboard (gtk_toggle_button_get_active (button));
 }
 
 static void
 on_at_screen_magnifier_checkbutton_toggled (GtkToggleButton          *button,
-                                            GsdA11yPreferencesDialog *dialog)
+                                            MsdA11yPreferencesDialog *dialog)
 {
         config_set_at_screen_magnifier (gtk_toggle_button_get_active (button));
 }
 
 static void
 on_large_print_checkbutton_toggled (GtkToggleButton          *button,
-                                    GsdA11yPreferencesDialog *dialog)
+                                    MsdA11yPreferencesDialog *dialog)
 {
         config_set_large_print (gtk_toggle_button_get_active (button));
 }
 
 static void
-ui_set_sticky_keys (GsdA11yPreferencesDialog *dialog,
+ui_set_sticky_keys (MsdA11yPreferencesDialog *dialog,
                     gboolean                  enabled)
 {
         gboolean active;
@@ -568,7 +568,7 @@ ui_set_sticky_keys (GsdA11yPreferencesDialog *dialog,
 }
 
 static void
-ui_set_bounce_keys (GsdA11yPreferencesDialog *dialog,
+ui_set_bounce_keys (MsdA11yPreferencesDialog *dialog,
                     gboolean                  enabled)
 {
         gboolean active;
@@ -580,7 +580,7 @@ ui_set_bounce_keys (GsdA11yPreferencesDialog *dialog,
 }
 
 static void
-ui_set_slow_keys (GsdA11yPreferencesDialog *dialog,
+ui_set_slow_keys (MsdA11yPreferencesDialog *dialog,
                   gboolean                  enabled)
 {
         gboolean active;
@@ -592,7 +592,7 @@ ui_set_slow_keys (GsdA11yPreferencesDialog *dialog,
 }
 
 static void
-ui_set_high_contrast (GsdA11yPreferencesDialog *dialog,
+ui_set_high_contrast (MsdA11yPreferencesDialog *dialog,
                       gboolean                  enabled)
 {
         gboolean active;
@@ -604,7 +604,7 @@ ui_set_high_contrast (GsdA11yPreferencesDialog *dialog,
 }
 
 static void
-ui_set_at_screen_reader (GsdA11yPreferencesDialog *dialog,
+ui_set_at_screen_reader (MsdA11yPreferencesDialog *dialog,
                          gboolean                  enabled)
 {
         gboolean active;
@@ -616,7 +616,7 @@ ui_set_at_screen_reader (GsdA11yPreferencesDialog *dialog,
 }
 
 static void
-ui_set_at_screen_keyboard (GsdA11yPreferencesDialog *dialog,
+ui_set_at_screen_keyboard (MsdA11yPreferencesDialog *dialog,
                            gboolean                  enabled)
 {
         gboolean active;
@@ -628,7 +628,7 @@ ui_set_at_screen_keyboard (GsdA11yPreferencesDialog *dialog,
 }
 
 static void
-ui_set_at_screen_magnifier (GsdA11yPreferencesDialog *dialog,
+ui_set_at_screen_magnifier (MsdA11yPreferencesDialog *dialog,
                             gboolean                  enabled)
 {
         gboolean active;
@@ -640,7 +640,7 @@ ui_set_at_screen_magnifier (GsdA11yPreferencesDialog *dialog,
 }
 
 static void
-ui_set_large_print (GsdA11yPreferencesDialog *dialog,
+ui_set_large_print (MsdA11yPreferencesDialog *dialog,
                     gboolean                  enabled)
 {
         gboolean active;
@@ -655,7 +655,7 @@ static void
 key_changed_cb (MateConfClient              *client,
                 guint                     cnxn_id,
                 MateConfEntry               *entry,
-                GsdA11yPreferencesDialog *dialog)
+                MsdA11yPreferencesDialog *dialog)
 {
         const char *key;
         MateConfValue *value;
@@ -729,7 +729,7 @@ key_changed_cb (MateConfClient              *client,
 }
 
 static void
-setup_dialog (GsdA11yPreferencesDialog *dialog,
+setup_dialog (MsdA11yPreferencesDialog *dialog,
               GtkBuilder               *builder)
 {
         GtkWidget   *widget;
@@ -876,7 +876,7 @@ setup_dialog (GsdA11yPreferencesDialog *dialog,
                               KEY_AT_DIR,
                               MATECONF_CLIENT_PRELOAD_ONELEVEL,
                               NULL);
-        dialog->priv->gsd_a11y_dir_cnxn = mateconf_client_notify_add (client,
+        dialog->priv->msd_a11y_dir_cnxn = mateconf_client_notify_add (client,
                                                                    KEY_AT_DIR,
                                                                    (MateConfClientNotifyFunc)key_changed_cb,
                                                                    dialog,
@@ -887,14 +887,14 @@ setup_dialog (GsdA11yPreferencesDialog *dialog,
 }
 
 static void
-gsd_a11y_preferences_dialog_init (GsdA11yPreferencesDialog *dialog)
+msd_a11y_preferences_dialog_init (MsdA11yPreferencesDialog *dialog)
 {
         static const gchar *ui_file_path = GTKBUILDERDIR "/" GTKBUILDER_UI_FILE;
         gchar *objects[] = {"main_box", NULL};
         GError *error = NULL;
         GtkBuilder  *builder;
 
-        dialog->priv = GSD_A11Y_PREFERENCES_DIALOG_GET_PRIVATE (dialog);
+        dialog->priv = MSD_A11Y_PREFERENCES_DIALOG_GET_PRIVATE (dialog);
 
         builder = gtk_builder_new ();
         gtk_builder_set_translation_domain (builder, PACKAGE);
@@ -937,15 +937,15 @@ gsd_a11y_preferences_dialog_init (GsdA11yPreferencesDialog *dialog)
 }
 
 static void
-gsd_a11y_preferences_dialog_finalize (GObject *object)
+msd_a11y_preferences_dialog_finalize (GObject *object)
 {
-        GsdA11yPreferencesDialog *dialog;
+        MsdA11yPreferencesDialog *dialog;
         MateConfClient              *client;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_A11Y_PREFERENCES_DIALOG (object));
+        g_return_if_fail (MSD_IS_A11Y_PREFERENCES_DIALOG (object));
 
-        dialog = GSD_A11Y_PREFERENCES_DIALOG (object);
+        dialog = MSD_A11Y_PREFERENCES_DIALOG (object);
 
         g_return_if_fail (dialog->priv != NULL);
 
@@ -954,21 +954,21 @@ gsd_a11y_preferences_dialog_finalize (GObject *object)
         if (dialog->priv->a11y_dir_cnxn > 0) {
                 mateconf_client_notify_remove (client, dialog->priv->a11y_dir_cnxn);
         }
-        if (dialog->priv->gsd_a11y_dir_cnxn > 0) {
-                mateconf_client_notify_remove (client, dialog->priv->gsd_a11y_dir_cnxn);
+        if (dialog->priv->msd_a11y_dir_cnxn > 0) {
+                mateconf_client_notify_remove (client, dialog->priv->msd_a11y_dir_cnxn);
         }
 
         g_object_unref (client);
 
-        G_OBJECT_CLASS (gsd_a11y_preferences_dialog_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_a11y_preferences_dialog_parent_class)->finalize (object);
 }
 
 GtkWidget *
-gsd_a11y_preferences_dialog_new (void)
+msd_a11y_preferences_dialog_new (void)
 {
         GObject *object;
 
-        object = g_object_new (GSD_TYPE_A11Y_PREFERENCES_DIALOG,
+        object = g_object_new (MSD_TYPE_A11Y_PREFERENCES_DIALOG,
                                NULL);
 
         return GTK_WIDGET (object);
diff --git a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.h
index 2be096a..967a94e 100644
--- a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.h
+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_A11Y_PREFERENCES_DIALOG_H
-#define __GSD_A11Y_PREFERENCES_DIALOG_H
+#ifndef __MSD_A11Y_PREFERENCES_DIALOG_H
+#define __MSD_A11Y_PREFERENCES_DIALOG_H
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -28,32 +28,32 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_A11Y_PREFERENCES_DIALOG         (gsd_a11y_preferences_dialog_get_type ())
-#define GSD_A11Y_PREFERENCES_DIALOG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_A11Y_PREFERENCES_DIALOG, GsdA11yPreferencesDialog))
-#define GSD_A11Y_PREFERENCES_DIALOG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_A11Y_PREFERENCES_DIALOG, GsdA11yPreferencesDialogClass))
-#define GSD_IS_A11Y_PREFERENCES_DIALOG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_A11Y_PREFERENCES_DIALOG))
-#define GSD_IS_A11Y_PREFERENCES_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_A11Y_PREFERENCES_DIALOG))
-#define GSD_A11Y_PREFERENCES_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_A11Y_PREFERENCES_DIALOG, GsdA11yPreferencesDialogClass))
+#define MSD_TYPE_A11Y_PREFERENCES_DIALOG         (msd_a11y_preferences_dialog_get_type ())
+#define MSD_A11Y_PREFERENCES_DIALOG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_A11Y_PREFERENCES_DIALOG, MsdA11yPreferencesDialog))
+#define MSD_A11Y_PREFERENCES_DIALOG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_A11Y_PREFERENCES_DIALOG, MsdA11yPreferencesDialogClass))
+#define MSD_IS_A11Y_PREFERENCES_DIALOG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_A11Y_PREFERENCES_DIALOG))
+#define MSD_IS_A11Y_PREFERENCES_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_A11Y_PREFERENCES_DIALOG))
+#define MSD_A11Y_PREFERENCES_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_A11Y_PREFERENCES_DIALOG, MsdA11yPreferencesDialogClass))
 
-typedef struct GsdA11yPreferencesDialogPrivate GsdA11yPreferencesDialogPrivate;
+typedef struct MsdA11yPreferencesDialogPrivate MsdA11yPreferencesDialogPrivate;
 
 typedef struct
 {
         GtkDialog                        parent;
-        GsdA11yPreferencesDialogPrivate *priv;
-} GsdA11yPreferencesDialog;
+        MsdA11yPreferencesDialogPrivate *priv;
+} MsdA11yPreferencesDialog;
 
 typedef struct
 {
         GtkDialogClass   parent_class;
-} GsdA11yPreferencesDialogClass;
+} MsdA11yPreferencesDialogClass;
 
-GType                  gsd_a11y_preferences_dialog_get_type                   (void);
+GType                  msd_a11y_preferences_dialog_get_type                   (void);
 
-GtkWidget            * gsd_a11y_preferences_dialog_new                        (void);
+GtkWidget            * msd_a11y_preferences_dialog_new                        (void);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __GSD_A11Y_PREFERENCES_DIALOG_H */
+#endif /* __MSD_A11Y_PREFERENCES_DIALOG_H */
diff --git a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.ui
index 6a0fcb0..6a0fcb0 100644
--- a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui
+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.ui
diff --git a/plugins/a11y-keyboard/test-a11y-preferences-dialog.c b/plugins/a11y-keyboard/test-a11y-preferences-dialog.c
index 343f61c..0325a36 100644
--- a/plugins/a11y-keyboard/test-a11y-preferences-dialog.c
+++ b/plugins/a11y-keyboard/test-a11y-preferences-dialog.c
@@ -27,14 +27,14 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gsd-a11y-preferences-dialog.h"
+#include "msd-a11y-preferences-dialog.h"
 
 static void
 test_window (void)
 {
         GtkWidget *window;
 
-        window = gsd_a11y_preferences_dialog_new ();
+        window = msd_a11y_preferences_dialog_new ();
         gtk_dialog_run (GTK_DIALOG (window));
 }