diff --git a/netutils/netlib/netlib_nodeaddrconv.c b/netutils/netlib/netlib_nodeaddrconv.c
index 02854c516..4cb6760e4 100644
--- a/netutils/netlib/netlib_nodeaddrconv.c
+++ b/netutils/netlib/netlib_nodeaddrconv.c
@@ -62,14 +62,14 @@ bool netlib_nodeaddrconv(FAR const char *hwstr, FAR uint8_t *hw)
 
   /* Form xx:xx or xx:xx:xx:xx:xx:xx:xx:xx for extended Rime address */
 
-  if (strlen(hwstr) != 3 * NET_6LOWPAN_RIMEADDR_SIZE - 1)
+  if (strlen(hwstr) != 3 * NET_6LOWPAN_ADDRSIZE - 1)
     {
       return false;
     }
 
   tmp = 0;
 
-  for (i = 0; i < NET_6LOWPAN_RIMEADDR_SIZE; ++i)
+  for (i = 0; i < NET_6LOWPAN_ADDRSIZE; ++i)
     {
       j = 0;
       do
diff --git a/netutils/netlib/netlib_setnodeaddr.c b/netutils/netlib/netlib_setnodeaddr.c
index 81e8f88d8..e88ca727b 100644
--- a/netutils/netlib/netlib_setnodeaddr.c
+++ b/netutils/netlib/netlib_setnodeaddr.c
@@ -67,7 +67,7 @@
  *
  * Parameters:
  *   ifname   The name of the interface to use
- *   nodeaddr Node address to set, size must be NET_6LOWPAN_RIMEADDR_SIZE
+ *   nodeaddr Node address to set, size must be NET_6LOWPAN_ADDRSIZE
  *
  * Return:
  *   0 on success; -1 on failure
@@ -94,7 +94,7 @@ int netlib_setnodeaddr(FAR const char *ifname, FAR const uint8_t *nodeaddr)
           /* Put the new MAC address into the request */
 
           req.ifr_hwaddr.sa_family = AF_INET6;
-          memcpy(&req.ifr_hwaddr.sa_data, nodeaddr, NET_6LOWPAN_RIMEADDR_SIZE);
+          memcpy(&req.ifr_hwaddr.sa_data, nodeaddr, NET_6LOWPAN_ADDRSIZE);
 
           /* Perform the ioctl to set the node address */
 
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 7f1f8c943..2607b6ede 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -762,7 +762,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
   uint8_t mac[IFHWADDRLEN];
 #endif
 #ifdef CONFIG_NET_6LOWPAN
-  uint8_t nodeaddr[NET_6LOWPAN_RIMEADDR_SIZE];
+  uint8_t nodeaddr[NET_6LOWPAN_ADDRSIZE];
 #endif
 #if defined(CONFIG_NSH_DHCPC)
   FAR void *handle;
diff --git a/nshlib/nsh_netinit.c b/nshlib/nsh_netinit.c
index 71b504eb6..905722867 100644
--- a/nshlib/nsh_netinit.c
+++ b/nshlib/nsh_netinit.c
@@ -260,7 +260,7 @@ static void nsh_netinit_configure(void)
 #if defined(CONFIG_NET_ETHERNET)
   uint8_t mac[IFHWADDRLEN];
 #elif defined(CONFIG_NET_6LOWPAN)
-  uint8_t nodeaddr[NET_6LOWPAN_RIMEADDR_SIZE];
+  uint8_t nodeaddr[NET_6LOWPAN_ADDRSIZE];
 #endif
 #endif