diff --git a/core/net/netstack.h b/core/net/netstack.h
index 775e237f7..96f56a2b2 100644
--- a/core/net/netstack.h
+++ b/core/net/netstack.h
@@ -71,7 +71,7 @@
 #ifdef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
 #define NETSTACK_RDC_CHANNEL_CHECK_RATE NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
 #else /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */
-#define NETSTACK_RDC_CHANNEL_CHECK_RATE 4
+#define NETSTACK_RDC_CHANNEL_CHECK_RATE 8
 #endif /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */
 #endif /* NETSTACK_RDC_CHANNEL_CHECK_RATE */
 
diff --git a/cpu/6502/6502def.h b/cpu/6502/6502def.h
index 6b87dd86e..ea9d272d5 100644
--- a/cpu/6502/6502def.h
+++ b/cpu/6502/6502def.h
@@ -68,7 +68,6 @@ typedef unsigned short uip_stats_t;
 #define UIP_ARCH_ADD32  1
 #define UIP_ARCH_CHKSUM 1
 
-#define MAC_CONF_CHANNEL_CHECK_RATE          1
 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 1
 
 #define LOADER_CONF_ARCH "lib/unload.h"
diff --git a/platform/iris/contiki-conf.h b/platform/iris/contiki-conf.h
index 51fadd71c..00a1401c3 100644
--- a/platform/iris/contiki-conf.h
+++ b/platform/iris/contiki-conf.h
@@ -56,7 +56,7 @@
 #define NETSTACK_CONF_FRAMER  framer_802154
 
 #define RF230_CONF_AUTOACK              1
-#define MAC_CONF_CHANNEL_CHECK_RATE      8
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE   8
 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
 #define CXMAC_CONF_ANNOUNCEMENTS         0
 
@@ -70,7 +70,7 @@
 #define NETSTACK_CONF_FRAMER  framer_802154
 
 #define RF230_CONF_AUTOACK              1
-#define MAC_CONF_CHANNEL_CHECK_RATE      8
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE   8
 
 #define COLLECT_CONF_ANNOUNCEMENTS       1
 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1
diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h
index 75160fa9e..20ee75a18 100644
--- a/platform/micaz/contiki-conf.h
+++ b/platform/micaz/contiki-conf.h
@@ -56,7 +56,7 @@
 #define NETSTACK_CONF_FRAMER  framer_802154
 
 #define CC2420_CONF_AUTOACK              1
-#define MAC_CONF_CHANNEL_CHECK_RATE      8
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE     8
 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
 #define CXMAC_CONF_ANNOUNCEMENTS         0
 
@@ -70,7 +70,7 @@
 #define NETSTACK_CONF_FRAMER  framer_802154
 
 #define CC2420_CONF_AUTOACK              1
-#define MAC_CONF_CHANNEL_CHECK_RATE      8
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE     8
 
 #define COLLECT_CONF_ANNOUNCEMENTS       1
 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1
diff --git a/platform/msb430/contiki-conf.h b/platform/msb430/contiki-conf.h
index d75ded1fe..e6b525d40 100644
--- a/platform/msb430/contiki-conf.h
+++ b/platform/msb430/contiki-conf.h
@@ -12,7 +12,7 @@
 #define NETSTACK_CONF_NETWORK		rime_driver
 #define NETSTACK_CONF_FRAMER		framer_nullmac
 
-#define MAC_CONF_CHANNEL_CHECK_RATE	8
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE	8
 
 #define ENERGEST_CONF_ON		1
 
diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h
index a0fd94e8b..5258090ad 100644
--- a/platform/z1/contiki-conf.h
+++ b/platform/z1/contiki-conf.h
@@ -73,7 +73,6 @@
 #define NETSTACK_CONF_FRAMER  framer_802154
 
 #define CC2420_CONF_AUTOACK              1
-#define MAC_CONF_CHANNEL_CHECK_RATE      8
 
 #define COLLECT_CONF_ANNOUNCEMENTS       1
 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
diff --git a/platform/z1sp/contiki-conf.h b/platform/z1sp/contiki-conf.h
index c09b44635..20e8db9f1 100644
--- a/platform/z1sp/contiki-conf.h
+++ b/platform/z1sp/contiki-conf.h
@@ -67,7 +67,6 @@
 #define NETSTACK_CONF_FRAMER  framer_802154
 
 #define CC2420_CONF_AUTOACK              0
-#define MAC_CONF_CHANNEL_CHECK_RATE      8
 
 #define COLLECT_CONF_ANNOUNCEMENTS       1
 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0