diff --git a/core/net/rpl/rpl-dag-root.c b/core/net/rpl/rpl-dag-root.c
index 57a10ef80..af87f6b9a 100644
--- a/core/net/rpl/rpl-dag-root.c
+++ b/core/net/rpl/rpl-dag-root.c
@@ -99,13 +99,12 @@ create_dag_callback(void *ptr)
     rpl_dag_t *dag;
 
     dag = rpl_get_any_dag();
-#if DEBUG
-    printf("Found a network we did not create\n");
-    printf("version %d grounded %d preference %d used %d joined %d rank %d\n",
+
+    PRINTF("RPL: Found a network we did not create\n");
+    PRINTF("RPL: version %d grounded %d preference %d used %d joined %d rank %d\n",
            dag->version, dag->grounded,
            dag->preference, dag->used,
            dag->joined, dag->rank);
-#endif /* DEBUG */
 
     /* We found a RPL network that we did not create so we just join
        it without becoming root. But if the network has an infinite
@@ -223,14 +222,14 @@ rpl_dag_root_init_dag_immediately(void)
 
       uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
       rpl_set_prefix(dag, &prefix, 64);
-      PRINTF("rpl_dag_root_init_dag: created a new RPL dag\n");
+      PRINTF("RPL: rpl_dag_root_init_dag: created a new RPL dag\n");
       return 0;
     } else {
-      PRINTF("rpl_dag_root_init_dag: failed to create a new RPL DAG\n");
+      PRINTF("RPL: rpl_dag_root_init_dag: failed to create a new RPL DAG\n");
       return -1;
     }
   } else {
-    PRINTF("rpl_dag_root_init_dag: failed to create a new RPL DAG, no preferred IP address found\n");
+    PRINTF("RPL: rpl_dag_root_init_dag: failed to create a new RPL DAG, no preferred IP address found\n");
     return -2;
   }
 }
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index b1694239c..329943950 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -525,10 +525,10 @@ rpl_set_prefix(rpl_dag_t *dag, uip_ipaddr_t *prefix, unsigned len)
   /* Autoconfigure an address if this node does not already have an address
      with this prefix. Otherwise, update the prefix */
   if(last_len == 0) {
-    PRINTF("rpl_set_prefix - prefix NULL\n");
+    PRINTF("RPL: rpl_set_prefix - prefix NULL\n");
     check_prefix(NULL, &dag->prefix_info);
   } else {
-    PRINTF("rpl_set_prefix - prefix NON-NULL\n");
+    PRINTF("RPL: rpl_set_prefix - prefix NON-NULL\n");
     check_prefix(&last_prefix, &dag->prefix_info);
   }
   return 1;
@@ -983,7 +983,7 @@ rpl_move_parent(rpl_dag_t *dag_src, rpl_dag_t *dag_dst, rpl_parent_t *parent)
       PRINTF("RPL: Removing default route ");
       PRINT6ADDR(rpl_get_parent_ipaddr(parent));
       PRINTF("\n");
-      PRINTF("rpl_move_parent\n");
+      PRINTF("RPL: rpl_move_parent\n");
       uip_ds6_defrt_rm(dag_src->instance->def_route);
       dag_src->instance->def_route = NULL;
     }
@@ -1546,7 +1546,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 
   /* The DIO comes from a valid DAG, we can refresh its lifetime */
   dag->lifetime = (1UL << (instance->dio_intmin + instance->dio_intdoubl)) * RPL_DAG_LIFETIME / 1000;
-  PRINTF("Set dag ");
+  PRINTF("RPL: Set dag ");
   PRINT6ADDR(&dag->dag_id);
   PRINTF(" lifetime to %ld\n", dag->lifetime);
 
diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index 1dd0850a2..83c13ea46 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -507,10 +507,10 @@ update_hbh_header(void)
       if((UIP_EXT_HDR_OPT_RPL_BUF->flags & RPL_HDR_OPT_DOWN)) {
         if(uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr) == NULL) {
           UIP_EXT_HDR_OPT_RPL_BUF->flags |= RPL_HDR_OPT_FWD_ERR;
-          PRINTF("RPL forwarding error\n");
+          PRINTF("RPL: RPL forwarding error\n");
           /* We should send back the packet to the originating parent,
                 but it is not feasible yet, so we send a No-Path DAO instead */
-          PRINTF("RPL generate No-Path DAO\n");
+          PRINTF("RPL: RPL generate No-Path DAO\n");
           parent = rpl_get_parent((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
           if(parent != NULL) {
             dao_output_target(parent, &UIP_IP_BUF->destipaddr, RPL_ZERO_LIFETIME);
@@ -526,11 +526,11 @@ update_hbh_header(void)
           /* No route was found, so this packet will go towards the RPL
                 root. If so, we should not set the down flag. */
           UIP_EXT_HDR_OPT_RPL_BUF->flags &= ~RPL_HDR_OPT_DOWN;
-          PRINTF("RPL option going up\n");
+          PRINTF("RPL: RPL option going up\n");
         } else {
           /* A DAO route was found so we set the down flag. */
           UIP_EXT_HDR_OPT_RPL_BUF->flags |= RPL_HDR_OPT_DOWN;
-          PRINTF("RPL option going down\n");
+          PRINTF("RPL: RPL option going down\n");
         }
       }
     }
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 6aff7249c..b812ba4d8 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1151,30 +1151,30 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
   }
 
   if(parent == NULL) {
-    PRINTF("RPL dao_output_target error parent NULL\n");
+    PRINTF("RPL: dao_output_target error parent NULL\n");
     return;
   }
 
   parent_ipaddr = rpl_get_parent_ipaddr(parent);
   if(parent_ipaddr == NULL) {
-    PRINTF("RPL dao_output_target error parent IP address NULL\n");
+    PRINTF("RPL: dao_output_target error parent IP address NULL\n");
     return;
   }
 
   dag = parent->dag;
   if(dag == NULL) {
-    PRINTF("RPL dao_output_target error dag NULL\n");
+    PRINTF("RPL: dao_output_target error dag NULL\n");
     return;
   }
 
   instance = dag->instance;
 
   if(instance == NULL) {
-    PRINTF("RPL dao_output_target error instance NULL\n");
+    PRINTF("RPL: dao_output_target error instance NULL\n");
     return;
   }
   if(prefix == NULL) {
-    PRINTF("RPL dao_output_target error prefix NULL\n");
+    PRINTF("RPL: dao_output_target error prefix NULL\n");
     return;
   }
 #ifdef RPL_DEBUG_DAO_OUTPUT
diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
index d10de973e..4f506f8bc 100644
--- a/core/net/rpl/rpl-nbr-policy.c
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -177,7 +177,7 @@ find_removable_dis(uip_ipaddr_t *from)
   if(num_free > 0) {
     /* there are free entries (e.g. unsused by RPL and ND6) but since it is
        used by other modules we can not pick these entries for removal. */
-    PRINTF("Num-free > 0 = %d - Other for RPL/ND6 unused NBR entry exists .",
+    PRINTF("NBR-POLICY: Num-free > 0 = %d - Other for RPL/ND6 unused NBR entry exists .",
            num_free);
   }
   if(num_children < MAX_CHILDREN) {
@@ -195,20 +195,20 @@ find_removable_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 
   instance = rpl_get_instance(dio->instance_id);
   if(instance == NULL || instance->current_dag == NULL) {
-    PRINTF("Did not find instance id: %d\n", dio->instance_id);
+    PRINTF("NBR-POLICY: Did not find instance id: %d\n", dio->instance_id);
     return NULL;
   }
 
   /* Add the new neighbor only if it is better than the worst parent. */
   if(dio->rank + instance->min_hoprankinc < worst_rank - instance->min_hoprankinc / 2) {
     /* Found *great* neighbor - add! */
-    PRINTF("Found better neighbor %d < %d - add to cache...\n",
+    PRINTF("NBR-POLICY: Found better neighbor %d < %d - add to cache...\n",
            dio->rank, worst_rank);
 
     return worst_rank_nbr;
   }
 
-  PRINTF("Found worse neighbor with new %d and old %d - NOT add to cache.\n",
+  PRINTF("NBR-POLICY: Found worse neighbor with new %d and old %d - NOT add to cache.\n",
          dio->rank, worst_rank);
   return NULL;
 }
@@ -229,7 +229,7 @@ find_removable_dao(uip_ipaddr_t *from, rpl_instance_t *instance)
   /* Check if this DAO sender is not yet neighbor and there is already too
      many children. */
   if(num_children >= max) {
-    PRINTF("Can not add another child - already at max.\n");
+    PRINTF("NBR-POLICY: Can not add another child - already at max.\n");
     return NULL;
   }
   /* remove the worst ranked nbr */
diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index 15dcb6e5a..b7553d251 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -91,13 +91,13 @@ rpl_set_mode(enum rpl_mode m)
 
     PRINTF("RPL: switching to feather mode\n");
     if(default_instance != NULL) {
-      PRINTF("rpl_set_mode: RPL sending DAO with zero lifetime\n");
+      PRINTF("RPL: rpl_set_mode: RPL sending DAO with zero lifetime\n");
       if(default_instance->current_dag != NULL) {
         dao_output(default_instance->current_dag->preferred_parent, RPL_ZERO_LIFETIME);
       }
       rpl_cancel_dao(default_instance);
     } else {
-      PRINTF("rpl_set_mode: no default instance\n");
+      PRINTF("RPL: rpl_set_mode: no default instance\n");
     }
 
     mode = m;
@@ -143,7 +143,7 @@ rpl_purge_routes(void)
       uip_ipaddr_copy(&prefix, &r->ipaddr);
       uip_ds6_route_rm(r);
       r = uip_ds6_route_head();
-      PRINTF("No more routes to ");
+      PRINTF("RPL: No more routes to ");
       PRINT6ADDR(&prefix);
       dag = default_instance->current_dag;
       /* Propagate this information with a No-Path DAO to preferred parent if we are not a RPL Root */
@@ -313,7 +313,7 @@ rpl_purge_dags(void)
         if(instance->dag_table[i].used) {
           if(instance->dag_table[i].lifetime == 0) {
             if(!instance->dag_table[i].joined) {
-              PRINTF("Removing dag ");
+              PRINTF("RPL: Removing dag ");
               PRINT6ADDR(&instance->dag_table[i].dag_id);
               PRINTF("\n");
               rpl_free_dag(&instance->dag_table[i]);
@@ -331,7 +331,7 @@ void
 rpl_init(void)
 {
   uip_ipaddr_t rplmaddr;
-  PRINTF("RPL started\n");
+  PRINTF("RPL: RPL started\n");
   default_instance = NULL;
 
   rpl_dag_init();