diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 1734480d8dcd..5a7c58deb92a 100644
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -21,7 +21,7 @@ obj-m += greybus.o
 obj-m += gb-phy.o
 obj-m += gb-vibrator.o
 obj-m += gb-battery.o
-obj-m += es1-ap-usb.o
+obj-m += gb-es1.o
 
 KERNELVER		?= $(shell uname -r)
 KERNELDIR 		?= /lib/modules/$(KERNELVER)/build
diff --git a/drivers/staging/greybus/es1-ap-usb.c b/drivers/staging/greybus/gb-es1.c
similarity index 100%
rename from drivers/staging/greybus/es1-ap-usb.c
rename to drivers/staging/greybus/gb-es1.c