diff --git a/examples/jn516x/rime/project-conf.h b/examples/jn516x/rime/project-conf.h
index 84e1cae06..3a7b0c44c 100644
--- a/examples/jn516x/rime/project-conf.h
+++ b/examples/jn516x/rime/project-conf.h
@@ -53,14 +53,8 @@
 #undef   UIP_CONF_IPV6
 #define  UIP_CONF_IPV6                   0
 
-#undef   RF_CHANNEL
-#define  RF_CHANNEL             25
-
 #undef   MICROMAC_CONF_CHANNEL
-#define  MICROMAC_CONF_CHANNEL  RF_CHANNEL
-
-#undef   CC2420_CONF_CHANNEL
-#define  CC2420_CONF_CHANNEL    RF_CHANNEL
+#define  MICROMAC_CONF_CHANNEL  25
 
 #undef   MICROMAC_CONF_AUTOACK
 #define  MICROMAC_CONF_AUTOACK   1
diff --git a/examples/jn516x/rpl/border-router/Makefile b/examples/jn516x/rpl/border-router/Makefile
index 53598e492..de68ecde8 100644
--- a/examples/jn516x/rpl/border-router/Makefile
+++ b/examples/jn516x/rpl/border-router/Makefile
@@ -7,6 +7,7 @@ CONTIKI=../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
+MODULES += core/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
diff --git a/examples/jn516x/rpl/coap-dongle-node/Makefile b/examples/jn516x/rpl/coap-dongle-node/Makefile
index 1a4afa652..747331845 100644
--- a/examples/jn516x/rpl/coap-dongle-node/Makefile
+++ b/examples/jn516x/rpl/coap-dongle-node/Makefile
@@ -8,6 +8,7 @@ CONTIKI=../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
+MODULES += core/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
diff --git a/examples/jn516x/rpl/coap-dr1175-node/Makefile b/examples/jn516x/rpl/coap-dr1175-node/Makefile
index f7960dcd1..d00fc9b9c 100644
--- a/examples/jn516x/rpl/coap-dr1175-node/Makefile
+++ b/examples/jn516x/rpl/coap-dr1175-node/Makefile
@@ -8,6 +8,7 @@ CONTIKI=../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
+MODULES += core/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
diff --git a/examples/jn516x/rpl/coap-dr1199-node/Makefile b/examples/jn516x/rpl/coap-dr1199-node/Makefile
index 5a649e429..9dc391e52 100644
--- a/examples/jn516x/rpl/coap-dr1199-node/Makefile
+++ b/examples/jn516x/rpl/coap-dr1199-node/Makefile
@@ -8,6 +8,7 @@ CONTIKI=../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
+MODULES += core/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
diff --git a/examples/jn516x/rpl/common-conf.h b/examples/jn516x/rpl/common-conf.h
index 299fd0e79..bef5407d5 100644
--- a/examples/jn516x/rpl/common-conf.h
+++ b/examples/jn516x/rpl/common-conf.h
@@ -137,8 +137,8 @@
 #undef IEEE802154_CONF_PANID
 #define IEEE802154_CONF_PANID 0xabcd
 
-#undef RF_CHANNEL
-#define RF_CHANNEL 26
+#undef MICROMAC_CONF_CHANNEL
+#define MICROMAC_CONF_CHANNEL 26
 
 /* UART Configuration */
 
diff --git a/examples/jn516x/rpl/node/Makefile b/examples/jn516x/rpl/node/Makefile
index 8096152ee..44cd68d8d 100644
--- a/examples/jn516x/rpl/node/Makefile
+++ b/examples/jn516x/rpl/node/Makefile
@@ -7,6 +7,7 @@ CONTIKI=../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
+MODULES += core/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
diff --git a/examples/jn516x/tsch/common-conf.h b/examples/jn516x/tsch/common-conf.h
index 3fbd8ad4b..b42e6c810 100644
--- a/examples/jn516x/tsch/common-conf.h
+++ b/examples/jn516x/tsch/common-conf.h
@@ -176,8 +176,8 @@
 #undef NETSTACK_CONF_RDC
 #define NETSTACK_CONF_RDC     nullrdc_driver
 
-#undef RF_CHANNEL
-#define RF_CHANNEL 26
+#undef MICROMAC_CONF_CHANNEL
+#define MICROMAC_CONF_CHANNEL 26
 
 #undef MICROMAC_CONF_AUTOACK
 #define MICROMAC_CONF_AUTOACK 1
diff --git a/platform/jn516x/Makefile.jn516x b/platform/jn516x/Makefile.jn516x
index 412a1cbd4..27587ccaf 100644
--- a/platform/jn516x/Makefile.jn516x
+++ b/platform/jn516x/Makefile.jn516x
@@ -145,7 +145,7 @@ CLEAN += *.jn516x.bin
 
 MODULES += core/net \
            core/net/mac \
-           core/net/mac/contikimac core/net/mac/tsch \
+           core/net/mac/contikimac \
            core/net/llsec core/net/llsec/noncoresec 
 
 CONTIKI_TARGET_SOURCEFILES += $(ARCH)
diff --git a/platform/jn516x/contiki-conf.h b/platform/jn516x/contiki-conf.h
index a1e74b251..8b702a56e 100644
--- a/platform/jn516x/contiki-conf.h
+++ b/platform/jn516x/contiki-conf.h
@@ -44,11 +44,11 @@
 #endif /* CCM_STAR_CONF */
 
 #ifndef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC     tschmac_driver
+#define NETSTACK_CONF_MAC     csma_driver
 #endif /* NETSTACK_CONF_MAC */
 
 #ifndef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nordc_driver
+#define NETSTACK_CONF_RDC     nullrdc_driver
 #endif /* NETSTACK_CONF_RDC */
 
 #ifndef NETSTACK_CONF_RADIO
@@ -59,10 +59,6 @@
 #define NETSTACK_CONF_FRAMER  framer_802154
 #endif /* NETSTACK_CONF_FRAMER */
 
-/* IEEE802.15.4 frame version */
-#undef FRAME802154_CONF_VERSION
-#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012
-
 #define PACKETBUF_CONF_ATTRS_INLINE 1
 
 #ifndef IEEE802154_CONF_PANID
diff --git a/platform/jn516x/platform-conf.h b/platform/jn516x/platform-conf.h
index da85202d8..c1c372b64 100644
--- a/platform/jn516x/platform-conf.h
+++ b/platform/jn516x/platform-conf.h
@@ -57,10 +57,6 @@
 #define MICROMAC_CONF_CHANNEL 26
 #endif
 
-#ifdef RF_CHANNEL
-#define MICROMAC_CONF_CHANNEL RF_CHANNEL
-#endif
-
 /* 32kHz or 16MHz rtimers? */
 #ifdef RTIMER_CONF_USE_32KHZ
 #define RTIMER_USE_32KHZ  RTIMER_CONF_USE_32KHZ