diff --git a/cpu/native/include/nativenet.h b/cpu/native/include/nativenet.h
index e4d462c7879ad..05931b5232970 100644
--- a/cpu/native/include/nativenet.h
+++ b/cpu/native/include/nativenet.h
@@ -42,7 +42,7 @@
 
 #ifndef NATIVE_MAX_DATA_LENGTH
 #include "tap.h"
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
 #define NATIVE_MAX_DATA_LENGTH (127)
 #else
 #define NATIVE_MAX_DATA_LENGTH (TAP_MAX_DATA)
diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index 47c35990be6cd..a867b54b35632 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -55,7 +55,7 @@
 #include "rtc.h"
 #endif
 
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
 #include "sixlowpan_legacy.h"
 #endif
 
@@ -241,7 +241,7 @@ void auto_init(void)
     DEBUG("Auto init net_if module.\n");
     auto_init_net_if();
 #endif
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
     DEBUG("Auto init 6LoWPAN module.\n");
     sixlowpan_legacy_lowpan_init();
 #endif
diff --git a/sys/net/network_layer/sixlowpan_legacy/ip.c b/sys/net/network_layer/sixlowpan_legacy/ip.c
index e81662b4fbf16..d7d27ef2fd45e 100644
--- a/sys/net/network_layer/sixlowpan_legacy/ip.c
+++ b/sys/net/network_layer/sixlowpan_legacy/ip.c
@@ -625,7 +625,7 @@ ipv6_addr_t *ipv6_addr_set_by_eui64(ipv6_addr_t *out, int if_id,
 
     if (net_if_get_eui64((net_if_eui64_t *) &out->uint8[8], if_id,
                          force_generation)) {
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
 
         if (!sixlowpan_legacy_lowpan_eui64_to_short_addr((net_if_eui64_t *)&out->uint8[8])) {
             out->uint8[8] ^= 0x02;
diff --git a/sys/shell/commands/sc_net_if.c b/sys/shell/commands/sc_net_if.c
index 16ea626e94875..a3a283f31ffd6 100644
--- a/sys/shell/commands/sc_net_if.c
+++ b/sys/shell/commands/sc_net_if.c
@@ -29,7 +29,7 @@
 #include "net_if.h"
 #include "transceiver.h"
 
-#ifndef MODULE_SIXLOWPAN
+#ifndef MODULE_SIXLOWPAN_LEGACY
 #define ADDR_REGISTERED_MAX (6)
 #define ADDRS_LEN_MAX       (16)
 
@@ -339,7 +339,7 @@ void _net_if_ifconfig_add_ipv6(int if_id, int argc, char **argv)
         type = NULL;
     }
 
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
     ipv6_addr_t ipv6_addr;
     void *addr_data = &ipv6_addr;
 #else
@@ -355,7 +355,7 @@ void _net_if_ifconfig_add_ipv6(int if_id, int argc, char **argv)
         return;
     }
 
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
 
     if (addr.addr_protocol & NET_IF_L3P_IPV6_PREFIX) {
         if (ndp_add_prefix_info(if_id, &ipv6_addr, addr.addr_len,
@@ -457,7 +457,7 @@ void _net_if_ifconfig_create(char *transceivers_str)
 
 static inline int _is_multicast(uint8_t *addr)
 {
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
     return ipv6_addr_is_multicast((ipv6_addr_t *) addr);
 #else
     return *addr == 0xff;
@@ -466,7 +466,7 @@ static inline int _is_multicast(uint8_t *addr)
 
 static inline int _is_link_local(uint8_t *addr)
 {
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
     return ipv6_addr_is_link_local((ipv6_addr_t *) addr);
 #else
     return (addr[0] == 0xfe && addr[1] == 0x80) ||
@@ -627,7 +627,7 @@ void _net_if_ifconfig_list(int if_id)
             puts("\n");
         }
 
-#ifdef MODULE_SIXLOWPAN
+#ifdef MODULE_SIXLOWPAN_LEGACY
         if (addr_ptr->addr_protocol & NET_IF_L3P_IPV6) {
             char addr_str[IPV6_MAX_ADDR_STR_LEN];
             printf("            inet6 addr: ");