diff --git a/configs b/configs
index 639546480f1..abab21dfa55 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 639546480f11f4438ab84aef4a51a82ab937c716
+Subproject commit abab21dfa553656a0ce40423931a2af2c61f3466
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f76a228380c..32c87c7e0c7 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -319,7 +319,7 @@ config NET_SLIP_MTU
 		256 MSS, but restrict transfers to 128 bytes (possibly by modifying
 		the tcp_mss() macro).
 
-config SLIP_NINTERFACES
+config NET_SLIP_NINTERFACES
 	int "Number of SLIP interfaces"
 	default 1
 	---help---
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 4b02475b831..bbabc1527e8 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -108,12 +108,12 @@
 #  warning "CONFIG_NET_SLIP_MTU == 296 is optimal"
 #endif
 
-/* CONFIG_SLIP_NINTERFACES determines the number of physical interfaces
+/* CONFIG_NET_SLIP_NINTERFACES determines the number of physical interfaces
  * that will be supported.
  */
 
-#ifndef CONFIG_SLIP_NINTERFACES
-# define CONFIG_SLIP_NINTERFACES 1
+#ifndef CONFIG_NET_SLIP_NINTERFACES
+# define CONFIG_NET_SLIP_NINTERFACES 1
 #endif
 
 /*  SLIP special character codes *******************************************/
@@ -183,11 +183,11 @@ struct slip_driver_s
  * Private Data
  ****************************************************************************/
 
- /* We really should get rid of CONFIG_SLIP_NINTERFACES and, instead,
+ /* We really should get rid of CONFIG_NET_SLIP_NINTERFACES and, instead,
   * kmm_malloc() new interface instances as needed.
   */
 
-static struct slip_driver_s g_slip[CONFIG_SLIP_NINTERFACES];
+static struct slip_driver_s g_slip[CONFIG_NET_SLIP_NINTERFACES];
 
 /****************************************************************************
  * Private Function Prototypes
@@ -462,7 +462,7 @@ static void slip_txtask(int argc, FAR char *argv[])
   unsigned int hsec;
 
   ndbg("index: %d\n", index);
-  DEBUGASSERT(index < CONFIG_SLIP_NINTERFACES);
+  DEBUGASSERT(index < CONFIG_NET_SLIP_NINTERFACES);
 
   /* Get our private data structure instance and wake up the waiting
    * initialization logic.
@@ -685,7 +685,7 @@ static int slip_rxtask(int argc, FAR char *argv[])
   int ch;
 
   ndbg("index: %d\n", index);
-  DEBUGASSERT(index < CONFIG_SLIP_NINTERFACES);
+  DEBUGASSERT(index < CONFIG_NET_SLIP_NINTERFACES);
 
   /* Get our private data structure instance and wake up the waiting
    * initialization logic.
@@ -959,7 +959,7 @@ int slip_initialize(int intf, FAR const char *devname)
 
   /* Get the interface structure associated with this interface number. */
 
-  DEBUGASSERT(intf < CONFIG_SLIP_NINTERFACES);
+  DEBUGASSERT(intf < CONFIG_NET_SLIP_NINTERFACES);
   priv = &g_slip[intf];
 
   /* Initialize the driver structure */
diff --git a/include/nuttx/net/slip.h b/include/nuttx/net/slip.h
index cfd1a3c8ad5..1fb2e46514c 100644
--- a/include/nuttx/net/slip.h
+++ b/include/nuttx/net/slip.h
@@ -59,11 +59,11 @@
  * SLIP Configuration:
  *
  *   CONFIG_NET_SLIP - Enables building of the SLIP driver
- *   CONFIG_SLIP_STACKSIZE - Provides the stack size for SLIP RX and TX
+ *   CONFIG_NET_SLIP_STACKSIZE - Provides the stack size for SLIP RX and TX
  *     threads.  Default: 2048
- *   CONFIG_SLIP_DEFPRIO - Provides the priority for SLIP RX and TX threads.
- *     Default 128.
- *   CONFIG_NET_SLIP_MTU - Provides the size of the SLIP packet buffers.
+ *   CONFIG_NET_SLIP_DEFPRIO - Provides the priority for SLIP RX and TX
+ *     threads.  Default 128.
+ *   CONFIG_NET_NET_SLIP_MTU - Provides the size of the SLIP packet buffers.
  *     Default 296
  *
  *     The Linux slip module hard-codes its MTU size to 296 (40 bytes for the
@@ -74,10 +74,10 @@
  *     uses a MTU of 296 and window of 256, but actually only sends 168 bytes
  *     of data: 40 + 128.  I believe that is to allow for the 2x worst cast
  *     packet expansion.  Ideally we would like to advertise the 256 MSS,
- *     but restrict transfers to 128 bytes (possibly by modifying the tcp_mss()
- *     macro).
+ *     but restrict transfers to 128 bytes (possibly by modifying the
+ *     tcp_mss() macro).
  *
- *   CONFIG_SLIP_NINTERFACES determines the number of physical interfaces
+ *   CONFIG_NET_SLIP_NINTERFACES determines the number of physical interfaces
  *   that will be supported.
  */