diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
index d2c0887fd46997348317cd02f5d7e8338a89bbb6..0603949ee74519a17c6db631b9794f26085ba996 100644
--- a/drivers/staging/gma500/Makefile
+++ b/drivers/staging/gma500/Makefile
@@ -6,11 +6,11 @@ ccflags-y += -Iinclude/drm
 psb_gfx-y += gem_glue.o \
 	  accel_2d.o \
 	  backlight.o \
-	  power.o \
 	  framebuffer.o \
+	  gem.o \
+	  gtt.o \
+	  power.o \
 	  psb_drv.o \
-	  psb_gem.o \
-	  psb_gtt.o \
 	  psb_intel_bios.o \
 	  psb_intel_opregion.o \
 	  psb_intel_display.o \
diff --git a/drivers/staging/gma500/psb_gem.c b/drivers/staging/gma500/gem.c
similarity index 100%
rename from drivers/staging/gma500/psb_gem.c
rename to drivers/staging/gma500/gem.c
diff --git a/drivers/staging/gma500/psb_gtt.c b/drivers/staging/gma500/gtt.c
similarity index 100%
rename from drivers/staging/gma500/psb_gtt.c
rename to drivers/staging/gma500/gtt.c
diff --git a/drivers/staging/gma500/psb_gtt.h b/drivers/staging/gma500/gtt.h
similarity index 100%
rename from drivers/staging/gma500/psb_gtt.h
rename to drivers/staging/gma500/gtt.h
diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h
index 9c6aba541294616b64c4209d96181e3325defbe8..307ff9c86fda05f286ae8d13024dc46cd13fad66 100644
--- a/drivers/staging/gma500/psb_drv.h
+++ b/drivers/staging/gma500/psb_drv.h
@@ -29,7 +29,7 @@
 #include "psb_drm.h"
 #include "psb_reg.h"
 #include "psb_intel_drv.h"
-#include "psb_gtt.h"
+#include "gtt.h"
 #include "psb_powermgmt.h"
 #include "mrst.h"