diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 36efd78f986..cd29b206111 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -958,7 +958,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1403,7 +1403,7 @@ static void c5471_txdone(struct c5471_driver_s *c5471)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&c5471->c_dev, c5471_uiptxpoll);
+  (void)devif_poll(&c5471->c_dev, c5471_uiptxpoll);
 }
 
 /****************************************************************************
@@ -1522,7 +1522,7 @@ static void c5471_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&c5471->c_dev, c5471_uiptxpoll);
+  (void)devif_poll(&c5471->c_dev, c5471_uiptxpoll);
 }
 
 /****************************************************************************
@@ -1554,7 +1554,7 @@ static void c5471_polltimer(int argc, uint32_t arg, ...)
     {
       /* If so, update TCP timing states and poll uIP for new XMIT data */
 
-      (void)uip_timer(&c5471->c_dev, c5471_uiptxpoll, C5471_POLLHSEC);
+      (void)devif_timer(&c5471->c_dev, c5471_uiptxpoll, C5471_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
@@ -1715,7 +1715,7 @@ static int c5471_txavail(struct net_driver_s *dev)
        {
           /* If so, then poll uIP for new XMIT data */
 
-          (void)uip_poll(&c5471->c_dev, c5471_uiptxpoll);
+          (void)devif_poll(&c5471->c_dev, c5471_uiptxpoll);
        }
     }
 
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 7b243d0416a..52a6d65278a 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -415,7 +415,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -609,7 +609,7 @@ static void kinetis_txdone(FAR struct kinetis_driver_s *priv)
    * data
    */
 
-  (void)uip_poll(&priv->dev, kinetis_uiptxpoll);
+  (void)devif_poll(&priv->dev, kinetis_uiptxpoll);
 }
 
 /****************************************************************************
@@ -722,7 +722,7 @@ static void kinetis_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->dev, kinetis_uiptxpoll);
+  (void)devif_poll(&priv->dev, kinetis_uiptxpoll);
 }
 
 /****************************************************************************
@@ -758,7 +758,7 @@ static void kinetis_polltimer(int argc, uint32_t arg, ...)
        * we will missing TCP time state updates?
        */
 
-      (void)uip_timer(&priv->dev, kinetis_uiptxpoll, KINETIS_POLLHSEC);
+      (void)devif_timer(&priv->dev, kinetis_uiptxpoll, KINETIS_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again in any case */
@@ -973,7 +973,7 @@ static int kinetis_txavail(struct net_driver_s *dev)
             * XMIT data.
             */
 
-           (void)uip_poll(&priv->dev, kinetis_uiptxpoll);
+           (void)devif_poll(&priv->dev, kinetis_uiptxpoll);
         }
     }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index e0093fddb6b..f38e5c435d0 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -647,7 +647,7 @@ static int lpc17_transmit(struct lpc17_driver_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -977,7 +977,7 @@ static void lpc17_txdone(struct lpc17_driver_s *priv)
 
   else
     {
-      (void)uip_poll(&priv->lp_dev, lpc17_uiptxpoll);
+      (void)devif_poll(&priv->lp_dev, lpc17_uiptxpoll);
     }
 }
 
@@ -1188,7 +1188,7 @@ static void lpc17_txtimeout(int argc, uint32_t arg, ...)
 
       /* Then poll uIP for new XMIT data */
 
-      (void)uip_poll(&priv->lp_dev, lpc17_uiptxpoll);
+      (void)devif_poll(&priv->lp_dev, lpc17_uiptxpoll);
     }
 }
 
@@ -1225,7 +1225,7 @@ static void lpc17_polltimer(int argc, uint32_t arg, ...)
        * we will missing TCP time state updates?
        */
 
-      (void)uip_timer(&priv->lp_dev, lpc17_uiptxpoll, LPC17_POLLHSEC);
+      (void)devif_timer(&priv->lp_dev, lpc17_uiptxpoll, LPC17_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
@@ -1482,7 +1482,7 @@ static int lpc17_txavail(struct net_driver_s *dev)
         {
           /* If so, then poll uIP for new XMIT data */
 
-          (void)uip_poll(&priv->lp_dev, lpc17_uiptxpoll);
+          (void)devif_poll(&priv->lp_dev, lpc17_uiptxpoll);
         }
     }
 
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index e3bdecdb226..164c10e0ede 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -789,7 +789,7 @@ static int sam_transmit(struct sam_emac_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -873,7 +873,7 @@ static void sam_dopoll(struct sam_emac_s *priv)
     {
       /* If we have the descriptor, then poll uIP for new XMIT data. */
 
-      (void)uip_poll(dev, sam_uiptxpoll);
+      (void)devif_poll(dev, sam_uiptxpoll);
     }
 }
 
@@ -1517,7 +1517,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...)
     {
       /* Update TCP timing states and poll uIP for new XMIT data. */
 
-      (void)uip_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
+      (void)devif_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index fca5e2dfd9a..715994b710c 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -799,7 +799,7 @@ static int sam_transmit(struct sam_emac_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -883,7 +883,7 @@ static void sam_dopoll(struct sam_emac_s *priv)
     {
       /* If we have the descriptor, then poll uIP for new XMIT data. */
 
-      (void)uip_poll(dev, sam_uiptxpoll);
+      (void)devif_poll(dev, sam_uiptxpoll);
     }
 }
 
@@ -1558,7 +1558,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...)
     {
       /* Update TCP timing states and poll uIP for new XMIT data. */
 
-      (void)uip_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
+      (void)devif_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index 0ac775d76d3..77d8e157346 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -1114,7 +1114,7 @@ static int sam_transmit(struct sam_emac_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1198,7 +1198,7 @@ static void sam_dopoll(struct sam_emac_s *priv)
     {
       /* If we have the descriptor, then poll uIP for new XMIT data. */
 
-      (void)uip_poll(dev, sam_uiptxpoll);
+      (void)devif_poll(dev, sam_uiptxpoll);
     }
 }
 
@@ -1903,7 +1903,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...)
     {
       /* Update TCP timing states and poll uIP for new XMIT data. */
 
-      (void)uip_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
+      (void)devif_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index f50a698a6a4..8048b6ad918 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -731,7 +731,7 @@ static int sam_transmit(struct sam_gmac_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -815,7 +815,7 @@ static void sam_dopoll(struct sam_gmac_s *priv)
     {
       /* If we have the descriptor, then poll uIP for new XMIT data. */
 
-      (void)uip_poll(dev, sam_uiptxpoll);
+      (void)devif_poll(dev, sam_uiptxpoll);
     }
 }
 
@@ -1510,7 +1510,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...)
     {
       /* Update TCP timing states and poll uIP for new XMIT data. */
 
-      (void)uip_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
+      (void)devif_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 17cc58a7c8f..5b786d87a6b 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -1140,7 +1140,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1266,7 +1266,7 @@ static void stm32_dopoll(FAR struct stm32_ethmac_s *priv)
 
       if (dev->d_buf)
         {
-          (void)uip_poll(dev, stm32_uiptxpoll);
+          (void)devif_poll(dev, stm32_uiptxpoll);
 
           /* We will, most likely end up with a buffer to be freed.  But it
            * might not be the same one that we allocated above.
@@ -1994,7 +1994,7 @@ static void stm32_polltimer(int argc, uint32_t arg, ...)
           /* Update TCP timing states and poll uIP for new XMIT data.
            */
 
-          (void)uip_timer(dev, stm32_uiptxpoll, STM32_POLLHSEC);
+          (void)devif_timer(dev, stm32_uiptxpoll, STM32_POLLHSEC);
 
           /* We will, most likely end up with a buffer to be freed.  But it
            * might not be the same one that we allocated above.
diff --git a/arch/arm/src/tiva/tiva_ethernet.c b/arch/arm/src/tiva/tiva_ethernet.c
index f33f497f56c..a9154b89dc8 100644
--- a/arch/arm/src/tiva/tiva_ethernet.c
+++ b/arch/arm/src/tiva/tiva_ethernet.c
@@ -577,7 +577,7 @@ static int tiva_transmit(struct tiva_driver_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -839,7 +839,7 @@ static void tiva_txdone(struct tiva_driver_s *priv)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->ld_dev, tiva_uiptxpoll);
+  (void)devif_poll(&priv->ld_dev, tiva_uiptxpoll);
 }
 
 /****************************************************************************
@@ -963,7 +963,7 @@ static void tiva_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->ld_dev, tiva_uiptxpoll);
+  (void)devif_poll(&priv->ld_dev, tiva_uiptxpoll);
 }
 
 /****************************************************************************
@@ -999,7 +999,7 @@ static void tiva_polltimer(int argc, uint32_t arg, ...)
     {
       /* If so, update TCP timing states and poll uIP for new XMIT data */
 
-      (void)uip_timer(&priv->ld_dev, tiva_uiptxpoll, TIVA_POLLHSEC);
+      (void)devif_timer(&priv->ld_dev, tiva_uiptxpoll, TIVA_POLLHSEC);
 
       /* Setup the watchdog poll timer again */
 
@@ -1285,7 +1285,7 @@ static int tiva_txavail(struct net_driver_s *dev)
        * for new Tx data
        */
 
-      (void)uip_poll(&priv->ld_dev, tiva_uiptxpoll);
+      (void)devif_poll(&priv->ld_dev, tiva_uiptxpoll);
     }
 
   irqrestore(flags);
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index 9b759e74a34..27f17649244 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -183,7 +183,7 @@ static int emac_transmit(FAR struct emac_driver_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -323,7 +323,7 @@ static void emac_txdone(FAR struct emac_driver_s *priv)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->d_dev, emac_uiptxpoll);
+  (void)devif_poll(&priv->d_dev, emac_uiptxpoll);
 }
 
 /****************************************************************************
@@ -394,7 +394,7 @@ static void emac_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->d_dev, emac_uiptxpoll);
+  (void)devif_poll(&priv->d_dev, emac_uiptxpoll);
 }
 
 /****************************************************************************
@@ -428,7 +428,7 @@ static void emac_polltimer(int argc, uint32_t arg, ...)
    * we will missing TCP time state updates?
    */
 
-  (void)uip_timer(&priv->d_dev, emac_uiptxpoll, HCS12_POLLHSEC);
+  (void)devif_timer(&priv->d_dev, emac_uiptxpoll, HCS12_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -554,7 +554,7 @@ static int emac_txavail(struct net_driver_s *dev)
 
       /* If so, then poll uIP for new XMIT data */
 
-      (void)uip_poll(&priv->d_dev, emac_uiptxpoll);
+      (void)devif_poll(&priv->d_dev, emac_uiptxpoll);
     }
 
   irqrestore(flags);
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index ef298668df6..8858a63a044 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -1113,7 +1113,7 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1212,7 +1212,7 @@ static void pic32mx_poll(struct pic32mx_driver_s *priv)
           /* And perform the poll */
 
           priv->pd_polling = true;
-          (void)uip_poll(&priv->pd_dev, pic32mx_uiptxpoll);
+          (void)devif_poll(&priv->pd_dev, pic32mx_uiptxpoll);
 
           /* Free any buffer left attached after the poll */
 
@@ -1258,7 +1258,7 @@ static void pic32mx_timerpoll(struct pic32mx_driver_s *priv)
           /* And perform the poll */
 
           priv->pd_polling = true;
-          (void)uip_timer(&priv->pd_dev, pic32mx_uiptxpoll, PIC32MX_POLLHSEC);
+          (void)devif_timer(&priv->pd_dev, pic32mx_uiptxpoll, PIC32MX_POLLHSEC);
 
           /* Free any buffer left attached after the poll */
 
diff --git a/arch/sim/src/up_uipdriver.c b/arch/sim/src/up_uipdriver.c
index fd18b515e06..7bf11244aaf 100644
--- a/arch/sim/src/up_uipdriver.c
+++ b/arch/sim/src/up_uipdriver.c
@@ -202,7 +202,7 @@ void uipdriver_loop(void)
   else if (timer_expired(&g_periodic_timer))
     {
       timer_reset(&g_periodic_timer);
-      uip_timer(&g_sim_dev, sim_uiptxpoll, 1);
+      devif_timer(&g_sim_dev, sim_uiptxpoll, 1);
     }
   sched_unlock();
 }
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index f6717379366..26c9f41939c 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -1048,7 +1048,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1578,7 +1578,7 @@ static void ez80emac_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->dev, ez80emac_uiptxpoll);
+  (void)devif_poll(&priv->dev, ez80emac_uiptxpoll);
 }
 
 /****************************************************************************
@@ -1604,7 +1604,7 @@ static void ez80emac_polltimer(int argc, uint32_t arg, ...)
 
   /* Poll uIP for new XMIT data */
 
-  (void)uip_timer(&priv->dev, ez80emac_uiptxpoll, EMAC_POLLHSEC);
+  (void)devif_timer(&priv->dev, ez80emac_uiptxpoll, EMAC_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -1791,7 +1791,7 @@ static int ez80emac_txavail(struct net_driver_s *dev)
 
       /* If so, then poll uIP for new XMIT data */
 
-      (void)uip_poll(&priv->dev, ez80emac_uiptxpoll);
+      (void)devif_poll(&priv->dev, ez80emac_uiptxpoll);
     }
 
   irqrestore(flags);