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

9 files changed, 400 insertions, 400 deletions

diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index f99aefc..8e1ab77 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -1,10 +1,10 @@
 plugin_LTLIBRARIES = libmouse.la
 
 libmouse_la_SOURCES = 		\
-	gsd-mouse-plugin.h	\
-	gsd-mouse-plugin.c	\
-	gsd-mouse-manager.h	\
-	gsd-mouse-manager.c
+	msd-mouse-plugin.h	\
+	msd-mouse-plugin.c	\
+	msd-mouse-manager.h	\
+	msd-mouse-manager.c
 
 libmouse_la_CPPFLAGS = \
 	-I$(top_srcdir)/mate-settings-daemon		\
@@ -17,7 +17,7 @@ libmouse_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libmouse_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)
+	$(MSD_PLUGIN_LDFLAGS)
 
 libmouse_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
@@ -28,19 +28,19 @@ plugin_in_files = mouse.mate-settings-plugin.in
 
 plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
 
-libexec_PROGRAMS = gsd-locate-pointer
+libexec_PROGRAMS = msd-locate-pointer
 
-gsd_locate_pointer_SOURCES = 	\
-	gsd-locate-pointer.h	\
-	gsd-locate-pointer.c	\
-	gsd-timeline.h		\
-	gsd-timeline.c
+msd_locate_pointer_SOURCES = 	\
+	msd-locate-pointer.h	\
+	msd-locate-pointer.c	\
+	msd-timeline.h		\
+	msd-timeline.c
 
-gsd_locate_pointer_CFLAGS = \
+msd_locate_pointer_CFLAGS = \
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
-gsd_locate_pointer_LDADD  = 		\
+msd_locate_pointer_LDADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)		\
 	$(X11_LIBS)			\
 	-lm
@@ -49,4 +49,4 @@ EXTRA_DIST = $(plugin_in_files)
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/mouse/gsd-locate-pointer.c b/plugins/mouse/gsd-locate-pointer.c
index acb2445..8582074 100644
--- a/plugins/mouse/gsd-locate-pointer.c
+++ b/plugins/mouse/gsd-locate-pointer.c
@@ -1,4 +1,4 @@
-/* gsd-locate-pointer.c
+/* msd-locate-pointer.c
  *
  * Copyright (C) 2008 Carlos Garnacho  <[email protected]>
  *
@@ -18,8 +18,8 @@
  */
 
 #include <gtk/gtk.h>
-#include "gsd-timeline.h"
-#include "gsd-locate-pointer.h"
+#include "msd-timeline.h"
+#include "msd-locate-pointer.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
@@ -37,21 +37,21 @@
 #define CIRCLES_PROGRESS_INTERVAL (0.5 / N_CIRCLES)
 #define CIRCLE_PROGRESS(p) (MIN (1., ((gdouble) (p) * 2.)))
 
-typedef struct GsdLocatePointerData GsdLocatePointerData;
+typedef struct MsdLocatePointerData MsdLocatePointerData;
 
-struct GsdLocatePointerData
+struct MsdLocatePointerData
 {
-  GsdTimeline *timeline;
+  MsdTimeline *timeline;
   GtkWidget *widget;
   GdkWindow *window;
 
   gdouble progress;
 };
 
-static GsdLocatePointerData *data = NULL;
+static MsdLocatePointerData *data = NULL;
 
 static void
-locate_pointer_paint (GsdLocatePointerData *data,
+locate_pointer_paint (MsdLocatePointerData *data,
 		      cairo_t              *cr,
 		      gboolean              composite)
 {
@@ -131,7 +131,7 @@ locate_pointer_expose (GtkWidget      *widget,
 		       GdkEventExpose *event,
 		       gpointer        user_data)
 {
-  GsdLocatePointerData *data = (GsdLocatePointerData *) user_data;
+  MsdLocatePointerData *data = (MsdLocatePointerData *) user_data;
   cairo_t *cr;
 
   if (event->window != data->window)
@@ -145,7 +145,7 @@ locate_pointer_expose (GtkWidget      *widget,
 }
 
 static void
-update_shape (GsdLocatePointerData *data)
+update_shape (MsdLocatePointerData *data)
 {
   cairo_t *cr;
   GdkBitmap *mask;
@@ -159,11 +159,11 @@ update_shape (GsdLocatePointerData *data)
 }
 
 static void
-timeline_frame_cb (GsdTimeline *timeline,
+timeline_frame_cb (MsdTimeline *timeline,
 		   gdouble      progress,
 		   gpointer     user_data)
 {
-  GsdLocatePointerData *data = (GsdLocatePointerData *) user_data;
+  MsdLocatePointerData *data = (MsdLocatePointerData *) user_data;
   GdkScreen *screen;
   gint cursor_x, cursor_y;
 
@@ -214,7 +214,7 @@ unset_transparent_shape (GdkWindow *window)
 
 static void
 composited_changed (GtkWidget            *widget,
-                    GsdLocatePointerData *data)
+                    MsdLocatePointerData *data)
 {
   if (!gtk_widget_is_composited (widget))
     set_transparent_shape (data->window);
@@ -223,10 +223,10 @@ composited_changed (GtkWidget            *widget,
 }
 
 static void
-timeline_finished_cb (GsdTimeline *timeline,
+timeline_finished_cb (MsdTimeline *timeline,
 		      gpointer     user_data)
 {
-  GsdLocatePointerData *data = (GsdLocatePointerData *) user_data;
+  MsdLocatePointerData *data = (MsdLocatePointerData *) user_data;
 
   /* set transparent shape and hide window */
   if (!gtk_widget_is_composited (data->widget))
@@ -236,7 +236,7 @@ timeline_finished_cb (GsdTimeline *timeline,
 }
 
 static void
-create_window (GsdLocatePointerData *data,
+create_window (MsdLocatePointerData *data,
 	       GdkScreen            *screen)
 {
   GdkColormap *colormap;
@@ -267,12 +267,12 @@ create_window (GsdLocatePointerData *data,
   gdk_window_set_user_data (data->window, data->widget);
 }
 
-static GsdLocatePointerData *
-gsd_locate_pointer_data_new (GdkScreen *screen)
+static MsdLocatePointerData *
+msd_locate_pointer_data_new (GdkScreen *screen)
 {
-  GsdLocatePointerData *data;
+  MsdLocatePointerData *data;
 
-  data = g_new0 (GsdLocatePointerData, 1);
+  data = g_new0 (MsdLocatePointerData, 1);
 
   /* this widget will never be shown, it's
    * mainly used to get signals/events from
@@ -284,7 +284,7 @@ gsd_locate_pointer_data_new (GdkScreen *screen)
                     G_CALLBACK (locate_pointer_expose),
                     data);
 
-  data->timeline = gsd_timeline_new (ANIMATION_LENGTH);
+  data->timeline = msd_timeline_new (ANIMATION_LENGTH);
   g_signal_connect (data->timeline, "frame",
 		    G_CALLBACK (timeline_frame_cb), data);
   g_signal_connect (data->timeline, "finished",
@@ -296,7 +296,7 @@ gsd_locate_pointer_data_new (GdkScreen *screen)
 }
 
 static void
-move_locate_pointer_window (GsdLocatePointerData *data,
+move_locate_pointer_window (MsdLocatePointerData *data,
 			    GdkScreen            *screen)
 {
   gint cursor_x, cursor_y;
@@ -326,13 +326,13 @@ move_locate_pointer_window (GsdLocatePointerData *data,
 }
 
 void
-gsd_locate_pointer (GdkScreen *screen)
+msd_locate_pointer (GdkScreen *screen)
 {
   if (!data)
-    data = gsd_locate_pointer_data_new (screen);
+    data = msd_locate_pointer_data_new (screen);
 
-  gsd_timeline_pause (data->timeline);
-  gsd_timeline_rewind (data->timeline);
+  msd_timeline_pause (data->timeline);
+  msd_timeline_rewind (data->timeline);
 
   /* Create again the window if it is not for the current screen */
   if (gdk_screen_get_number (screen) != gdk_screen_get_number (gdk_drawable_get_screen (data->window)))
@@ -352,7 +352,7 @@ gsd_locate_pointer (GdkScreen *screen)
   composited_changed (data->widget, data);
   gdk_window_show (data->window);
 
-  gsd_timeline_start (data->timeline);
+  msd_timeline_start (data->timeline);
 }
 
 
@@ -394,7 +394,7 @@ filter (GdkXEvent *xevent,
               XAllowEvents (xev->xkey.display,
                             AsyncKeyboard,
                             xev->xkey.time);
-              gsd_locate_pointer (screen);
+              msd_locate_pointer (screen);
             }
         }
       else
diff --git a/plugins/mouse/gsd-locate-pointer.h b/plugins/mouse/gsd-locate-pointer.h
index 3b261a5..c21da43 100644
--- a/plugins/mouse/gsd-locate-pointer.h
+++ b/plugins/mouse/gsd-locate-pointer.h
@@ -19,6 +19,6 @@
 
 #include <gdk/gdk.h>
 
-void gsd_locate_pointer (GdkScreen *screen);
+void msd_locate_pointer (GdkScreen *screen);
 
 #endif
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index d843314..d7cb8e4 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -48,9 +48,9 @@
 #include <mateconf/mateconf-client.h>
 
 #include "mate-settings-profile.h"
-#include "gsd-mouse-manager.h"
+#include "msd-mouse-manager.h"
 
-#define GSD_MOUSE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUSE_MANAGER, GsdMouseManagerPrivate))
+#define MSD_MOUSE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_MOUSE_MANAGER, MsdMouseManagerPrivate))
 
 #define MATECONF_MOUSE_DIR         "/desktop/mate/peripherals/mouse"
 #define MATECONF_MOUSE_A11Y_DIR    "/desktop/mate/accessibility/mouse"
@@ -70,7 +70,7 @@
 #define KEY_TOUCHPAD_ENABLED    MATECONF_TOUCHPAD_DIR "/touchpad_enabled"
 #endif
 
-struct GsdMouseManagerPrivate
+struct MsdMouseManagerPrivate
 {
         guint notify;
         guint notify_a11y;
@@ -83,28 +83,28 @@ struct GsdMouseManagerPrivate
 	GPid locate_pointer_pid;
 };
 
-static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
-static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manager);
-static void     gsd_mouse_manager_finalize    (GObject             *object);
-static void     set_mouse_settings            (GsdMouseManager      *manager);
+static void     msd_mouse_manager_class_init  (MsdMouseManagerClass *klass);
+static void     msd_mouse_manager_init        (MsdMouseManager      *mouse_manager);
+static void     msd_mouse_manager_finalize    (GObject             *object);
+static void     set_mouse_settings            (MsdMouseManager      *manager);
 #ifdef HAVE_X11_EXTENSIONS_XINPUT_H
 static int      set_tap_to_click              (gboolean state, gboolean left_handed);
 static XDevice* device_is_touchpad            (XDeviceInfo deviceinfo);
 #endif
 
-G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdMouseManager, msd_mouse_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
 
 static void
-gsd_mouse_manager_set_property (GObject        *object,
+msd_mouse_manager_set_property (GObject        *object,
                                guint           prop_id,
                                const GValue   *value,
                                GParamSpec     *pspec)
 {
-        GsdMouseManager *self;
+        MsdMouseManager *self;
 
-        self = GSD_MOUSE_MANAGER (object);
+        self = MSD_MOUSE_MANAGER (object);
 
         switch (prop_id) {
         default:
@@ -114,14 +114,14 @@ gsd_mouse_manager_set_property (GObject        *object,
 }
 
 static void
-gsd_mouse_manager_get_property (GObject        *object,
+msd_mouse_manager_get_property (GObject        *object,
                                guint           prop_id,
                                GValue         *value,
                                GParamSpec     *pspec)
 {
-        GsdMouseManager *self;
+        MsdMouseManager *self;
 
-        self = GSD_MOUSE_MANAGER (object);
+        self = MSD_MOUSE_MANAGER (object);
 
         switch (prop_id) {
         default:
@@ -131,16 +131,16 @@ gsd_mouse_manager_get_property (GObject        *object,
 }
 
 static GObject *
-gsd_mouse_manager_constructor (GType                  type,
+msd_mouse_manager_constructor (GType                  type,
                               guint                  n_construct_properties,
                               GObjectConstructParam *construct_properties)
 {
-        GsdMouseManager      *mouse_manager;
-        GsdMouseManagerClass *klass;
+        MsdMouseManager      *mouse_manager;
+        MsdMouseManagerClass *klass;
 
-        klass = GSD_MOUSE_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_MOUSE_MANAGER));
+        klass = MSD_MOUSE_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_MOUSE_MANAGER));
 
-        mouse_manager = GSD_MOUSE_MANAGER (G_OBJECT_CLASS (gsd_mouse_manager_parent_class)->constructor (type,
+        mouse_manager = MSD_MOUSE_MANAGER (G_OBJECT_CLASS (msd_mouse_manager_parent_class)->constructor (type,
                                                                                                       n_construct_properties,
                                                                                                       construct_properties));
 
@@ -148,27 +148,27 @@ gsd_mouse_manager_constructor (GType                  type,
 }
 
 static void
-gsd_mouse_manager_dispose (GObject *object)
+msd_mouse_manager_dispose (GObject *object)
 {
-        GsdMouseManager *mouse_manager;
+        MsdMouseManager *mouse_manager;
 
-        mouse_manager = GSD_MOUSE_MANAGER (object);
+        mouse_manager = MSD_MOUSE_MANAGER (object);
 
-        G_OBJECT_CLASS (gsd_mouse_manager_parent_class)->dispose (object);
+        G_OBJECT_CLASS (msd_mouse_manager_parent_class)->dispose (object);
 }
 
 static void
-gsd_mouse_manager_class_init (GsdMouseManagerClass *klass)
+msd_mouse_manager_class_init (MsdMouseManagerClass *klass)
 {
         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->get_property = gsd_mouse_manager_get_property;
-        object_class->set_property = gsd_mouse_manager_set_property;
-        object_class->constructor = gsd_mouse_manager_constructor;
-        object_class->dispose = gsd_mouse_manager_dispose;
-        object_class->finalize = gsd_mouse_manager_finalize;
+        object_class->get_property = msd_mouse_manager_get_property;
+        object_class->set_property = msd_mouse_manager_set_property;
+        object_class->constructor = msd_mouse_manager_constructor;
+        object_class->dispose = msd_mouse_manager_dispose;
+        object_class->finalize = msd_mouse_manager_finalize;
 
-        g_type_class_add_private (klass, sizeof (GsdMouseManagerPrivate));
+        g_type_class_add_private (klass, sizeof (MsdMouseManagerPrivate));
 }
 
 
@@ -386,13 +386,13 @@ devicepresence_filter (GdkXEvent *xevent,
         {
             XDevicePresenceNotifyEvent *dpn = (XDevicePresenceNotifyEvent *) xev;
             if (dpn->devchange == DeviceEnabled)
-                set_mouse_settings ((GsdMouseManager *) data);
+                set_mouse_settings ((MsdMouseManager *) data);
         }
         return GDK_FILTER_CONTINUE;
 }
 
 static void
-set_devicepresence_handler (GsdMouseManager *manager)
+set_devicepresence_handler (MsdMouseManager *manager)
 {
         Display *display;
         XEventClass class_presence;
@@ -416,7 +416,7 @@ set_devicepresence_handler (GsdMouseManager *manager)
 #endif
 
 static void
-set_left_handed (GsdMouseManager *manager,
+set_left_handed (MsdMouseManager *manager,
                  gboolean         left_handed)
 {
         guchar *buttons ;
@@ -462,7 +462,7 @@ set_left_handed (GsdMouseManager *manager,
 }
 
 static void
-set_motion_acceleration (GsdMouseManager *manager,
+set_motion_acceleration (MsdMouseManager *manager,
                          gfloat           motion_acceleration)
 {
         gint numerator, denominator;
@@ -498,7 +498,7 @@ set_motion_acceleration (GsdMouseManager *manager,
 }
 
 static void
-set_motion_threshold (GsdMouseManager *manager,
+set_motion_threshold (MsdMouseManager *manager,
                       int              motion_threshold)
 {
         XChangePointerControl (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), False, True,
@@ -543,7 +543,7 @@ device_is_touchpad (XDeviceInfo deviceinfo)
 #endif
 
 static int
-set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+set_disable_w_typing (MsdMouseManager *manager, gboolean state)
 {
 
         if (state) {
@@ -805,7 +805,7 @@ set_touchpad_enabled (gboolean state)
 #endif
 
 static void
-set_locate_pointer (GsdMouseManager *manager,
+set_locate_pointer (MsdMouseManager *manager,
                     gboolean         state)
 {
         if (state) {
@@ -815,7 +815,7 @@ set_locate_pointer (GsdMouseManager *manager,
                 if (manager->priv->locate_pointer_spawned)
                         return;
 
-                args[0] = LIBEXECDIR "/gsd-locate-pointer";
+                args[0] = LIBEXECDIR "/msd-locate-pointer";
                 args[1] = NULL;
 
                 g_spawn_async (NULL, args, NULL,
@@ -841,7 +841,7 @@ set_locate_pointer (GsdMouseManager *manager,
 }
 
 static void
-set_mousetweaks_daemon (GsdMouseManager *manager,
+set_mousetweaks_daemon (MsdMouseManager *manager,
                         gboolean         dwell_enable,
                         gboolean         delay_enable)
 {
@@ -896,7 +896,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager,
 }
 
 static void
-set_mouse_settings (GsdMouseManager *manager)
+set_mouse_settings (MsdMouseManager *manager)
 {
         MateConfClient *client = mateconf_client_get_default ();
         gboolean left_handed = mateconf_client_get_bool (client, KEY_LEFT_HANDED, NULL);
@@ -920,7 +920,7 @@ static void
 mouse_callback (MateConfClient        *client,
                 guint               cnxn_id,
                 MateConfEntry         *entry,
-                GsdMouseManager    *manager)
+                MsdMouseManager    *manager)
 {
         if (! strcmp (entry->key, KEY_LEFT_HANDED)) {
                 if (entry->value->type == MATECONF_VALUE_BOOL) {
@@ -978,7 +978,7 @@ mouse_callback (MateConfClient        *client,
 }
 
 static guint
-register_config_callback (GsdMouseManager         *manager,
+register_config_callback (MsdMouseManager         *manager,
                           MateConfClient             *client,
                           const char              *path,
                           MateConfClientNotifyFunc    func)
@@ -988,13 +988,13 @@ register_config_callback (GsdMouseManager         *manager,
 }
 
 static void
-gsd_mouse_manager_init (GsdMouseManager *manager)
+msd_mouse_manager_init (MsdMouseManager *manager)
 {
-        manager->priv = GSD_MOUSE_MANAGER_GET_PRIVATE (manager);
+        manager->priv = MSD_MOUSE_MANAGER_GET_PRIVATE (manager);
 }
 
 static gboolean
-gsd_mouse_manager_idle_cb (GsdMouseManager *manager)
+msd_mouse_manager_idle_cb (MsdMouseManager *manager)
 {
         MateConfClient *client;
 
@@ -1045,12 +1045,12 @@ gsd_mouse_manager_idle_cb (GsdMouseManager *manager)
 }
 
 gboolean
-gsd_mouse_manager_start (GsdMouseManager *manager,
+msd_mouse_manager_start (MsdMouseManager *manager,
                          GError         **error)
 {
         mate_settings_profile_start (NULL);
 
-        g_idle_add ((GSourceFunc) gsd_mouse_manager_idle_cb, manager);
+        g_idle_add ((GSourceFunc) msd_mouse_manager_idle_cb, manager);
 
         mate_settings_profile_end (NULL);
 
@@ -1058,9 +1058,9 @@ gsd_mouse_manager_start (GsdMouseManager *manager,
 }
 
 void
-gsd_mouse_manager_stop (GsdMouseManager *manager)
+msd_mouse_manager_stop (MsdMouseManager *manager)
 {
-        GsdMouseManagerPrivate *p = manager->priv;
+        MsdMouseManagerPrivate *p = manager->priv;
         MateConfClient *client;
 
         g_debug ("Stopping mouse manager");
@@ -1095,30 +1095,30 @@ gsd_mouse_manager_stop (GsdMouseManager *manager)
 }
 
 static void
-gsd_mouse_manager_finalize (GObject *object)
+msd_mouse_manager_finalize (GObject *object)
 {
-        GsdMouseManager *mouse_manager;
+        MsdMouseManager *mouse_manager;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_MOUSE_MANAGER (object));
+        g_return_if_fail (MSD_IS_MOUSE_MANAGER (object));
 
-        mouse_manager = GSD_MOUSE_MANAGER (object);
+        mouse_manager = MSD_MOUSE_MANAGER (object);
 
         g_return_if_fail (mouse_manager->priv != NULL);
 
-        G_OBJECT_CLASS (gsd_mouse_manager_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_mouse_manager_parent_class)->finalize (object);
 }
 
-GsdMouseManager *
-gsd_mouse_manager_new (void)
+MsdMouseManager *
+msd_mouse_manager_new (void)
 {
         if (manager_object != NULL) {
                 g_object_ref (manager_object);
         } else {
-                manager_object = g_object_new (GSD_TYPE_MOUSE_MANAGER, NULL);
+                manager_object = g_object_new (MSD_TYPE_MOUSE_MANAGER, NULL);
                 g_object_add_weak_pointer (manager_object,
                                            (gpointer *) &manager_object);
         }
 
-        return GSD_MOUSE_MANAGER (manager_object);
+        return MSD_MOUSE_MANAGER (manager_object);
 }
diff --git a/plugins/mouse/gsd-mouse-manager.h b/plugins/mouse/gsd-mouse-manager.h
index f8f513c..e691d7b 100644
--- a/plugins/mouse/gsd-mouse-manager.h
+++ b/plugins/mouse/gsd-mouse-manager.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_MOUSE_MANAGER_H
-#define __GSD_MOUSE_MANAGER_H
+#ifndef __MSD_MOUSE_MANAGER_H
+#define __MSD_MOUSE_MANAGER_H
 
 #include <glib-object.h>
 
@@ -27,35 +27,35 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_MOUSE_MANAGER         (gsd_mouse_manager_get_type ())
-#define GSD_MOUSE_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MOUSE_MANAGER, GsdMouseManager))
-#define GSD_MOUSE_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MOUSE_MANAGER, GsdMouseManagerClass))
-#define GSD_IS_MOUSE_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MOUSE_MANAGER))
-#define GSD_IS_MOUSE_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MOUSE_MANAGER))
-#define GSD_MOUSE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MOUSE_MANAGER, GsdMouseManagerClass))
+#define MSD_TYPE_MOUSE_MANAGER         (msd_mouse_manager_get_type ())
+#define MSD_MOUSE_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_MOUSE_MANAGER, MsdMouseManager))
+#define MSD_MOUSE_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_MOUSE_MANAGER, MsdMouseManagerClass))
+#define MSD_IS_MOUSE_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_MOUSE_MANAGER))
+#define MSD_IS_MOUSE_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_MOUSE_MANAGER))
+#define MSD_MOUSE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_MOUSE_MANAGER, MsdMouseManagerClass))
 
-typedef struct GsdMouseManagerPrivate GsdMouseManagerPrivate;
+typedef struct MsdMouseManagerPrivate MsdMouseManagerPrivate;
 
 typedef struct
 {
         GObject                     parent;
-        GsdMouseManagerPrivate *priv;
-} GsdMouseManager;
+        MsdMouseManagerPrivate *priv;
+} MsdMouseManager;
 
 typedef struct
 {
         GObjectClass   parent_class;
-} GsdMouseManagerClass;
+} MsdMouseManagerClass;
 
-GType                   gsd_mouse_manager_get_type            (void);
+GType                   msd_mouse_manager_get_type            (void);
 
-GsdMouseManager *       gsd_mouse_manager_new                 (void);
-gboolean                gsd_mouse_manager_start               (GsdMouseManager *manager,
+MsdMouseManager *       msd_mouse_manager_new                 (void);
+gboolean                msd_mouse_manager_start               (MsdMouseManager *manager,
                                                                GError         **error);
-void                    gsd_mouse_manager_stop                (GsdMouseManager *manager);
+void                    msd_mouse_manager_stop                (MsdMouseManager *manager);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __GSD_MOUSE_MANAGER_H */
+#endif /* __MSD_MOUSE_MANAGER_H */
diff --git a/plugins/mouse/gsd-mouse-plugin.c b/plugins/mouse/gsd-mouse-plugin.c
index 900a6d5..7203002 100644
--- a/plugins/mouse/gsd-mouse-plugin.c
+++ b/plugins/mouse/gsd-mouse-plugin.c
@@ -24,38 +24,38 @@
 #include <gmodule.h>
 
 #include "mate-settings-plugin.h"
-#include "gsd-mouse-plugin.h"
-#include "gsd-mouse-manager.h"
+#include "msd-mouse-plugin.h"
+#include "msd-mouse-manager.h"
 
-struct GsdMousePluginPrivate {
-        GsdMouseManager *manager;
+struct MsdMousePluginPrivate {
+        MsdMouseManager *manager;
 };
 
-#define GSD_MOUSE_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MOUSE_PLUGIN, GsdMousePluginPrivate))
+#define MSD_MOUSE_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_MOUSE_PLUGIN, MsdMousePluginPrivate))
 
-MATE_SETTINGS_PLUGIN_REGISTER (GsdMousePlugin, gsd_mouse_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdMousePlugin, msd_mouse_plugin)
 
 static void
-gsd_mouse_plugin_init (GsdMousePlugin *plugin)
+msd_mouse_plugin_init (MsdMousePlugin *plugin)
 {
-        plugin->priv = GSD_MOUSE_PLUGIN_GET_PRIVATE (plugin);
+        plugin->priv = MSD_MOUSE_PLUGIN_GET_PRIVATE (plugin);
 
-        g_debug ("GsdMousePlugin initializing");
+        g_debug ("MsdMousePlugin initializing");
 
-        plugin->priv->manager = gsd_mouse_manager_new ();
+        plugin->priv->manager = msd_mouse_manager_new ();
 }
 
 static void
-gsd_mouse_plugin_finalize (GObject *object)
+msd_mouse_plugin_finalize (GObject *object)
 {
-        GsdMousePlugin *plugin;
+        MsdMousePlugin *plugin;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_MOUSE_PLUGIN (object));
+        g_return_if_fail (MSD_IS_MOUSE_PLUGIN (object));
 
-        g_debug ("GsdMousePlugin finalizing");
+        g_debug ("MsdMousePlugin finalizing");
 
-        plugin = GSD_MOUSE_PLUGIN (object);
+        plugin = MSD_MOUSE_PLUGIN (object);
 
         g_return_if_fail (plugin->priv != NULL);
 
@@ -63,7 +63,7 @@ gsd_mouse_plugin_finalize (GObject *object)
                 g_object_unref (plugin->priv->manager);
         }
 
-        G_OBJECT_CLASS (gsd_mouse_plugin_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_mouse_plugin_parent_class)->finalize (object);
 }
 
 static void
@@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)
         g_debug ("Activating mouse plugin");
 
         error = NULL;
-        res = gsd_mouse_manager_start (GSD_MOUSE_PLUGIN (plugin)->priv->manager, &error);
+        res = msd_mouse_manager_start (MSD_MOUSE_PLUGIN (plugin)->priv->manager, &error);
         if (! res) {
                 g_warning ("Unable to start mouse manager: %s", error->message);
                 g_error_free (error);
@@ -86,19 +86,19 @@ static void
 impl_deactivate (MateSettingsPlugin *plugin)
 {
         g_debug ("Deactivating mouse plugin");
-        gsd_mouse_manager_stop (GSD_MOUSE_PLUGIN (plugin)->priv->manager);
+        msd_mouse_manager_stop (MSD_MOUSE_PLUGIN (plugin)->priv->manager);
 }
 
 static void
-gsd_mouse_plugin_class_init (GsdMousePluginClass *klass)
+msd_mouse_plugin_class_init (MsdMousePluginClass *klass)
 {
         GObjectClass           *object_class = G_OBJECT_CLASS (klass);
         MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
 
-        object_class->finalize = gsd_mouse_plugin_finalize;
+        object_class->finalize = msd_mouse_plugin_finalize;
 
         plugin_class->activate = impl_activate;
         plugin_class->deactivate = impl_deactivate;
 
-        g_type_class_add_private (klass, sizeof (GsdMousePluginPrivate));
+        g_type_class_add_private (klass, sizeof (MsdMousePluginPrivate));
 }
diff --git a/plugins/mouse/gsd-mouse-plugin.h b/plugins/mouse/gsd-mouse-plugin.h
index e442450..2c2da6c 100644
--- a/plugins/mouse/gsd-mouse-plugin.h
+++ b/plugins/mouse/gsd-mouse-plugin.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_MOUSE_PLUGIN_H__
-#define __GSD_MOUSE_PLUGIN_H__
+#ifndef __MSD_MOUSE_PLUGIN_H__
+#define __MSD_MOUSE_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -31,27 +31,27 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_MOUSE_PLUGIN                (gsd_mouse_plugin_get_type ())
-#define GSD_MOUSE_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MOUSE_PLUGIN, GsdMousePlugin))
-#define GSD_MOUSE_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MOUSE_PLUGIN, GsdMousePluginClass))
-#define GSD_IS_MOUSE_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MOUSE_PLUGIN))
-#define GSD_IS_MOUSE_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MOUSE_PLUGIN))
-#define GSD_MOUSE_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MOUSE_PLUGIN, GsdMousePluginClass))
+#define MSD_TYPE_MOUSE_PLUGIN                (msd_mouse_plugin_get_type ())
+#define MSD_MOUSE_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_MOUSE_PLUGIN, MsdMousePlugin))
+#define MSD_MOUSE_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_MOUSE_PLUGIN, MsdMousePluginClass))
+#define MSD_IS_MOUSE_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_MOUSE_PLUGIN))
+#define MSD_IS_MOUSE_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_MOUSE_PLUGIN))
+#define MSD_MOUSE_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_MOUSE_PLUGIN, MsdMousePluginClass))
 
-typedef struct GsdMousePluginPrivate GsdMousePluginPrivate;
+typedef struct MsdMousePluginPrivate MsdMousePluginPrivate;
 
 typedef struct
 {
         MateSettingsPlugin    parent;
-        GsdMousePluginPrivate *priv;
-} GsdMousePlugin;
+        MsdMousePluginPrivate *priv;
+} MsdMousePlugin;
 
 typedef struct
 {
         MateSettingsPluginClass parent_class;
-} GsdMousePluginClass;
+} MsdMousePluginClass;
 
-GType   gsd_mouse_plugin_get_type            (void) G_GNUC_CONST;
+GType   msd_mouse_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_MOUSE_PLUGIN_H__ */
+#endif /* __MSD_MOUSE_PLUGIN_H__ */
diff --git a/plugins/mouse/gsd-timeline.c b/plugins/mouse/gsd-timeline.c
index 748a0ad..9bcfd2f 100644
--- a/plugins/mouse/gsd-timeline.c
+++ b/plugins/mouse/gsd-timeline.c
@@ -1,4 +1,4 @@
-/* gsd-timeline.c
+/* msd-timeline.c
  *
  * Copyright (C) 2008 Carlos Garnacho  <[email protected]>
  *
@@ -20,16 +20,16 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <math.h>
-#include "gsd-timeline.h"
+#include "msd-timeline.h"
 
-#define GSD_TIMELINE_GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GSD_TYPE_TIMELINE, GsdTimelinePriv))
+#define MSD_TIMELINE_GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MSD_TYPE_TIMELINE, MsdTimelinePriv))
 #define MSECS_PER_SEC 1000
 #define FRAME_INTERVAL(nframes) (MSECS_PER_SEC / nframes)
 #define DEFAULT_FPS 30
 
-typedef struct GsdTimelinePriv GsdTimelinePriv;
+typedef struct MsdTimelinePriv MsdTimelinePriv;
 
-struct GsdTimelinePriv
+struct MsdTimelinePriv
 {
   guint duration;
   guint fps;
@@ -38,8 +38,8 @@ struct GsdTimelinePriv
   GTimer *timer;
 
   GdkScreen *screen;
-  GsdTimelineProgressType progress_type;
-  GsdTimelineProgressFunc progress_func;
+  MsdTimelineProgressType progress_type;
+  MsdTimelineProgressFunc progress_func;
 
   guint loop      : 1;
   guint direction : 1;
@@ -66,67 +66,67 @@ enum {
 static guint signals [LAST_SIGNAL] = { 0, };
 
 
-static void  gsd_timeline_set_property  (GObject         *object,
+static void  msd_timeline_set_property  (GObject         *object,
 					 guint            prop_id,
 					 const GValue    *value,
 					 GParamSpec      *pspec);
-static void  gsd_timeline_get_property  (GObject         *object,
+static void  msd_timeline_get_property  (GObject         *object,
 					 guint            prop_id,
 					 GValue          *value,
 					 GParamSpec      *pspec);
-static void  gsd_timeline_finalize      (GObject *object);
+static void  msd_timeline_finalize      (GObject *object);
 
 
-G_DEFINE_TYPE (GsdTimeline, gsd_timeline, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdTimeline, msd_timeline, G_TYPE_OBJECT)
 
 
 GType
-gsd_timeline_direction_get_type (void)
+msd_timeline_direction_get_type (void)
 {
   static GType type = 0;
 
   if (G_UNLIKELY (type == 0))
     {
       static const GEnumValue values[] = {
-	{ GSD_TIMELINE_DIRECTION_FORWARD,  "GSD_TIMELINE_DIRECTION_FORWARD",  "forward" },
-	{ GSD_TIMELINE_DIRECTION_BACKWARD, "GSD_TIMELINE_DIRECTION_BACKWARD", "backward" },
+	{ MSD_TIMELINE_DIRECTION_FORWARD,  "MSD_TIMELINE_DIRECTION_FORWARD",  "forward" },
+	{ MSD_TIMELINE_DIRECTION_BACKWARD, "MSD_TIMELINE_DIRECTION_BACKWARD", "backward" },
 	{ 0, NULL, NULL }
       };
 
-      type = g_enum_register_static (g_intern_static_string ("GsdTimelineDirection"), values);
+      type = g_enum_register_static (g_intern_static_string ("MsdTimelineDirection"), values);
     }
 
   return type;
 }
 
 GType
-gsd_timeline_progress_type_get_type (void)
+msd_timeline_progress_type_get_type (void)
 {
   static GType type = 0;
 
   if (G_UNLIKELY (type == 0))
     {
       static const GEnumValue values[] = {
-	{ GSD_TIMELINE_PROGRESS_LINEAR,      "GSD_TIMELINE_PROGRESS_LINEAR",      "linear" },
-	{ GSD_TIMELINE_PROGRESS_SINUSOIDAL,  "GSD_TIMELINE_PROGRESS_SINUSOIDAL",  "sinusoidal" },
-	{ GSD_TIMELINE_PROGRESS_EXPONENTIAL, "GSD_TIMELINE_PROGRESS_EXPONENTIAL", "exponential" },
+	{ MSD_TIMELINE_PROGRESS_LINEAR,      "MSD_TIMELINE_PROGRESS_LINEAR",      "linear" },
+	{ MSD_TIMELINE_PROGRESS_SINUSOIDAL,  "MSD_TIMELINE_PROGRESS_SINUSOIDAL",  "sinusoidal" },
+	{ MSD_TIMELINE_PROGRESS_EXPONENTIAL, "MSD_TIMELINE_PROGRESS_EXPONENTIAL", "exponential" },
 	{ 0, NULL, NULL }
       };
 
-      type = g_enum_register_static (g_intern_static_string ("GsdTimelineProgressType"), values);
+      type = g_enum_register_static (g_intern_static_string ("MsdTimelineProgressType"), values);
     }
 
   return type;
 }
 
 static void
-gsd_timeline_class_init (GsdTimelineClass *class)
+msd_timeline_class_init (MsdTimelineClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-  object_class->set_property = gsd_timeline_set_property;
-  object_class->get_property = gsd_timeline_get_property;
-  object_class->finalize = gsd_timeline_finalize;
+  object_class->set_property = msd_timeline_set_property;
+  object_class->get_property = msd_timeline_get_property;
+  object_class->finalize = msd_timeline_finalize;
 
   g_object_class_install_property (object_class,
 				   PROP_FPS,
@@ -158,16 +158,16 @@ gsd_timeline_class_init (GsdTimelineClass *class)
 				   g_param_spec_enum ("direction",
 						      "Direction",
 						      "Whether the timeline moves forward or backward in time",
-						      GSD_TYPE_TIMELINE_DIRECTION,
-						      GSD_TIMELINE_DIRECTION_FORWARD,
+						      MSD_TYPE_TIMELINE_DIRECTION,
+						      MSD_TIMELINE_DIRECTION_FORWARD,
 						      G_PARAM_READWRITE));
   g_object_class_install_property (object_class,
 				   PROP_DIRECTION,
 				   g_param_spec_enum ("progress-type",
 						      "Progress type",
 						      "Type of progress through the timeline",
-						      GSD_TYPE_TIMELINE_PROGRESS_TYPE,
-						      GSD_TIMELINE_PROGRESS_LINEAR,
+						      MSD_TYPE_TIMELINE_PROGRESS_TYPE,
+						      MSD_TIMELINE_PROGRESS_LINEAR,
 						      G_PARAM_READWRITE));
   g_object_class_install_property (object_class,
 				   PROP_SCREEN,
@@ -181,7 +181,7 @@ gsd_timeline_class_init (GsdTimelineClass *class)
     g_signal_new ("started",
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GsdTimelineClass, started),
+		  G_STRUCT_OFFSET (MsdTimelineClass, started),
 		  NULL, NULL,
 		  g_cclosure_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
@@ -190,7 +190,7 @@ gsd_timeline_class_init (GsdTimelineClass *class)
     g_signal_new ("paused",
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GsdTimelineClass, paused),
+		  G_STRUCT_OFFSET (MsdTimelineClass, paused),
 		  NULL, NULL,
 		  g_cclosure_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
@@ -199,7 +199,7 @@ gsd_timeline_class_init (GsdTimelineClass *class)
     g_signal_new ("finished",
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GsdTimelineClass, finished),
+		  G_STRUCT_OFFSET (MsdTimelineClass, finished),
 		  NULL, NULL,
 		  g_cclosure_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
@@ -208,60 +208,60 @@ gsd_timeline_class_init (GsdTimelineClass *class)
     g_signal_new ("frame",
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GsdTimelineClass, frame),
+		  G_STRUCT_OFFSET (MsdTimelineClass, frame),
 		  NULL, NULL,
 		  g_cclosure_marshal_VOID__DOUBLE,
 		  G_TYPE_NONE, 1,
 		  G_TYPE_DOUBLE);
 
-  g_type_class_add_private (class, sizeof (GsdTimelinePriv));
+  g_type_class_add_private (class, sizeof (MsdTimelinePriv));
 }
 
 static void
-gsd_timeline_init (GsdTimeline *timeline)
+msd_timeline_init (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   priv->fps = DEFAULT_FPS;
   priv->duration = 0;
-  priv->direction = GSD_TIMELINE_DIRECTION_FORWARD;
+  priv->direction = MSD_TIMELINE_DIRECTION_FORWARD;
   priv->screen = gdk_screen_get_default ();
 }
 
 static void
-gsd_timeline_set_property (GObject      *object,
+msd_timeline_set_property (GObject      *object,
 			   guint         prop_id,
 			   const GValue *value,
 			   GParamSpec   *pspec)
 {
-  GsdTimeline *timeline;
-  GsdTimelinePriv *priv;
+  MsdTimeline *timeline;
+  MsdTimelinePriv *priv;
 
-  timeline = GSD_TIMELINE (object);
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  timeline = MSD_TIMELINE (object);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   switch (prop_id)
     {
     case PROP_FPS:
-      gsd_timeline_set_fps (timeline, g_value_get_uint (value));
+      msd_timeline_set_fps (timeline, g_value_get_uint (value));
       break;
     case PROP_DURATION:
-      gsd_timeline_set_duration (timeline, g_value_get_uint (value));
+      msd_timeline_set_duration (timeline, g_value_get_uint (value));
       break;
     case PROP_LOOP:
-      gsd_timeline_set_loop (timeline, g_value_get_boolean (value));
+      msd_timeline_set_loop (timeline, g_value_get_boolean (value));
       break;
     case PROP_DIRECTION:
-      gsd_timeline_set_direction (timeline, g_value_get_enum (value));
+      msd_timeline_set_direction (timeline, g_value_get_enum (value));
       break;
     case PROP_SCREEN:
-      gsd_timeline_set_screen (timeline,
+      msd_timeline_set_screen (timeline,
 			       GDK_SCREEN (g_value_get_object (value)));
       break;
     case PROP_PROGRESS_TYPE:
-      gsd_timeline_set_progress_type (timeline, g_value_get_enum (value));
+      msd_timeline_set_progress_type (timeline, g_value_get_enum (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -269,16 +269,16 @@ gsd_timeline_set_property (GObject      *object,
 }
 
 static void
-gsd_timeline_get_property (GObject    *object,
+msd_timeline_get_property (GObject    *object,
 			   guint       prop_id,
 			   GValue     *value,
 			   GParamSpec *pspec)
 {
-  GsdTimeline *timeline;
-  GsdTimelinePriv *priv;
+  MsdTimeline *timeline;
+  MsdTimelinePriv *priv;
 
-  timeline = GSD_TIMELINE (object);
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  timeline = MSD_TIMELINE (object);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   switch (prop_id)
     {
@@ -306,11 +306,11 @@ gsd_timeline_get_property (GObject    *object,
 }
 
 static void
-gsd_timeline_finalize (GObject *object)
+msd_timeline_finalize (GObject *object)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  priv = GSD_TIMELINE_GET_PRIV (object);
+  priv = MSD_TIMELINE_GET_PRIV (object);
 
   if (priv->source_id)
     {
@@ -321,7 +321,7 @@ gsd_timeline_finalize (GObject *object)
   if (priv->timer)
       g_timer_destroy (priv->timer);
 
-  G_OBJECT_CLASS (gsd_timeline_parent_class)->finalize (object);
+  G_OBJECT_CLASS (msd_timeline_parent_class)->finalize (object);
 }
 
 /* Sinusoidal progress */
@@ -337,27 +337,27 @@ exponential_progress (gdouble progress)
   return progress * progress;
 }
 
-static GsdTimelineProgressFunc
-progress_type_to_func (GsdTimelineProgressType type)
+static MsdTimelineProgressFunc
+progress_type_to_func (MsdTimelineProgressType type)
 {
-  if (type == GSD_TIMELINE_PROGRESS_SINUSOIDAL)
+  if (type == MSD_TIMELINE_PROGRESS_SINUSOIDAL)
     return sinusoidal_progress;
-  else if (type == GSD_TIMELINE_PROGRESS_EXPONENTIAL)
+  else if (type == MSD_TIMELINE_PROGRESS_EXPONENTIAL)
     return exponential_progress;
 
   return NULL;
 }
 
 static gboolean
-gsd_timeline_run_frame (GsdTimeline *timeline,
+msd_timeline_run_frame (MsdTimeline *timeline,
 			gboolean     enable_animations)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
   gdouble linear_progress, progress;
   guint elapsed_time;
-  GsdTimelineProgressFunc progress_func = NULL;
+  MsdTimelineProgressFunc progress_func = NULL;
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   if (enable_animations)
     {
@@ -365,7 +365,7 @@ gsd_timeline_run_frame (GsdTimeline *timeline,
 
       linear_progress = (gdouble) elapsed_time / priv->duration;
 
-      if (priv->direction == GSD_TIMELINE_DIRECTION_BACKWARD)
+      if (priv->direction == MSD_TIMELINE_DIRECTION_BACKWARD)
 	linear_progress = 1 - linear_progress;
 
       linear_progress = CLAMP (linear_progress, 0., 1.);
@@ -381,13 +381,13 @@ gsd_timeline_run_frame (GsdTimeline *timeline,
 	progress = linear_progress;
     }
   else
-    progress = (priv->direction == GSD_TIMELINE_DIRECTION_FORWARD) ? 1.0 : 0.0;
+    progress = (priv->direction == MSD_TIMELINE_DIRECTION_FORWARD) ? 1.0 : 0.0;
 
   g_signal_emit (timeline, signals [FRAME], 0,
 		 CLAMP (progress, 0.0, 1.0));
 
-  if ((priv->direction == GSD_TIMELINE_DIRECTION_FORWARD && progress >= 1.0) ||
-      (priv->direction == GSD_TIMELINE_DIRECTION_BACKWARD && progress <= 0.0))
+  if ((priv->direction == MSD_TIMELINE_DIRECTION_FORWARD && progress >= 1.0) ||
+      (priv->direction == MSD_TIMELINE_DIRECTION_BACKWARD && progress <= 0.0))
     {
       if (!priv->loop)
 	{
@@ -401,60 +401,60 @@ gsd_timeline_run_frame (GsdTimeline *timeline,
 	  return FALSE;
 	}
       else
-	gsd_timeline_rewind (timeline);
+	msd_timeline_rewind (timeline);
     }
 
   return TRUE;
 }
 
 static gboolean
-gsd_timeline_frame_idle_func (GsdTimeline *timeline)
+msd_timeline_frame_idle_func (MsdTimeline *timeline)
 {
-  return gsd_timeline_run_frame (timeline, TRUE);
+  return msd_timeline_run_frame (timeline, TRUE);
 }
 
 /**
- * gsd_timeline_new:
+ * msd_timeline_new:
  * @duration: duration in milliseconds for the timeline
  *
- * Creates a new #GsdTimeline with the specified number of frames.
+ * Creates a new #MsdTimeline with the specified number of frames.
  *
- * Return Value: the newly created #GsdTimeline
+ * Return Value: the newly created #MsdTimeline
  **/
-GsdTimeline *
-gsd_timeline_new (guint duration)
+MsdTimeline *
+msd_timeline_new (guint duration)
 {
-  return g_object_new (GSD_TYPE_TIMELINE,
+  return g_object_new (MSD_TYPE_TIMELINE,
 		       "duration", duration,
 		       NULL);
 }
 
-GsdTimeline *
-gsd_timeline_new_for_screen (guint      duration,
+MsdTimeline *
+msd_timeline_new_for_screen (guint      duration,
 			     GdkScreen *screen)
 {
-  return g_object_new (GSD_TYPE_TIMELINE,
+  return g_object_new (MSD_TYPE_TIMELINE,
 		       "duration", duration,
 		       "screen", screen,
 		       NULL);
 }
 
 /**
- * gsd_timeline_start:
- * @timeline: A #GsdTimeline
+ * msd_timeline_start:
+ * @timeline: A #MsdTimeline
  *
  * Runs the timeline from the current frame.
  **/
 void
-gsd_timeline_start (GsdTimeline *timeline)
+msd_timeline_start (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
   GtkSettings *settings;
   gboolean enable_animations = FALSE;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   if (priv->screen)
     {
@@ -477,7 +477,7 @@ gsd_timeline_start (GsdTimeline *timeline)
 	  g_signal_emit (timeline, signals [STARTED], 0);
 
 	  priv->source_id = gdk_threads_add_timeout (FRAME_INTERVAL (priv->fps),
-						     (GSourceFunc) gsd_timeline_frame_idle_func,
+						     (GSourceFunc) msd_timeline_frame_idle_func,
 						     timeline);
 	}
     }
@@ -490,24 +490,24 @@ gsd_timeline_start (GsdTimeline *timeline)
        * loop into this animation again.
        */
       g_signal_emit (timeline, signals [STARTED], 0);
-      gsd_timeline_run_frame (timeline, FALSE);
+      msd_timeline_run_frame (timeline, FALSE);
     }
 }
 
 /**
- * gsd_timeline_pause:
- * @timeline: A #GsdTimeline
+ * msd_timeline_pause:
+ * @timeline: A #MsdTimeline
  *
  * Pauses the timeline.
  **/
 void
-gsd_timeline_pause (GsdTimeline *timeline)
+msd_timeline_pause (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   if (priv->source_id)
     {
@@ -519,26 +519,26 @@ gsd_timeline_pause (GsdTimeline *timeline)
 }
 
 /**
- * gsd_timeline_rewind:
- * @timeline: A #GsdTimeline
+ * msd_timeline_rewind:
+ * @timeline: A #MsdTimeline
  *
  * Rewinds the timeline.
  **/
 void
-gsd_timeline_rewind (GsdTimeline *timeline)
+msd_timeline_rewind (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   /* destroy and re-create timer if neccesary  */
   if (priv->timer)
     {
       g_timer_destroy (priv->timer);
 
-      if (gsd_timeline_is_running (timeline))
+      if (msd_timeline_is_running (timeline))
 	priv->timer = g_timer_new ();
       else
 	priv->timer = NULL;
@@ -546,70 +546,70 @@ gsd_timeline_rewind (GsdTimeline *timeline)
 }
 
 /**
- * gsd_timeline_is_running:
- * @timeline: A #GsdTimeline
+ * msd_timeline_is_running:
+ * @timeline: A #MsdTimeline
  *
  * Returns whether the timeline is running or not.
  *
  * Return Value: %TRUE if the timeline is running
  **/
 gboolean
-gsd_timeline_is_running (GsdTimeline *timeline)
+msd_timeline_is_running (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_val_if_fail (GSD_IS_TIMELINE (timeline), FALSE);
+  g_return_val_if_fail (MSD_IS_TIMELINE (timeline), FALSE);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   return (priv->source_id != 0);
 }
 
 /**
- * gsd_timeline_get_fps:
- * @timeline: A #GsdTimeline
+ * msd_timeline_get_fps:
+ * @timeline: A #MsdTimeline
  *
  * Returns the number of frames per second.
  *
  * Return Value: frames per second
  **/
 guint
-gsd_timeline_get_fps (GsdTimeline *timeline)
+msd_timeline_get_fps (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_val_if_fail (GSD_IS_TIMELINE (timeline), 1);
+  g_return_val_if_fail (MSD_IS_TIMELINE (timeline), 1);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
   return priv->fps;
 }
 
 /**
- * gsd_timeline_set_fps:
- * @timeline: A #GsdTimeline
+ * msd_timeline_set_fps:
+ * @timeline: A #MsdTimeline
  * @fps: frames per second
  *
  * Sets the number of frames per second that
  * the timeline will play.
  **/
 void
-gsd_timeline_set_fps (GsdTimeline *timeline,
+msd_timeline_set_fps (MsdTimeline *timeline,
 		      guint        fps)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
   g_return_if_fail (fps > 0);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   priv->fps = fps;
 
-  if (gsd_timeline_is_running (timeline))
+  if (msd_timeline_is_running (timeline))
     {
       g_source_remove (priv->source_id);
       priv->source_id = gdk_threads_add_timeout (FRAME_INTERVAL (priv->fps),
-						 (GSourceFunc) gsd_timeline_run_frame,
+						 (GSourceFunc) msd_timeline_run_frame,
 						 timeline);
     }
 
@@ -617,8 +617,8 @@ gsd_timeline_set_fps (GsdTimeline *timeline,
 }
 
 /**
- * gsd_timeline_get_loop:
- * @timeline: A #GsdTimeline
+ * msd_timeline_get_loop:
+ * @timeline: A #MsdTimeline
  *
  * Returns whether the timeline loops to the
  * beginning when it has reached the end.
@@ -626,47 +626,47 @@ gsd_timeline_set_fps (GsdTimeline *timeline,
  * Return Value: %TRUE if the timeline loops
  **/
 gboolean
-gsd_timeline_get_loop (GsdTimeline *timeline)
+msd_timeline_get_loop (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_val_if_fail (GSD_IS_TIMELINE (timeline), FALSE);
+  g_return_val_if_fail (MSD_IS_TIMELINE (timeline), FALSE);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
   return priv->loop;
 }
 
 /**
- * gsd_timeline_set_loop:
- * @timeline: A #GsdTimeline
+ * msd_timeline_set_loop:
+ * @timeline: A #MsdTimeline
  * @loop: %TRUE to make the timeline loop
  *
  * Sets whether the timeline loops to the beginning
  * when it has reached the end.
  **/
 void
-gsd_timeline_set_loop (GsdTimeline *timeline,
+msd_timeline_set_loop (MsdTimeline *timeline,
 		       gboolean     loop)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
   priv->loop = loop;
 
   g_object_notify (G_OBJECT (timeline), "loop");
 }
 
 void
-gsd_timeline_set_duration (GsdTimeline *timeline,
+msd_timeline_set_duration (MsdTimeline *timeline,
 			   guint        duration)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   priv->duration = duration;
 
@@ -674,78 +674,78 @@ gsd_timeline_set_duration (GsdTimeline *timeline,
 }
 
 guint
-gsd_timeline_get_duration (GsdTimeline *timeline)
+msd_timeline_get_duration (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_val_if_fail (GSD_IS_TIMELINE (timeline), 0);
+  g_return_val_if_fail (MSD_IS_TIMELINE (timeline), 0);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   return priv->duration;
 }
 
 /**
- * gsd_timeline_get_direction:
- * @timeline: A #GsdTimeline
+ * msd_timeline_get_direction:
+ * @timeline: A #MsdTimeline
  *
  * Returns the direction of the timeline.
  *
  * Return Value: direction
  **/
-GsdTimelineDirection
-gsd_timeline_get_direction (GsdTimeline *timeline)
+MsdTimelineDirection
+msd_timeline_get_direction (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_val_if_fail (GSD_IS_TIMELINE (timeline), GSD_TIMELINE_DIRECTION_FORWARD);
+  g_return_val_if_fail (MSD_IS_TIMELINE (timeline), MSD_TIMELINE_DIRECTION_FORWARD);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
   return priv->direction;
 }
 
 /**
- * gsd_timeline_set_direction:
- * @timeline: A #GsdTimeline
+ * msd_timeline_set_direction:
+ * @timeline: A #MsdTimeline
  * @direction: direction
  *
  * Sets the direction of the timeline.
  **/
 void
-gsd_timeline_set_direction (GsdTimeline          *timeline,
-			    GsdTimelineDirection  direction)
+msd_timeline_set_direction (MsdTimeline          *timeline,
+			    MsdTimelineDirection  direction)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
   priv->direction = direction;
 
   g_object_notify (G_OBJECT (timeline), "direction");
 }
 
 GdkScreen *
-gsd_timeline_get_screen (GsdTimeline *timeline)
+msd_timeline_get_screen (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_val_if_fail (GSD_IS_TIMELINE (timeline), NULL);
+  g_return_val_if_fail (MSD_IS_TIMELINE (timeline), NULL);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
   return priv->screen;
 }
 
 void
-gsd_timeline_set_screen (GsdTimeline *timeline,
+msd_timeline_set_screen (MsdTimeline *timeline,
 			 GdkScreen   *screen)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
   g_return_if_fail (GDK_IS_SCREEN (screen));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   if (priv->screen)
     g_object_unref (priv->screen);
@@ -756,38 +756,38 @@ gsd_timeline_set_screen (GsdTimeline *timeline,
 }
 
 void
-gsd_timeline_set_progress_type (GsdTimeline             *timeline,
-				GsdTimelineProgressType  type)
+msd_timeline_set_progress_type (MsdTimeline             *timeline,
+				MsdTimelineProgressType  type)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   priv->progress_type = type;
 
   g_object_notify (G_OBJECT (timeline), "progress-type");
 }
 
-GsdTimelineProgressType
-gsd_timeline_get_progress_type (GsdTimeline *timeline)
+MsdTimelineProgressType
+msd_timeline_get_progress_type (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_val_if_fail (GSD_IS_TIMELINE (timeline), GSD_TIMELINE_PROGRESS_LINEAR);
+  g_return_val_if_fail (MSD_IS_TIMELINE (timeline), MSD_TIMELINE_PROGRESS_LINEAR);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   if (priv->progress_func)
-    return GSD_TIMELINE_PROGRESS_LINEAR;
+    return MSD_TIMELINE_PROGRESS_LINEAR;
 
   return priv->progress_type;
 }
 
 /**
- * gsd_timeline_set_progress_func:
- * @timeline: A #GsdTimeline
+ * msd_timeline_set_progress_func:
+ * @timeline: A #MsdTimeline
  * @progress_func: progress function
  *
  * Sets the progress function. This function will be used to calculate
@@ -799,28 +799,28 @@ gsd_timeline_get_progress_type (GsdTimeline *timeline)
  * All progresses are in the [0.0, 1.0] range.
  **/
 void
-gsd_timeline_set_progress_func (GsdTimeline             *timeline,
-				GsdTimelineProgressFunc  progress_func)
+msd_timeline_set_progress_func (MsdTimeline             *timeline,
+				MsdTimelineProgressFunc  progress_func)
 {
-  GsdTimelinePriv *priv;
+  MsdTimelinePriv *priv;
 
-  g_return_if_fail (GSD_IS_TIMELINE (timeline));
+  g_return_if_fail (MSD_IS_TIMELINE (timeline));
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
   priv->progress_func = progress_func;
 }
 
 gdouble
-gsd_timeline_get_progress (GsdTimeline *timeline)
+msd_timeline_get_progress (MsdTimeline *timeline)
 {
-  GsdTimelinePriv *priv;
-  GsdTimelineProgressFunc progress_func = NULL;
+  MsdTimelinePriv *priv;
+  MsdTimelineProgressFunc progress_func = NULL;
   gdouble linear_progress, progress;
   guint elapsed_time;
 
-  g_return_val_if_fail (GSD_IS_TIMELINE (timeline), 0.0);
+  g_return_val_if_fail (MSD_IS_TIMELINE (timeline), 0.0);
 
-  priv = GSD_TIMELINE_GET_PRIV (timeline);
+  priv = MSD_TIMELINE_GET_PRIV (timeline);
 
   if (!priv->timer)
     return 0.;
@@ -829,7 +829,7 @@ gsd_timeline_get_progress (GsdTimeline *timeline)
 
   linear_progress = (gdouble) elapsed_time / priv->duration;
 
-  if (priv->direction == GSD_TIMELINE_DIRECTION_BACKWARD)
+  if (priv->direction == MSD_TIMELINE_DIRECTION_BACKWARD)
     linear_progress = 1 - linear_progress;
 
   linear_progress = CLAMP (linear_progress, 0., 1.);
diff --git a/plugins/mouse/gsd-timeline.h b/plugins/mouse/gsd-timeline.h
index d4ecbcc..b8d40ca 100644
--- a/plugins/mouse/gsd-timeline.h
+++ b/plugins/mouse/gsd-timeline.h
@@ -1,4 +1,4 @@
-/* gsdtimeline.c
+/* msdtimeline.c
  *
  * Copyright (C) 2008 Carlos Garnacho  <[email protected]>
  *
@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GSD_TIMELINE_H__
-#define __GSD_TIMELINE_H__
+#ifndef __MSD_TIMELINE_H__
+#define __MSD_TIMELINE_H__
 
 #include <glib-object.h>
 #include <gdk/gdk.h>
@@ -27,101 +27,101 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_TIMELINE_DIRECTION       (gsd_timeline_direction_get_type ())
-#define GSD_TYPE_TIMELINE_PROGRESS_TYPE   (gsd_timeline_progress_type_get_type ())
-#define GSD_TYPE_TIMELINE                 (gsd_timeline_get_type ())
-#define GSD_TIMELINE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_TIMELINE, GsdTimeline))
-#define GSD_TIMELINE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass),  GSD_TYPE_TIMELINE, GsdTimelineClass))
-#define GSD_IS_TIMELINE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_TIMELINE))
-#define GSD_IS_TIMELINE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass),  GSD_TYPE_TIMELINE))
-#define GSD_TIMELINE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj),  GSD_TYPE_TIMELINE, GsdTimelineClass))
+#define MSD_TYPE_TIMELINE_DIRECTION       (msd_timeline_direction_get_type ())
+#define MSD_TYPE_TIMELINE_PROGRESS_TYPE   (msd_timeline_progress_type_get_type ())
+#define MSD_TYPE_TIMELINE                 (msd_timeline_get_type ())
+#define MSD_TIMELINE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), MSD_TYPE_TIMELINE, MsdTimeline))
+#define MSD_TIMELINE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass),  MSD_TYPE_TIMELINE, MsdTimelineClass))
+#define MSD_IS_TIMELINE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MSD_TYPE_TIMELINE))
+#define MSD_IS_TIMELINE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass),  MSD_TYPE_TIMELINE))
+#define MSD_TIMELINE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj),  MSD_TYPE_TIMELINE, MsdTimelineClass))
 
 typedef enum {
-  GSD_TIMELINE_DIRECTION_FORWARD,
-  GSD_TIMELINE_DIRECTION_BACKWARD
-} GsdTimelineDirection;
+  MSD_TIMELINE_DIRECTION_FORWARD,
+  MSD_TIMELINE_DIRECTION_BACKWARD
+} MsdTimelineDirection;
 
 typedef enum {
-  GSD_TIMELINE_PROGRESS_LINEAR,
-  GSD_TIMELINE_PROGRESS_SINUSOIDAL,
-  GSD_TIMELINE_PROGRESS_EXPONENTIAL
-} GsdTimelineProgressType;
+  MSD_TIMELINE_PROGRESS_LINEAR,
+  MSD_TIMELINE_PROGRESS_SINUSOIDAL,
+  MSD_TIMELINE_PROGRESS_EXPONENTIAL
+} MsdTimelineProgressType;
 
-typedef struct GsdTimeline      GsdTimeline;
-typedef struct GsdTimelineClass GsdTimelineClass;
+typedef struct MsdTimeline      MsdTimeline;
+typedef struct MsdTimelineClass MsdTimelineClass;
 
-struct GsdTimeline
+struct MsdTimeline
 {
   GObject parent_instance;
 };
 
-struct GsdTimelineClass
+struct MsdTimelineClass
 {
   GObjectClass parent_class;
 
-  void (* started)           (GsdTimeline *timeline);
-  void (* finished)          (GsdTimeline *timeline);
-  void (* paused)            (GsdTimeline *timeline);
+  void (* started)           (MsdTimeline *timeline);
+  void (* finished)          (MsdTimeline *timeline);
+  void (* paused)            (MsdTimeline *timeline);
 
-  void (* frame)             (GsdTimeline *timeline,
+  void (* frame)             (MsdTimeline *timeline,
 			      gdouble      progress);
 
-  void (* __gsd_reserved1) (void);
-  void (* __gsd_reserved2) (void);
-  void (* __gsd_reserved3) (void);
-  void (* __gsd_reserved4) (void);
+  void (* __msd_reserved1) (void);
+  void (* __msd_reserved2) (void);
+  void (* __msd_reserved3) (void);
+  void (* __msd_reserved4) (void);
 };
 
-typedef gdouble (*GsdTimelineProgressFunc) (gdouble progress);
+typedef gdouble (*MsdTimelineProgressFunc) (gdouble progress);
 
 
-GType                   gsd_timeline_get_type           (void) G_GNUC_CONST;
-GType                   gsd_timeline_direction_get_type (void) G_GNUC_CONST;
-GType                   gsd_timeline_progress_type_get_type (void) G_GNUC_CONST;
+GType                   msd_timeline_get_type           (void) G_GNUC_CONST;
+GType                   msd_timeline_direction_get_type (void) G_GNUC_CONST;
+GType                   msd_timeline_progress_type_get_type (void) G_GNUC_CONST;
 
-GsdTimeline            *gsd_timeline_new                (guint                    duration);
-GsdTimeline            *gsd_timeline_new_for_screen     (guint                    duration,
+MsdTimeline            *msd_timeline_new                (guint                    duration);
+MsdTimeline            *msd_timeline_new_for_screen     (guint                    duration,
 							 GdkScreen               *screen);
 
-void                    gsd_timeline_start              (GsdTimeline             *timeline);
-void                    gsd_timeline_pause              (GsdTimeline             *timeline);
-void                    gsd_timeline_rewind             (GsdTimeline             *timeline);
+void                    msd_timeline_start              (MsdTimeline             *timeline);
+void                    msd_timeline_pause              (MsdTimeline             *timeline);
+void                    msd_timeline_rewind             (MsdTimeline             *timeline);
 
-gboolean                gsd_timeline_is_running         (GsdTimeline             *timeline);
+gboolean                msd_timeline_is_running         (MsdTimeline             *timeline);
 
-guint                   gsd_timeline_get_fps            (GsdTimeline             *timeline);
-void                    gsd_timeline_set_fps            (GsdTimeline             *timeline,
+guint                   msd_timeline_get_fps            (MsdTimeline             *timeline);
+void                    msd_timeline_set_fps            (MsdTimeline             *timeline,
 							 guint                    fps);
 
-gboolean                gsd_timeline_get_loop           (GsdTimeline             *timeline);
-void                    gsd_timeline_set_loop           (GsdTimeline             *timeline,
+gboolean                msd_timeline_get_loop           (MsdTimeline             *timeline);
+void                    msd_timeline_set_loop           (MsdTimeline             *timeline,
 							 gboolean                 loop);
 
-guint                   gsd_timeline_get_duration       (GsdTimeline             *timeline);
-void                    gsd_timeline_set_duration       (GsdTimeline             *timeline,
+guint                   msd_timeline_get_duration       (MsdTimeline             *timeline);
+void                    msd_timeline_set_duration       (MsdTimeline             *timeline,
 							 guint                    duration);
 
-GdkScreen              *gsd_timeline_get_screen         (GsdTimeline             *timeline);
-void                    gsd_timeline_set_screen         (GsdTimeline             *timeline,
+GdkScreen              *msd_timeline_get_screen         (MsdTimeline             *timeline);
+void                    msd_timeline_set_screen         (MsdTimeline             *timeline,
 							 GdkScreen               *screen);
 
-GsdTimelineDirection    gsd_timeline_get_direction      (GsdTimeline             *timeline);
-void                    gsd_timeline_set_direction      (GsdTimeline             *timeline,
-							 GsdTimelineDirection     direction);
+MsdTimelineDirection    msd_timeline_get_direction      (MsdTimeline             *timeline);
+void                    msd_timeline_set_direction      (MsdTimeline             *timeline,
+							 MsdTimelineDirection     direction);
 
-GsdTimelineProgressType gsd_timeline_get_progress_type  (GsdTimeline             *timeline);
-void                    gsd_timeline_set_progress_type  (GsdTimeline             *timeline,
-							 GsdTimelineProgressType  type);
-void                    gsd_timeline_get_progress_func  (GsdTimeline             *timeline);
+MsdTimelineProgressType msd_timeline_get_progress_type  (MsdTimeline             *timeline);
+void                    msd_timeline_set_progress_type  (MsdTimeline             *timeline,
+							 MsdTimelineProgressType  type);
+void                    msd_timeline_get_progress_func  (MsdTimeline             *timeline);
 
-void                    gsd_timeline_set_progress_func  (GsdTimeline             *timeline,
-							 GsdTimelineProgressFunc  progress_func);
+void                    msd_timeline_set_progress_func  (MsdTimeline             *timeline,
+							 MsdTimelineProgressFunc  progress_func);
 
-gdouble                 gsd_timeline_get_progress       (GsdTimeline             *timeline);
+gdouble                 msd_timeline_get_progress       (MsdTimeline             *timeline);
 
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __GSD_TIMELINE_H__ */
+#endif /* __MSD_TIMELINE_H__ */