diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index f8f59cb82e6..d5de8016f53 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -1402,10 +1402,10 @@ netutils/
 |   |-- Kconfig
 |   |-- Make.defs
 |   `-- <i>(thttpd HTTP server source files)</i>
-|-- uiplib/
+|-- netlib/
 |   |-- Kconfig
 |   |-- Make.defs
-|   `-- <i>(uiplib source files)</i>
+|   `-- <i>(netlib source files)</i>
 |-- weblclient/
 |   |-- Kconfig
 |   |-- Make.defs
diff --git a/configs/16z/nsh/defconfig b/configs/16z/nsh/defconfig
index caeb0ef3ba2..b5e721af8f2 100644
--- a/configs/16z/nsh/defconfig
+++ b/configs/16z/nsh/defconfig
@@ -557,7 +557,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 7ca46647fb4..ffb4c990fd1 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -461,7 +461,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index fd9d0873f04..065a5b5204e 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -562,7 +562,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index c148055412b..68e5e4850e7 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -511,7 +511,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 3ae0bdee534..0316bd94d6b 100644
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -504,7 +504,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index ef3294ba09b..697b2f0f54b 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -557,7 +557,7 @@ CONFIG_EXAMPLES_UIP_NOMAC=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 0c05b25e4ab..4a23c9d0394 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -558,7 +558,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 803f971446d..249aa614033 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -563,7 +563,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index 63ef8d27c71..c365b615f1f 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -593,7 +593,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index 97c0d072c75..fc976f5ab43 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -493,7 +493,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index b01d5c86e2e..ca612dc56ee 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -517,7 +517,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index 00c56975c37..638d88cb788 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -522,7 +522,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index 1037b0af135..60fdc7b8b7b 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -665,7 +665,7 @@ CONFIG_EXAMPLES_NXTEXT_PUFONTID=0
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index c528e3a7b8b..63dcca55fcf 100644
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -459,7 +459,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 5f223462ae4..25464efae0b 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -528,7 +528,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 0c3225b771e..5b6d7faebb4 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -614,7 +614,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 229a498bcc4..625987fa8b5 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -595,7 +595,7 @@ CONFIG_EXAMPLES_USBSERIAL=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 651698b284f..1c383dee2e7 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -542,7 +542,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index c3a8c3b7ded..f82fb828070 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -624,7 +624,7 @@ CONFIG_EXAMPLES_UIP_NOMAC=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index c2ccee25d7c..37df73b1140 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -674,7 +674,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 577b2c7fcc2..42a38ea58e9 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -680,7 +680,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index beb5f3001bc..4cae4769f5e 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -572,7 +572,7 @@ CONFIG_EXAMPLES_NXFLAT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 503fa93c6e6..ae5322ff3e0 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -653,7 +653,7 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index fb725cddb17..d0bf2edb00a 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -663,7 +663,7 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index a51cccc598d..3dffb78cceb 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -531,7 +531,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index 8495caf7fcc..dd4c1afb888 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -626,7 +626,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_DISCOVER is not set
 
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index f3ed9b29e5c..0ce68a7713a 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -628,7 +628,7 @@ CONFIG_EXAMPLES_UIP_NOMAC=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index d91299244e4..f9da31c4758 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -629,7 +629,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index ec905a7808c..8c55139a4f8 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -642,7 +642,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index 39da3473020..bb6d5fb2d6c 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -629,7 +629,7 @@ CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index c2cb656b9b3..fb12cf4f48a 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -881,7 +881,7 @@ CONFIG_NETUTILS_TFTPC=y
 #
 # uIP support library
 #
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 
 #
 # uIP web client
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index d0e0a44c27f..bb8dbd308df 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -538,7 +538,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 2703b56989c..b16f9e20e09 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -526,7 +526,7 @@ CONFIG_EXAMPLES_PWM_DURATION=5
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index 2cf7a577e18..f23c9dd490f 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -575,7 +575,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index ea288edfd62..7373338c23b 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -586,7 +586,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index a65139bac3a..6f899a24c75 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -770,7 +770,7 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index 26e81d517c3..d54e889ea75 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -739,7 +739,7 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index 5849d1ba888..9af888cbd3a 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -618,7 +618,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index b377f3fe56f..542bca8d921 100644
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -716,7 +716,7 @@ CONFIG_EXAMPLES_USBSERIAL=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index 2f76ef53720..f8d239f4cb6 100644
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -516,7 +516,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index 6482c5e2d79..f00625c534d 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -583,7 +583,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 995daae3f00..989c4791d4a 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -659,7 +659,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index 47a81688cf8..c4d6dbadf8d 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -672,7 +672,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 47a81688cf8..c4d6dbadf8d 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -672,7 +672,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index 94d247f6213..b3d7078cd4b 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -673,7 +673,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index c536c9bb001..c18d8070be8 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -684,7 +684,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index e12d3fb44e1..e466b4b7e4c 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -680,7 +680,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 35ecb9cc4de..4667a30aa79 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -681,7 +681,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index cc2b9e873f6..ccf83c3bc15 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -579,7 +579,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index eede2a473bb..0060666ac2c 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -592,7 +592,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index e6e0c21a673..c7eb8803ce4 100644
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -694,7 +694,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_NTPCLIENT is not set
 # CONFIG_NETUTILS_DISCOVER is not set
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index 0bd0d25a7ee..045f9952241 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -756,7 +756,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index b8605498de8..8e1a1de9a4b 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -734,7 +734,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 1587c899ce4..e62a9b4bc6b 100644
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -730,7 +730,7 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index c5d93ebb4a5..fc9326b37c1 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -681,7 +681,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 07d4b402f96..37fcb32ae38 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -676,7 +676,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index 327478d6186..ecec4a66459 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -843,7 +843,7 @@ CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index 4d4d2c55f5e..71719b29bf7 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -702,7 +702,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index 536a05f5f80..86ffc032632 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -612,7 +612,7 @@ CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 03d755b54c9..72d0cc84228 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -620,7 +620,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index d445c34eabe..e469e538a9b 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -617,7 +617,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 176b5fca6ed..d737c8fc0f8 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -480,7 +480,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 8bd36c4b769..3bcdfcde930 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -593,7 +593,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index dd19f2ea0ee..06caf3c5a7c 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -581,7 +581,7 @@ CONFIG_EXAMPLES_USBSERIAL=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index 931b5af167e..5674accbb1c 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -469,7 +469,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 33663face24..836f5ba8fcc 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -1043,7 +1043,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 5e2278bb82f..d59fc0980e2 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -859,7 +859,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index ed86202785e..18fb659d633 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -785,7 +785,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index a589caf7dc7..1f57c8a2256 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -761,7 +761,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 5c65d72f1f7..02d4a575ca8 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -763,7 +763,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index 4daea9c09ea..51665d85203 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -772,7 +772,7 @@ CONFIG_EXAMPLES_NXTEXT_DEFAULT_FONT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index 7e2bfb6fa77..fff2e4da8fc 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -833,7 +833,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 93542855ea2..2c3203bb211 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -634,7 +634,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 789d6c9531d..2b0f600ad32 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -680,7 +680,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index d2f6d8eab7a..ff8350b4e87 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -531,7 +531,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index 70479f3464d..5ebdeddf224 100644
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -459,7 +459,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index e66240584a8..a143290eb48 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -601,7 +601,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index ae9f3b6fe3f..381272abc36 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -623,7 +623,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index d8769f561d7..8617fcc5d38 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -601,7 +601,7 @@ CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index 2a73e105441..e19b67a135a 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -636,7 +636,7 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index d40b1151a1d..aee9e775ccd 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -590,7 +590,7 @@ CONFIG_EXAMPLES_UDP_SERVERIP=0x0a000001
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_DISCOVER is not set
 
diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig
index 8642a8d9d06..71c614b04d3 100644
--- a/configs/ntosd-dm320/uip/defconfig
+++ b/configs/ntosd-dm320/uip/defconfig
@@ -599,7 +599,7 @@ CONFIG_EXAMPLES_UIP_NOMAC=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
diff --git a/configs/nucleo-f401re/nsh/defconfig b/configs/nucleo-f401re/nsh/defconfig
index e848e3c2f93..24c3c611ea3 100644
--- a/configs/nucleo-f401re/nsh/defconfig
+++ b/configs/nucleo-f401re/nsh/defconfig
@@ -774,7 +774,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index b7f97dc34d3..261957a1271 100644
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -588,7 +588,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/nucleus2g/usbmsc/defconfig b/configs/nucleus2g/usbmsc/defconfig
index 4428df75c9d..8d73469a357 100644
--- a/configs/nucleus2g/usbmsc/defconfig
+++ b/configs/nucleus2g/usbmsc/defconfig
@@ -619,7 +619,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index d7010c65a6e..c7c88a2be7d 100644
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -559,7 +559,7 @@ CONFIG_EXAMPLES_USBSERIAL=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index 335b0b1f939..eadcd0d41df 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -507,7 +507,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index 94ef334d5b9..079ae7f2690 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -530,7 +530,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index 301f3427179..4e06f339e57 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -743,7 +743,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_NTPCLIENT is not set
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 2b95c6cccc6..8227ef0b682 100644
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -682,7 +682,7 @@ CONFIG_EXAMPLES_HIDKBD_ENCODED=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index 507a7bd2fbf..94cb3d79798 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -743,7 +743,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index 6e66d47329e..27634716528 100644
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -697,7 +697,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index d9033a4c7d2..92417497790 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -743,7 +743,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index 07577ba0c6a..e7bd9bf81db 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -745,7 +745,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index b9ead68ecd5..16b2bdd3bff 100644
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -714,7 +714,7 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index 4be3b0cf082..488ebb5a839 100644
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -731,7 +731,7 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index f51db8f268d..20ff7b938f4 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -682,7 +682,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 66685c939f8..0a0186e97c0 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -669,7 +669,7 @@ CONFIG_EXAMPLES_USBSERIAL=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index 321cdeaee1e..b70f1f8dfd5 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -753,7 +753,7 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index ba29f1588ad..5873987bec5 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -553,7 +553,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/olimex-stm32-h405/nshusb/defconfig b/configs/olimex-stm32-h405/nshusb/defconfig
index c7bd08b4ea9..1124b9b40f3 100644
--- a/configs/olimex-stm32-h405/nshusb/defconfig
+++ b/configs/olimex-stm32-h405/nshusb/defconfig
@@ -838,7 +838,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 96f67a5a17c..a363dd10699 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -734,7 +734,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index 9f43d37d9c9..53f41711866 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -796,7 +796,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_DISCOVER is not set
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 0c24a0f407b..463c5670929 100644
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -629,7 +629,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index cd50042c039..6fc2c2a44c2 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -573,7 +573,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 9ba768c8d93..65d49aef1c5 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -598,7 +598,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 7ba4e86ec51..08ac9f79d49 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -553,7 +553,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index 83d68a88cec..090c64e2d63 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -655,7 +655,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=32
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig
index d70e211001c..61b2a0b1748 100644
--- a/configs/p112/ostest/defconfig
+++ b/configs/p112/ostest/defconfig
@@ -458,7 +458,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index db906c8c553..b27d19e54ff 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -598,7 +598,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index 744034b5b9d..f1bbde8f01a 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -597,7 +597,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig
index dd6500fad42..25e19c03731 100644
--- a/configs/pic32-starterkit/nsh/defconfig
+++ b/configs/pic32-starterkit/nsh/defconfig
@@ -699,7 +699,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/pic32-starterkit/nsh2/defconfig b/configs/pic32-starterkit/nsh2/defconfig
index 0ac44bc6984..6ec3d19b99f 100644
--- a/configs/pic32-starterkit/nsh2/defconfig
+++ b/configs/pic32-starterkit/nsh2/defconfig
@@ -784,7 +784,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 83b39d98b5a..e87cbaec1fc 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -834,7 +834,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index cce557e183c..012d423a9b2 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -467,7 +467,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index c8b395497a2..2c70cbe422b 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -459,7 +459,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/px4fmu-v2_upstream/nsh/defconfig b/configs/px4fmu-v2_upstream/nsh/defconfig
index f9bd05b789e..0a484dce758 100644
--- a/configs/px4fmu-v2_upstream/nsh/defconfig
+++ b/configs/px4fmu-v2_upstream/nsh/defconfig
@@ -966,7 +966,7 @@ CONFIG_EXAMPLES_USBTERM=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 6ab04526762..7cd873aa4fb 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -504,7 +504,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index ba1e12233f1..d48a43a40cb 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -486,7 +486,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/rgmp/arm/default/defconfig b/configs/rgmp/arm/default/defconfig
index ba309aff3d9..7f073d0cd52 100644
--- a/configs/rgmp/arm/default/defconfig
+++ b/configs/rgmp/arm/default/defconfig
@@ -540,7 +540,7 @@ CONFIG_EXAMPLES_RGMP=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_DISCOVER is not set
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index dea6ce875fc..bbedcc4381e 100644
--- a/configs/rgmp/arm/nsh/defconfig
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -566,7 +566,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/rgmp/x86/cxxtest/defconfig b/configs/rgmp/x86/cxxtest/defconfig
index 7fcc74b28ab..acc50edeecd 100644
--- a/configs/rgmp/x86/cxxtest/defconfig
+++ b/configs/rgmp/x86/cxxtest/defconfig
@@ -581,7 +581,7 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_DISCOVER is not set
diff --git a/configs/rgmp/x86/default/defconfig b/configs/rgmp/x86/default/defconfig
index 9ea922f0149..3039be319ae 100644
--- a/configs/rgmp/x86/default/defconfig
+++ b/configs/rgmp/x86/default/defconfig
@@ -548,7 +548,7 @@ CONFIG_EXAMPLES_RGMP=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_DISCOVER is not set
diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig
index 312b3183938..04f7afd9436 100644
--- a/configs/rgmp/x86/helloxx/defconfig
+++ b/configs/rgmp/x86/helloxx/defconfig
@@ -578,7 +578,7 @@ CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_DISCOVER is not set
diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
index a455b18ec87..085dc40321d 100644
--- a/configs/rgmp/x86/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -579,7 +579,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index c7d9126c003..a5251e51ad1 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -655,7 +655,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 82b092fd192..072d1cc3bac 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -629,7 +629,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index c396610b668..cd60dc73b37 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -714,7 +714,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 22e3b32c90d..229b8fd3ccb 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -766,7 +766,7 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt
index 4e53692099d..14680c0df9c 100644
--- a/configs/sam4e-ek/README.txt
+++ b/configs/sam4e-ek/README.txt
@@ -398,7 +398,7 @@ Networking Support
     CONFIG_NETUTILS_DNSCLIENT=y            : Enable host address resolution
     CONFIG_NETUTILS_TELNETD=y           : Enable the Telnet daemon
     CONFIG_NETUTILS_TFTPC=y             : Enable TFTP data file transfers for get and put commands
-    CONFIG_NETUTILS_UIPLIB=y            : Network library support is needed
+    CONFIG_NETUTILS_NETLIB=y            : Network library support is needed
     CONFIG_NETUTILS_WEBCLIENT=y         : Needed for wget support
                                         : Defaults should be okay for other options
   Application Configuration -> NSH Library
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index 111edc99a0e..4b5305da119 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -812,7 +812,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index 1324d549f1b..83a8d4dd4bf 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -860,7 +860,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index a31d8899668..0add7223251 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -656,7 +656,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index 04a25c5a7a5..42c90849889 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -812,7 +812,7 @@ CONFIG_EXAMPLES_SERIALRX_PRIORITY=50
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 19a98ef1161..9324adf2fac 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -630,7 +630,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt
index 0fa278dcced..6bfec18f9f8 100644
--- a/configs/sama5d3-xplained/README.txt
+++ b/configs/sama5d3-xplained/README.txt
@@ -814,7 +814,7 @@ Networking
     CONFIG_NETUTILS_DNSCLIENT=y          : Enable host address resolution
     CONFIG_NETUTILS_TELNETD=y            : Enable the Telnet daemon
     CONFIG_NETUTILS_TFTPC=y              : Enable TFTP data file transfers for get and put commands
-    CONFIG_NETUTILS_UIPLIB=y             : Network library support is needed
+    CONFIG_NETUTILS_NETLIB=y             : Network library support is needed
     CONFIG_NETUTILS_WEBCLIENT=y          : Needed for wget support
                                          : Defaults should be okay for other options
   Application Configuration -> NSH Library
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 7e36ba50f0c..1900e52ab19 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -678,7 +678,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index 98764734054..f39e86e3ae7 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -966,7 +966,7 @@ Networking
     CONFIG_NETUTILS_DNSCLIENT=y          : Enable host address resolution
     CONFIG_NETUTILS_TELNETD=y            : Enable the Telnet daemon
     CONFIG_NETUTILS_TFTPC=y              : Enable TFTP data file transfers for get and put commands
-    CONFIG_NETUTILS_UIPLIB=y             : Network library support is needed
+    CONFIG_NETUTILS_NETLIB=y             : Network library support is needed
     CONFIG_NETUTILS_WEBCLIENT=y          : Needed for wget support
                                          : Defaults should be okay for other options
   Application Configuration -> NSH Library
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 0cc77b9ff41..49e2149de74 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -848,7 +848,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index b3f3c7b1ff9..e4219825223 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -653,7 +653,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index ad051d1dc63..7e397e9d4f3 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -667,7 +667,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index c92181e20a0..9763ed16132 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -692,7 +692,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index bf73b88afb2..c115131d26d 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -791,7 +791,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index 858354ada65..ed7e2a2a731 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -854,7 +854,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index 5f31a956fcd..c675c950893 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -737,7 +737,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt
index 1f2aca8eacc..f7164f68f0a 100644
--- a/configs/sama5d4-ek/README.txt
+++ b/configs/sama5d4-ek/README.txt
@@ -1260,7 +1260,7 @@ Networking
     CONFIG_NETUTILS_DNSCLIENT=y          : Enable host address resolution
     CONFIG_NETUTILS_TELNETD=y            : Enable the Telnet daemon
     CONFIG_NETUTILS_TFTPC=y              : Enable TFTP data file transfers for get and put commands
-    CONFIG_NETUTILS_UIPLIB=y             : Network library support is needed
+    CONFIG_NETUTILS_NETLIB=y             : Network library support is needed
     CONFIG_NETUTILS_WEBCLIENT=y          : Needed for wget support
                                          : Defaults should be okay for other options
   Application Configuration -> NSH Library
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 169c75a43db..26611f713bf 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -743,7 +743,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index c0d56bcbe38..dbdf70d3aef 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -704,7 +704,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index 4212f06a25a..4c97e0bd63b 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -898,7 +898,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index d939eb7a433..0495bdb9adb 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -704,7 +704,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 29402e30747..354bec89c0e 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -623,7 +623,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index ee442559eeb..f32ee81cb0d 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -593,7 +593,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index 4a4df03ed3b..bbf4c526cf8 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -936,7 +936,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index 3c13c9ddfee..1f28281339e 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -801,7 +801,7 @@ CONFIG_NETUTILS_TFTPC=y
 #
 # uIP support library
 #
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 
 #
 # uIP web client
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index 7383bf8b94d..11b95b836e2 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -524,7 +524,7 @@ CONFIG_EXAMPLES_NXFFS_NLOOPS=100
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 45dc26a568f..b64f12a0961 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -492,7 +492,7 @@ CONFIG_EXAMPLES_CXXTEST=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index f8779b9a02d..885286bedea 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -486,7 +486,7 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index 5689c79e52b..2852bf18be5 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -507,7 +507,7 @@ CONFIG_EXAMPLES_MTDPART_NPARTITIONS=3
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 01963df6306..abd4072e2ae 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -520,7 +520,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 396ec65f6ba..7512b952a93 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -506,7 +506,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index 6f0fe5d79c7..914f7fb5f7a 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -554,7 +554,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 1baefd83995..d064de51af8 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -543,7 +543,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index daaae2a4294..0f83948e5bc 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -544,7 +544,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 18555fb0f74..2f7ab8c08ba 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -500,7 +500,7 @@ CONFIG_EXAMPLES_NXFFS_NLOOPS=100
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index 0a15652dc95..189035de285 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -556,7 +556,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=32
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index d0677fbe39b..d2d5f26e6fc 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -565,7 +565,7 @@ CONFIG_HAVE_CXX=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 80d20a6000e..345c08bd892 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -487,7 +487,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index a372ee66c46..238a316ba16 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -499,7 +499,7 @@ CONFIG_INTERPRETERS_PRUN=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index f9d98cb5ef4..161cc0ba3d7 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -549,7 +549,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index 33ad48340a0..be1c37f3b55 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -471,7 +471,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index 0aa3a720093..e67c5b1ecc4 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -829,7 +829,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index a33b79f6762..61bb05fb769 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -829,7 +829,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index b995019c488..1d1bc820f70 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -793,7 +793,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index ff8222bac2b..431f25553c9 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -778,7 +778,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index 3b55d8d2edb..82d4603af0e 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -809,7 +809,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index 3d1ce47f9fb..d7680210987 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -724,7 +724,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index 801558a17d0..750791a684b 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -832,7 +832,7 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index e59f16a3231..e10b1e4ad80 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -794,7 +794,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index dc1987b4948..1112cd34830 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -950,7 +950,7 @@ CONFIG_EXAMPLES_NXHELLO_FONTID=6
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index c5846d772e0..b9f63d1cb29 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -856,7 +856,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig
index 48f9f2a0f46..dc1e14739d6 100644
--- a/configs/stm3210e-eval/nxconsole/defconfig
+++ b/configs/stm3210e-eval/nxconsole/defconfig
@@ -843,7 +843,7 @@ CONFIG_EXAMPLES_NXCONSOLE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 32727a0da4f..c987b2b847b 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -874,7 +874,7 @@ CONFIG_EXAMPLES_NXHELLO_FONTID=6
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index 8be796582d4..197482db6a2 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -765,7 +765,7 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index d4404b362a7..6ffb85a53e3 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -742,7 +742,7 @@ CONFIG_EXAMPLES_USBSERIAL=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index bed972767c4..610e2d00d7a 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -810,7 +810,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_DISCOVER is not set
 
diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig
index 99f5516e883..9c94c467162 100644
--- a/configs/stm3220g-eval/nettest/defconfig
+++ b/configs/stm3220g-eval/nettest/defconfig
@@ -812,7 +812,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index 5893e747d4e..8115d6a3fb5 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -872,7 +872,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index 076e7cd7007..f03f1fa4d05 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -883,7 +883,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 15095a5a8b5..c4429547200 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -987,7 +987,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig
index 33bca89736d..92556c88b36 100644
--- a/configs/stm3220g-eval/telnetd/defconfig
+++ b/configs/stm3220g-eval/telnetd/defconfig
@@ -813,7 +813,7 @@ CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
 CONFIG_NETUTILS_TELNETD=y
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index b6e6222a1b4..809c227d5e0 100644
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -812,7 +812,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_DISCOVER is not set
 
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index 002fc48c5a7..a976561cf0a 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -870,7 +870,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 CONFIG_NETUTILS_DISCOVER=y
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index 06b73995aa1..8934a349d3a 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -892,7 +892,7 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index 40b6d4e46d4..a7c04be0e72 100644
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -814,7 +814,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index a42a7b8eb59..3f0794bafce 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -854,7 +854,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index 9f88c2fffa2..defa02060ae 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -885,7 +885,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig
index cd5c0260d3b..8c981c048aa 100644
--- a/configs/stm3240g-eval/nxconsole/defconfig
+++ b/configs/stm3240g-eval/nxconsole/defconfig
@@ -961,7 +961,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index b0637eadaad..097f739386c 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -982,7 +982,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig
index d3968671d2b..5cce2aafc5c 100644
--- a/configs/stm3240g-eval/telnetd/defconfig
+++ b/configs/stm3240g-eval/telnetd/defconfig
@@ -815,7 +815,7 @@ CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
 CONFIG_NETUTILS_TELNETD=y
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 46815629816..4e3e46ddd81 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -872,7 +872,7 @@ CONFIG_EXAMPLES_UIP_NOMAC=y
 CONFIG_NETUTILS_TELNETD=y
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index 7bdd1e7b11b..1aa9766d490 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -867,7 +867,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_DISCOVER is not set
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index 79392edbbcb..29344c3cee7 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -622,7 +622,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index ed3858ec4ba..da4b600f61a 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -599,7 +599,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f100rc_generic/nsh/defconfig b/configs/stm32f100rc_generic/nsh/defconfig
index 169f6dde5e4..b02e27dfe1b 100644
--- a/configs/stm32f100rc_generic/nsh/defconfig
+++ b/configs/stm32f100rc_generic/nsh/defconfig
@@ -509,7 +509,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 718e933ba34..72ce956a939 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -687,7 +687,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index 1d4807d7585..1e0e12f6fd3 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -675,7 +675,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index 71b886ab172..c0e0a088738 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -830,7 +830,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 539825114d0..66e78ca6c69 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -762,7 +762,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index 51ecd6532e5..8c6e970a03e 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -790,7 +790,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index eec878975c0..9286704670a 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -817,7 +817,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index 68223995225..a9897392c07 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -724,7 +724,7 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index 3a893988623..be76395e05a 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -732,7 +732,7 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index 7178ae26f3f..7231f7b9810 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -729,7 +729,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index f502b7fb6e9..44d301a6e28 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -741,7 +741,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 546c6b5c7fc..c76289ee3b0 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -844,7 +844,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index 45513383e69..864d2d31d3c 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -747,7 +747,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index b985b89064f..00b93e05016 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -734,7 +734,7 @@ CONFIG_EXAMPLES_POSIXSPAWN_DEVPATH="/dev/ram0"
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index bda2680dbf5..1ff720811cc 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -783,7 +783,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index 51fd57450d9..12ca238ab67 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -515,7 +515,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index 4ad57c8a009..0e503657e5f 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -592,7 +592,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index 6a428bba1e8..def489b3776 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -511,7 +511,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index c5c021608ee..7f105cfa084 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -600,7 +600,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 271faecc58b..057de9f479b 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -649,7 +649,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/teensy/hello/defconfig b/configs/teensy/hello/defconfig
index 9288a741f51..e5ddbdd83e1 100644
--- a/configs/teensy/hello/defconfig
+++ b/configs/teensy/hello/defconfig
@@ -472,7 +472,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/teensy/nsh/defconfig b/configs/teensy/nsh/defconfig
index 36e04669853..92ad0acc2e2 100644
--- a/configs/teensy/nsh/defconfig
+++ b/configs/teensy/nsh/defconfig
@@ -484,7 +484,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/teensy/usbmsc/defconfig b/configs/teensy/usbmsc/defconfig
index 48c9c5ca9bd..ea30878f701 100644
--- a/configs/teensy/usbmsc/defconfig
+++ b/configs/teensy/usbmsc/defconfig
@@ -531,7 +531,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index a000a9fe90d..dbd44a7023c 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -579,7 +579,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 72f71d6638f..63bf342e442 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -523,7 +523,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 2b7e64af11a..ccf9f40316f 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -656,7 +656,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index adc3cf8ce64..66decb39328 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -486,7 +486,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index 987365a1c06..060cba75268 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -487,7 +487,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig
index 9934ef0bb37..f65847054bc 100644
--- a/configs/viewtool-stm32f107/highpri/defconfig
+++ b/configs/viewtool-stm32f107/highpri/defconfig
@@ -707,7 +707,7 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
 # CONFIG_NETUTILS_SMTP is not set
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index e4f0bcfaf8a..8952a108616 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -810,7 +810,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index 44d583fcd7a..0c80e91b8a5 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -775,7 +775,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index 73e53e7093d..8a48c9ef310 100644
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -781,7 +781,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index f6cfb0b97ef..5681c982bf4 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -386,7 +386,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index 458d1af4028..b0456cf63c0 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -390,7 +390,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index 89497efe7c4..3fd8a1f7c07 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -387,7 +387,7 @@ CONFIG_INTERPRETERS_PRUN=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index d4fedd3c788..f46c2c90232 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -570,7 +570,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index 4553216a022..0ef05cb0096 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -510,7 +510,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index 644cdf9e179..fa1cea9c732 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -424,7 +424,7 @@ CONFIG_INTERPRETERS_PRUN=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 99ef2e31979..987225ec328 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -386,7 +386,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index 2d993c005a9..c13f2a31953 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -390,7 +390,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 1b5e1b38fab..58c55ef4e56 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -386,7 +386,7 @@ CONFIG_INTERPRETERS_PRUN=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index e9062a596a7..8bee9e7f4c6 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -416,7 +416,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index c08e9c620d7..7670dc12d97 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -416,7 +416,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig
index 2a6d23b1d5c..e0f3b59da1a 100644
--- a/configs/zkit-arm-1769/hello/defconfig
+++ b/configs/zkit-arm-1769/hello/defconfig
@@ -698,7 +698,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index ae11539e945..1f7ff501138 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -742,7 +742,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index abd30fa99c4..98c0e146f8a 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -852,7 +852,7 @@ CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index 50599cee172..f2141919f08 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -731,7 +731,7 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 21d3787d1e1..fdddb2db011 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -455,7 +455,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index f0b6b23a867..62547c3964c 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -540,7 +540,7 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #