gsd to msd complete rename patch by NiceandGently; code changes commit

11 files changed, 298 insertions, 298 deletions

diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 3a2f65e..9bd9553 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -7,9 +7,9 @@ SUBDIRS = cut-n-paste
 plugin_LTLIBRARIES = libmedia-keys.la
 
 BUILT_SOURCES = 			\
-	gsd-media-keys-manager-glue.h	\
-	gsd-marshal.h			\
-	gsd-marshal.c			\
+	msd-media-keys-manager-glue.h	\
+	msd-marshal.h			\
+	msd-marshal.c			\
 	$(NULL)
 
 ICON_FILES = 			\
@@ -55,24 +55,24 @@ uninstall-local:
 	rm -f $(DESTDIR)$(icondir)/32x32/$(context)/touchpad-disabled.png
 	rm -f $(DESTDIR)$(icondir)/scalable/$(context)/touchpad-disabled.svg
 
-gsd-media-keys-manager-glue.h: gsd-media-keys-manager.xml Makefile
-	dbus-binding-tool --prefix=gsd_media_keys_manager --mode=glib-server $< > xgen-$(@F) \
+msd-media-keys-manager-glue.h: msd-media-keys-manager.xml Makefile
+	dbus-binding-tool --prefix=msd_media_keys_manager --mode=glib-server $< > xgen-$(@F) \
 	&& ( cmp -s xgen-$(@F) $@ || cp xgen-$(@F) $@ ) \
 	&& rm -f xgen-$(@F)
 
-gsd-marshal.c: gsd-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@
+msd-marshal.c: msd-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=msd_marshal $< --header --body --internal > $@
 
-gsd-marshal.h: gsd-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@
+msd-marshal.h: msd-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=msd_marshal $< --header --internal > $@
 
 libmedia_keys_la_SOURCES = 		\
-	gsd-media-keys-plugin.h		\
-	gsd-media-keys-plugin.c		\
-	gsd-media-keys-manager.h	\
-	gsd-media-keys-manager.c	\
-	gsd-media-keys-window.h		\
-	gsd-media-keys-window.c		\
+	msd-media-keys-plugin.h		\
+	msd-media-keys-plugin.c		\
+	msd-media-keys-manager.h	\
+	msd-media-keys-manager.c	\
+	msd-media-keys-window.h		\
+	msd-media-keys-window.c		\
 	acme.h				\
 	$(BUILT_SOURCES)		\
 	$(NULL)
@@ -91,7 +91,7 @@ libmedia_keys_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libmedia_keys_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)
+	$(MSD_PLUGIN_LDFLAGS)
 
 libmedia_keys_la_LIBADD  = 		\
 	$(top_builddir)/plugins/common/libcommon.la			\
@@ -111,8 +111,8 @@ noinst_PROGRAMS =				\
 	$(NULL)
 
 test_media_window_SOURCES =			\
-	gsd-media-keys-window.c			\
-	gsd-media-keys-window.h			\
+	msd-media-keys-window.c			\
+	msd-media-keys-window.h			\
 	test-media-window.c			\
 	$(NULL)
 
@@ -139,10 +139,10 @@ test_media_window_LDADD = \
 	-lm
 
 test_media_keys_SOURCES =			\
-	gsd-media-keys-manager.c		\
-	gsd-media-keys-manager.h		\
-	gsd-media-keys-window.h			\
-	gsd-media-keys-window.c			\
+	msd-media-keys-manager.c		\
+	msd-media-keys-manager.h		\
+	msd-media-keys-window.h			\
+	msd-media-keys-window.c			\
 	test-media-keys.c			\
 	$(BUILT_SOURCES)			\
 	$(NULL)
@@ -161,7 +161,7 @@ test_media_keys_CFLAGS = \
 	$(AM_CFLAGS)
 
 test_media_keys_LDADD = \
-	$(top_builddir)/mate-settings-daemon/libgsd-profile.la		\
+	$(top_builddir)/mate-settings-daemon/libmsd-profile.la		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
@@ -179,8 +179,8 @@ gtkbuilder_DATA =	\
 DIST_SUBDIRS = cut-n-paste
 
 EXTRA_DIST = 				\
-	gsd-media-keys-manager.xml	\
-	gsd-marshal.list		\
+	msd-media-keys-manager.xml	\
+	msd-marshal.list		\
 	$(plugin_in_files)		\
 	$(gtkbuilder_DATA)		\
 	$(pixmaps_DATA)			\
@@ -195,4 +195,4 @@ CLEANFILES = 			\
 DISTCLEANFILES =		\
 	$(plugin_DATA)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/media-keys/acme.h b/plugins/media-keys/acme.h
index 66e13bc..41228e0 100644
--- a/plugins/media-keys/acme.h
+++ b/plugins/media-keys/acme.h
@@ -21,7 +21,7 @@
 #ifndef __ACME_H__
 #define __ACME_H__
 
-#include "gsd-keygrab.h"
+#include "msd-keygrab.h"
 
 #define MATECONF_BINDING_DIR "/apps/mate_settings_daemon/keybindings"
 #define MATECONF_MISC_DIR "/apps/mate_settings_daemon"
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 1110dd5..d7e1b04 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -42,13 +42,13 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include "mate-settings-profile.h"
-#include "gsd-marshal.h"
-#include "gsd-media-keys-manager.h"
-#include "gsd-media-keys-manager-glue.h"
+#include "msd-marshal.h"
+#include "msd-media-keys-manager.h"
+#include "msd-media-keys-manager-glue.h"
 
 #include "eggaccelerators.h"
 #include "acme.h"
-#include "gsd-media-keys-window.h"
+#include "msd-media-keys-window.h"
 
 #ifdef HAVE_PULSE
 #include <canberra-gtk.h>
@@ -57,24 +57,24 @@
 #include "gvc-gstreamer-acme-vol.h"
 #endif /* HAVE_PULSE */
 
-#define GSD_DBUS_PATH "/org/mate/SettingsDaemon"
-#define GSD_DBUS_NAME "org.mate.SettingsDaemon"
-#define GSD_MEDIA_KEYS_DBUS_PATH GSD_DBUS_PATH "/MediaKeys"
-#define GSD_MEDIA_KEYS_DBUS_NAME GSD_DBUS_NAME ".MediaKeys"
+#define MSD_DBUS_PATH "/org/mate/SettingsDaemon"
+#define MSD_DBUS_NAME "org.mate.SettingsDaemon"
+#define MSD_MEDIA_KEYS_DBUS_PATH MSD_DBUS_PATH "/MediaKeys"
+#define MSD_MEDIA_KEYS_DBUS_NAME MSD_DBUS_NAME ".MediaKeys"
 
 #define TOUCHPAD_ENABLED_KEY "/desktop/mate/peripherals/touchpad/touchpad_enabled"
 
 #define VOLUME_STEP 6           /* percents for one volume button press */
 #define MAX_VOLUME 65536.0
 
-#define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
+#define MSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_MEDIA_KEYS_MANAGER, MsdMediaKeysManagerPrivate))
 
 typedef struct {
         char   *application;
         guint32 time;
 } MediaPlayer;
 
-struct GsdMediaKeysManagerPrivate
+struct MsdMediaKeysManagerPrivate
 {
 #ifdef HAVE_PULSE
         /* Volume bits */
@@ -104,17 +104,17 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-static void     gsd_media_keys_manager_class_init  (GsdMediaKeysManagerClass *klass);
-static void     gsd_media_keys_manager_init        (GsdMediaKeysManager      *media_keys_manager);
-static void     gsd_media_keys_manager_finalize    (GObject                  *object);
+static void     msd_media_keys_manager_class_init  (MsdMediaKeysManagerClass *klass);
+static void     msd_media_keys_manager_init        (MsdMediaKeysManager      *media_keys_manager);
+static void     msd_media_keys_manager_finalize    (GObject                  *object);
 
-G_DEFINE_TYPE (GsdMediaKeysManager, gsd_media_keys_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdMediaKeysManager, msd_media_keys_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
 
 
 static void
-init_screens (GsdMediaKeysManager *manager)
+init_screens (MsdMediaKeysManager *manager)
 {
         GdkDisplay *display;
         int i;
@@ -154,7 +154,7 @@ acme_error (char * msg)
 }
 
 static char *
-get_term_command (GsdMediaKeysManager *manager)
+get_term_command (MsdMediaKeysManager *manager)
 {
         char *cmd_term;
         char *cmd = NULL;
@@ -180,7 +180,7 @@ get_term_command (GsdMediaKeysManager *manager)
 }
 
 static void
-execute (GsdMediaKeysManager *manager,
+execute (MsdMediaKeysManager *manager,
          char                *cmd,
          gboolean             sync,
          gboolean             need_term)
@@ -247,16 +247,16 @@ execute (GsdMediaKeysManager *manager,
 }
 
 static void
-dialog_init (GsdMediaKeysManager *manager)
+dialog_init (MsdMediaKeysManager *manager)
 {
         if (manager->priv->dialog != NULL
-            && !gsd_osd_window_is_valid (GSD_OSD_WINDOW (manager->priv->dialog))) {
+            && !msd_osd_window_is_valid (MSD_OSD_WINDOW (manager->priv->dialog))) {
                 gtk_widget_destroy (manager->priv->dialog);
                 manager->priv->dialog = NULL;
         }
 
         if (manager->priv->dialog == NULL) {
-                manager->priv->dialog = gsd_media_keys_window_new ();
+                manager->priv->dialog = msd_media_keys_window_new ();
         }
 }
 
@@ -277,7 +277,7 @@ static void
 update_kbd_cb (MateConfClient         *client,
                guint                id,
                MateConfEntry          *entry,
-               GsdMediaKeysManager *manager)
+               MsdMediaKeysManager *manager)
 {
         int      i;
         gboolean need_flush = TRUE;
@@ -331,7 +331,7 @@ update_kbd_cb (MateConfClient         *client,
                 g_warning ("Grab failed for some keys, another application may already have access the them.");
 }
 
-static void init_kbd(GsdMediaKeysManager* manager)
+static void init_kbd(MsdMediaKeysManager* manager)
 {
 	int i;
 	gboolean need_flush = FALSE;
@@ -395,7 +395,7 @@ static void init_kbd(GsdMediaKeysManager* manager)
 }
 
 static void
-dialog_show (GsdMediaKeysManager *manager)
+dialog_show (MsdMediaKeysManager *manager)
 {
         int            orig_w;
         int            orig_h;
@@ -463,7 +463,7 @@ dialog_show (GsdMediaKeysManager *manager)
 }
 
 static void
-do_unknown_action (GsdMediaKeysManager *manager,
+do_unknown_action (MsdMediaKeysManager *manager,
                    const char          *url)
 {
         char *string;
@@ -484,7 +484,7 @@ do_unknown_action (GsdMediaKeysManager *manager,
 }
 
 static void
-do_help_action (GsdMediaKeysManager *manager)
+do_help_action (MsdMediaKeysManager *manager)
 {
         char *string;
 
@@ -505,7 +505,7 @@ do_help_action (GsdMediaKeysManager *manager)
 }
 
 static void
-do_mail_action (GsdMediaKeysManager *manager)
+do_mail_action (MsdMediaKeysManager *manager)
 {
         char *string;
 
@@ -527,7 +527,7 @@ do_mail_action (GsdMediaKeysManager *manager)
 }
 
 static void
-do_media_action (GsdMediaKeysManager *manager)
+do_media_action (MsdMediaKeysManager *manager)
 {
         char *command;
 
@@ -544,7 +544,7 @@ do_media_action (GsdMediaKeysManager *manager)
 }
 
 static void
-do_www_action (GsdMediaKeysManager *manager,
+do_www_action (MsdMediaKeysManager *manager,
                const char          *url)
 {
         char *string;
@@ -575,7 +575,7 @@ do_www_action (GsdMediaKeysManager *manager,
 }
 
 static void
-do_exit_action (GsdMediaKeysManager *manager)
+do_exit_action (MsdMediaKeysManager *manager)
 {
         execute (manager, "mate-session-save --shutdown-dialog", FALSE, FALSE);
 }
@@ -583,7 +583,7 @@ do_exit_action (GsdMediaKeysManager *manager)
 static void
 do_eject_action_cb (GDrive              *drive,
                     GAsyncResult        *res,
-                    GsdMediaKeysManager *manager)
+                    MsdMediaKeysManager *manager)
 {
         g_drive_eject_with_operation_finish (drive, res, NULL);
 }
@@ -592,7 +592,7 @@ do_eject_action_cb (GDrive              *drive,
 #define SCORE_CAN_EJECT 50
 #define SCORE_HAS_MEDIA 100
 static void
-do_eject_action (GsdMediaKeysManager *manager)
+do_eject_action (MsdMediaKeysManager *manager)
 {
         GList *drives, *l;
         GDrive *fav_drive;
@@ -624,7 +624,7 @@ do_eject_action (GsdMediaKeysManager *manager)
 
         /* Show the dialogue */
         dialog_init (manager);
-        gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+        msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
                                                  "media-eject",
                                                  FALSE);
         dialog_show (manager);
@@ -647,13 +647,13 @@ do_eject_action (GsdMediaKeysManager *manager)
 }
 
 static void
-do_touchpad_action (GsdMediaKeysManager *manager)
+do_touchpad_action (MsdMediaKeysManager *manager)
 {
         MateConfClient *client = manager->priv->conf_client;
         gboolean state = mateconf_client_get_bool (client, TOUCHPAD_ENABLED_KEY, NULL);
 
         dialog_init (manager);
-        gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+        msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
                                                  (!state) ? "touchpad-enabled" : "touchpad-disabled",
                                                  FALSE);
         dialog_show (manager);
@@ -663,7 +663,7 @@ do_touchpad_action (GsdMediaKeysManager *manager)
 
 #ifdef HAVE_PULSE
 static void
-update_dialog (GsdMediaKeysManager *manager,
+update_dialog (MsdMediaKeysManager *manager,
                guint vol,
                gboolean muted,
                gboolean sound_changed)
@@ -672,11 +672,11 @@ update_dialog (GsdMediaKeysManager *manager,
         vol = CLAMP (vol, 0, 100);
 
         dialog_init (manager);
-        gsd_media_keys_window_set_volume_muted (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+        msd_media_keys_window_set_volume_muted (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
                                                 muted);
-        gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog), vol);
-        gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-                                          GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
+        msd_media_keys_window_set_volume_level (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog), vol);
+        msd_media_keys_window_set_action (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+                                          MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
         dialog_show (manager);
 
         if (sound_changed != FALSE && muted == FALSE)
@@ -690,7 +690,7 @@ update_dialog (GsdMediaKeysManager *manager,
  
 #if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
 static void
-do_sound_action (GsdMediaKeysManager *manager,
+do_sound_action (MsdMediaKeysManager *manager,
                  int                  type)
 {
         gboolean muted;
@@ -814,12 +814,12 @@ do_sound_action (GsdMediaKeysManager *manager,
         /* FIXME: AcmeVolume should probably emit signals
            instead of doing it like this */
         dialog_init (manager);
-        gsd_media_keys_window_set_volume_muted (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+        msd_media_keys_window_set_volume_muted (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
                                                 muted);
-        gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+        msd_media_keys_window_set_volume_level (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
                                                 vol);
-        gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-                                          GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
+        msd_media_keys_window_set_action (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+                                          MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
         dialog_show (manager);
 #endif /* HAVE_PULSE */
 }
@@ -827,7 +827,7 @@ do_sound_action (GsdMediaKeysManager *manager,
 
 #ifdef HAVE_PULSE
 static void
-update_default_sink (GsdMediaKeysManager *manager)
+update_default_sink (MsdMediaKeysManager *manager)
 {
         GvcMixerStream *stream;
 
@@ -849,7 +849,7 @@ update_default_sink (GsdMediaKeysManager *manager)
 
 static void
 on_control_ready (GvcMixerControl     *control,
-                  GsdMediaKeysManager *manager)
+                  MsdMediaKeysManager *manager)
 {
         update_default_sink (manager);
 }
@@ -857,7 +857,7 @@ on_control_ready (GvcMixerControl     *control,
 static void
 on_control_default_sink_changed (GvcMixerControl     *control,
                                  guint                id,
-                                 GsdMediaKeysManager *manager)
+                                 MsdMediaKeysManager *manager)
 {
         update_default_sink (manager);
 }
@@ -886,7 +886,7 @@ find_by_time (gconstpointer a,
  * events only nobody is interested.
  */
 gboolean
-gsd_media_keys_manager_grab_media_player_keys (GsdMediaKeysManager *manager,
+msd_media_keys_manager_grab_media_player_keys (MsdMediaKeysManager *manager,
                                                const char          *application,
                                                guint32              time,
                                                GError             **error)
@@ -928,7 +928,7 @@ gsd_media_keys_manager_grab_media_player_keys (GsdMediaKeysManager *manager,
 }
 
 gboolean
-gsd_media_keys_manager_release_media_player_keys (GsdMediaKeysManager *manager,
+msd_media_keys_manager_release_media_player_keys (MsdMediaKeysManager *manager,
                                                   const char          *application,
                                                   GError             **error)
 {
@@ -949,7 +949,7 @@ gsd_media_keys_manager_release_media_player_keys (GsdMediaKeysManager *manager,
 }
 
 static gboolean
-gsd_media_player_key_pressed (GsdMediaKeysManager *manager,
+msd_media_player_key_pressed (MsdMediaKeysManager *manager,
                               const char          *key)
 {
         const char *application = NULL;
@@ -967,14 +967,14 @@ gsd_media_player_key_pressed (GsdMediaKeysManager *manager,
 }
 
 static gboolean
-do_multimedia_player_action (GsdMediaKeysManager *manager,
+do_multimedia_player_action (MsdMediaKeysManager *manager,
                              const char          *key)
 {
-        return gsd_media_player_key_pressed (manager, key);
+        return msd_media_player_key_pressed (manager, key);
 }
 
 static gboolean
-do_action (GsdMediaKeysManager *manager,
+do_action (MsdMediaKeysManager *manager,
            int                  type)
 {
         char *cmd;
@@ -1062,7 +1062,7 @@ do_action (GsdMediaKeysManager *manager,
 }
 
 static GdkScreen *
-acme_get_screen_from_event (GsdMediaKeysManager *manager,
+acme_get_screen_from_event (MsdMediaKeysManager *manager,
                             XAnyEvent           *xanyev)
 {
         GdkWindow *window;
@@ -1085,7 +1085,7 @@ acme_get_screen_from_event (GsdMediaKeysManager *manager,
 static GdkFilterReturn
 acme_filter_events (GdkXEvent           *xevent,
                     GdkEvent            *event,
-                    GsdMediaKeysManager *manager)
+                    MsdMediaKeysManager *manager)
 {
         XEvent    *xev = (XEvent *) xevent;
         XAnyEvent *xany = (XAnyEvent *) xevent;
@@ -1126,7 +1126,7 @@ acme_filter_events (GdkXEvent           *xevent,
 }
 
 static gboolean
-start_media_keys_idle_cb (GsdMediaKeysManager *manager)
+start_media_keys_idle_cb (MsdMediaKeysManager *manager)
 {
         GSList *l;
 
@@ -1162,7 +1162,7 @@ start_media_keys_idle_cb (GsdMediaKeysManager *manager)
 }
 
 gboolean
-gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
+msd_media_keys_manager_start (MsdMediaKeysManager *manager,
                               GError             **error)
 {
         mate_settings_profile_start (NULL);
@@ -1203,9 +1203,9 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
 }
 
 void
-gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
+msd_media_keys_manager_stop (MsdMediaKeysManager *manager)
 {
-        GsdMediaKeysManagerPrivate *priv = manager->priv;
+        MsdMediaKeysManagerPrivate *priv = manager->priv;
         GSList *ls;
         GList *l;
         int i;
@@ -1295,14 +1295,14 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
 }
 
 static void
-gsd_media_keys_manager_set_property (GObject        *object,
+msd_media_keys_manager_set_property (GObject        *object,
                                guint           prop_id,
                                const GValue   *value,
                                GParamSpec     *pspec)
 {
-        GsdMediaKeysManager *self;
+        MsdMediaKeysManager *self;
 
-        self = GSD_MEDIA_KEYS_MANAGER (object);
+        self = MSD_MEDIA_KEYS_MANAGER (object);
 
         switch (prop_id) {
         default:
@@ -1312,14 +1312,14 @@ gsd_media_keys_manager_set_property (GObject        *object,
 }
 
 static void
-gsd_media_keys_manager_get_property (GObject        *object,
+msd_media_keys_manager_get_property (GObject        *object,
                                guint           prop_id,
                                GValue         *value,
                                GParamSpec     *pspec)
 {
-        GsdMediaKeysManager *self;
+        MsdMediaKeysManager *self;
 
-        self = GSD_MEDIA_KEYS_MANAGER (object);
+        self = MSD_MEDIA_KEYS_MANAGER (object);
 
         switch (prop_id) {
         default:
@@ -1329,16 +1329,16 @@ gsd_media_keys_manager_get_property (GObject        *object,
 }
 
 static GObject *
-gsd_media_keys_manager_constructor (GType                  type,
+msd_media_keys_manager_constructor (GType                  type,
                               guint                  n_construct_properties,
                               GObjectConstructParam *construct_properties)
 {
-        GsdMediaKeysManager      *media_keys_manager;
-        GsdMediaKeysManagerClass *klass;
+        MsdMediaKeysManager      *media_keys_manager;
+        MsdMediaKeysManagerClass *klass;
 
-        klass = GSD_MEDIA_KEYS_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_MEDIA_KEYS_MANAGER));
+        klass = MSD_MEDIA_KEYS_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_MEDIA_KEYS_MANAGER));
 
-        media_keys_manager = GSD_MEDIA_KEYS_MANAGER (G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->constructor (type,
+        media_keys_manager = MSD_MEDIA_KEYS_MANAGER (G_OBJECT_CLASS (msd_media_keys_manager_parent_class)->constructor (type,
                                                                                                       n_construct_properties,
                                                                                                       construct_properties));
 
@@ -1346,68 +1346,68 @@ gsd_media_keys_manager_constructor (GType                  type,
 }
 
 static void
-gsd_media_keys_manager_dispose (GObject *object)
+msd_media_keys_manager_dispose (GObject *object)
 {
-        GsdMediaKeysManager *media_keys_manager;
+        MsdMediaKeysManager *media_keys_manager;
 
-        media_keys_manager = GSD_MEDIA_KEYS_MANAGER (object);
+        media_keys_manager = MSD_MEDIA_KEYS_MANAGER (object);
 
-        G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->dispose (object);
+        G_OBJECT_CLASS (msd_media_keys_manager_parent_class)->dispose (object);
 }
 
 static void
-gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
+msd_media_keys_manager_class_init (MsdMediaKeysManagerClass *klass)
 {
         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->get_property = gsd_media_keys_manager_get_property;
-        object_class->set_property = gsd_media_keys_manager_set_property;
-        object_class->constructor = gsd_media_keys_manager_constructor;
-        object_class->dispose = gsd_media_keys_manager_dispose;
-        object_class->finalize = gsd_media_keys_manager_finalize;
+        object_class->get_property = msd_media_keys_manager_get_property;
+        object_class->set_property = msd_media_keys_manager_set_property;
+        object_class->constructor = msd_media_keys_manager_constructor;
+        object_class->dispose = msd_media_keys_manager_dispose;
+        object_class->finalize = msd_media_keys_manager_finalize;
 
        signals[MEDIA_PLAYER_KEY_PRESSED] =
                g_signal_new ("media-player-key-pressed",
                              G_OBJECT_CLASS_TYPE (klass),
                              G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (GsdMediaKeysManagerClass, media_player_key_pressed),
+                             G_STRUCT_OFFSET (MsdMediaKeysManagerClass, media_player_key_pressed),
                              NULL,
                              NULL,
-                             gsd_marshal_VOID__STRING_STRING,
+                             msd_marshal_VOID__STRING_STRING,
                              G_TYPE_NONE,
                              2,
                              G_TYPE_STRING,
                              G_TYPE_STRING);
 
-        dbus_g_object_type_install_info (GSD_TYPE_MEDIA_KEYS_MANAGER, &dbus_glib_gsd_media_keys_manager_object_info);
+        dbus_g_object_type_install_info (MSD_TYPE_MEDIA_KEYS_MANAGER, &dbus_glib_msd_media_keys_manager_object_info);
 
-        g_type_class_add_private (klass, sizeof (GsdMediaKeysManagerPrivate));
+        g_type_class_add_private (klass, sizeof (MsdMediaKeysManagerPrivate));
 }
 
 static void
-gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
+msd_media_keys_manager_init (MsdMediaKeysManager *manager)
 {
-        manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
+        manager->priv = MSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
 
 }
 
 static void
-gsd_media_keys_manager_finalize (GObject *object)
+msd_media_keys_manager_finalize (GObject *object)
 {
-        GsdMediaKeysManager *media_keys_manager;
+        MsdMediaKeysManager *media_keys_manager;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_MANAGER (object));
+        g_return_if_fail (MSD_IS_MEDIA_KEYS_MANAGER (object));
 
-        media_keys_manager = GSD_MEDIA_KEYS_MANAGER (object);
+        media_keys_manager = MSD_MEDIA_KEYS_MANAGER (object);
 
         g_return_if_fail (media_keys_manager->priv != NULL);
 
-        G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_media_keys_manager_parent_class)->finalize (object);
 }
 
 static gboolean
-register_manager (GsdMediaKeysManager *manager)
+register_manager (MsdMediaKeysManager *manager)
 {
         GError *error = NULL;
 
@@ -1420,20 +1420,20 @@ register_manager (GsdMediaKeysManager *manager)
                 return FALSE;
         }
 
-        dbus_g_connection_register_g_object (manager->priv->connection, GSD_MEDIA_KEYS_DBUS_PATH, G_OBJECT (manager));
+        dbus_g_connection_register_g_object (manager->priv->connection, MSD_MEDIA_KEYS_DBUS_PATH, G_OBJECT (manager));
 
         return TRUE;
 }
 
-GsdMediaKeysManager *
-gsd_media_keys_manager_new (void)
+MsdMediaKeysManager *
+msd_media_keys_manager_new (void)
 {
         if (manager_object != NULL) {
                 g_object_ref (manager_object);
         } else {
                 gboolean res;
 
-                manager_object = g_object_new (GSD_TYPE_MEDIA_KEYS_MANAGER, NULL);
+                manager_object = g_object_new (MSD_TYPE_MEDIA_KEYS_MANAGER, NULL);
                 g_object_add_weak_pointer (manager_object,
                                            (gpointer *) &manager_object);
                 res = register_manager (manager_object);
@@ -1443,5 +1443,5 @@ gsd_media_keys_manager_new (void)
                 }
         }
 
-        return GSD_MEDIA_KEYS_MANAGER (manager_object);
+        return MSD_MEDIA_KEYS_MANAGER (manager_object);
 }
diff --git a/plugins/media-keys/gsd-media-keys-manager.h b/plugins/media-keys/gsd-media-keys-manager.h
index 19dafd5..96c135f 100644
--- a/plugins/media-keys/gsd-media-keys-manager.h
+++ b/plugins/media-keys/gsd-media-keys-manager.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_MEDIA_KEYS_MANAGER_H
-#define __GSD_MEDIA_KEYS_MANAGER_H
+#ifndef __MSD_MEDIA_KEYS_MANAGER_H
+#define __MSD_MEDIA_KEYS_MANAGER_H
 
 #include <glib-object.h>
 
@@ -27,41 +27,41 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_MEDIA_KEYS_MANAGER         (gsd_media_keys_manager_get_type ())
-#define GSD_MEDIA_KEYS_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManager))
-#define GSD_MEDIA_KEYS_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerClass))
-#define GSD_IS_MEDIA_KEYS_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER))
-#define GSD_IS_MEDIA_KEYS_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_MANAGER))
-#define GSD_MEDIA_KEYS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerClass))
+#define MSD_TYPE_MEDIA_KEYS_MANAGER         (msd_media_keys_manager_get_type ())
+#define MSD_MEDIA_KEYS_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_MEDIA_KEYS_MANAGER, MsdMediaKeysManager))
+#define MSD_MEDIA_KEYS_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_MEDIA_KEYS_MANAGER, MsdMediaKeysManagerClass))
+#define MSD_IS_MEDIA_KEYS_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_MEDIA_KEYS_MANAGER))
+#define MSD_IS_MEDIA_KEYS_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_MEDIA_KEYS_MANAGER))
+#define MSD_MEDIA_KEYS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_MEDIA_KEYS_MANAGER, MsdMediaKeysManagerClass))
 
-typedef struct GsdMediaKeysManagerPrivate GsdMediaKeysManagerPrivate;
+typedef struct MsdMediaKeysManagerPrivate MsdMediaKeysManagerPrivate;
 
 typedef struct
 {
         GObject                     parent;
-        GsdMediaKeysManagerPrivate *priv;
-} GsdMediaKeysManager;
+        MsdMediaKeysManagerPrivate *priv;
+} MsdMediaKeysManager;
 
 typedef struct
 {
         GObjectClass   parent_class;
-        void          (* media_player_key_pressed) (GsdMediaKeysManager *manager,
+        void          (* media_player_key_pressed) (MsdMediaKeysManager *manager,
                                                     const char          *application,
                                                     const char          *key);
-} GsdMediaKeysManagerClass;
+} MsdMediaKeysManagerClass;
 
-GType                 gsd_media_keys_manager_get_type                  (void);
+GType                 msd_media_keys_manager_get_type                  (void);
 
-GsdMediaKeysManager * gsd_media_keys_manager_new                       (void);
-gboolean              gsd_media_keys_manager_start                     (GsdMediaKeysManager *manager,
+MsdMediaKeysManager * msd_media_keys_manager_new                       (void);
+gboolean              msd_media_keys_manager_start                     (MsdMediaKeysManager *manager,
                                                                         GError             **error);
-void                  gsd_media_keys_manager_stop                      (GsdMediaKeysManager *manager);
+void                  msd_media_keys_manager_stop                      (MsdMediaKeysManager *manager);
 
-gboolean              gsd_media_keys_manager_grab_media_player_keys    (GsdMediaKeysManager *manager,
+gboolean              msd_media_keys_manager_grab_media_player_keys    (MsdMediaKeysManager *manager,
                                                                         const char          *application,
                                                                         guint32              time,
                                                                         GError             **error);
-gboolean              gsd_media_keys_manager_release_media_player_keys (GsdMediaKeysManager *manager,
+gboolean              msd_media_keys_manager_release_media_player_keys (MsdMediaKeysManager *manager,
                                                                         const char          *application,
                                                                         GError             **error);
 
@@ -69,4 +69,4 @@ gboolean              gsd_media_keys_manager_release_media_player_keys (GsdMedia
 }
 #endif
 
-#endif /* __GSD_MEDIA_KEYS_MANAGER_H */
+#endif /* __MSD_MEDIA_KEYS_MANAGER_H */
diff --git a/plugins/media-keys/gsd-media-keys-manager.xml b/plugins/media-keys/gsd-media-keys-manager.xml
index 12cd03a..db0552e 100644
--- a/plugins/media-keys/gsd-media-keys-manager.xml
+++ b/plugins/media-keys/gsd-media-keys-manager.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
   <interface name="org.mate.SettingsDaemon.MediaKeys">
-    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="gsd_media_keys_manager"/>
+    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="msd_media_keys_manager"/>
     <method name="GrabMediaPlayerKeys">
       <arg name="application" direction="in" type="s"/>
       <arg name="time" direction="in" type="u"/>
diff --git a/plugins/media-keys/gsd-media-keys-plugin.c b/plugins/media-keys/gsd-media-keys-plugin.c
index 319a42a..d76e233 100644
--- a/plugins/media-keys/gsd-media-keys-plugin.c
+++ b/plugins/media-keys/gsd-media-keys-plugin.c
@@ -24,38 +24,38 @@
 #include <gmodule.h>
 
 #include "mate-settings-plugin.h"
-#include "gsd-media-keys-plugin.h"
-#include "gsd-media-keys-manager.h"
+#include "msd-media-keys-plugin.h"
+#include "msd-media-keys-manager.h"
 
-struct GsdMediaKeysPluginPrivate {
-        GsdMediaKeysManager *manager;
+struct MsdMediaKeysPluginPrivate {
+        MsdMediaKeysManager *manager;
 };
 
-#define GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginPrivate))
+#define MSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_MEDIA_KEYS_PLUGIN, MsdMediaKeysPluginPrivate))
 
-MATE_SETTINGS_PLUGIN_REGISTER (GsdMediaKeysPlugin, gsd_media_keys_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdMediaKeysPlugin, msd_media_keys_plugin)
 
 static void
-gsd_media_keys_plugin_init (GsdMediaKeysPlugin *plugin)
+msd_media_keys_plugin_init (MsdMediaKeysPlugin *plugin)
 {
-        plugin->priv = GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin);
+        plugin->priv = MSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin);
 
-        g_debug ("GsdMediaKeysPlugin initializing");
+        g_debug ("MsdMediaKeysPlugin initializing");
 
-        plugin->priv->manager = gsd_media_keys_manager_new ();
+        plugin->priv->manager = msd_media_keys_manager_new ();
 }
 
 static void
-gsd_media_keys_plugin_finalize (GObject *object)
+msd_media_keys_plugin_finalize (GObject *object)
 {
-        GsdMediaKeysPlugin *plugin;
+        MsdMediaKeysPlugin *plugin;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_PLUGIN (object));
+        g_return_if_fail (MSD_IS_MEDIA_KEYS_PLUGIN (object));
 
-        g_debug ("GsdMediaKeysPlugin finalizing");
+        g_debug ("MsdMediaKeysPlugin finalizing");
 
-        plugin = GSD_MEDIA_KEYS_PLUGIN (object);
+        plugin = MSD_MEDIA_KEYS_PLUGIN (object);
 
         g_return_if_fail (plugin->priv != NULL);
 
@@ -63,7 +63,7 @@ gsd_media_keys_plugin_finalize (GObject *object)
                 g_object_unref (plugin->priv->manager);
         }
 
-        G_OBJECT_CLASS (gsd_media_keys_plugin_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_media_keys_plugin_parent_class)->finalize (object);
 }
 
 static void
@@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)
         g_debug ("Activating media_keys plugin");
 
         error = NULL;
-        res = gsd_media_keys_manager_start (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error);
+        res = msd_media_keys_manager_start (MSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error);
         if (! res) {
                 g_warning ("Unable to start media_keys manager: %s", error->message);
                 g_error_free (error);
@@ -86,19 +86,19 @@ static void
 impl_deactivate (MateSettingsPlugin *plugin)
 {
         g_debug ("Deactivating media_keys plugin");
-        gsd_media_keys_manager_stop (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager);
+        msd_media_keys_manager_stop (MSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager);
 }
 
 static void
-gsd_media_keys_plugin_class_init (GsdMediaKeysPluginClass *klass)
+msd_media_keys_plugin_class_init (MsdMediaKeysPluginClass *klass)
 {
         GObjectClass           *object_class = G_OBJECT_CLASS (klass);
         MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
 
-        object_class->finalize = gsd_media_keys_plugin_finalize;
+        object_class->finalize = msd_media_keys_plugin_finalize;
 
         plugin_class->activate = impl_activate;
         plugin_class->deactivate = impl_deactivate;
 
-        g_type_class_add_private (klass, sizeof (GsdMediaKeysPluginPrivate));
+        g_type_class_add_private (klass, sizeof (MsdMediaKeysPluginPrivate));
 }
diff --git a/plugins/media-keys/gsd-media-keys-plugin.h b/plugins/media-keys/gsd-media-keys-plugin.h
index fa092b5..c869d62 100644
--- a/plugins/media-keys/gsd-media-keys-plugin.h
+++ b/plugins/media-keys/gsd-media-keys-plugin.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_MEDIA_KEYS_PLUGIN_H__
-#define __GSD_MEDIA_KEYS_PLUGIN_H__
+#ifndef __MSD_MEDIA_KEYS_PLUGIN_H__
+#define __MSD_MEDIA_KEYS_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -31,27 +31,27 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_MEDIA_KEYS_PLUGIN                (gsd_media_keys_plugin_get_type ())
-#define GSD_MEDIA_KEYS_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPlugin))
-#define GSD_MEDIA_KEYS_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
-#define GSD_IS_MEDIA_KEYS_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN))
-#define GSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_PLUGIN))
-#define GSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
+#define MSD_TYPE_MEDIA_KEYS_PLUGIN                (msd_media_keys_plugin_get_type ())
+#define MSD_MEDIA_KEYS_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_MEDIA_KEYS_PLUGIN, MsdMediaKeysPlugin))
+#define MSD_MEDIA_KEYS_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_MEDIA_KEYS_PLUGIN, MsdMediaKeysPluginClass))
+#define MSD_IS_MEDIA_KEYS_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_MEDIA_KEYS_PLUGIN))
+#define MSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_MEDIA_KEYS_PLUGIN))
+#define MSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_MEDIA_KEYS_PLUGIN, MsdMediaKeysPluginClass))
 
-typedef struct GsdMediaKeysPluginPrivate GsdMediaKeysPluginPrivate;
+typedef struct MsdMediaKeysPluginPrivate MsdMediaKeysPluginPrivate;
 
 typedef struct
 {
         MateSettingsPlugin    parent;
-        GsdMediaKeysPluginPrivate *priv;
-} GsdMediaKeysPlugin;
+        MsdMediaKeysPluginPrivate *priv;
+} MsdMediaKeysPlugin;
 
 typedef struct
 {
         MateSettingsPluginClass parent_class;
-} GsdMediaKeysPluginClass;
+} MsdMediaKeysPluginClass;
 
-GType   gsd_media_keys_plugin_get_type            (void) G_GNUC_CONST;
+GType   msd_media_keys_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_MEDIA_KEYS_PLUGIN_H__ */
+#endif /* __MSD_MEDIA_KEYS_PLUGIN_H__ */
diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index 2547068..8bd6c33 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -30,13 +30,13 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gsd-media-keys-window.h"
+#include "msd-media-keys-window.h"
 
-#define GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowPrivate))
+#define MSD_MEDIA_KEYS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_MEDIA_KEYS_WINDOW, MsdMediaKeysWindowPrivate))
 
-struct GsdMediaKeysWindowPrivate
+struct MsdMediaKeysWindowPrivate
 {
-        GsdMediaKeysWindowAction action;
+        MsdMediaKeysWindowAction action;
         char                    *icon_name;
         gboolean                 show_level;
 
@@ -47,10 +47,10 @@ struct GsdMediaKeysWindowPrivate
         GtkWidget               *progress;
 };
 
-G_DEFINE_TYPE (GsdMediaKeysWindow, gsd_media_keys_window, GSD_TYPE_OSD_WINDOW)
+G_DEFINE_TYPE (MsdMediaKeysWindow, msd_media_keys_window, MSD_TYPE_OSD_WINDOW)
 
 static void
-volume_controls_set_visible (GsdMediaKeysWindow *window,
+volume_controls_set_visible (MsdMediaKeysWindow *window,
                              gboolean            visible)
 {
         if (window->priv->progress == NULL)
@@ -64,7 +64,7 @@ volume_controls_set_visible (GsdMediaKeysWindow *window,
 }
 
 static void
-window_set_icon_name (GsdMediaKeysWindow *window,
+window_set_icon_name (MsdMediaKeysWindow *window,
                       const char         *name)
 {
         if (window->priv->image == NULL)
@@ -75,11 +75,11 @@ window_set_icon_name (GsdMediaKeysWindow *window,
 }
 
 static void
-action_changed (GsdMediaKeysWindow *window)
+action_changed (MsdMediaKeysWindow *window)
 {
-        if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
+        if (!msd_osd_window_is_composited (MSD_OSD_WINDOW (window))) {
                 switch (window->priv->action) {
-                case GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME:
+                case MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME:
                         volume_controls_set_visible (window, TRUE);
 
                         if (window->priv->volume_muted) {
@@ -89,7 +89,7 @@ action_changed (GsdMediaKeysWindow *window)
                         }
 
                         break;
-                case GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
+                case MSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
                         volume_controls_set_visible (window, window->priv->show_level);
                         window_set_icon_name (window, window->priv->icon_name);
                         break;
@@ -99,15 +99,15 @@ action_changed (GsdMediaKeysWindow *window)
                 }
         }
 
-        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+        msd_osd_window_update_and_hide (MSD_OSD_WINDOW (window));
 }
 
 static void
-volume_level_changed (GsdMediaKeysWindow *window)
+volume_level_changed (MsdMediaKeysWindow *window)
 {
-        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+        msd_osd_window_update_and_hide (MSD_OSD_WINDOW (window));
 
-        if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window)) && window->priv->progress != NULL) {
+        if (!msd_osd_window_is_composited (MSD_OSD_WINDOW (window)) && window->priv->progress != NULL) {
                 double fraction;
 
                 fraction = (double) window->priv->volume_level / 100.0;
@@ -118,11 +118,11 @@ volume_level_changed (GsdMediaKeysWindow *window)
 }
 
 static void
-volume_muted_changed (GsdMediaKeysWindow *window)
+volume_muted_changed (MsdMediaKeysWindow *window)
 {
-        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+        msd_osd_window_update_and_hide (MSD_OSD_WINDOW (window));
 
-        if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
+        if (!msd_osd_window_is_composited (MSD_OSD_WINDOW (window))) {
                 if (window->priv->volume_muted) {
                         window_set_icon_name (window, "audio-volume-muted");
                 } else {
@@ -132,46 +132,46 @@ volume_muted_changed (GsdMediaKeysWindow *window)
 }
 
 void
-gsd_media_keys_window_set_action (GsdMediaKeysWindow      *window,
-                                  GsdMediaKeysWindowAction action)
+msd_media_keys_window_set_action (MsdMediaKeysWindow      *window,
+                                  MsdMediaKeysWindowAction action)
 {
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
-        g_return_if_fail (action == GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
+        g_return_if_fail (MSD_IS_MEDIA_KEYS_WINDOW (window));
+        g_return_if_fail (action == MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
 
         if (window->priv->action != action) {
                 window->priv->action = action;
                 action_changed (window);
         } else {
-                gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+                msd_osd_window_update_and_hide (MSD_OSD_WINDOW (window));
         }
 }
 
 void
-gsd_media_keys_window_set_action_custom (GsdMediaKeysWindow      *window,
+msd_media_keys_window_set_action_custom (MsdMediaKeysWindow      *window,
                                          const char              *icon_name,
                                          gboolean                 show_level)
 {
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
+        g_return_if_fail (MSD_IS_MEDIA_KEYS_WINDOW (window));
         g_return_if_fail (icon_name != NULL);
 
-        if (window->priv->action != GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM ||
+        if (window->priv->action != MSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM ||
             g_strcmp0 (window->priv->icon_name, icon_name) != 0 ||
             window->priv->show_level != show_level) {
-                window->priv->action = GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM;
+                window->priv->action = MSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM;
                 g_free (window->priv->icon_name);
                 window->priv->icon_name = g_strdup (icon_name);
                 window->priv->show_level = show_level;
                 action_changed (window);
         } else {
-                gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+                msd_osd_window_update_and_hide (MSD_OSD_WINDOW (window));
         }
 }
 
 void
-gsd_media_keys_window_set_volume_muted (GsdMediaKeysWindow *window,
+msd_media_keys_window_set_volume_muted (MsdMediaKeysWindow *window,
                                         gboolean            muted)
 {
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
+        g_return_if_fail (MSD_IS_MEDIA_KEYS_WINDOW (window));
 
         if (window->priv->volume_muted != muted) {
                 window->priv->volume_muted = muted;
@@ -180,10 +180,10 @@ gsd_media_keys_window_set_volume_muted (GsdMediaKeysWindow *window,
 }
 
 void
-gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window,
+msd_media_keys_window_set_volume_level (MsdMediaKeysWindow *window,
                                         int                 level)
 {
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
+        g_return_if_fail (MSD_IS_MEDIA_KEYS_WINDOW (window));
 
         if (window->priv->volume_level != level) {
                 window->priv->volume_level = level;
@@ -192,7 +192,7 @@ gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window,
 }
 
 static GdkPixbuf *
-load_pixbuf (GsdMediaKeysWindow *window,
+load_pixbuf (MsdMediaKeysWindow *window,
              const char         *name,
              int                 icon_size)
 {
@@ -236,10 +236,10 @@ draw_eject (cairo_t *cr,
         cairo_rel_line_to (cr, -width / 2, -tri_height);
         cairo_rel_line_to (cr, -width / 2, tri_height);
         cairo_close_path (cr);
-        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, GSD_OSD_WINDOW_FG_ALPHA);
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, MSD_OSD_WINDOW_FG_ALPHA);
         cairo_fill_preserve (cr);
 
-        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, GSD_OSD_WINDOW_FG_ALPHA / 2);
+        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, MSD_OSD_WINDOW_FG_ALPHA / 2);
         cairo_set_line_width (cr, 2);
         cairo_stroke (cr);
 }
@@ -298,12 +298,12 @@ draw_cross (cairo_t *cr,
         cairo_move_to (cr, cx, cy + size/2.0);
         cairo_rel_line_to (cr, size, -size);
 
-        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, GSD_OSD_WINDOW_FG_ALPHA / 2);
+        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, MSD_OSD_WINDOW_FG_ALPHA / 2);
         cairo_set_line_width (cr, 14);
         cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
         cairo_stroke_preserve (cr);
 
-        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, GSD_OSD_WINDOW_FG_ALPHA);
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, MSD_OSD_WINDOW_FG_ALPHA);
         cairo_set_line_width (cr, 10);
         cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
         cairo_stroke (cr);
@@ -337,16 +337,16 @@ draw_speaker (cairo_t *cr,
         cairo_line_to (cr, _x0, _y0);
         cairo_close_path (cr);
 
-        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, GSD_OSD_WINDOW_FG_ALPHA);
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, MSD_OSD_WINDOW_FG_ALPHA);
         cairo_fill_preserve (cr);
 
-        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, GSD_OSD_WINDOW_FG_ALPHA / 2);
+        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, MSD_OSD_WINDOW_FG_ALPHA / 2);
         cairo_set_line_width (cr, 2);
         cairo_stroke (cr);
 }
 
 static gboolean
-render_speaker (GsdMediaKeysWindow *window,
+render_speaker (MsdMediaKeysWindow *window,
                 cairo_t            *cr,
                 double              _x0,
                 double              _y0,
@@ -385,7 +385,7 @@ render_speaker (GsdMediaKeysWindow *window,
         }
 
         gdk_cairo_set_source_pixbuf (cr, pixbuf, _x0, _y0);
-        cairo_paint_with_alpha (cr, GSD_OSD_WINDOW_FG_ALPHA);
+        cairo_paint_with_alpha (cr, MSD_OSD_WINDOW_FG_ALPHA);
 
         g_object_unref (pixbuf);
 
@@ -393,7 +393,7 @@ render_speaker (GsdMediaKeysWindow *window,
 }
 
 static void
-draw_volume_boxes (GsdMediaKeysWindow *window,
+draw_volume_boxes (MsdMediaKeysWindow *window,
                    cairo_t            *cr,
                    double              percentage,
                    double              _x0,
@@ -414,20 +414,20 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         style = gtk_widget_get_style (GTK_WIDGET (window));
 
         /* bar background */
-        gsd_osd_window_color_reverse (&style->dark[GTK_STATE_NORMAL], &color);
+        msd_osd_window_color_reverse (&style->dark[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        gsd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, width, height);
-        cairo_set_source_rgba (cr, r, g, b, GSD_OSD_WINDOW_FG_ALPHA / 2);
+        msd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, width, height);
+        cairo_set_source_rgba (cr, r, g, b, MSD_OSD_WINDOW_FG_ALPHA / 2);
         cairo_fill_preserve (cr);
 
         /* bar border */
-        gsd_osd_window_color_reverse (&style->light[GTK_STATE_NORMAL], &color);
+        msd_osd_window_color_reverse (&style->light[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_set_source_rgba (cr, r, g, b, GSD_OSD_WINDOW_FG_ALPHA / 2);
+        cairo_set_source_rgba (cr, r, g, b, MSD_OSD_WINDOW_FG_ALPHA / 2);
         cairo_set_line_width (cr, 1);
         cairo_stroke (cr);
 
@@ -438,13 +438,13 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        gsd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 6 - 0.5, x1, height - 1);
-        cairo_set_source_rgba (cr, r, g, b, GSD_OSD_WINDOW_FG_ALPHA);
+        msd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 6 - 0.5, x1, height - 1);
+        cairo_set_source_rgba (cr, r, g, b, MSD_OSD_WINDOW_FG_ALPHA);
         cairo_fill (cr);
 }
 
 static void
-draw_action_volume (GsdMediaKeysWindow *window,
+draw_action_volume (MsdMediaKeysWindow *window,
                     cairo_t            *cr)
 {
         int window_width;
@@ -546,7 +546,7 @@ draw_action_volume (GsdMediaKeysWindow *window,
 }
 
 static gboolean
-render_custom (GsdMediaKeysWindow *window,
+render_custom (MsdMediaKeysWindow *window,
                cairo_t            *cr,
                double              _x0,
                double              _y0,
@@ -573,7 +573,7 @@ render_custom (GsdMediaKeysWindow *window,
         }
 
         gdk_cairo_set_source_pixbuf (cr, pixbuf, _x0, _y0);
-        cairo_paint_with_alpha (cr, GSD_OSD_WINDOW_FG_ALPHA);
+        cairo_paint_with_alpha (cr, MSD_OSD_WINDOW_FG_ALPHA);
 
         g_object_unref (pixbuf);
 
@@ -581,7 +581,7 @@ render_custom (GsdMediaKeysWindow *window,
 }
 
 static void
-draw_action_custom (GsdMediaKeysWindow *window,
+draw_action_custom (MsdMediaKeysWindow *window,
                     cairo_t            *cr)
 {
         int window_width;
@@ -645,16 +645,16 @@ draw_action_custom (GsdMediaKeysWindow *window,
 }
 
 static void
-gsd_media_keys_window_expose_when_composited (GsdOsdWindow *osd_window,
+msd_media_keys_window_expose_when_composited (MsdOsdWindow *osd_window,
                                               cairo_t      *cr)
 {
-        GsdMediaKeysWindow *window = GSD_MEDIA_KEYS_WINDOW (osd_window);
+        MsdMediaKeysWindow *window = MSD_MEDIA_KEYS_WINDOW (osd_window);
 
         switch (window->priv->action) {
-        case GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME:
+        case MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME:
                 draw_action_volume (window, cr);
                 break;
-        case GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
+        case MSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
                 draw_action_custom (window, cr);
                 break;
         default:
@@ -663,25 +663,25 @@ gsd_media_keys_window_expose_when_composited (GsdOsdWindow *osd_window,
 }
 
 static void
-gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass)
+msd_media_keys_window_class_init (MsdMediaKeysWindowClass *klass)
 {
-        GsdOsdWindowClass *osd_window_class = GSD_OSD_WINDOW_CLASS (klass);
+        MsdOsdWindowClass *osd_window_class = MSD_OSD_WINDOW_CLASS (klass);
 
-        osd_window_class->expose_when_composited = gsd_media_keys_window_expose_when_composited;
+        osd_window_class->expose_when_composited = msd_media_keys_window_expose_when_composited;
 
-        g_type_class_add_private (klass, sizeof (GsdMediaKeysWindowPrivate));
+        g_type_class_add_private (klass, sizeof (MsdMediaKeysWindowPrivate));
 }
 
 static void
-gsd_media_keys_window_init (GsdMediaKeysWindow *window)
+msd_media_keys_window_init (MsdMediaKeysWindow *window)
 {
         GdkScreen *screen;
 
-        window->priv = GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE (window);
+        window->priv = MSD_MEDIA_KEYS_WINDOW_GET_PRIVATE (window);
 
         screen = gtk_widget_get_screen (GTK_WIDGET (window));
 
-        if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
+        if (!msd_osd_window_is_composited (MSD_OSD_WINDOW (window))) {
                 GtkBuilder *builder;
                 const gchar *objects[] = {"acme_box", NULL};
                 GtkWidget *box;
@@ -708,7 +708,7 @@ gsd_media_keys_window_init (GsdMediaKeysWindow *window)
 }
 
 GtkWidget *
-gsd_media_keys_window_new (void)
+msd_media_keys_window_new (void)
 {
-        return g_object_new (GSD_TYPE_MEDIA_KEYS_WINDOW, NULL);
+        return g_object_new (MSD_TYPE_MEDIA_KEYS_WINDOW, NULL);
 }
diff --git a/plugins/media-keys/gsd-media-keys-window.h b/plugins/media-keys/gsd-media-keys-window.h
index 236d011..c0e5739 100644
--- a/plugins/media-keys/gsd-media-keys-window.h
+++ b/plugins/media-keys/gsd-media-keys-window.h
@@ -20,56 +20,56 @@
  *
  */
 
-#ifndef GSD_MEDIA_KEYS_WINDOW_H
-#define GSD_MEDIA_KEYS_WINDOW_H
+#ifndef MSD_MEDIA_KEYS_WINDOW_H
+#define MSD_MEDIA_KEYS_WINDOW_H
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "gsd-osd-window.h"
+#include "msd-osd-window.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define GSD_TYPE_MEDIA_KEYS_WINDOW            (gsd_media_keys_window_get_type ())
-#define GSD_MEDIA_KEYS_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),  GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindow))
-#define GSD_MEDIA_KEYS_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),   GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowClass))
-#define GSD_IS_MEDIA_KEYS_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj),  GSD_TYPE_MEDIA_KEYS_WINDOW))
-#define GSD_IS_MEDIA_KEYS_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), GSD_TYPE_MEDIA_KEYS_WINDOW))
+#define MSD_TYPE_MEDIA_KEYS_WINDOW            (msd_media_keys_window_get_type ())
+#define MSD_MEDIA_KEYS_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),  MSD_TYPE_MEDIA_KEYS_WINDOW, MsdMediaKeysWindow))
+#define MSD_MEDIA_KEYS_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),   MSD_TYPE_MEDIA_KEYS_WINDOW, MsdMediaKeysWindowClass))
+#define MSD_IS_MEDIA_KEYS_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj),  MSD_TYPE_MEDIA_KEYS_WINDOW))
+#define MSD_IS_MEDIA_KEYS_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), MSD_TYPE_MEDIA_KEYS_WINDOW))
 
-typedef struct GsdMediaKeysWindow                   GsdMediaKeysWindow;
-typedef struct GsdMediaKeysWindowClass              GsdMediaKeysWindowClass;
-typedef struct GsdMediaKeysWindowPrivate            GsdMediaKeysWindowPrivate;
+typedef struct MsdMediaKeysWindow                   MsdMediaKeysWindow;
+typedef struct MsdMediaKeysWindowClass              MsdMediaKeysWindowClass;
+typedef struct MsdMediaKeysWindowPrivate            MsdMediaKeysWindowPrivate;
 
-struct GsdMediaKeysWindow {
-        GsdOsdWindow parent;
+struct MsdMediaKeysWindow {
+        MsdOsdWindow parent;
 
-        GsdMediaKeysWindowPrivate  *priv;
+        MsdMediaKeysWindowPrivate  *priv;
 };
 
-struct GsdMediaKeysWindowClass {
-        GsdOsdWindowClass parent_class;
+struct MsdMediaKeysWindowClass {
+        MsdOsdWindowClass parent_class;
 };
 
 typedef enum {
-        GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME,
-        GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM
-} GsdMediaKeysWindowAction;
+        MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME,
+        MSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM
+} MsdMediaKeysWindowAction;
 
-GType                 gsd_media_keys_window_get_type          (void);
+GType                 msd_media_keys_window_get_type          (void);
 
-GtkWidget *           gsd_media_keys_window_new               (void);
-void                  gsd_media_keys_window_set_action        (GsdMediaKeysWindow      *window,
-                                                               GsdMediaKeysWindowAction action);
-void                  gsd_media_keys_window_set_action_custom (GsdMediaKeysWindow      *window,
+GtkWidget *           msd_media_keys_window_new               (void);
+void                  msd_media_keys_window_set_action        (MsdMediaKeysWindow      *window,
+                                                               MsdMediaKeysWindowAction action);
+void                  msd_media_keys_window_set_action_custom (MsdMediaKeysWindow      *window,
                                                                const char              *icon_name,
                                                                gboolean                 show_level);
-void                  gsd_media_keys_window_set_volume_muted  (GsdMediaKeysWindow      *window,
+void                  msd_media_keys_window_set_volume_muted  (MsdMediaKeysWindow      *window,
                                                                gboolean                 muted);
-void                  gsd_media_keys_window_set_volume_level  (GsdMediaKeysWindow      *window,
+void                  msd_media_keys_window_set_volume_level  (MsdMediaKeysWindow      *window,
                                                                int                      level);
-gboolean              gsd_media_keys_window_is_valid          (GsdMediaKeysWindow      *window);
+gboolean              msd_media_keys_window_is_valid          (MsdMediaKeysWindow      *window);
 
 #ifdef __cplusplus
 }
diff --git a/plugins/media-keys/test-media-keys.c b/plugins/media-keys/test-media-keys.c
index e3345f9..6505550 100644
--- a/plugins/media-keys/test-media-keys.c
+++ b/plugins/media-keys/test-media-keys.c
@@ -27,9 +27,9 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gsd-media-keys-manager.h"
+#include "msd-media-keys-manager.h"
 
-static GsdMediaKeysManager *manager = NULL;
+static MsdMediaKeysManager *manager = NULL;
 
 int
 main (int    argc,
@@ -53,10 +53,10 @@ main (int    argc,
                 exit (1);
         }
 
-        manager = gsd_media_keys_manager_new ();
+        manager = msd_media_keys_manager_new ();
 
         error = NULL;
-        res = gsd_media_keys_manager_start (manager, &error);
+        res = msd_media_keys_manager_start (manager, &error);
 
         gtk_main ();
 
diff --git a/plugins/media-keys/test-media-window.c b/plugins/media-keys/test-media-window.c
index c97f3d9..8860999 100644
--- a/plugins/media-keys/test-media-window.c
+++ b/plugins/media-keys/test-media-window.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gsd-media-keys-window.h"
+#include "msd-media-keys-window.h"
 
 static gboolean
 update_state (GtkWidget *window)
@@ -38,58 +38,58 @@ update_state (GtkWidget *window)
 
         switch (count) {
         case 1:
-                gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_volume_level (MSD_MEDIA_KEYS_WINDOW (window),
                                                         50);
-                gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (window),
-                                                  GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
+                msd_media_keys_window_set_action (MSD_MEDIA_KEYS_WINDOW (window),
+                                                  MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
 
                 gtk_widget_show (window);
                 break;
         case 2:
-                gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_volume_level (MSD_MEDIA_KEYS_WINDOW (window),
                                                         100);
-                gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (window),
-                                                  GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
+                msd_media_keys_window_set_action (MSD_MEDIA_KEYS_WINDOW (window),
+                                                  MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
 
                 gtk_widget_show (window);
                 break;
         case 3:
-                gsd_media_keys_window_set_volume_muted (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_volume_muted (MSD_MEDIA_KEYS_WINDOW (window),
                                                         TRUE);
-                gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (window),
-                                                  GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
+                msd_media_keys_window_set_action (MSD_MEDIA_KEYS_WINDOW (window),
+                                                  MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
 
                 gtk_widget_show (window);
                 break;
         case 4:
-                gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
                                                          "media-eject",
                                                          FALSE);
 
                 gtk_widget_show (window);
                 break;
         case 5:
-                gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_volume_level (MSD_MEDIA_KEYS_WINDOW (window),
                                                         0);
-                gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
                                                          "gpm-brightness-lcd",
                                                          TRUE);
 
                 gtk_widget_show (window);
                 break;
         case 6:
-                gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_volume_level (MSD_MEDIA_KEYS_WINDOW (window),
                                                         50);
-                gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
                                                          "gpm-brightness-lcd",
                                                          TRUE);
 
                 gtk_widget_show (window);
                 break;
         case 7:
-                gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_volume_level (MSD_MEDIA_KEYS_WINDOW (window),
                                                         100);
-                gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (window),
+                msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
                                                          "gpm-brightness-lcd",
                                                          TRUE);
 
@@ -108,13 +108,13 @@ test_window (void)
 {
         GtkWidget *window;
 
-        window = gsd_media_keys_window_new ();
+        window = msd_media_keys_window_new ();
         gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER_ALWAYS);
 
-        gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (window),
+        msd_media_keys_window_set_volume_level (MSD_MEDIA_KEYS_WINDOW (window),
                                                 0);
-        gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (window),
-                                          GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
+        msd_media_keys_window_set_action (MSD_MEDIA_KEYS_WINDOW (window),
+                                          MSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
 
         gtk_widget_show (window);