diff --git a/core/sched.c b/core/sched.c
index 1cb4bc469..9dd0a238d 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -14,6 +14,7 @@
  * @brief       Scheduler implementation
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
+ * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  *
  * @}
  */
@@ -126,14 +127,16 @@ void sched_set_status(tcb_t *process, unsigned int status)
 {
     if (status >= STATUS_ON_RUNQUEUE) {
         if (!(process->status >= STATUS_ON_RUNQUEUE)) {
-            DEBUG("adding process %s to runqueue %u.\n", process->name, process->priority);
+            DEBUG("sched_set_status: adding process %" PRIkernel_pid " to runqueue %" PRIu16 ".\n",
+                  process->pid, process->priority);
             clist_add(&sched_runqueues[process->priority], &(process->rq_entry));
             runqueue_bitcache |= 1 << process->priority;
         }
     }
     else {
         if (process->status >= STATUS_ON_RUNQUEUE) {
-            DEBUG("removing process %s from runqueue %u.\n", process->name, process->priority);
+            DEBUG("sched_set_status: removing process %" PRIkernel_pid " to runqueue %" PRIu16 ".\n",
+                  process->pid, process->priority);
             clist_remove(&sched_runqueues[process->priority], &(process->rq_entry));
 
             if (!sched_runqueues[process->priority]) {
@@ -148,9 +151,12 @@ void sched_set_status(tcb_t *process, unsigned int status)
 void sched_switch(uint16_t other_prio)
 {
     int in_isr = inISR();
-    uint16_t current_prio = sched_active_thread->priority;
+    tcb_t *active_thread = (tcb_t *) sched_active_thread;
+    uint16_t current_prio = active_thread->priority;
 
-    DEBUG("%s: %" PRIu16 " %" PRIu16 " %i\n", sched_active_thread->name, current_prio, other_prio, in_isr);
+    DEBUG("sched_switch: active pid=%" PRIkernel_pid" prio=%" PRIu16
+          ", other_prio=%" PRIu16 " in_isr=%i\n",
+          active_thread->pid, current_prio, other_prio, in_isr);
 
     if (current_prio > other_prio) {
         if (in_isr) {
@@ -164,7 +170,7 @@ void sched_switch(uint16_t other_prio)
 
 NORETURN void sched_task_exit(void)
 {
-    DEBUG("sched_task_exit(): ending task %s...\n", sched_active_thread->name);
+    DEBUG("sched_task_exit(): ending task %" PRIkernel_pid "...\n", sched_active_thread->pid);
 
     dINT();
     sched_threads[sched_active_pid] = NULL;