diff --git a/src/sugar/Makefile.am b/src/sugar/Makefile.am
index a0e2e1d8..ef91efe9 100644
--- a/src/sugar/Makefile.am
+++ b/src/sugar/Makefile.am
@@ -23,12 +23,16 @@ _sugarext_la_LIBADD = $(EXT_LIBS) -lSM -lICE
 _sugarext_la_SOURCES =			\
 	$(BUILT_SOURCES)		\
 	_sugarextmodule.c		\
-        app.h				\
-	app.c				\
-	client.h			\
-	client.c			\
-	client-xsmp.h			\
-	client-xsmp.c			\
+        gsm-app.h			\
+	gsm-app.c			\
+	gsm-client.h			\
+	gsm-client.c			\
+	gsm-client-xsmp.h		\
+	gsm-client-xsmp.c		\
+	gsm-xsmp.h			\
+	gsm-xsmp.c			\
+	gsm-session.h			\
+	gsm-session.c			\
 	eggaccelerators.c		\
 	eggaccelerators.h		\
 	eggdesktopfile.h		\
@@ -37,8 +41,6 @@ _sugarext_la_SOURCES =			\
 	eggsmclient.c			\
 	eggsmclient-private.h		\
 	eggsmclient-xsmp.c		\
-	session.h			\
-	session.c			\
 	sexy-icon-entry.h		\
 	sexy-icon-entry.c		\
 	sugar-address-entry.c		\
@@ -48,9 +50,7 @@ _sugarext_la_SOURCES =			\
 	sugar-menu.h			\
 	sugar-menu.c			\
 	sugar-preview.h			\
-	sugar-preview.c			\
-	xsmp.h				\
-	xsmp.c
+	sugar-preview.c
 
 BUILT_SOURCES = 			\
 	_sugarext.c			\
diff --git a/src/sugar/_sugarext.override b/src/sugar/_sugarext.override
index 271edcee..db49e274 100644
--- a/src/sugar/_sugarext.override
+++ b/src/sugar/_sugarext.override
@@ -9,7 +9,7 @@ headers
 #include "sugar-menu.h"
 #include "sugar-preview.h"
 #include "sexy-icon-entry.h"
-#include "session.h"
+#include "gsm-session.h"
 
 #define EGG_SM_CLIENT_BACKEND_XSMP
 #include "eggsmclient.h"
diff --git a/src/sugar/app.c b/src/sugar/gsm-app.c
similarity index 99%
rename from src/sugar/app.c
rename to src/sugar/gsm-app.c
index 785e52da..3a63bacf 100644
--- a/src/sugar/app.c
+++ b/src/sugar/gsm-app.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <sys/wait.h>
 
-#include "app.h"
+#include "gsm-app.h"
 
 enum {
   EXITED,
diff --git a/src/sugar/app.h b/src/sugar/gsm-app.h
similarity index 98%
rename from src/sugar/app.h
rename to src/sugar/gsm-app.h
index be3672c6..32ee62d5 100644
--- a/src/sugar/app.h
+++ b/src/sugar/gsm-app.h
@@ -10,7 +10,7 @@
 #include <sys/types.h>
 
 #include "eggdesktopfile.h"
-#include "session.h"
+#include "gsm-session.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/sugar/client-xsmp.c b/src/sugar/gsm-client-xsmp.c
similarity index 99%
rename from src/sugar/client-xsmp.c
rename to src/sugar/gsm-client-xsmp.c
index d4226839..dcacc6f2 100644
--- a/src/sugar/client-xsmp.c
+++ b/src/sugar/gsm-client-xsmp.c
@@ -27,8 +27,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "client-xsmp.h"
-#include "session.h"
+#include "gsm-client-xsmp.h"
+#include "gsm-session.h"
 
 /* FIXME */
 #define GsmDesktopFile "_Gsm_DesktopFile"
diff --git a/src/sugar/client-xsmp.h b/src/sugar/gsm-client-xsmp.h
similarity index 98%
rename from src/sugar/client-xsmp.h
rename to src/sugar/gsm-client-xsmp.h
index c744ee13..46e34a58 100644
--- a/src/sugar/client-xsmp.h
+++ b/src/sugar/gsm-client-xsmp.h
@@ -20,7 +20,7 @@
 #ifndef __GSM_CLIENT_XSMP_H__
 #define __GSM_CLIENT_XSMP_H__
 
-#include "client.h"
+#include "gsm-client.h"
 
 #include <X11/SM/SMlib.h>
 
diff --git a/src/sugar/client.c b/src/sugar/gsm-client.c
similarity index 99%
rename from src/sugar/client.c
rename to src/sugar/gsm-client.c
index 48655237..31554d4c 100644
--- a/src/sugar/client.c
+++ b/src/sugar/gsm-client.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "client.h"
+#include "gsm-client.h"
 
 enum {
   SAVED_STATE,
diff --git a/src/sugar/client.h b/src/sugar/gsm-client.h
similarity index 100%
rename from src/sugar/client.h
rename to src/sugar/gsm-client.h
diff --git a/src/sugar/session.c b/src/sugar/gsm-session.c
similarity index 99%
rename from src/sugar/session.c
rename to src/sugar/gsm-session.c
index 37e3587a..3e621cad 100644
--- a/src/sugar/session.c
+++ b/src/sugar/gsm-session.c
@@ -19,9 +19,9 @@
 
 #include <string.h>
 
-#include "session.h"
-#include "app.h"
-#include "xsmp.h"
+#include "gsm-session.h"
+#include "gsm-app.h"
+#include "gsm-xsmp.h"
 
 GsmSession *global_session;
 
diff --git a/src/sugar/session.h b/src/sugar/gsm-session.h
similarity index 99%
rename from src/sugar/session.h
rename to src/sugar/gsm-session.h
index cc4376af..94577c9a 100644
--- a/src/sugar/session.h
+++ b/src/sugar/gsm-session.h
@@ -21,7 +21,7 @@
 #define __GSM_SESSION_H__
 
 #include <glib.h>
-#include "client.h"
+#include "gsm-client.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/sugar/xsmp.c b/src/sugar/gsm-xsmp.c
similarity index 99%
rename from src/sugar/xsmp.c
rename to src/sugar/gsm-xsmp.c
index d1260b29..aa9dff1b 100644
--- a/src/sugar/xsmp.c
+++ b/src/sugar/gsm-xsmp.c
@@ -32,10 +32,8 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "client-xsmp.h"
-//#include "gsm.h"
-//#include "util.h"
-#include "xsmp.h"
+#include "gsm-client-xsmp.h"
+#include "gsm-xsmp.h"
 
 #include <X11/ICE/ICElib.h>
 #include <X11/ICE/ICEutil.h>
diff --git a/src/sugar/xsmp.h b/src/sugar/gsm-xsmp.h
similarity index 100%
rename from src/sugar/xsmp.h
rename to src/sugar/gsm-xsmp.h