diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c
index 7e9d7a6d5..b6c6ceefa 100644
--- a/lib/nvmf/fc.c
+++ b/lib/nvmf/fc.c
@@ -513,7 +513,7 @@ spdk_nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp)
 		return;
 	}
 
-	hwqp->thread = fgroup->tp_poll_group.group->thread;
+	hwqp->thread = fgroup->group.group->thread;
 	hwqp->fgroup = fgroup;
 	fgroup->hwqp_count++;
 	spdk_nvmf_fc_poller_api_func(hwqp, SPDK_NVMF_FC_POLLER_API_ADD_HWQP, NULL);
@@ -1300,7 +1300,7 @@ nvmf_fc_request_alloc_buffers(struct spdk_nvmf_fc_request *fc_req)
 	uint32_t length = fc_req->req.length;
 	uint32_t num_buffers;
 	struct spdk_nvmf_fc_poll_group *fgroup = fc_req->hwqp->fgroup;
-	struct spdk_nvmf_transport_poll_group *group = &fgroup->tp_poll_group;
+	struct spdk_nvmf_transport_poll_group *group = &fgroup->group;
 	struct spdk_nvmf_transport *transport = &fgroup->fc_transport->transport;
 
 	num_buffers = SPDK_CEIL_DIV(length, transport->opts.io_unit_size);
@@ -1469,7 +1469,7 @@ spdk_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req)
 {
 	struct spdk_nvmf_fc_hwqp *hwqp = fc_req->hwqp;
 	struct spdk_nvmf_fc_poll_group *fgroup = hwqp->fgroup;
-	struct spdk_nvmf_transport_poll_group *group = &fgroup->tp_poll_group;
+	struct spdk_nvmf_transport_poll_group *group = &fgroup->group;
 	struct spdk_nvmf_transport *transport = &fgroup->fc_transport->transport;
 
 	if (!fc_req) {
@@ -2009,7 +2009,7 @@ nvmf_fc_poll_group_create(struct spdk_nvmf_transport *transport)
 	g_nvmf_fgroup_count++;
 	pthread_mutex_unlock(&fc_transport->lock);
 
-	return &fgroup->tp_poll_group;
+	return &fgroup->group;
 }
 
 static void
@@ -2017,7 +2017,7 @@ nvmf_fc_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group)
 {
 	struct spdk_nvmf_fc_poll_group *fgroup;
 
-	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, tp_poll_group);
+	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, group);
 	pthread_mutex_lock(&fgroup->fc_transport->lock);
 	TAILQ_REMOVE(&g_nvmf_fgroups, fgroup, link);
 	g_nvmf_fgroup_count--;
@@ -2036,7 +2036,7 @@ nvmf_fc_poll_group_add(struct spdk_nvmf_transport_poll_group *group,
 	struct spdk_nvmf_fc_ls_add_conn_api_data *api_data = NULL;
 	bool hwqp_found = false;
 
-	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, tp_poll_group);
+	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, group);
 	fc_conn  = SPDK_CONTAINEROF(qpair, struct spdk_nvmf_fc_conn, qpair);
 
 	TAILQ_FOREACH(hwqp, &fgroup->hwqp_list, link) {
@@ -2079,7 +2079,7 @@ nvmf_fc_poll_group_poll(struct spdk_nvmf_transport_poll_group *group)
 	struct spdk_nvmf_fc_poll_group *fgroup;
 	struct spdk_nvmf_fc_hwqp *hwqp;
 
-	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, tp_poll_group);
+	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, group);
 
 	TAILQ_FOREACH(hwqp, &fgroup->hwqp_list, link) {
 		if (hwqp->state == SPDK_FC_HWQP_ONLINE) {
diff --git a/lib/nvmf/nvmf_fc.h b/lib/nvmf/nvmf_fc.h
index ae59953ff..3212060cc 100644
--- a/lib/nvmf/nvmf_fc.h
+++ b/lib/nvmf/nvmf_fc.h
@@ -263,7 +263,7 @@ struct spdk_nvmf_fc_xchg {
  *  FC poll group structure
  */
 struct spdk_nvmf_fc_poll_group {
-	struct spdk_nvmf_transport_poll_group tp_poll_group;
+	struct spdk_nvmf_transport_poll_group group;
 	struct spdk_nvmf_tgt *nvmf_tgt;
 	struct spdk_nvmf_fc_transport *fc_transport;
 	uint32_t hwqp_count; /* number of hwqp's assigned to this pg */
diff --git a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
index 1bd4ad154..1ad8e6bf8 100644
--- a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
+++ b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
@@ -707,8 +707,8 @@ ls_tests_init(void)
 		bzero(&g_fgroup[i], sizeof(struct spdk_nvmf_fc_poll_group));
 		TAILQ_INIT(&g_poll_group[i].tgroups);
 		TAILQ_INIT(&g_poll_group[i].qpairs);
-		g_fgroup[i].tp_poll_group.transport = &g_nvmf_transport;
-		g_fgroup[i].tp_poll_group.group = &g_poll_group[i];
+		g_fgroup[i].group.transport = &g_nvmf_transport;
+		g_fgroup[i].group.group = &g_poll_group[i];
 		hwqp->fgroup = &g_fgroup[i];
 	}