diff --git a/lib/nvmf/conf.c b/lib/nvmf/conf.c
index 89981025e..71b97b299 100644
--- a/lib/nvmf/conf.c
+++ b/lib/nvmf/conf.c
@@ -296,7 +296,7 @@ spdk_nvmf_parse_init_grp(struct spdk_conf_section *sp)
 		}
 	}
 
-	host = spdk_nvmf_init_grp_create(sp->num, num_netmasks, netmasks);
+	host = spdk_nvmf_host_create(sp->num, num_netmasks, netmasks);
 
 	if (!host) {
 		free(netmasks);
diff --git a/lib/nvmf/init_grp.c b/lib/nvmf/init_grp.c
index 4bab94b16..c6e1e5dc6 100644
--- a/lib/nvmf/init_grp.c
+++ b/lib/nvmf/init_grp.c
@@ -52,15 +52,15 @@
 static TAILQ_HEAD(, spdk_nvmf_host) g_host_head = TAILQ_HEAD_INITIALIZER(g_host_head);
 
 struct spdk_nvmf_host *
-spdk_nvmf_init_grp_create(int tag,
-			  int num_netmasks,
-			  char **netmasks)
+spdk_nvmf_host_create(int tag,
+		      int num_netmasks,
+		      char **netmasks)
 {
 	int i;
 	struct spdk_nvmf_host *host = NULL;
 
 	/* Make sure there are no duplicate initiator group tags */
-	if (nvmf_initiator_group_find_by_tag(tag)) {
+	if (spdk_nvmf_host_find_by_tag(tag)) {
 		SPDK_ERRLOG("Initiator group creation failed due to duplicate initiator group tag (%d)\n",
 			    tag);
 		return NULL;
@@ -240,7 +240,7 @@ spdk_nvmf_allow_netmask(const char *netmask, const char *addr)
 }
 
 struct spdk_nvmf_host *
-nvmf_initiator_group_find_by_addr(char *addr)
+spdk_nvmf_host_find_by_addr(char *addr)
 {
 	struct spdk_nvmf_host	*host;
 	int i;
@@ -268,7 +268,7 @@ nvmf_initiator_group_find_by_addr(char *addr)
 }
 
 struct spdk_nvmf_host *
-nvmf_initiator_group_find_by_tag(int tag)
+spdk_nvmf_host_find_by_tag(int tag)
 {
 	struct spdk_nvmf_host *host;
 
@@ -283,7 +283,7 @@ nvmf_initiator_group_find_by_tag(int tag)
 }
 
 void
-nvmf_initiator_group_array_destroy(void)
+spdk_nvmf_host_destroy_all(void)
 {
 	struct spdk_nvmf_host *host;
 
diff --git a/lib/nvmf/init_grp.h b/lib/nvmf/init_grp.h
index 8e369c4f8..3fc8cc9b3 100644
--- a/lib/nvmf/init_grp.h
+++ b/lib/nvmf/init_grp.h
@@ -48,17 +48,17 @@ struct spdk_nvmf_host {
 
 /* NVMf Initiator Group management API */
 struct spdk_nvmf_host *
-spdk_nvmf_init_grp_create(int tag,
-			  int num_netmasks,
-			  char **netmasks);
+spdk_nvmf_host_create(int tag,
+		      int num_netmasks,
+		      char **netmasks);
 
 struct spdk_nvmf_host *
-nvmf_initiator_group_find_by_tag(int tag);
+spdk_nvmf_host_find_by_tag(int tag);
 
 struct spdk_nvmf_host *
-nvmf_initiator_group_find_by_addr(char *addr);
+spdk_nvmf_host_find_by_addr(char *addr);
 
 void
-nvmf_initiator_group_array_destroy(void);
+spdk_nvmf_host_destroy_all(void);
 
 #endif /* NVMF_INIT_GRP_H */
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index ed857d239..f7ea1de44 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -339,7 +339,7 @@ nvmf_tgt_subsystem_fini(void)
 {
 	spdk_shutdown_nvmf_subsystems();
 	nvmf_shutdown();
-	nvmf_initiator_group_array_destroy();
+	spdk_nvmf_host_destroy_all();
 	spdk_nvmf_port_destroy_all();
 	free(g_nvmf_tgt.nodebase);
 
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index d7e02369f..c861598e6 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -453,7 +453,7 @@ nvmf_rdma_cm_connect(struct rdma_cm_event *event)
 	SPDK_TRACELOG(SPDK_TRACE_RDMA, "Connect Route: peer addr %s\n",
 		      addr_str);
 
-	host = nvmf_initiator_group_find_by_addr(addr_str);
+	host = spdk_nvmf_host_find_by_addr(addr_str);
 	if (host == NULL) {
 		SPDK_ERRLOG("connect request: remote host addr not provisioned!\n");
 		goto err1;
diff --git a/lib/nvmf/subsystem_grp.c b/lib/nvmf/subsystem_grp.c
index 1e7830c36..392667961 100644
--- a/lib/nvmf/subsystem_grp.c
+++ b/lib/nvmf/subsystem_grp.c
@@ -244,7 +244,7 @@ spdk_nvmf_subsystem_add_map(struct spdk_nvmf_subsystem_grp *ss_group,
 		SPDK_ERRLOG("%s: Port%d not active\n", ss_group->name, port_tag);
 		return -1;
 	}
-	host = nvmf_initiator_group_find_by_tag(host_tag);
+	host = spdk_nvmf_host_find_by_tag(host_tag);
 	if (host == NULL) {
 		SPDK_ERRLOG("%s: Host%d not found\n", ss_group->name, host_tag);
 		return -1;
diff --git a/test/lib/nvmf/nvmf_c/nvmf_ut.c b/test/lib/nvmf/nvmf_c/nvmf_ut.c
index 5f452c35d..88091c385 100644
--- a/test/lib/nvmf/nvmf_c/nvmf_ut.c
+++ b/test/lib/nvmf/nvmf_c/nvmf_ut.c
@@ -98,7 +98,7 @@ int spdk_initialize_nvmf_conns(int max_connections)
 	return 0;
 }
 
-void nvmf_initiator_group_array_destroy(void)
+void spdk_nvmf_host_destroy_all(void)
 {
 }
 
@@ -111,7 +111,7 @@ void spdk_nvmf_port_destroy_all(void)
 {
 }
 
-struct spdk_nvmf_host *nvmf_initiator_group_find_by_tag(int tag)
+struct spdk_nvmf_host *spdk_nvmf_host_find_by_tag(int tag)
 {
 	return NULL;
 }