diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 08cdaf1affb8..6c0b0ca5be38 100644
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -2,7 +2,7 @@ greybus-y :=	core.o		\
 		debugfs.o	\
 		ap.o		\
 		manifest.o	\
-		interface_block.o	\
+		interface.o	\
 		bundle.o	\
 		connection.o	\
 		protocol.o	\
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index 230cc2859b27..e0c5eb7bd13f 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -24,7 +24,7 @@
 #include "greybus_id.h"
 #include "greybus_manifest.h"
 #include "manifest.h"
-#include "interface_block.h"
+#include "interface.h"
 #include "bundle.h"
 #include "connection.h"
 #include "protocol.h"
diff --git a/drivers/staging/greybus/interface_block.c b/drivers/staging/greybus/interface.c
similarity index 100%
rename from drivers/staging/greybus/interface_block.c
rename to drivers/staging/greybus/interface.c
diff --git a/drivers/staging/greybus/interface_block.h b/drivers/staging/greybus/interface.h
similarity index 93%
rename from drivers/staging/greybus/interface_block.h
rename to drivers/staging/greybus/interface.h
index e0846d8ee84f..5c7cebc17e2e 100644
--- a/drivers/staging/greybus/interface_block.h
+++ b/drivers/staging/greybus/interface.h
@@ -7,8 +7,8 @@
  * Released under the GPLv2 only.
  */
 
-#ifndef __INTERFACE_BLOCK_H
-#define __INTERFACE_BLOCK_H
+#ifndef __INTERFACE_H
+#define __INTERFACE_H
 
 /* Increase these values if needed */
 #define MAX_CPORTS_PER_MODULE	10
@@ -55,4 +55,4 @@ const struct greybus_interface_block_id *
 struct gb_interface_block *gb_ib_find(struct greybus_host_device *hd,
 				      u8 module_id);
 
-#endif /* __INTERFACE_BLOCK_H */
+#endif /* __INTERFACE_H */