diff --git a/TODO b/TODO
index 6523d3f902..a36ac17f32 100644
--- a/TODO
+++ b/TODO
@@ -385,7 +385,7 @@ o Kernel Build
                ifup     netdev_foreach()
                ifdown   netdev_foreach()
                ifconfig netdev_foreach(), g_netstats
-               ping     uip_ping()
+               ping     icmp_ping()
 
   Status:      Open
   Priority:    Medium/High -- the kernel build configuration is not fully fielded
diff --git a/include/nuttx/net/icmp.h b/include/nuttx/net/icmp.h
index 3e1ea5605b..a7dfe7b42f 100644
--- a/include/nuttx/net/icmp.h
+++ b/include/nuttx/net/icmp.h
@@ -203,8 +203,8 @@ extern "C"
  * Public Function Prototypes
  ****************************************************************************/
 
-int uip_ping(net_ipaddr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
-             int dsecs);
+int icmp_ping(net_ipaddr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
+              int dsecs);
 
 #undef EXTERN
 #ifdef __cplusplus
diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c
index 2510410843..5271f179c8 100644
--- a/net/icmp/icmp_ping.c
+++ b/net/icmp/icmp_ping.c
@@ -297,7 +297,7 @@ end_wait:
  ****************************************************************************/
 
 /****************************************************************************
- * Name: uip_ping
+ * Name: imcp_ping
  *
  * Description:
  *   Send a ECHO request and wait for the ECHO response
@@ -323,8 +323,8 @@ end_wait:
  *
  ****************************************************************************/
 
-int uip_ping(net_ipaddr_t addr, uint16_t id, uint16_t seqno,
-             uint16_t datalen, int dsecs)
+int icmp_ping(net_ipaddr_t addr, uint16_t id, uint16_t seqno,
+              uint16_t datalen, int dsecs)
 {
   struct icmp_ping_s state;
   net_lock_t save;