diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index d323f4cee9c..fdd5387d5b7 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -861,7 +861,7 @@ Where <subdir> is one of the following:
 
        CONFIG_NSH_NOMAC=y
        CONFIG_NSH_SWMAC=y
-       CONFIG_NSH_MACADDR=0x00e0deadbeef
+       CONFIG_NETINIT_MACADDR=0x00e0deadbeef
 
   nsh:
   ---
diff --git a/configs/freedom-k66f/README.txt b/configs/freedom-k66f/README.txt
index 704fcc7c4dd..f024c73b7c9 100644
--- a/configs/freedom-k66f/README.txt
+++ b/configs/freedom-k66f/README.txt
@@ -868,7 +868,7 @@ Where <subdir> is one of the following:
 
        CONFIG_NSH_NOMAC=y
        CONFIG_NSH_SWMAC=y
-       CONFIG_NSH_MACADDR=0x00e0deadbeef
+       CONFIG_NETINIT_MACADDR=0x00e0deadbeef
 
   nsh:
   ---
diff --git a/configs/lc823450-xgevk/src/lc823450_bringup.c b/configs/lc823450-xgevk/src/lc823450_bringup.c
index b6f35319528..647aaab2628 100644
--- a/configs/lc823450-xgevk/src/lc823450_bringup.c
+++ b/configs/lc823450-xgevk/src/lc823450_bringup.c
@@ -116,14 +116,14 @@ int lc823450_bringup(void)
   lc823450_wm8776initialize(0);
 #endif
 
-#if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR)
+#if defined(CONFIG_RNDIS) && defined(CONFIG_NETINIT_MACADDR)
   uint8_t mac[6];
   mac[0] = 0xa0; /* TODO */
-  mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff;
-  mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff;
-  mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
-  mac[4] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
-  mac[5] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
+  mac[1] = (CONFIG_NETINIT_MACADDR >> (8 * 4)) & 0xff;
+  mac[2] = (CONFIG_NETINIT_MACADDR >> (8 * 3)) & 0xff;
+  mac[3] = (CONFIG_NETINIT_MACADDR >> (8 * 2)) & 0xff;
+  mac[4] = (CONFIG_NETINIT_MACADDR >> (8 * 1)) & 0xff;
+  mac[5] = (CONFIG_NETINIT_MACADDR >> (8 * 0)) & 0xff;
   usbdev_rndis_initialize(mac);
 #endif
 
diff --git a/configs/omnibusf4/src/stm32_bringup.c b/configs/omnibusf4/src/stm32_bringup.c
index bf608cbfd64..5801a21cf2d 100644
--- a/configs/omnibusf4/src/stm32_bringup.c
+++ b/configs/omnibusf4/src/stm32_bringup.c
@@ -306,16 +306,16 @@ int stm32_bringup(void)
     }
 #endif
 
-#if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR)
+#if defined(CONFIG_RNDIS) && defined(CONFIG_NETINIT_MACADDR)
   /* Set up a MAC address for the RNDIS device. */
 
   uint8_t mac[6];
   mac[0] = 0xa0; /* TODO */
-  mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff;
-  mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff;
-  mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
-  mac[4] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
-  mac[5] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
+  mac[1] = (CONFIG_NETINIT_MACADDR >> (8 * 4)) & 0xff;
+  mac[2] = (CONFIG_NETINIT_MACADDR >> (8 * 3)) & 0xff;
+  mac[3] = (CONFIG_NETINIT_MACADDR >> (8 * 2)) & 0xff;
+  mac[4] = (CONFIG_NETINIT_MACADDR >> (8 * 1)) & 0xff;
+  mac[5] = (CONFIG_NETINIT_MACADDR >> (8 * 0)) & 0xff;
   usbdev_rndis_initialize(mac);
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c
index 90f482f4537..f9ff25c940a 100644
--- a/configs/stm32f4discovery/src/stm32_bringup.c
+++ b/configs/stm32f4discovery/src/stm32_bringup.c
@@ -427,14 +427,14 @@ int stm32_bringup(void)
     }
 #endif
 
-#if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR)
+#if defined(CONFIG_RNDIS) && defined(CONFIG_NETINIT_MACADDR)
   uint8_t mac[6];
   mac[0] = 0xa0; /* TODO */
-  mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff;
-  mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff;
-  mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
-  mac[4] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
-  mac[5] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
+  mac[1] = (CONFIG_NETINIT_MACADDR >> (8 * 4)) & 0xff;
+  mac[2] = (CONFIG_NETINIT_MACADDR >> (8 * 3)) & 0xff;
+  mac[3] = (CONFIG_NETINIT_MACADDR >> (8 * 2)) & 0xff;
+  mac[4] = (CONFIG_NETINIT_MACADDR >> (8 * 1)) & 0xff;
+  mac[5] = (CONFIG_NETINIT_MACADDR >> (8 * 0)) & 0xff;
   usbdev_rndis_initialize(mac);
 #endif
 
diff --git a/configs/viewtool-stm32f107/src/stm32_max3421e.c b/configs/viewtool-stm32f107/src/stm32_max3421e.c
index 661381980df..12bd225268a 100644
--- a/configs/viewtool-stm32f107/src/stm32_max3421e.c
+++ b/configs/viewtool-stm32f107/src/stm32_max3421e.c
@@ -364,16 +364,16 @@ int stm32_max3421e_setup(void)
     }
 #endif
 
-#if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR)
+#if defined(CONFIG_RNDIS) && defined(CONFIG_NETINIT_MACADDR)
   {
     uint8_t mac[6];
 
     mac[0] = 0xa0; /* TODO */
-    mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff;
-    mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff;
-    mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
-    mac[4] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
-    mac[5] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
+    mac[1] = (CONFIG_NETINIT_MACADDR >> (8 * 4)) & 0xff;
+    mac[2] = (CONFIG_NETINIT_MACADDR >> (8 * 3)) & 0xff;
+    mac[3] = (CONFIG_NETINIT_MACADDR >> (8 * 2)) & 0xff;
+    mac[4] = (CONFIG_NETINIT_MACADDR >> (8 * 1)) & 0xff;
+    mac[5] = (CONFIG_NETINIT_MACADDR >> (8 * 0)) & 0xff;
 
     ret = usbdev_rndis_initialize(mac);
     if (ret < 0)