NET: Rename uiplib/UIPLIB to netlib/NETLIB

28 files changed, 57 insertions, 57 deletions

diff --git a/apps/netutils/Kconfig b/apps/netutils/Kconfig
index 01fa40dd7..33702e5a2 100644
--- a/apps/netutils/Kconfig
+++ b/apps/netutils/Kconfig
@@ -16,7 +16,7 @@ source "$APPSDIR/netutils/smtp/Kconfig"
 source "$APPSDIR/netutils/telnetd/Kconfig"
 source "$APPSDIR/netutils/tftpc/Kconfig"
 source "$APPSDIR/netutils/thttpd/Kconfig"
-source "$APPSDIR/netutils/uiplib/Kconfig"
+source "$APPSDIR/netutils/netlib/Kconfig"
 source "$APPSDIR/netutils/webclient/Kconfig"
 source "$APPSDIR/netutils/webserver/Kconfig"
 source "$APPSDIR/netutils/ntpclient/Kconfig"
diff --git a/apps/netutils/Make.defs b/apps/netutils/Make.defs
index 11f7d261e..41ed1dff9 100644
--- a/apps/netutils/Make.defs
+++ b/apps/netutils/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_NETUTILS_THTTPD),y)
 CONFIGURED_APPS += netutils/thttpd
 endif
 
-ifeq ($(CONFIG_NETUTILS_UIPLIB),y)
-CONFIGURED_APPS += netutils/uiplib
+ifeq ($(CONFIG_NETUTILS_NETLIB),y)
+CONFIGURED_APPS += netutils/netlib
 endif
 
 ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y)
diff --git a/apps/netutils/Makefile b/apps/netutils/Makefile
index 8a8a5fdf4..b6244e2f9 100644
--- a/apps/netutils/Makefile
+++ b/apps/netutils/Makefile
@@ -39,7 +39,7 @@
 
 SUBDIRS  = json codecs
 ifeq ($(CONFIG_NET),y)
-SUBDIRS += uiplib dhcpc dhcpd discover dnsclient ftpc ftpd smtp telnetd
+SUBDIRS += netlib dhcpc dhcpd discover dnsclient ftpc ftpd smtp telnetd
 SUBDIRS += webclient webserver tftpc thttpd xmlrpc
 endif
 
diff --git a/apps/netutils/README.txt b/apps/netutils/README.txt
index 83e774638..818f6a784 100644
--- a/apps/netutils/README.txt
+++ b/apps/netutils/README.txt
@@ -75,7 +75,7 @@ highly influenced by uIP) include:
               defconfig file to select the appropriate netutils
               libraries:
 
-                CONFIG_NETUTILS_UIPLIB=y
+                CONFIG_NETUTILS_NETLIB=y
                 CONFIG_NETUTILS_THTTPD=y
 
   xmlrpc    - The Embeddable Lightweight XML-RPC Server discussed at
@@ -92,7 +92,7 @@ Telnetd into your custom applications.
 To enable and link the Telnetd daemon, you need to include the following in
 in your defconfig file:
 
-  CONFIG_NETUTILS_UIPLIB=y
+  CONFIG_NETUTILS_NETLIB=y
   CONFIG_NETUTILS_TELNETD=y
 
 Also if the Telnet console is enabled, make sure that you have the following
diff --git a/apps/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c
index 5410e6ad9..2033be31d 100644
--- a/apps/netutils/dhcpc/dhcpc.c
+++ b/apps/netutils/dhcpc/dhcpc.c
@@ -54,7 +54,7 @@
 
 #include <nuttx/net/uip.h>
 #include <apps/netutils/dhcpc.h>
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Definitions
diff --git a/apps/netutils/discover/Kconfig b/apps/netutils/discover/Kconfig
index 2e088506f..1ae18a0d3 100644
--- a/apps/netutils/discover/Kconfig
+++ b/apps/netutils/discover/Kconfig
@@ -7,7 +7,7 @@ config NETUTILS_DISCOVER
 	bool "Network Discovery Utility"
 	default n
 	depends on NET_UDP
-	select NETUTILS_UIPLIB
+	select NETUTILS_NETLIB
 	---help---
 		Tool for discovering devices on the local network per UDP broadcast.
 
diff --git a/apps/netutils/dnsclient/dns_socket.c b/apps/netutils/dnsclient/dns_socket.c
index 002d48674..6b78169ea 100644
--- a/apps/netutils/dnsclient/dns_socket.c
+++ b/apps/netutils/dnsclient/dns_socket.c
@@ -60,7 +60,7 @@
 #include <arpa/inet.h>
 
 #include <apps/netutils/dnsclient.h>
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -515,7 +515,7 @@ int dns_query_sock(int sockfd, FAR const char *hostname, FAR in_addr_t *ipaddr)
 
   /* First check if the host is an IP address. */
 
-  if (!uiplib_ipaddrconv(hostname, (uint8_t*)ipaddr))
+  if (!netlib_ipaddrconv(hostname, (uint8_t*)ipaddr))
     {
       /* 'host' does not point to a valid address string.  Try to resolve
        *  the host name to an IP address.
diff --git a/apps/netutils/uiplib/.gitignore b/apps/netutils/netlib/.gitignore
index f21c854d1..f21c854d1 100644
--- a/apps/netutils/uiplib/.gitignore
+++ b/apps/netutils/netlib/.gitignore
diff --git a/apps/netutils/uiplib/Kconfig b/apps/netutils/netlib/Kconfig
index 2eb098717..fce403198 100644
--- a/apps/netutils/uiplib/Kconfig
+++ b/apps/netutils/netlib/Kconfig
@@ -3,11 +3,11 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config NETUTILS_UIPLIB
+config NETUTILS_NETLIB
 	bool "Network support library"
 	default n
 	---help---
 		Enable support for the network support library.
 
-if NETUTILS_UIPLIB
+if NETUTILS_NETLIB
 endif
diff --git a/apps/netutils/uiplib/Makefile b/apps/netutils/netlib/Makefile
index 76daf985e..01157c1dd 100644
--- a/apps/netutils/uiplib/Makefile
+++ b/apps/netutils/netlib/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/netutils/uiplib/Makefile
+# apps/netutils/netlib/Makefile
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
 # UIP Library
 
 ASRCS		=
-CSRCS		= uiplib.c uip_sethostaddr.c uip_gethostaddr.c uip_setdraddr.c \
+CSRCS		= netlib.c uip_sethostaddr.c uip_gethostaddr.c uip_setdraddr.c \
 		  uip_setnetmask.c uip_parsehttpurl.c uip_setifflag.c \
 		  uip_getifflag.c
 
diff --git a/apps/netutils/uiplib/uiplib.c b/apps/netutils/netlib/netlib.c
index 4644c61b0..691c94546 100644
--- a/apps/netutils/uiplib/uiplib.c
+++ b/apps/netutils/netlib/netlib.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uiplib.c
+ * netutils/netlib/netlib.c
  * Various uIP library functions.
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
@@ -49,14 +49,14 @@
 #include <debug.h>
 
 #include <nuttx/net/uip.h>
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
-bool uiplib_ipaddrconv(const char *addrstr, uint8_t *ipaddr)
+bool netlib_ipaddrconv(const char *addrstr, uint8_t *ipaddr)
 {
   unsigned char tmp;
   char c;
@@ -98,7 +98,7 @@ bool uiplib_ipaddrconv(const char *addrstr, uint8_t *ipaddr)
   return true;
 }
 
-bool uiplib_hwmacconv(const char *hwstr, uint8_t *hw)
+bool netlib_hwmacconv(const char *hwstr, uint8_t *hw)
 {
   unsigned char tmp;
   char c;
diff --git a/apps/netutils/uiplib/uip_gethostaddr.c b/apps/netutils/netlib/uip_gethostaddr.c
index 0b2b5dd28..e354ca9de 100644
--- a/apps/netutils/uiplib/uip_gethostaddr.c
+++ b/apps/netutils/netlib/uip_gethostaddr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_gethostaddr.c
+ * netutils/netlib/uip_gethostaddr.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -84,7 +84,7 @@ int uip_gethostaddr(const char *ifname, struct in_addr *addr)
   int ret = ERROR;
   if (ifname && addr)
     {
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
diff --git a/apps/netutils/uiplib/uip_getifflag.c b/apps/netutils/netlib/uip_getifflag.c
index d8f2717bb..8e82afe03 100644
--- a/apps/netutils/uiplib/uip_getifflag.c
+++ b/apps/netutils/netlib/uip_getifflag.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_getifflag.c
+ * netutils/netlib/uip_getifflag.c
  *
  *   Copyright (C) 2007-2009, 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +51,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Global Functions
@@ -79,7 +79,7 @@ int uip_getifstatus(FAR const char *ifname, FAR uint8_t *flags)
     {
       /* Get a socket (only so that we get access to the INET subsystem) */
 
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
diff --git a/apps/netutils/uiplib/uip_getmacaddr.c b/apps/netutils/netlib/uip_getmacaddr.c
index e0f72f4a7..8923f4bb1 100644
--- a/apps/netutils/uiplib/uip_getmacaddr.c
+++ b/apps/netutils/netlib/uip_getmacaddr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_getmacaddr.c
+ * netutils/netlib/uip_getmacaddr.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Global Functions
@@ -78,7 +78,7 @@ int uip_getmacaddr(const char *ifname, uint8_t *macaddr)
     {
       /* Get a socket (only so that we get access to the INET subsystem) */
 
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
diff --git a/apps/netutils/uiplib/uip_ipmsfilter.c b/apps/netutils/netlib/uip_ipmsfilter.c
index 8b8b8e77a..1068d0804 100644
--- a/apps/netutils/uiplib/uip_ipmsfilter.c
+++ b/apps/netutils/netlib/uip_ipmsfilter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_setmultiaddr.c
+ * netutils/netlib/uip_setmultiaddr.c
  *
  *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <sys/sockio.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 #include <apps/netutils/ipmsfilter.h>
 
 #ifdef CONFIG_NET_IGMP
@@ -90,7 +90,7 @@ int ipmsfilter(FAR const char *ifname, FAR const struct in_addr *multiaddr,
     {
       /* Get a socket (only so that we get access to the INET subsystem) */
 
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ip_msfilter imsf;
diff --git a/apps/netutils/uiplib/uip_listenon.c b/apps/netutils/netlib/uip_listenon.c
index 7b61747fb..cacea174b 100644
--- a/apps/netutils/uiplib/uip_listenon.c
+++ b/apps/netutils/netlib/uip_listenon.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_listenon.c
+ * netutils/netlib/uip_listenon.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 #include <debug.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/apps/netutils/uiplib/uip_parsehttpurl.c b/apps/netutils/netlib/uip_parsehttpurl.c
index fbb2a9046..efc88956a 100644
--- a/apps/netutils/uiplib/uip_parsehttpurl.c
+++ b/apps/netutils/netlib/uip_parsehttpurl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_parsehttpurl.c
+ * netutils/netlib/uip_parsehttpurl.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Private Data
diff --git a/apps/netutils/uiplib/uip_server.c b/apps/netutils/netlib/uip_server.c
index b3e1759ab..c6b3d1631 100644
--- a/apps/netutils/uiplib/uip_server.c
+++ b/apps/netutils/netlib/uip_server.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_server.c
+ * netutils/netlib/uip_server.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +51,7 @@
 
 #include <netinet/in.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/apps/netutils/uiplib/uip_setdraddr.c b/apps/netutils/netlib/uip_setdraddr.c
index 5b7a2183e..bdc19d624 100644
--- a/apps/netutils/uiplib/uip_setdraddr.c
+++ b/apps/netutils/netlib/uip_setdraddr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_setdraddr.c
+ * netutils/netlib/uip_setdraddr.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Global Functions
@@ -80,7 +80,7 @@ int uip_setdraddr(const char *ifname, const struct in_addr *addr)
   int ret = ERROR;
   if (ifname && addr)
     {
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
diff --git a/apps/netutils/uiplib/uip_sethostaddr.c b/apps/netutils/netlib/uip_sethostaddr.c
index 3cc73faed..ada4431f5 100644
--- a/apps/netutils/uiplib/uip_sethostaddr.c
+++ b/apps/netutils/netlib/uip_sethostaddr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_sethostaddr.c
+ * netutils/netlib/uip_sethostaddr.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Global Functions
@@ -80,7 +80,7 @@ int uip_sethostaddr(const char *ifname, const struct in_addr *addr)
   int ret = ERROR;
   if (ifname && addr)
     {
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
diff --git a/apps/netutils/uiplib/uip_setifflag.c b/apps/netutils/netlib/uip_setifflag.c
index f18ad00e4..c7a6dfb73 100644
--- a/apps/netutils/uiplib/uip_setifflag.c
+++ b/apps/netutils/netlib/uip_setifflag.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_setifflag.c
+ * netutils/netlib/uip_setifflag.c
  *
  *   Copyright (C) 2007-2009, 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Global Functions
@@ -77,7 +77,7 @@ int uip_ifup(const char *ifname)
     {
       /* Get a socket (only so that we get access to the INET subsystem) */
 
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
@@ -120,7 +120,7 @@ int uip_ifdown(const char *ifname)
     {
       /* Get a socket (only so that we get access to the INET subsystem) */
 
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
diff --git a/apps/netutils/uiplib/uip_setmacaddr.c b/apps/netutils/netlib/uip_setmacaddr.c
index 49323d833..d35034a69 100644
--- a/apps/netutils/uiplib/uip_setmacaddr.c
+++ b/apps/netutils/netlib/uip_setmacaddr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_setmacaddr.c
+ * netutils/netlib/uip_setmacaddr.c
  *
  *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -89,7 +89,7 @@ int uip_setmacaddr(const char *ifname, const uint8_t *macaddr)
     {
       /* Get a socket (only so that we get access to the INET subsystem) */
 
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
diff --git a/apps/netutils/uiplib/uip_setnetmask.c b/apps/netutils/netlib/uip_setnetmask.c
index 7ebe83f85..8b3f9651c 100644
--- a/apps/netutils/uiplib/uip_setnetmask.c
+++ b/apps/netutils/netlib/uip_setnetmask.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * netutils/uiplib/uip_setnetmask.c
+ * netutils/netlib/uip_setnetmask.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 /****************************************************************************
  * Global Functions
@@ -79,7 +79,7 @@ int uip_setnetmask(const char *ifname, const struct in_addr *addr)
   int ret = ERROR;
   if (ifname && addr)
     {
-      int sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0);
+      int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0);
       if (sockfd >= 0)
         {
           struct ifreq req;
diff --git a/apps/netutils/telnetd/telnetd_daemon.c b/apps/netutils/telnetd/telnetd_daemon.c
index 24c11bef4..663b3021d 100644
--- a/apps/netutils/telnetd/telnetd_daemon.c
+++ b/apps/netutils/telnetd/telnetd_daemon.c
@@ -54,7 +54,7 @@
 #include <netinet/in.h>
 
 #include <apps/netutils/telnetd.h>
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 #include "telnetd.h"
 
diff --git a/apps/netutils/telnetd/telnetd_driver.c b/apps/netutils/telnetd/telnetd_driver.c
index f189d5613..c5a2e8b9b 100644
--- a/apps/netutils/telnetd/telnetd_driver.c
+++ b/apps/netutils/telnetd/telnetd_driver.c
@@ -62,7 +62,7 @@
 #include <nuttx/net/net.h>
 
 #include <apps/netutils/telnetd.h>
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 
 #include "telnetd.h"
 
diff --git a/apps/netutils/webclient/webclient.c b/apps/netutils/webclient/webclient.c
index ea1bd0714..41f3ef6f5 100644
--- a/apps/netutils/webclient/webclient.c
+++ b/apps/netutils/webclient/webclient.c
@@ -72,7 +72,7 @@
 #include <netinet/in.h>
 
 #include <nuttx/version.h>
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 #include <apps/netutils/webclient.h>
 
 #if defined(CONFIG_NETUTILS_CODECS)
diff --git a/apps/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c
index ab67842ee..c4ada2f8b 100644
--- a/apps/netutils/webserver/httpd.c
+++ b/apps/netutils/webserver/httpd.c
@@ -62,7 +62,7 @@
 #endif
 
 #include <nuttx/net/uip.h>
-#include <apps/netutils/uiplib.h>
+#include <apps/netutils/netlib.h>
 #include <apps/netutils/httpd.h>
 
 #include "httpd.h"
diff --git a/apps/netutils/xmlrpc/Kconfig b/apps/netutils/xmlrpc/Kconfig
index 6765bda07..d24515775 100644
--- a/apps/netutils/xmlrpc/Kconfig
+++ b/apps/netutils/xmlrpc/Kconfig
@@ -7,7 +7,7 @@ config NETUTILS_XMLRPC
 	bool "XML RPC library"
 	default n
 	depends on NET_TCP
-	select NETUTILS_UIPLIB
+	select NETUTILS_NETLIB
 	---help---
 		Enables the Embeddable Lightweight XML-RPC Server discussed at
 		http://www.drdobbs.com/web-development/an-embeddable-lightweight-xml-rpc-server/184405364