diff --git a/platform/esb/contiki-esb-default-init-net.c b/platform/esb/contiki-esb-default-init-net.c
index cb12fb791..ed99266e8 100644
--- a/platform/esb/contiki-esb-default-init-net.c
+++ b/platform/esb/contiki-esb-default-init-net.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-esb-default-init-net.c,v 1.13 2009/07/07 13:06:56 nifi Exp $
+ * @(#)$Id: contiki-esb-default-init-net.c,v 1.14 2010/02/18 23:19:03 adamdunkels Exp $
  */
 
 #include "contiki-conf.h"
@@ -55,8 +55,8 @@ init_net(void)
   rimeaddr_t rimeaddr;
   int i;
 
-  tr1001_init();
-  rime_init(MAC_DRIVER.init(&tr1001_driver));
+  netstack_init();
+
   rimeaddr.u8[0] = node_id & 0xff;
   rimeaddr.u8[1] = node_id >> 8;
   rimeaddr_set_node_addr(&rimeaddr);
diff --git a/platform/micaz/init-net-rime.c b/platform/micaz/init-net-rime.c
index be97aebf5..567cb8d41 100644
--- a/platform/micaz/init-net-rime.c
+++ b/platform/micaz/init-net-rime.c
@@ -56,13 +56,10 @@ void
 init_net(void)
 {
   rimeaddr_t rimeaddr;
-  cc2420_init();
+
+  netstack_init();
   cc2420_set_channel(RF_CHANNEL);
 
-  NETSTACK_RDC.init();
-  NETSTACK_MAC.init();
-  NETSTACK_NETWORK.init();
-  
   rimeaddr.u8[0] = node_id & 0xff;
   rimeaddr.u8[1] = node_id >> 8;
   rimeaddr_set_node_addr(&rimeaddr);
diff --git a/platform/netsim/contiki-main.c b/platform/netsim/contiki-main.c
index 9e5433504..9bb25b853 100644
--- a/platform/netsim/contiki-main.c
+++ b/platform/netsim/contiki-main.c
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-main.c,v 1.34 2010/02/18 23:10:06 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.35 2010/02/18 23:19:03 adamdunkels Exp $
  */
 
 #include "contiki.h"
@@ -127,11 +127,9 @@ contiki_main(int flag)
  
   ctimer_init();
 
-  NETSTACK_RDC.init();
-  NETSTACK_MAC.init();
-  NETSTACK_NETWORK.init();
+  netstack_init();
 
-    uip_over_mesh_init(2);
+  uip_over_mesh_init(2);
   uip_over_mesh_set_net(&meshif.ipaddr, &meshif.netmask);
       
   if(flag == 1) {