diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 0eb401112..113f01d11 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -46,7 +46,7 @@ SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF)
 
 #define MAX_SUBSYSTEMS 4
 
-struct spdk_nvmf_globals g_nvmf_tgt;
+struct spdk_nvmf_tgt g_nvmf_tgt;
 
 int
 spdk_nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_queues_per_sess,
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index e508d2725..fd6866cc9 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -45,7 +45,7 @@
 
 #define SPDK_NVMF_DEFAULT_NUM_SESSIONS_PER_LCORE 1
 
-struct spdk_nvmf_globals {
+struct spdk_nvmf_tgt {
 	uint16_t max_queue_depth;
 	uint16_t max_queues_per_session;
 
@@ -63,7 +63,7 @@ nvmf_u32log2(uint32_t x)
 	return 31u - __builtin_clz(x);
 }
 
-extern struct spdk_nvmf_globals g_nvmf_tgt;
+extern struct spdk_nvmf_tgt g_nvmf_tgt;
 
 struct spdk_nvmf_listen_addr *spdk_nvmf_listen_addr_create(char *trname, char *traddr,
 		char *trsvcid);
diff --git a/test/lib/nvmf/session/session_ut.c b/test/lib/nvmf/session/session_ut.c
index c13b7fa91..89310fdcc 100644
--- a/test/lib/nvmf/session/session_ut.c
+++ b/test/lib/nvmf/session/session_ut.c
@@ -42,7 +42,7 @@
 
 SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF)
 
-struct spdk_nvmf_globals g_nvmf_tgt;
+struct spdk_nvmf_tgt g_nvmf_tgt;
 
 struct spdk_nvmf_subsystem *
 spdk_nvmf_find_subsystem_with_cntlid(uint16_t cntlid)
diff --git a/test/lib/nvmf/subsystem/subsystem_ut.c b/test/lib/nvmf/subsystem/subsystem_ut.c
index e9c1e082e..be81cc3a1 100644
--- a/test/lib/nvmf/subsystem/subsystem_ut.c
+++ b/test/lib/nvmf/subsystem/subsystem_ut.c
@@ -46,7 +46,7 @@ const struct spdk_nvmf_ctrlr_ops spdk_nvmf_virtual_ctrlr_ops;
 
 SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF)
 
-struct spdk_nvmf_globals g_nvmf_tgt;
+struct spdk_nvmf_tgt g_nvmf_tgt;
 
 struct spdk_nvmf_listen_addr *
 spdk_nvmf_listen_addr_create(char *trname, char *traddr, char *trsvcid)