diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 8b28b4b5a53d..d479a0291ed7 100644
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -24,7 +24,7 @@ gb-phy-y :=	gpbridge.o	\
 
 # Prefix all modules with gb-
 gb-vibrator-y := vibrator.o
-gb-battery-y := battery.o
+gb-power-supply-y := power_supply.o
 gb-loopback-y := loopback.o
 gb-light-y := light.o
 gb-raw-y := raw.o
@@ -36,7 +36,7 @@ gb-db3-y := db3-platform.o
 obj-m += greybus.o
 obj-m += gb-phy.o
 obj-m += gb-vibrator.o
-obj-m += gb-battery.o
+obj-m += gb-power-supply.o
 obj-m += gb-loopback.o
 obj-m += gb-light.o
 obj-m += gb-hid.o
diff --git a/drivers/staging/greybus/battery.c b/drivers/staging/greybus/power_supply.c
similarity index 100%
rename from drivers/staging/greybus/battery.c
rename to drivers/staging/greybus/power_supply.c