diff --git a/wireless/ieee802154/libmac/ieee802154_getchan.c b/wireless/ieee802154/libmac/ieee802154_getchan.c
index bf011f2ca..622fc9655 100644
--- a/wireless/ieee802154/libmac/ieee802154_getchan.c
+++ b/wireless/ieee802154/libmac/ieee802154_getchan.c
@@ -61,7 +61,7 @@ int ieee802154_getchan(int fd, FAR uint8_t *chan)
   req.pib_attr = IEEE802154_PIB_PHY_CURRENT_CHANNEL;
   ret = ieee802154_get_req(fd, &req);
 
-  *chan = req.attr_value.phy.channel;
+  *chan = req.attrval.phy.channel;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_geteaddr.c b/wireless/ieee802154/libmac/ieee802154_geteaddr.c
index cfadd54d8..9ee011e1c 100644
--- a/wireless/ieee802154/libmac/ieee802154_geteaddr.c
+++ b/wireless/ieee802154/libmac/ieee802154_geteaddr.c
@@ -61,7 +61,7 @@ int ieee802154_geteaddr(int fd, FAR uint8_t *eaddr)
   req.pib_attr = IEEE802154_PIB_MAC_EXTENDED_ADDR;
   ret = ieee802154_get_req(fd, &req);
 
-  memcpy(eaddr, &req.attr_value.mac.eaddr[0], 8);
+  memcpy(eaddr, &req.attrval.mac.eaddr[0], 8);
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_getpanid.c b/wireless/ieee802154/libmac/ieee802154_getpanid.c
index 67683fde4..7a7e2d01b 100644
--- a/wireless/ieee802154/libmac/ieee802154_getpanid.c
+++ b/wireless/ieee802154/libmac/ieee802154_getpanid.c
@@ -57,10 +57,10 @@ int ieee802154_getpanid(int fd, FAR uint16_t *panid)
   struct ieee802154_get_req_s req;
   int ret;
 
-  req.pib_attr = IEEE802154_PIB_MAC_PAN_ID;
+  req.pib_attr = IEEE802154_PIB_MAC_PANID;
   ret = ieee802154_get_req(fd, &req);
 
-  *panid = req.attr_value.mac.panid;
+  *panid = req.attrval.mac.panid;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_getpromisc.c b/wireless/ieee802154/libmac/ieee802154_getpromisc.c
index 3e144fa63..34599c7f1 100644
--- a/wireless/ieee802154/libmac/ieee802154_getpromisc.c
+++ b/wireless/ieee802154/libmac/ieee802154_getpromisc.c
@@ -60,7 +60,7 @@ int ieee802154_getpromisc(int fd, FAR bool *promisc)
   req.pib_attr = IEEE802154_PIB_MAC_PROMISCUOUS_MODE;
   ret = ieee802154_get_req(fd, &req);
 
-  *promisc = req.attr_value.mac.promisc_mode;
+  *promisc = req.attrval.mac.promisc_mode;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_getrxonidle.c b/wireless/ieee802154/libmac/ieee802154_getrxonidle.c
index f80c1f460..7b57d09e5 100644
--- a/wireless/ieee802154/libmac/ieee802154_getrxonidle.c
+++ b/wireless/ieee802154/libmac/ieee802154_getrxonidle.c
@@ -61,7 +61,7 @@ int ieee802154_getrxonidle(int fd, FAR bool *rxonidle)
   req.pib_attr = IEEE802154_PIB_MAC_RX_ON_WHEN_IDLE;
   ret = ieee802154_get_req(fd, &req);
 
-  *rxonidle = req.attr_value.mac.rxonidle;
+  *rxonidle = req.attrval.mac.rxonidle;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_getsaddr.c b/wireless/ieee802154/libmac/ieee802154_getsaddr.c
index a4c19a1f6..71b297e91 100644
--- a/wireless/ieee802154/libmac/ieee802154_getsaddr.c
+++ b/wireless/ieee802154/libmac/ieee802154_getsaddr.c
@@ -60,7 +60,7 @@ int ieee802154_getsaddr(int fd, FAR uint16_t *saddr)
   req.pib_attr = IEEE802154_PIB_MAC_SHORT_ADDRESS;
   ret = ieee802154_get_req(fd, &req);
 
-  *saddr = req.attr_value.mac.saddr;
+  *saddr = req.attrval.mac.saddr;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_gettxpwr.c b/wireless/ieee802154/libmac/ieee802154_gettxpwr.c
index e21f2441a..634b8dd14 100644
--- a/wireless/ieee802154/libmac/ieee802154_gettxpwr.c
+++ b/wireless/ieee802154/libmac/ieee802154_gettxpwr.c
@@ -60,7 +60,7 @@ int ieee802154_gettxpwr(int fd, FAR int32_t *txpwr)
   req.pib_attr = IEEE802154_PIB_PHY_TX_POWER;
   ret = ieee802154_get_req(fd, &req);
 
-  *txpwr = req.attr_value.phy.txpwr;
+  *txpwr = req.attrval.phy.txpwr;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_setchan.c b/wireless/ieee802154/libmac/ieee802154_setchan.c
index 4b5ef5341..a74eae895 100644
--- a/wireless/ieee802154/libmac/ieee802154_setchan.c
+++ b/wireless/ieee802154/libmac/ieee802154_setchan.c
@@ -58,7 +58,7 @@ int ieee802154_setchan(int fd, uint8_t chan)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_PHY_CURRENT_CHANNEL;
-  req.attr_value.phy.channel = chan;
+  req.attrval.phy.channel = chan;
 
   return ieee802154_set_req(fd, &req);
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_seteaddr.c b/wireless/ieee802154/libmac/ieee802154_seteaddr.c
index 3fc9cfd1c..75c589702 100644
--- a/wireless/ieee802154/libmac/ieee802154_seteaddr.c
+++ b/wireless/ieee802154/libmac/ieee802154_seteaddr.c
@@ -59,7 +59,7 @@ int ieee802154_seteaddr(int fd, FAR const uint8_t *eaddr)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_MAC_EXTENDED_ADDR;
-  memcpy(&req.attr_value.mac.eaddr[0], eaddr, 8);
+  memcpy(&req.attrval.mac.eaddr[0], eaddr, 8);
 
   return ieee802154_set_req(fd, &req);
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_setpanid.c b/wireless/ieee802154/libmac/ieee802154_setpanid.c
index bd3eb6e58..2a1d3983f 100644
--- a/wireless/ieee802154/libmac/ieee802154_setpanid.c
+++ b/wireless/ieee802154/libmac/ieee802154_setpanid.c
@@ -57,8 +57,8 @@ int ieee802154_setpanid(int fd, uint16_t panid)
 {
   struct ieee802154_set_req_s req;
 
-  req.pib_attr = IEEE802154_PIB_MAC_PAN_ID;
-  req.attr_value.mac.panid = panid;
+  req.pib_attr = IEEE802154_PIB_MAC_PANID;
+  req.attrval.mac.panid = panid;
 
   return ieee802154_set_req(fd, &req);
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_setpromisc.c b/wireless/ieee802154/libmac/ieee802154_setpromisc.c
index e41911aaf..833b5bd4f 100644
--- a/wireless/ieee802154/libmac/ieee802154_setpromisc.c
+++ b/wireless/ieee802154/libmac/ieee802154_setpromisc.c
@@ -59,7 +59,7 @@ int ieee802154_setpromisc(int fd, bool promisc)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_MAC_PROMISCUOUS_MODE;
-  req.attr_value.mac.promisc_mode = promisc;
+  req.attrval.mac.promisc_mode = promisc;
 
   return ieee802154_set_req(fd, &req);
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_setrxonidle.c b/wireless/ieee802154/libmac/ieee802154_setrxonidle.c
index de4d32d21..bf5f019de 100644
--- a/wireless/ieee802154/libmac/ieee802154_setrxonidle.c
+++ b/wireless/ieee802154/libmac/ieee802154_setrxonidle.c
@@ -59,7 +59,7 @@ int ieee802154_setrxonidle(int fd, bool rxonidle)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_MAC_RX_ON_WHEN_IDLE;
-  req.attr_value.mac.rxonidle = rxonidle;
+  req.attrval.mac.rxonidle = rxonidle;
 
   return ieee802154_set_req(fd, &req);
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_setsaddr.c b/wireless/ieee802154/libmac/ieee802154_setsaddr.c
index fe05c808c..fe2559dbe 100644
--- a/wireless/ieee802154/libmac/ieee802154_setsaddr.c
+++ b/wireless/ieee802154/libmac/ieee802154_setsaddr.c
@@ -58,7 +58,7 @@ int ieee802154_setsaddr(int fd, uint16_t saddr)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_MAC_SHORT_ADDRESS;
-  req.attr_value.mac.saddr = saddr;
+  req.attrval.mac.saddr = saddr;
 
   return ieee802154_set_req(fd, &req);
 }
diff --git a/wireless/ieee802154/libmac/ieee802154_settxpwr.c b/wireless/ieee802154/libmac/ieee802154_settxpwr.c
index 6911754b7..e66eb1650 100644
--- a/wireless/ieee802154/libmac/ieee802154_settxpwr.c
+++ b/wireless/ieee802154/libmac/ieee802154_settxpwr.c
@@ -57,7 +57,7 @@ int ieee802154_settxpwr(int fd, int32_t txpwr)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_PHY_TX_POWER;
-  req.attr_value.phy.txpwr = txpwr;
+  req.attrval.phy.txpwr = txpwr;
 
   return ieee802154_set_req(fd, &req);
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_getchan.c b/wireless/ieee802154/libmac/sixlowpan_getchan.c
index 5d327dde7..7d5b5b3dd 100644
--- a/wireless/ieee802154/libmac/sixlowpan_getchan.c
+++ b/wireless/ieee802154/libmac/sixlowpan_getchan.c
@@ -61,7 +61,7 @@ int sixlowpan_getchan(int sock, FAR const char *ifname, FAR uint8_t *chan)
   req.pib_attr = IEEE802154_PIB_PHY_CURRENT_CHANNEL;
   ret = sixlowpan_get_req(sock, ifname, &req);
 
-  *chan = req.attr_value.phy.channel;
+  *chan = req.attrval.phy.channel;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_geteaddr.c b/wireless/ieee802154/libmac/sixlowpan_geteaddr.c
index ec991d24d..0c62cc2dd 100644
--- a/wireless/ieee802154/libmac/sixlowpan_geteaddr.c
+++ b/wireless/ieee802154/libmac/sixlowpan_geteaddr.c
@@ -61,7 +61,7 @@ int sixlowpan_geteaddr(int sock, FAR const char *ifname, FAR uint8_t *eaddr)
   req.pib_attr = IEEE802154_PIB_MAC_EXTENDED_ADDR;
   ret = sixlowpan_get_req(sock, ifname, &req);
 
-  memcpy(eaddr, &req.attr_value.mac.eaddr[0], 8);
+  memcpy(eaddr, &req.attrval.mac.eaddr[0], 8);
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_getpanid.c b/wireless/ieee802154/libmac/sixlowpan_getpanid.c
index 49263724e..7b102ada1 100644
--- a/wireless/ieee802154/libmac/sixlowpan_getpanid.c
+++ b/wireless/ieee802154/libmac/sixlowpan_getpanid.c
@@ -58,10 +58,10 @@ int sixlowpan_getpanid(int sock, FAR const char *ifname, FAR uint16_t *panid)
   struct ieee802154_get_req_s req;
   int ret;
 
-  req.pib_attr = IEEE802154_PIB_MAC_PAN_ID;
+  req.pib_attr = IEEE802154_PIB_MAC_PANID;
   ret = sixlowpan_get_req(sock, ifname, &req);
 
-  *panid = req.attr_value.mac.panid;
+  *panid = req.attrval.mac.panid;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_getpromisc.c b/wireless/ieee802154/libmac/sixlowpan_getpromisc.c
index c4ae0d55b..00254a6ea 100644
--- a/wireless/ieee802154/libmac/sixlowpan_getpromisc.c
+++ b/wireless/ieee802154/libmac/sixlowpan_getpromisc.c
@@ -61,7 +61,7 @@ int sixlowpan_getpromisc(int sock, FAR const char *ifname, FAR bool *promisc)
   req.pib_attr = IEEE802154_PIB_MAC_PROMISCUOUS_MODE;
   ret = sixlowpan_get_req(sock, ifname, &req);
 
-  *promisc = req.attr_value.mac.promisc_mode;
+  *promisc = req.attrval.mac.promisc_mode;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_getrxonidle.c b/wireless/ieee802154/libmac/sixlowpan_getrxonidle.c
index 0c5a5ec21..c75b2d2fd 100644
--- a/wireless/ieee802154/libmac/sixlowpan_getrxonidle.c
+++ b/wireless/ieee802154/libmac/sixlowpan_getrxonidle.c
@@ -61,7 +61,7 @@ int sixlowpan_getrxonidle(int sock, FAR const char *ifname, FAR bool *rxonidle)
   req.pib_attr = IEEE802154_PIB_MAC_RX_ON_WHEN_IDLE;
   ret = sixlowpan_get_req(sock, ifname, &req);
 
-  *rxonidle = req.attr_value.mac.rxonidle;
+  *rxonidle = req.attrval.mac.rxonidle;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_getsaddr.c b/wireless/ieee802154/libmac/sixlowpan_getsaddr.c
index 53557082e..c9e62a880 100644
--- a/wireless/ieee802154/libmac/sixlowpan_getsaddr.c
+++ b/wireless/ieee802154/libmac/sixlowpan_getsaddr.c
@@ -61,7 +61,7 @@ int sixlowpan_getsaddr(int sock, FAR const char *ifname, FAR uint16_t *saddr)
   req.pib_attr = IEEE802154_PIB_MAC_SHORT_ADDRESS;
   ret = sixlowpan_get_req(sock, ifname, &req);
 
-  *saddr = req.attr_value.mac.saddr;
+  *saddr = req.attrval.mac.saddr;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_gettxpwr.c b/wireless/ieee802154/libmac/sixlowpan_gettxpwr.c
index 71617f26d..e6dbdb607 100644
--- a/wireless/ieee802154/libmac/sixlowpan_gettxpwr.c
+++ b/wireless/ieee802154/libmac/sixlowpan_gettxpwr.c
@@ -61,7 +61,7 @@ int sixlowpan_gettxpwr(int sock, FAR const char *ifname, FAR int32_t *txpwr)
   req.pib_attr = IEEE802154_PIB_PHY_TX_POWER;
   ret = sixlowpan_get_req(sock, ifname, &req);
 
-  *txpwr = req.attr_value.phy.txpwr;
+  *txpwr = req.attrval.phy.txpwr;
 
   return ret;
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_setchan.c b/wireless/ieee802154/libmac/sixlowpan_setchan.c
index ceb13cc25..df3d834b5 100644
--- a/wireless/ieee802154/libmac/sixlowpan_setchan.c
+++ b/wireless/ieee802154/libmac/sixlowpan_setchan.c
@@ -58,7 +58,7 @@ int sixlowpan_setchan(int sock, FAR const char *ifname, uint8_t chan)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_PHY_CURRENT_CHANNEL;
-  req.attr_value.phy.channel = chan;
+  req.attrval.phy.channel = chan;
 
   return sixlowpan_set_req(sock, ifname, &req);
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_seteaddr.c b/wireless/ieee802154/libmac/sixlowpan_seteaddr.c
index 114411bba..e7034a971 100644
--- a/wireless/ieee802154/libmac/sixlowpan_seteaddr.c
+++ b/wireless/ieee802154/libmac/sixlowpan_seteaddr.c
@@ -58,7 +58,7 @@ int sixlowpan_seteaddr(int sock, FAR const char *ifname, FAR const uint8_t *eadd
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_MAC_EXTENDED_ADDR;
-  memcpy(&req.attr_value.mac.eaddr[0], eaddr, 8);
+  memcpy(&req.attrval.mac.eaddr[0], eaddr, 8);
 
   return sixlowpan_set_req(sock, ifname, &req);
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_setpanid.c b/wireless/ieee802154/libmac/sixlowpan_setpanid.c
index d2d87071c..fbe1186ec 100644
--- a/wireless/ieee802154/libmac/sixlowpan_setpanid.c
+++ b/wireless/ieee802154/libmac/sixlowpan_setpanid.c
@@ -57,8 +57,8 @@ int sixlowpan_setpanid(int sock, FAR const char *ifname, uint16_t panid)
 {
   struct ieee802154_set_req_s req;
 
-  req.pib_attr = IEEE802154_PIB_MAC_PAN_ID;
-  req.attr_value.mac.panid = panid;
+  req.pib_attr = IEEE802154_PIB_MAC_PANID;
+  req.attrval.mac.panid = panid;
 
   return sixlowpan_set_req(sock, ifname, &req);
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_setpromisc.c b/wireless/ieee802154/libmac/sixlowpan_setpromisc.c
index a92251782..b0d4e7007 100644
--- a/wireless/ieee802154/libmac/sixlowpan_setpromisc.c
+++ b/wireless/ieee802154/libmac/sixlowpan_setpromisc.c
@@ -59,7 +59,7 @@ int sixlowpan_setpromisc(int sock, FAR const char *ifname, bool promisc)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_MAC_PROMISCUOUS_MODE;
-  req.attr_value.mac.promisc_mode = promisc;
+  req.attrval.mac.promisc_mode = promisc;
 
   return sixlowpan_set_req(sock, ifname, &req);
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_setrxonidle.c b/wireless/ieee802154/libmac/sixlowpan_setrxonidle.c
index cc0c0d889..81dd30765 100644
--- a/wireless/ieee802154/libmac/sixlowpan_setrxonidle.c
+++ b/wireless/ieee802154/libmac/sixlowpan_setrxonidle.c
@@ -59,7 +59,7 @@ int sixlowpan_setrxonidle(int sock, FAR const char *ifname, bool rxonidle)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_MAC_RX_ON_WHEN_IDLE;
-  req.attr_value.mac.rxonidle = rxonidle;
+  req.attrval.mac.rxonidle = rxonidle;
 
   return sixlowpan_set_req(sock, ifname, &req);
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_setsaddr.c b/wireless/ieee802154/libmac/sixlowpan_setsaddr.c
index c15ae5595..556777a3d 100644
--- a/wireless/ieee802154/libmac/sixlowpan_setsaddr.c
+++ b/wireless/ieee802154/libmac/sixlowpan_setsaddr.c
@@ -58,7 +58,7 @@ int sixlowpan_setsaddr(int sock, FAR const char *ifname, uint16_t saddr)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_MAC_SHORT_ADDRESS;
-  req.attr_value.mac.saddr = saddr;
+  req.attrval.mac.saddr = saddr;
 
   return sixlowpan_set_req(sock, ifname, &req);
 }
diff --git a/wireless/ieee802154/libmac/sixlowpan_settxpwr.c b/wireless/ieee802154/libmac/sixlowpan_settxpwr.c
index 003acdf8e..9c5a82cec 100644
--- a/wireless/ieee802154/libmac/sixlowpan_settxpwr.c
+++ b/wireless/ieee802154/libmac/sixlowpan_settxpwr.c
@@ -58,7 +58,7 @@ int sixlowpan_settxpwr(int sock, FAR const char *ifname, int32_t txpwr)
   struct ieee802154_set_req_s req;
 
   req.pib_attr = IEEE802154_PIB_PHY_TX_POWER;
-  req.attr_value.phy.txpwr = txpwr;
+  req.attrval.phy.txpwr = txpwr;
 
   return sixlowpan_set_req(sock, ifname, &req);
 }