diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 4fa9b3f29e57..41186b7bb2e4 100644
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -3,7 +3,7 @@ greybus-y :=	core.o		\
 		debugfs.o	\
 		ap.o		\
 		manifest.o	\
-		module.o	\
+		interface_block.o	\
 		interface.o	\
 		connection.o	\
 		protocol.o	\
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index 11f4e5529d9a..101b71168491 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -23,7 +23,7 @@
 #include "greybus_id.h"
 #include "greybus_manifest.h"
 #include "manifest.h"
-#include "module.h"
+#include "interface_block.h"
 #include "interface.h"
 #include "connection.h"
 #include "protocol.h"
diff --git a/drivers/staging/greybus/module.c b/drivers/staging/greybus/interface_block.c
similarity index 100%
rename from drivers/staging/greybus/module.c
rename to drivers/staging/greybus/interface_block.c
diff --git a/drivers/staging/greybus/module.h b/drivers/staging/greybus/interface_block.h
similarity index 100%
rename from drivers/staging/greybus/module.h
rename to drivers/staging/greybus/interface_block.h