diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index a5d5470974bac1c5e979094bb5a0f3edca5ea74c..55b4a37c58fbb5b5924e29ebfa7ea75001adeb39 100644
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -10,12 +10,12 @@ greybus-y :=	core.o		\
 		operation.o
 
 gb-phy-y :=	gpb.o		\
-		sdio-gb.o	\
-		uart-gb.o	\
-		pwm-gb.o	\
-		gpio-gb.o	\
-		i2c-gb.o	\
-		usb-gb.o
+		sdio.o	\
+		uart.o	\
+		pwm.o	\
+		gpio.o	\
+		i2c.o	\
+		usb.o
 
 obj-m += greybus.o
 obj-m += gb-phy.o
diff --git a/drivers/staging/greybus/gpio-gb.c b/drivers/staging/greybus/gpio.c
similarity index 100%
rename from drivers/staging/greybus/gpio-gb.c
rename to drivers/staging/greybus/gpio.c
diff --git a/drivers/staging/greybus/i2c-gb.c b/drivers/staging/greybus/i2c.c
similarity index 100%
rename from drivers/staging/greybus/i2c-gb.c
rename to drivers/staging/greybus/i2c.c
diff --git a/drivers/staging/greybus/pwm-gb.c b/drivers/staging/greybus/pwm.c
similarity index 100%
rename from drivers/staging/greybus/pwm-gb.c
rename to drivers/staging/greybus/pwm.c
diff --git a/drivers/staging/greybus/sdio-gb.c b/drivers/staging/greybus/sdio.c
similarity index 100%
rename from drivers/staging/greybus/sdio-gb.c
rename to drivers/staging/greybus/sdio.c
diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart.c
similarity index 100%
rename from drivers/staging/greybus/uart-gb.c
rename to drivers/staging/greybus/uart.c
diff --git a/drivers/staging/greybus/usb-gb.c b/drivers/staging/greybus/usb.c
similarity index 100%
rename from drivers/staging/greybus/usb-gb.c
rename to drivers/staging/greybus/usb.c