diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c
index 14bb7dc9b..6716c20f8 100644
--- a/lib/iscsi/conn.c
+++ b/lib/iscsi/conn.c
@@ -180,7 +180,7 @@ iscsi_poll_group_add_conn(struct spdk_iscsi_poll_group *pg, struct spdk_iscsi_co
 	}
 
 	conn->is_stopped = false;
-	STAILQ_INSERT_TAIL(&pg->connections, conn, link);
+	STAILQ_INSERT_TAIL(&pg->connections, conn, pg_link);
 }
 
 static void
@@ -195,7 +195,7 @@ iscsi_poll_group_remove_conn(struct spdk_iscsi_poll_group *pg, struct spdk_iscsi
 	}
 
 	conn->is_stopped = true;
-	STAILQ_REMOVE(&pg->connections, conn, spdk_iscsi_conn, link);
+	STAILQ_REMOVE(&pg->connections, conn, spdk_iscsi_conn, pg_link);
 }
 
 static void
diff --git a/lib/iscsi/conn.h b/lib/iscsi/conn.h
index dd18bd4b3..08aaf2d05 100644
--- a/lib/iscsi/conn.h
+++ b/lib/iscsi/conn.h
@@ -189,7 +189,7 @@ struct spdk_iscsi_conn {
 	uint32_t ttt; /* target transfer tag */
 	char *partial_text_parameter;
 
-	STAILQ_ENTRY(spdk_iscsi_conn) link;
+	STAILQ_ENTRY(spdk_iscsi_conn) pg_link;
 	bool			is_stopped;  /* Set true when connection is stopped for migration */
 	TAILQ_HEAD(queued_r2t_tasks, spdk_iscsi_task)	queued_r2t_tasks;
 	TAILQ_HEAD(active_r2t_tasks, spdk_iscsi_task)	active_r2t_tasks;
diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c
index 6df6a3b97..8ab43d31d 100644
--- a/lib/iscsi/iscsi_rpc.c
+++ b/lib/iscsi/iscsi_rpc.c
@@ -977,7 +977,7 @@ _rpc_iscsi_get_connections(struct spdk_io_channel_iter *i)
 	struct spdk_iscsi_poll_group *pg = spdk_io_channel_get_ctx(ch);
 	struct spdk_iscsi_conn *conn;
 
-	STAILQ_FOREACH(conn, &pg->connections, link) {
+	STAILQ_FOREACH(conn, &pg->connections, pg_link) {
 		iscsi_conn_info_json(ctx->w, conn);
 	}
 
diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c
index 0e12b9e94..1eb766233 100644
--- a/lib/iscsi/iscsi_subsystem.c
+++ b/lib/iscsi/iscsi_subsystem.c
@@ -1197,7 +1197,7 @@ iscsi_poll_group_poll(void *ctx)
 		SPDK_ERRLOG("Failed to poll sock_group=%p\n", group->sock_group);
 	}
 
-	STAILQ_FOREACH_SAFE(conn, &group->connections, link, tmp) {
+	STAILQ_FOREACH_SAFE(conn, &group->connections, pg_link, tmp) {
 		if (conn->state == ISCSI_CONN_STATE_EXITING) {
 			iscsi_conn_destruct(conn);
 		}
@@ -1212,7 +1212,7 @@ iscsi_poll_group_handle_nop(void *ctx)
 	struct spdk_iscsi_poll_group *group = ctx;
 	struct spdk_iscsi_conn *conn, *tmp;
 
-	STAILQ_FOREACH_SAFE(conn, &group->connections, link, tmp) {
+	STAILQ_FOREACH_SAFE(conn, &group->connections, pg_link, tmp) {
 		iscsi_conn_handle_nop(conn);
 	}