diff --git a/src/backend/cdb/motion/ic_proxy_addr.c b/src/backend/cdb/motion/ic_proxy_addr.c
index ebf1682b9248b16cad54a956cfe97c76e6d2f4f3..15d33c2a7b6cd99bc3a3025c0f65159fcf169e7b 100644
--- a/src/backend/cdb/motion/ic_proxy_addr.c
+++ b/src/backend/cdb/motion/ic_proxy_addr.c
@@ -98,7 +98,7 @@ ic_proxy_addr_on_getaddrinfo(uv_getaddrinfo_t *req,
 			}
 #endif /* IC_PROXY_LOG_LEVEL <= LOG */
 
-			memcpy(&addr->addr, iter->ai_addr, iter->ai_addrlen);
+			memcpy(&addr->sockaddr, iter->ai_addr, iter->ai_addrlen);
 			ic_proxy_addrs = lappend(ic_proxy_addrs, addr);
 			break;
 		}
@@ -226,14 +226,14 @@ ic_proxy_get_my_addr(void)
 int
 ic_proxy_addr_get_port(const ICProxyAddr *addr)
 {
-	if (addr->addr.ss_family == AF_INET)
+	if (addr->sockaddr.ss_family == AF_INET)
 		return ntohs(((struct sockaddr_in *) addr)->sin_port);
-	else if (addr->addr.ss_family == AF_INET6)
+	else if (addr->sockaddr.ss_family == AF_INET6)
 		return ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
 
 	ic_proxy_log(WARNING,
 				 "ic-proxy-addr: invalid address family %d for seg%d,dbid%d",
-				 addr->addr.ss_family, addr->content, addr->dbid);
+				 addr->sockaddr.ss_family, addr->content, addr->dbid);
 	return -1;
 }
 
@@ -255,8 +255,8 @@ ic_proxy_addr_get_port(const ICProxyAddr *addr)
  * error code.
  */
 int
-ic_proxy_extract_addr(const struct sockaddr *addr,
-					  char *name, size_t namelen, int *port, int *family)
+ic_proxy_extract_sockaddr(const struct sockaddr *addr,
+						  char *name, size_t namelen, int *port, int *family)
 {
 	int			ret;
 
diff --git a/src/backend/cdb/motion/ic_proxy_addr.h b/src/backend/cdb/motion/ic_proxy_addr.h
index 4cc262867ab8a0ee127786f2d82393a06911528a..a3081a7e6fdb56ce8b700667efa1bd7e1ff6832b 100644
--- a/src/backend/cdb/motion/ic_proxy_addr.h
+++ b/src/backend/cdb/motion/ic_proxy_addr.h
@@ -18,7 +18,7 @@ typedef struct ICProxyAddr ICProxyAddr;
 
 struct ICProxyAddr
 {
-	struct sockaddr_storage addr;
+	struct sockaddr_storage sockaddr;
 
 	int			dbid;
 	int			content;
@@ -48,9 +48,9 @@ extern List		   *ic_proxy_addrs;
 extern void ic_proxy_reload_addresses(uv_loop_t *loop);
 extern const ICProxyAddr *ic_proxy_get_my_addr(void);
 extern int ic_proxy_addr_get_port(const ICProxyAddr *addr);
-extern int ic_proxy_extract_addr(const struct sockaddr *addr,
-								 char *name, size_t namelen,
-								 int *port, int *family);
+extern int ic_proxy_extract_sockaddr(const struct sockaddr *addr,
+									 char *name, size_t namelen,
+									 int *port, int *family);
 
 
 #endif   /* IC_PROXY_ADDR_H */
diff --git a/src/backend/cdb/motion/ic_proxy_main.c b/src/backend/cdb/motion/ic_proxy_main.c
index ef2b2bfc479a8a5385e5951ac9d8e4d91cdfe0a1..750133d2b1824df2026aaf4612554d84267c835a 100644
--- a/src/backend/cdb/motion/ic_proxy_main.c
+++ b/src/backend/cdb/motion/ic_proxy_main.c
@@ -177,7 +177,7 @@ ic_proxy_server_peer_listener_init(uv_loop_t *loop)
 	uv_tcp_init(loop, listener);
 	uv_tcp_nodelay(listener, true);
 
-	ret = uv_tcp_bind(listener, (struct sockaddr *) &addr->addr, 0);
+	ret = uv_tcp_bind(listener, (struct sockaddr *) &addr->sockaddr, 0);
 	if (ret < 0)
 	{
 		ic_proxy_log(WARNING, "ic-proxy-server: tcp: fail to bind: %s",
diff --git a/src/backend/cdb/motion/ic_proxy_peer.c b/src/backend/cdb/motion/ic_proxy_peer.c
index d162261a28b4f27fe088b82be6c9c48803934713..783bc92f6cf9c3a1df2434c89516a72da6f0fe8a 100644
--- a/src/backend/cdb/motion/ic_proxy_peer.c
+++ b/src/backend/cdb/motion/ic_proxy_peer.c
@@ -134,14 +134,14 @@ ic_proxy_peer_update_name(ICProxyPeer *peer)
 	 * happens.
 	 */
 	uv_tcp_getsockname(&peer->tcp, (struct sockaddr *) &peeraddr, &addrlen);
-	ic_proxy_extract_addr((struct sockaddr *) &peeraddr,
-						  sockname, sizeof(sockname),
-						  &sockport, NULL /* family */);
+	ic_proxy_extract_sockaddr((struct sockaddr *) &peeraddr,
+							  sockname, sizeof(sockname),
+							  &sockport, NULL /* family */);
 
 	uv_tcp_getpeername(&peer->tcp, (struct sockaddr *) &peeraddr, &addrlen);
-	ic_proxy_extract_addr((struct sockaddr *) &peeraddr,
-						  peername, sizeof(peername),
-						  &peerport, NULL /* family */);
+	ic_proxy_extract_sockaddr((struct sockaddr *) &peeraddr,
+							  peername, sizeof(peername),
+							  &peerport, NULL /* family */);
 
 	snprintf(peer->name, sizeof(peer->name), "peer%s[seg%hd,dbid%hu %s:%d->%s:%d]",
 			 (peer->state & IC_PROXY_PEER_STATE_LEGACY) ? ".legacy" : "",