diff --git a/net/devif/devif_poll.c b/net/devif/devif_poll.c
index e49d8215f8..afaa161a35 100644
--- a/net/devif/devif_poll.c
+++ b/net/devif/devif_poll.c
@@ -82,7 +82,7 @@ static int devif_poll_pkt_connections(FAR struct net_driver_s *dev,
 
   /* Traverse all of the allocated packet connections and perform the poll action */
 
-  while (!bstop && (pkt_conn = uip_nextpktconn(pkt_conn)))
+  while (!bstop && (pkt_conn = pkt_nextconn(pkt_conn)))
     {
       /* Perform the packet TX poll */
 
@@ -170,7 +170,7 @@ static int devif_poll_udp_connections(FAR struct net_driver_s *dev,
 
   /* Traverse all of the allocated UDP connections and perform the poll action */
 
-  while (!bstop && (conn = uip_nextudpconn(conn)))
+  while (!bstop && (conn = udp_nextconn(conn)))
     {
       /* Perform the UDP TX poll */
 
@@ -206,7 +206,7 @@ static inline int devif_poll_tcp_connections(FAR struct net_driver_s *dev,
 
   /* Traverse all of the active TCP connections and perform the poll action */
 
-  while (!bstop && (conn = uip_nexttcpconn(conn)))
+  while (!bstop && (conn = tcp_nextconn(conn)))
     {
       /* Perform the TCP TX poll */
 
@@ -245,7 +245,7 @@ static inline int devif_poll_tcp_timer(FAR struct net_driver_s *dev,
 
   /* Traverse all of the active TCP connections and perform the poll action */
 
-  while (!bstop && (conn = uip_nexttcpconn(conn)))
+  while (!bstop && (conn = tcp_nextconn(conn)))
     {
       /* Perform the TCP timer poll */
 
diff --git a/net/pkt/pkt.h b/net/pkt/pkt.h
index 5010d72752..dee1fecbf3 100644
--- a/net/pkt/pkt.h
+++ b/net/pkt/pkt.h
@@ -84,7 +84,7 @@ void pkt_initialize(void);
 FAR struct pkt_conn_s *pkt_alloc(void);
 void pkt_free(FAR struct pkt_conn_s *conn);
 struct pkt_conn_s *pkt_active(FAR struct eth_hdr_s *buf);
-struct pkt_conn_s *uip_nextpktconn(FAR struct pkt_conn_s *conn);
+struct pkt_conn_s *pkt_nextconn(FAR struct pkt_conn_s *conn);
 
 /* Defined in pkt_callback.c ************************************************/
 
diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c
index 2b4bf98309..047303f27f 100644
--- a/net/pkt/pkt_conn.c
+++ b/net/pkt/pkt_conn.c
@@ -239,7 +239,7 @@ FAR struct pkt_conn_s *pkt_active(struct eth_hdr_s *buf)
 }
 
 /****************************************************************************
- * Name: uip_nextpktconn()
+ * Name: pkt_nextconn()
  *
  * Description:
  *   Traverse the list of allocated packet connections
@@ -250,7 +250,7 @@ FAR struct pkt_conn_s *pkt_active(struct eth_hdr_s *buf)
  *
  ****************************************************************************/
 
-FAR struct pkt_conn_s *uip_nextpktconn(FAR struct pkt_conn_s *conn)
+FAR struct pkt_conn_s *pkt_nextconn(FAR struct pkt_conn_s *conn)
 {
   if (!conn)
     {
diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h
index 90475b2b5c..6ac2892357 100644
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
@@ -81,7 +81,7 @@ struct tcp_iphdr_s; /* Forward reference */
 
 void tcp_initialize(void);
 struct tcp_conn_s *tcp_active(FAR struct tcp_iphdr_s *buf);
-struct tcp_conn_s *uip_nexttcpconn(FAR struct tcp_conn_s *conn);
+struct tcp_conn_s *tcp_nextconn(FAR struct tcp_conn_s *conn);
 struct tcp_conn_s *tcp_listener(uint16_t portno);
 struct tcp_conn_s *tcp_alloc_accept(FAR struct tcp_iphdr_s *buf);
 
diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index 362165f15f..f2eba21ca1 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -438,7 +438,7 @@ FAR struct tcp_conn_s *tcp_active(struct tcp_iphdr_s *buf)
 }
 
 /****************************************************************************
- * Name: uip_nexttcpconn()
+ * Name: tcp_nextconn()
  *
  * Description:
  *   Traverse the list of active TCP connections
@@ -449,7 +449,7 @@ FAR struct tcp_conn_s *tcp_active(struct tcp_iphdr_s *buf)
  *
  ****************************************************************************/
 
-FAR struct tcp_conn_s *uip_nexttcpconn(FAR struct tcp_conn_s *conn)
+FAR struct tcp_conn_s *tcp_nextconn(FAR struct tcp_conn_s *conn)
 {
   if (!conn)
     {
diff --git a/net/udp/udp.h b/net/udp/udp.h
index f9904d39ac..6d2c636b05 100644
--- a/net/udp/udp.h
+++ b/net/udp/udp.h
@@ -82,7 +82,7 @@ struct udp_conn_s; /* Forward reference */
 
 void udp_initialize(void);
 FAR struct udp_conn_s *udp_active(FAR struct udp_iphdr_s *buf);
-FAR struct udp_conn_s *uip_nextudpconn(FAR struct udp_conn_s *conn);
+FAR struct udp_conn_s *udp_nextconn(FAR struct udp_conn_s *conn);
 
 /* Defined in udp_poll.c ****************************************************/
 
diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c
index 1e4b2ff4f6..65a04aad12 100644
--- a/net/udp/udp_conn.c
+++ b/net/udp/udp_conn.c
@@ -337,7 +337,7 @@ FAR struct udp_conn_s *udp_active(FAR struct udp_iphdr_s *buf)
 }
 
 /****************************************************************************
- * Name: uip_nextudpconn()
+ * Name: udp_nextconn()
  *
  * Description:
  *   Traverse the list of allocated UDP connections
@@ -348,7 +348,7 @@ FAR struct udp_conn_s *udp_active(FAR struct udp_iphdr_s *buf)
  *
  ****************************************************************************/
 
-FAR struct udp_conn_s *uip_nextudpconn(FAR struct udp_conn_s *conn)
+FAR struct udp_conn_s *udp_nextconn(FAR struct udp_conn_s *conn)
 {
   if (!conn)
     {