diff --git a/cpu/esp_common/esp-now/esp_now_netdev.c b/cpu/esp_common/esp-now/esp_now_netdev.c
index 7a6fe0ce0483791603c91c1dfaece0358a4f78e0..82bbe3509e5d725bb30f55e49d70ee55a0b6370a 100644
--- a/cpu/esp_common/esp-now/esp_now_netdev.c
+++ b/cpu/esp_common/esp-now/esp_now_netdev.c
@@ -627,7 +627,7 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
             break;
 #endif
 
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             CHECK_PARAM_RET(max_len >= sizeof(uint16_t), -EOVERFLOW);
             *((uint16_t *)val) = ESP_NOW_MAX_SIZE;
             res = sizeof(uint16_t);
diff --git a/cpu/nrf5x_common/radio/nrfmin/nrfmin.c b/cpu/nrf5x_common/radio/nrfmin/nrfmin.c
index ad1dabf44352aec47e1292bbb46cc0b8514fef0e..02d713208d3a44906764745ad30d6765be9debd7 100644
--- a/cpu/nrf5x_common/radio/nrfmin/nrfmin.c
+++ b/cpu/nrf5x_common/radio/nrfmin/nrfmin.c
@@ -473,7 +473,7 @@ static int nrfmin_get(netdev_t *dev, netopt_t opt, void *val, size_t max_len)
             assert(max_len >= sizeof(int16_t));
             *((int16_t *)val) = nrfmin_get_txpower();
             return sizeof(int16_t);
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             assert(max_len >= sizeof(uint16_t));
             *((uint16_t *)val) = NRFMIN_PAYLOAD_MAX;
             return sizeof(uint16_t);
diff --git a/drivers/cc110x/cc110x-netdev.c b/drivers/cc110x/cc110x-netdev.c
index 241fcdfae5b01ec73a612b350916377544092a05..b840389e22f8943cb0563af638d585ba3dccbb5f 100644
--- a/drivers/cc110x/cc110x-netdev.c
+++ b/drivers/cc110x/cc110x-netdev.c
@@ -109,7 +109,7 @@ static int _get(netdev_t *dev, netopt_t opt, void *value, size_t value_len)
             assert(value_len > 0);
             *((uint8_t *)value) = cc110x->radio_address;
             return sizeof(uint8_t);
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             assert(value_len > 0);
             *((uint16_t *)value) = CC110X_PACKET_LENGTH - CC110X_L2_HDR_SIZE;
             return sizeof(uint16_t);
diff --git a/drivers/netdev_eth/netdev_eth.c b/drivers/netdev_eth/netdev_eth.c
index df420461e8257457bc6b7e5f272a49195ab33cae..9bdbefad5b40d48931b47ddd1454d2daed4fad10 100644
--- a/drivers/netdev_eth/netdev_eth.c
+++ b/drivers/netdev_eth/netdev_eth.c
@@ -63,7 +63,7 @@ int netdev_eth_get(netdev_t *dev, netopt_t opt, void *value, size_t max_len)
                 res = sizeof(uint16_t);
                 break;
             }
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             {
                 assert(max_len >= 2);
                 uint16_t *val = (uint16_t*) value;
diff --git a/drivers/netdev_ieee802154/netdev_ieee802154.c b/drivers/netdev_ieee802154/netdev_ieee802154.c
index 9318ac21abd4c9a6cf28cd0c7f1aaa68b13af8bc..d21e798e078079f8532fb9659018261ff74d73ab 100644
--- a/drivers/netdev_ieee802154/netdev_ieee802154.c
+++ b/drivers/netdev_ieee802154/netdev_ieee802154.c
@@ -150,7 +150,7 @@ int netdev_ieee802154_get(netdev_ieee802154_t *dev, netopt_t opt, void *value,
             res = sizeof(l2filter_t **);
             break;
 #endif
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             assert(max_len >= sizeof(int16_t));
             *((uint16_t *)value) = (IEEE802154_FRAME_LEN_MAX -
                                   IEEE802154_MAX_HDR_LEN) -
diff --git a/drivers/sx127x/sx127x_netdev.c b/drivers/sx127x/sx127x_netdev.c
index 72b355c4c1aaba4e55cf0c293bd52048ac166d15..e9c533719ed8a33a7d93200f2277f7abea78b6b1 100644
--- a/drivers/sx127x/sx127x_netdev.c
+++ b/drivers/sx127x/sx127x_netdev.c
@@ -333,7 +333,7 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
             *((uint8_t*) val) = sx127x_get_coding_rate(dev);
             return sizeof(uint8_t);
 
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             assert(max_len >= sizeof(uint8_t));
             *((uint8_t*) val) = sx127x_get_max_payload_len(dev);
             return sizeof(uint8_t);
@@ -437,7 +437,7 @@ static int _set(netdev_t *netdev, netopt_t opt, const void *val, size_t len)
             sx127x_set_coding_rate(dev, cr);
             return sizeof(uint8_t);
 
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             assert(len <= sizeof(uint8_t));
             sx127x_set_max_payload_len(dev, *((const uint8_t*) val));
             return sizeof(uint8_t);
diff --git a/drivers/xbee/xbee.c b/drivers/xbee/xbee.c
index 1b4b8843c7346d167e01386785f689e97338d4a7..2541c4d73119b572d26da72bcd334d15db568221 100644
--- a/drivers/xbee/xbee.c
+++ b/drivers/xbee/xbee.c
@@ -770,7 +770,7 @@ static int xbee_get(netdev_t *ndev, netopt_t opt, void *value, size_t max_len)
             return sizeof(eui64_t);
         case NETOPT_CHANNEL:
             return _get_channel(dev, (uint8_t *)value, max_len);
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             if (max_len < sizeof(uint16_t)) {
                 return -EOVERFLOW;
             }
diff --git a/sys/include/net/netopt.h b/sys/include/net/netopt.h
index d5fb9273c1e8f10d9a9d8e7e50f537f7919d1b02..09531f1f5a34f62d43c165f5c7179905618bd1c9 100644
--- a/sys/include/net/netopt.h
+++ b/sys/include/net/netopt.h
@@ -29,6 +29,14 @@
 extern "C" {
 #endif
 
+/**
+ * @brief       A deprecated alias for @ref NETOPT_MAX_PDU_SIZE
+ *
+ * @deprecated  Please use @ref NETOPT_MAX_PDU_SIZE instead of
+ *              `NETOPT_MAX_PACKET_SIZE`
+ */
+#define NETOPT_MAX_PACKET_SIZE NETOPT_MAX_PDU_SIZE
+
 /**
  * @brief   Global list of configuration options available throughout the
  *          network stack, e.g. by netdev and netapi
@@ -171,9 +179,9 @@ typedef enum {
      */
     NETOPT_TX_POWER,
     /**
-     * @brief   (uint16_t) maximum packet size a network module can handle
+     * @brief   (uint16_t) maximum protocol data unit
      */
-    NETOPT_MAX_PACKET_SIZE,
+    NETOPT_MAX_PDU_SIZE,
     /**
      * @brief   (@ref netopt_enable_t) frame preloading
      *
diff --git a/sys/net/crosslayer/netopt/netopt.c b/sys/net/crosslayer/netopt/netopt.c
index 177ab6ef1001fe6e36d1c2a4e67e3f2ccd695d46..c510909caa36061d5f0268a7b4a0a2f1f6431de3 100644
--- a/sys/net/crosslayer/netopt/netopt.c
+++ b/sys/net/crosslayer/netopt/netopt.c
@@ -41,7 +41,7 @@ static const char *_netopt_strmap[] = {
     [NETOPT_IPV6_FORWARDING]       = "NETOPT_IPV6_FORWARDING",
     [NETOPT_IPV6_SND_RTR_ADV]      = "NETOPT_IPV6_SND_RTR_ADV",
     [NETOPT_TX_POWER]              = "NETOPT_TX_POWER",
-    [NETOPT_MAX_PACKET_SIZE]       = "NETOPT_MAX_PACKET_SIZE",
+    [NETOPT_MAX_PDU_SIZE]          = "NETOPT_MAX_PDU_SIZE",
     [NETOPT_PRELOADING]            = "NETOPT_PRELOADING",
     [NETOPT_PROMISCUOUSMODE]       = "NETOPT_PROMISCUOUSMODE",
     [NETOPT_AUTOACK]               = "NETOPT_AUTOACK",
diff --git a/sys/net/gnrc/application_layer/tftp/gnrc_tftp.c b/sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
index 0c952e73feaf816cd143779c0d84fccae33955f9..acb1eba52fe4f0c521aff2513c87304423d21ca9 100644
--- a/sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
+++ b/sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
@@ -256,7 +256,7 @@ static uint16_t _tftp_get_maximum_block_size(void)
     uint16_t tmp;
     gnrc_netif_t *netif = gnrc_netif_iter(NULL);
 
-    if ((netif != NULL) && gnrc_netapi_get(netif->pid, NETOPT_MAX_PACKET_SIZE,
+    if ((netif != NULL) && gnrc_netapi_get(netif->pid, NETOPT_MAX_PDU_SIZE,
                                            0, &tmp, sizeof(uint16_t)) >= 0) {
         /* TODO calculate proper block size */
         return tmp - sizeof(udp_hdr_t) - sizeof(ipv6_hdr_t) - 10;
diff --git a/sys/net/gnrc/netif/gnrc_netif.c b/sys/net/gnrc/netif/gnrc_netif.c
index 09da4038cd243c9363624f7bee72d35d75dd67f0..f4f1b0f7cd3e84e5c91e349f7a6c1dc20a73768e 100644
--- a/sys/net/gnrc/netif/gnrc_netif.c
+++ b/sys/net/gnrc/netif/gnrc_netif.c
@@ -192,7 +192,7 @@ int gnrc_netif_get_from_netdev(gnrc_netif_t *netif, gnrc_netapi_opt_t *opt)
             assert(opt->data_len >= sizeof(eui64_t));
             res = gnrc_netif_ipv6_get_iid(netif, opt->data);
             break;
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             if (opt->context == GNRC_NETTYPE_IPV6) {
                 assert(opt->data_len == sizeof(uint16_t));
                 *((uint16_t *)opt->data) = netif->ipv6.mtu;
@@ -285,7 +285,7 @@ int gnrc_netif_set_from_netdev(gnrc_netif_t *netif,
             gnrc_netif_ipv6_group_leave_internal(netif, opt->data);
             res = sizeof(ipv6_addr_t);
             break;
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             if (opt->context == GNRC_NETTYPE_IPV6) {
                 assert(opt->data_len == sizeof(uint16_t));
                 netif->ipv6.mtu = *((uint16_t *)opt->data);
diff --git a/sys/net/gnrc/netif/gnrc_netif_device_type.c b/sys/net/gnrc/netif/gnrc_netif_device_type.c
index 1ad0176d8c69277c68d1ff161bd066aa53e8ecb8..d63bfe46781252fc4477388e1b194365f96633f2 100644
--- a/sys/net/gnrc/netif/gnrc_netif_device_type.c
+++ b/sys/net/gnrc/netif/gnrc_netif_device_type.c
@@ -149,7 +149,7 @@ void gnrc_netif_ipv6_init_mtu(gnrc_netif_t *netif)
 #endif
             /* intentionally falls through */
         case NETDEV_TYPE_ESP_NOW:
-            res = dev->driver->get(dev, NETOPT_MAX_PACKET_SIZE,
+            res = dev->driver->get(dev, NETOPT_MAX_PDU_SIZE,
                                    &tmp, sizeof(tmp));
             assert(res == sizeof(tmp));
 #ifdef MODULE_GNRC_SIXLOWPAN
@@ -184,7 +184,7 @@ void gnrc_netif_ipv6_init_mtu(gnrc_netif_t *netif)
             LOG_DEBUG("gnrc_netif: getting MTU from device for interface %i\n",
                       netif->pid);
 #endif
-            res = dev->driver->get(dev, NETOPT_MAX_PACKET_SIZE,
+            res = dev->driver->get(dev, NETOPT_MAX_PDU_SIZE,
                                    &tmp, sizeof(tmp));
             if (res < 0) {
                 /* assume maximum possible transition unit */
diff --git a/sys/shell/commands/sc_gnrc_netif.c b/sys/shell/commands/sc_gnrc_netif.c
index 948ded696cfbc7a78edfe825b375b65b66bf7ae7..d9777589f39efa337a7f17efb8285b8d832448ff 100644
--- a/sys/shell/commands/sc_gnrc_netif.c
+++ b/sys/shell/commands/sc_gnrc_netif.c
@@ -237,7 +237,7 @@ static void _print_netopt(netopt_t opt)
             printf("hop limit");
             break;
 
-        case NETOPT_MAX_PACKET_SIZE:
+        case NETOPT_MAX_PDU_SIZE:
             printf("MTU");
             break;
 
@@ -505,13 +505,13 @@ static void _netif_list(kernel_pid_t iface)
                                    line_thresh);
     line_thresh = _netif_list_flag(iface, NETOPT_CHANNEL_HOP, "CHAN_HOP",
                                    line_thresh);
-    res = gnrc_netapi_get(iface, NETOPT_MAX_PACKET_SIZE, 0, &u16, sizeof(u16));
+    res = gnrc_netapi_get(iface, NETOPT_MAX_PDU_SIZE, 0, &u16, sizeof(u16));
     if (res > 0) {
         printf("L2-PDU:%" PRIu16 " ", u16);
         line_thresh++;
     }
 #ifdef MODULE_GNRC_IPV6
-    res = gnrc_netapi_get(iface, NETOPT_MAX_PACKET_SIZE, GNRC_NETTYPE_IPV6, &u16, sizeof(u16));
+    res = gnrc_netapi_get(iface, NETOPT_MAX_PDU_SIZE, GNRC_NETTYPE_IPV6, &u16, sizeof(u16));
     if (res > 0) {
         printf("MTU:%" PRIu16 "  ", u16);
         line_thresh++;
@@ -1040,7 +1040,7 @@ static int _netif_set(char *cmd_name, kernel_pid_t iface, char *key, char *value
     }
 #ifdef MODULE_GNRC_IPV6
     else if (strcmp("mtu", key) == 0) {
-        return _netif_set_u16(iface, NETOPT_MAX_PACKET_SIZE, GNRC_NETTYPE_IPV6,
+        return _netif_set_u16(iface, NETOPT_MAX_PDU_SIZE, GNRC_NETTYPE_IPV6,
                               value);
     }
 #endif
diff --git a/tests/driver_at86rf2xx/cmd.c b/tests/driver_at86rf2xx/cmd.c
index d6730e7c725805f5e3459636fbdc4c3ebd00a5e5..99d5e5a5c12dc81ca92e4725f9001a3da06309b8 100644
--- a/tests/driver_at86rf2xx/cmd.c
+++ b/tests/driver_at86rf2xx/cmd.c
@@ -61,7 +61,7 @@ int ifconfig_list(int idx)
     }
     printf(", Source address length: %u", (unsigned)u16_val);
 
-    res = get((netdev_t *)dev, NETOPT_MAX_PACKET_SIZE, &u16_val,
+    res = get((netdev_t *)dev, NETOPT_MAX_PDU_SIZE, &u16_val,
               sizeof(u16_val));
     if (res < 0) {
         puts("(err)");
diff --git a/tests/gnrc_ipv6_nib/main.c b/tests/gnrc_ipv6_nib/main.c
index f430b3f2a4d978828dd7d9e745d340ef8e621479..3df1ea7a99f47d50fac6d1a51b1193f6c15c87ac 100644
--- a/tests/gnrc_ipv6_nib/main.c
+++ b/tests/gnrc_ipv6_nib/main.c
@@ -1366,7 +1366,7 @@ int _mock_netif_get(gnrc_netapi_opt_t *opt)
             return sizeof(_loc_l2);
         case NETOPT_IS_WIRED:
             return 1;
-        case NETOPT_MAX_PACKET_SIZE: {
+        case NETOPT_MAX_PDU_SIZE: {
                 uint16_t *val = opt->data;
                 if (opt->data_len != sizeof(uint16_t)) {
                     return -EOVERFLOW;
diff --git a/tests/gnrc_ipv6_nib/mockup_netif.c b/tests/gnrc_ipv6_nib/mockup_netif.c
index 0adf9096f20b5fa58d08b880b5bc45e0319ef797..97193d520e0301ceb2f09427bd4833f098027e88 100644
--- a/tests/gnrc_ipv6_nib/mockup_netif.c
+++ b/tests/gnrc_ipv6_nib/mockup_netif.c
@@ -74,7 +74,7 @@ void _tests_init(void)
     netdev_test_setup(&_mock_netdev, 0);
     netdev_test_set_get_cb(&_mock_netdev, NETOPT_DEVICE_TYPE,
                            _get_device_type);
-    netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PACKET_SIZE,
+    netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PDU_SIZE,
                            _get_max_packet_size);
     netdev_test_set_get_cb(&_mock_netdev, NETOPT_ADDRESS,
                            _get_address);
diff --git a/tests/gnrc_ipv6_nib_6ln/main.c b/tests/gnrc_ipv6_nib_6ln/main.c
index c74945ceb98163720a9832ec2ddec88c0101adb2..df2052ae31e855dcf2e9cf8f0f64f23aeda81bc8 100644
--- a/tests/gnrc_ipv6_nib_6ln/main.c
+++ b/tests/gnrc_ipv6_nib_6ln/main.c
@@ -1075,11 +1075,9 @@ static void test_handle_pkt__rtr_adv__success(uint8_t rtr_adv_flags,
             TEST_ASSERT((_PIO_PFX_LTIME / MS_PER_SEC) < prefix.pref_until);
         }
     }
-    if (!pio) {
-        if (!pio) {
-            TEST_ASSERT_EQUAL_INT(exp_addr_count,
-                                  _netif_addr_count(_mock_netif));
-        }
+    else {
+        TEST_ASSERT_EQUAL_INT(exp_addr_count,
+                              _netif_addr_count(_mock_netif));
         TEST_ASSERT_MESSAGE(!gnrc_ipv6_nib_pl_iter(0, &state, &prefix),
                             "There is an unexpected prefix list entry");
     }
@@ -1333,7 +1331,7 @@ int _mock_netif_get(gnrc_netapi_opt_t *opt)
             return sizeof(_loc_iid);
         case NETOPT_IS_WIRED:
             return 1;
-        case NETOPT_MAX_PACKET_SIZE: {
+        case NETOPT_MAX_PDU_SIZE: {
                 uint16_t *val = opt->data;
                 if (opt->data_len != sizeof(uint16_t)) {
                     return -EOVERFLOW;
diff --git a/tests/gnrc_ipv6_nib_6ln/mockup_netif.c b/tests/gnrc_ipv6_nib_6ln/mockup_netif.c
index f6ef1047f6cfab3d5195cfd37921da8aacc9e4c4..53996d932add432e1a44a28504170498436d7efe 100644
--- a/tests/gnrc_ipv6_nib_6ln/mockup_netif.c
+++ b/tests/gnrc_ipv6_nib_6ln/mockup_netif.c
@@ -83,7 +83,7 @@ void _tests_init(void)
     netdev_test_setup(&_mock_netdev, 0);
     netdev_test_set_get_cb(&_mock_netdev, NETOPT_DEVICE_TYPE,
                            _get_device_type);
-    netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PACKET_SIZE,
+    netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PDU_SIZE,
                            _get_max_packet_size);
     netdev_test_set_get_cb(&_mock_netdev, NETOPT_SRC_LEN,
                            _get_src_len);
diff --git a/tests/gnrc_ndp/main.c b/tests/gnrc_ndp/main.c
index 86452dcbff573eddf414fd49fe108e656df9a5df..224f5c8cdde7505dc43310a29a4f1bd77eb21c5b 100644
--- a/tests/gnrc_ndp/main.c
+++ b/tests/gnrc_ndp/main.c
@@ -973,7 +973,7 @@ static int _test_netif_get(gnrc_netif_t *netif, gnrc_netapi_opt_t *opt)
             return sizeof(uint64_t);
         case NETOPT_IS_WIRED:
             return 1;
-        case NETOPT_MAX_PACKET_SIZE: {
+        case NETOPT_MAX_PDU_SIZE: {
                 uint16_t *val = opt->data;
                 if (opt->data_len != sizeof(uint16_t)) {
                     return -EOVERFLOW;
diff --git a/tests/gnrc_netif/common.c b/tests/gnrc_netif/common.c
index 5a29d29391982954e473bda7669f0c1c5c2fb6b2..629dc58fdde08c227cea000c2e94f1ec39da692c 100644
--- a/tests/gnrc_netif/common.c
+++ b/tests/gnrc_netif/common.c
@@ -158,7 +158,7 @@ void _tests_init(void)
     netdev_test_set_isr_cb((netdev_test_t *)ethernet_dev, _netdev_isr);
     netdev_test_set_get_cb((netdev_test_t *)ethernet_dev, NETOPT_DEVICE_TYPE,
                            _get_netdev_device_type);
-    netdev_test_set_get_cb((netdev_test_t *)ethernet_dev, NETOPT_MAX_PACKET_SIZE,
+    netdev_test_set_get_cb((netdev_test_t *)ethernet_dev, NETOPT_MAX_PDU_SIZE,
                            _get_netdev_max_packet_size);
     netdev_test_setup((netdev_test_t *)ieee802154_dev, (void *)1);
     netdev_test_set_send_cb((netdev_test_t *)ieee802154_dev, _dump_send_packet);
@@ -167,13 +167,13 @@ void _tests_init(void)
     netdev_test_set_get_cb((netdev_test_t *)ieee802154_dev, NETOPT_DEVICE_TYPE,
                            _get_netdev_device_type);
     netdev_test_set_get_cb((netdev_test_t *)ieee802154_dev,
-                           NETOPT_MAX_PACKET_SIZE, _get_netdev_max_packet_size);
+                           NETOPT_MAX_PDU_SIZE, _get_netdev_max_packet_size);
     for (intptr_t i = SPECIAL_DEVS; i < GNRC_NETIF_NUMOF; i++) {
         devs[i - SPECIAL_DEVS] = (netdev_t *)&_devs[i];
         netdev_test_setup(&_devs[i], (void *)i);
         netdev_test_set_get_cb(&_devs[i], NETOPT_DEVICE_TYPE,
                                _get_netdev_device_type);
-        netdev_test_set_get_cb(&_devs[i], NETOPT_MAX_PACKET_SIZE,
+        netdev_test_set_get_cb(&_devs[i], NETOPT_MAX_PDU_SIZE,
                                _get_netdev_max_packet_size);
     }
     gnrc_netreg_entry_init_pid(&dumper_undef, GNRC_NETREG_DEMUX_CTX_ALL,
diff --git a/tests/gnrc_netif/main.c b/tests/gnrc_netif/main.c
index a6b64f99352b28881d10bcdc2b12b841292f0400..07ed7fc28d31f9c25f61108f986de49ff723249e 100644
--- a/tests/gnrc_netif/main.c
+++ b/tests/gnrc_netif/main.c
@@ -774,32 +774,32 @@ static void test_netapi_get__MAX_PACKET_SIZE(void)
     uint16_t value;
 
     TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(ethernet_netif->pid,
-                                                            NETOPT_MAX_PACKET_SIZE,
+                                                            NETOPT_MAX_PDU_SIZE,
                                                             GNRC_NETTYPE_IPV6,
                                                             &value, sizeof(value)));
     TEST_ASSERT_EQUAL_INT(ETHERNET_DATA_LEN, value);
     TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(ethernet_netif->pid,
-                                                            NETOPT_MAX_PACKET_SIZE,
+                                                            NETOPT_MAX_PDU_SIZE,
                                                             GNRC_NETTYPE_NETIF,
                                                             &value, sizeof(value)));
     TEST_ASSERT_EQUAL_INT(ETHERNET_DATA_LEN, value);
     TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(ieee802154_netif->pid,
-                                                            NETOPT_MAX_PACKET_SIZE,
+                                                            NETOPT_MAX_PDU_SIZE,
                                                             GNRC_NETTYPE_IPV6,
                                                             &value, sizeof(value)));
     TEST_ASSERT_EQUAL_INT(IPV6_MIN_MTU, value);
     TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(ieee802154_netif->pid,
-                                                            NETOPT_MAX_PACKET_SIZE,
+                                                            NETOPT_MAX_PDU_SIZE,
                                                             GNRC_NETTYPE_NETIF,
                                                             &value, sizeof(value)));
     TEST_ASSERT_EQUAL_INT(TEST_IEEE802154_MAX_FRAG_SIZE, value);
     TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(netifs[0]->pid,
-                                                            NETOPT_MAX_PACKET_SIZE,
+                                                            NETOPT_MAX_PDU_SIZE,
                                                             GNRC_NETTYPE_IPV6,
                                                             &value, sizeof(value)));
     TEST_ASSERT_EQUAL_INT(IPV6_MIN_MTU, value);
     TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(netifs[0]->pid,
-                                                            NETOPT_MAX_PACKET_SIZE,
+                                                            NETOPT_MAX_PDU_SIZE,
                                                             GNRC_NETTYPE_NETIF,
                                                             &value, sizeof(value)));
     TEST_ASSERT_EQUAL_INT(IPV6_MIN_MTU, value);
@@ -935,13 +935,13 @@ static void test_netapi_set__MAX_PACKET_SIZE(void)
 
     TEST_ASSERT_EQUAL_INT(sizeof(value),
                           gnrc_netapi_set(netifs[0]->pid,
-                                          NETOPT_MAX_PACKET_SIZE,
+                                          NETOPT_MAX_PDU_SIZE,
                                           GNRC_NETTYPE_IPV6,
                                           &value, sizeof(value)));
     TEST_ASSERT_EQUAL_INT(value, netifs[0]->ipv6.mtu);
     TEST_ASSERT_EQUAL_INT(-ENOTSUP,
                           gnrc_netapi_set(netifs[0]->pid,
-                                          NETOPT_MAX_PACKET_SIZE, 0,
+                                          NETOPT_MAX_PDU_SIZE, 0,
                                           &value, sizeof(value)));
 }
 
diff --git a/tests/gnrc_sixlowpan/main.c b/tests/gnrc_sixlowpan/main.c
index 74bcbbc4a7349d6d62b297f09544be4f4225ce8e..171d0dd624b7dbfcaa23ac108339e823e1680557 100644
--- a/tests/gnrc_sixlowpan/main.c
+++ b/tests/gnrc_sixlowpan/main.c
@@ -91,7 +91,7 @@ static void _init_interface(void)
     netdev_test_setup(&_ieee802154_dev, NULL);
     netdev_test_set_get_cb(&_ieee802154_dev, NETOPT_DEVICE_TYPE,
                            _get_netdev_device_type);
-    netdev_test_set_get_cb(&_ieee802154_dev, NETOPT_MAX_PACKET_SIZE,
+    netdev_test_set_get_cb(&_ieee802154_dev, NETOPT_MAX_PDU_SIZE,
                            _get_netdev_max_packet_size);
     netdev_test_set_get_cb(&_ieee802154_dev, NETOPT_SRC_LEN,
                            _get_netdev_src_len);
diff --git a/tests/lwip_sock_ip/stack.c b/tests/lwip_sock_ip/stack.c
index 431b033135848e9cc754f68df411676aa43910e8..29d81b744a5f2a7feed73d0fa63f0e9ea84951c6 100644
--- a/tests/lwip_sock_ip/stack.c
+++ b/tests/lwip_sock_ip/stack.c
@@ -60,7 +60,7 @@ static inline void _get_iid(uint8_t *iid)
 
 static int _get_max_pkt_size(netdev_t *dev, void *value, size_t max_len)
 {
-    return netdev_eth_get(dev, NETOPT_MAX_PACKET_SIZE, value, max_len);
+    return netdev_eth_get(dev, NETOPT_MAX_PDU_SIZE, value, max_len);
 }
 
 static int _get_src_len(netdev_t *dev, void *value, size_t max_len)
@@ -172,7 +172,7 @@ void _net_init(void)
 
     netdev_test_setup(&netdev, NULL);
     netdev_test_set_get_cb(&netdev, NETOPT_SRC_LEN, _get_src_len);
-    netdev_test_set_get_cb(&netdev, NETOPT_MAX_PACKET_SIZE,
+    netdev_test_set_get_cb(&netdev, NETOPT_MAX_PDU_SIZE,
                             _get_max_pkt_size);
     netdev_test_set_get_cb(&netdev, NETOPT_ADDRESS, _get_addr);
     netdev_test_set_get_cb(&netdev, NETOPT_ADDR_LEN,
diff --git a/tests/lwip_sock_udp/stack.c b/tests/lwip_sock_udp/stack.c
index 85271e1c58eef370897a77be2ea04906bfb0154a..9f46b32325cbd526976610121ecea1550f9f26d9 100644
--- a/tests/lwip_sock_udp/stack.c
+++ b/tests/lwip_sock_udp/stack.c
@@ -61,7 +61,7 @@ static inline void _get_iid(uint8_t *iid)
 
 static int _get_max_pkt_size(netdev_t *dev, void *value, size_t max_len)
 {
-    return netdev_eth_get(dev, NETOPT_MAX_PACKET_SIZE, value, max_len);
+    return netdev_eth_get(dev, NETOPT_MAX_PDU_SIZE, value, max_len);
 }
 
 static int _get_src_len(netdev_t *dev, void *value, size_t max_len)
@@ -174,7 +174,7 @@ void _net_init(void)
 
     netdev_test_setup(&netdev, NULL);
     netdev_test_set_get_cb(&netdev, NETOPT_SRC_LEN, _get_src_len);
-    netdev_test_set_get_cb(&netdev, NETOPT_MAX_PACKET_SIZE,
+    netdev_test_set_get_cb(&netdev, NETOPT_MAX_PDU_SIZE,
                             _get_max_pkt_size);
     netdev_test_set_get_cb(&netdev, NETOPT_ADDRESS, _get_addr);
     netdev_test_set_get_cb(&netdev, NETOPT_ADDR_LEN,