diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c
index a3f7014e5..03243af53 100644
--- a/app/nvmf_tgt/nvmf_tgt.c
+++ b/app/nvmf_tgt/nvmf_tgt.c
@@ -47,7 +47,7 @@
 #include "nvmf/conn.h"
 #include "nvmf/rdma.h"
 #include "nvmf/port.h"
-#include "nvmf/init_grp.h"
+#include "nvmf/host.h"
 #include "nvmf/nvmf.h"
 
 #include "spdk/log.h"
diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile
index a4b3ee847..81d587b04 100644
--- a/lib/nvmf/Makefile
+++ b/lib/nvmf/Makefile
@@ -37,7 +37,7 @@ CFLAGS += $(DPDK_INC)
 LIBNAME = nvmf
 C_SRCS = nvmf_admin_cmd.c nvmf_io_cmd.c \
 	 rdma.c port.c conn.c controller.c \
-	 init_grp.c subsystem_grp.c conf.c \
+	 host.c subsystem_grp.c conf.c \
 	 nvmf.c session.c
 
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/nvmf/conf.c b/lib/nvmf/conf.c
index 71b97b299..7fdf6ab49 100644
--- a/lib/nvmf/conf.c
+++ b/lib/nvmf/conf.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "conf.h"
-#include "init_grp.h"
+#include "host.h"
 #include "nvmf_internal.h"
 #include "port.h"
 #include "spdk/conf.h"
diff --git a/lib/nvmf/init_grp.c b/lib/nvmf/host.c
similarity index 99%
rename from lib/nvmf/init_grp.c
rename to lib/nvmf/host.c
index c6e1e5dc6..dc08a55a6 100644
--- a/lib/nvmf/init_grp.c
+++ b/lib/nvmf/host.c
@@ -34,7 +34,7 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-#include "init_grp.h"
+#include "host.h"
 #include "nvmf_internal.h"
 #include "subsystem_grp.h"
 #include "spdk/log.h"
diff --git a/lib/nvmf/init_grp.h b/lib/nvmf/host.h
similarity index 96%
rename from lib/nvmf/init_grp.h
rename to lib/nvmf/host.h
index 3fc8cc9b3..02c617a93 100644
--- a/lib/nvmf/init_grp.h
+++ b/lib/nvmf/host.h
@@ -31,8 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef NVMF_INIT_GRP_H
-#define NVMF_INIT_GRP_H
+#ifndef NVMF_HOST_H
+#define NVMF_HOST_H
 
 #include "spdk/queue.h"
 #include "port.h" // For enum group_state
@@ -61,4 +61,4 @@ spdk_nvmf_host_find_by_addr(char *addr);
 void
 spdk_nvmf_host_destroy_all(void);
 
-#endif /* NVMF_INIT_GRP_H */
+#endif
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index f7ea1de44..61941505c 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -43,7 +43,7 @@
 #include "conn.h"
 #include "controller.h"
 #include "port.h"
-#include "init_grp.h"
+#include "host.h"
 #include "rdma.h"
 #include "subsystem_grp.h"
 #include "spdk/trace.h"
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index c861598e6..0e023e4a5 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -48,7 +48,7 @@
 #include "rdma.h"
 #include "nvmf.h"
 #include "port.h"
-#include "init_grp.h"
+#include "host.h"
 #include "spdk/log.h"
 #include "spdk/trace.h"
 
diff --git a/lib/nvmf/subsystem_grp.c b/lib/nvmf/subsystem_grp.c
index 392667961..a4ca375ea 100644
--- a/lib/nvmf/subsystem_grp.c
+++ b/lib/nvmf/subsystem_grp.c
@@ -35,7 +35,7 @@
 
 #include "controller.h"
 #include "port.h"
-#include "init_grp.h"
+#include "host.h"
 #include "nvmf_internal.h"
 #include "nvmf.h"
 #include "session.h"