diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile
index eeffd4c03..7458de751 100644
--- a/lib/nvmf/Makefile
+++ b/lib/nvmf/Makefile
@@ -36,7 +36,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 CFLAGS += $(DPDK_INC)
 LIBNAME = nvmf
 C_SRCS = rdma.c port.c conn.c controller.c \
-	 host.c subsystem_grp.c conf.c \
+	 host.c subsystem.c conf.c \
 	 nvmf.c request.c session.c
 
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/nvmf/host.c b/lib/nvmf/host.c
index dc08a55a6..339d5878d 100644
--- a/lib/nvmf/host.c
+++ b/lib/nvmf/host.c
@@ -36,7 +36,7 @@
 
 #include "host.h"
 #include "nvmf_internal.h"
-#include "subsystem_grp.h"
+#include "subsystem.h"
 #include "spdk/log.h"
 #include "spdk/trace.h"
 
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 602c6b10b..3dbaa5a29 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -44,7 +44,7 @@
 #include "port.h"
 #include "host.h"
 #include "rdma.h"
-#include "subsystem_grp.h"
+#include "subsystem.h"
 #include "spdk/trace.h"
 
 SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF)
diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c
index d80fdd9e5..dc5888226 100644
--- a/lib/nvmf/request.c
+++ b/lib/nvmf/request.c
@@ -40,7 +40,7 @@
 #include "rdma.h"
 #include "request.h"
 #include "session.h"
-#include "subsystem_grp.h"
+#include "subsystem.h"
 
 #include "spdk/log.h"
 #include "spdk/nvme.h"
diff --git a/lib/nvmf/session.c b/lib/nvmf/session.c
index 61aab7356..10bca623a 100644
--- a/lib/nvmf/session.c
+++ b/lib/nvmf/session.c
@@ -35,7 +35,7 @@
 
 #include "session.h"
 #include "nvmf_internal.h"
-#include "subsystem_grp.h"
+#include "subsystem.h"
 #include "spdk/log.h"
 #include "spdk/trace.h"
 #include "spdk/nvme_spec.h"
diff --git a/lib/nvmf/subsystem_grp.c b/lib/nvmf/subsystem.c
similarity index 99%
rename from lib/nvmf/subsystem_grp.c
rename to lib/nvmf/subsystem.c
index bcab37057..a0adeb1ed 100644
--- a/lib/nvmf/subsystem_grp.c
+++ b/lib/nvmf/subsystem.c
@@ -38,7 +38,7 @@
 #include "host.h"
 #include "nvmf_internal.h"
 #include "session.h"
-#include "subsystem_grp.h"
+#include "subsystem.h"
 #include "spdk/log.h"
 #include "spdk/string.h"
 #include "spdk/trace.h"
diff --git a/lib/nvmf/subsystem_grp.h b/lib/nvmf/subsystem.h
similarity index 96%
rename from lib/nvmf/subsystem_grp.h
rename to lib/nvmf/subsystem.h
index 974217c8d..7820b0738 100644
--- a/lib/nvmf/subsystem_grp.h
+++ b/lib/nvmf/subsystem.h
@@ -31,8 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _NVMF_SUBSYSTEM_GROUP_H_
-#define _NVMF_SUBSYSTEM_GROUP_H_
+#ifndef SPDK_NVMF_SUBSYSTEM_H
+#define SPDK_NVMF_SUBSYSTEM_H
 
 #include "spdk/nvme.h"
 #include "spdk/queue.h"
@@ -91,4 +91,4 @@ spdk_shutdown_nvmf_subsystems(void);
 void
 spdk_format_discovery_log(struct spdk_nvmf_discovery_log_page *disc_log, uint32_t length);
 
-#endif /* _NVMF_SUBSYSTEM_GROUP_H_ */
+#endif /* SPDK_NVMF_SUBSYSTEM_H */