diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 55b4a37c58fb..79af8128aac9 100644
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -17,6 +17,12 @@ gb-phy-y :=	gpb.o		\
 		i2c.o	\
 		usb.o
 
+# Prefix all modules with gb-
+gb-vibrator-y := vibrator.o
+gb-battery-y := battery.o
+gb-es1-y := es1.o
+gb-es2-y := es2.o
+
 obj-m += greybus.o
 obj-m += gb-phy.o
 obj-m += gb-vibrator.o
diff --git a/drivers/staging/greybus/gb-battery.c b/drivers/staging/greybus/battery.c
similarity index 100%
rename from drivers/staging/greybus/gb-battery.c
rename to drivers/staging/greybus/battery.c
diff --git a/drivers/staging/greybus/gb-es1.c b/drivers/staging/greybus/es1.c
similarity index 100%
rename from drivers/staging/greybus/gb-es1.c
rename to drivers/staging/greybus/es1.c
diff --git a/drivers/staging/greybus/gb-es2.c b/drivers/staging/greybus/es2.c
similarity index 100%
rename from drivers/staging/greybus/gb-es2.c
rename to drivers/staging/greybus/es2.c
diff --git a/drivers/staging/greybus/gb-vibrator.c b/drivers/staging/greybus/vibrator.c
similarity index 100%
rename from drivers/staging/greybus/gb-vibrator.c
rename to drivers/staging/greybus/vibrator.c