diff --git a/boards/telosb/driver_cc2420.c b/boards/telosb/driver_cc2420.c
index 638c8f6c1..eb0f27555 100644
--- a/boards/telosb/driver_cc2420.c
+++ b/boards/telosb/driver_cc2420.c
@@ -14,7 +14,7 @@
 #include "cpu.h"
 #include "irq.h"
 #include "hwtimer.h"
-#include "crash.h"
+#include "panic.h"
 
 #include "cc2420.h"
 #include "cc2420_arch.h"
diff --git a/boards/wsn430-v1_4/driver_cc2420.c b/boards/wsn430-v1_4/driver_cc2420.c
index fbe0da06e..15407f5ef 100644
--- a/boards/wsn430-v1_4/driver_cc2420.c
+++ b/boards/wsn430-v1_4/driver_cc2420.c
@@ -14,7 +14,7 @@
 #include "cpu.h"
 #include "irq.h"
 #include "hwtimer.h"
-#include "crash.h"
+#include "panic.h"
 
 #include "cc2420.h"
 #include "cc2420_arch.h"
diff --git a/boards/z1/driver_cc2420.c b/boards/z1/driver_cc2420.c
index f8e0fe13b..d912da685 100644
--- a/boards/z1/driver_cc2420.c
+++ b/boards/z1/driver_cc2420.c
@@ -28,7 +28,7 @@
 #include "cpu.h"
 #include "irq.h"
 #include "hwtimer.h"
-#include "crash.h"
+#include "panic.h"
 
 #include "cc2420.h"
 #include "cc2420_arch.h"
diff --git a/core/include/crash.h b/core/include/panic.h
similarity index 88%
rename from core/include/crash.h
rename to core/include/panic.h
index bbb422109..60c8e0199 100644
--- a/core/include/crash.h
+++ b/core/include/panic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 INRIA
+ * Copyright (C) 2014, 2015 INRIA
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -10,17 +10,17 @@
  * @addtogroup  core_util
  * @{
  *
- * @file        crash.h
+ * @file
  * @brief       Crash handling header
  *
- * Define a core_panic() function that allows to stop/reboot the system
+ * Define a ::core_panic function that allows to stop/reboot the system
  * when an unrecoverable problem has occurred.
  *
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
  */
 
-#ifndef CRASH_H
-#define CRASH_H
+#ifndef PANIC_H
+#define PANIC_H
 
 #include "kernel.h"
 
@@ -54,5 +54,5 @@ NORETURN void core_panic(int crash_code, const char *message);
 }
 #endif
 
-#endif /* CRASH_H */
+#endif /* PANIC_H */
 /** @} */
diff --git a/cpu/arm7_common/crash.c b/cpu/arm7_common/panic.c
similarity index 97%
rename from cpu/arm7_common/crash.c
rename to cpu/arm7_common/panic.c
index 1899c6310..e93ff05d7 100644
--- a/cpu/arm7_common/crash.c
+++ b/cpu/arm7_common/panic.c
@@ -10,7 +10,7 @@
  * @ingroup  core_util
  * @{
  *
- * @file        crash.c
+ * @file        panic.c
  * @brief       Crash handling functions implementation for ARM-based MCUs
  *
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
@@ -18,7 +18,7 @@
 
 #include "cpu.h"
 #include "lpm.h"
-#include "crash.h"
+#include "panic.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/cpu/cortex-m0_common/crash.c b/cpu/cortex-m0_common/panic.c
similarity index 99%
rename from cpu/cortex-m0_common/crash.c
rename to cpu/cortex-m0_common/panic.c
index 03d71cba8..e660de4e4 100644
--- a/cpu/cortex-m0_common/crash.c
+++ b/cpu/cortex-m0_common/panic.c
@@ -24,7 +24,7 @@
 #include "cpu.h"
 #include "irq.h"
 #include "lpm.h"
-#include "crash.h"
+#include "panic.h"
 
 #define PANIC_STR_SIZE 80
 
diff --git a/cpu/cortex-m3_common/crash.c b/cpu/cortex-m3_common/panic.c
similarity index 99%
rename from cpu/cortex-m3_common/crash.c
rename to cpu/cortex-m3_common/panic.c
index 93e7ce471..76db9bdea 100644
--- a/cpu/cortex-m3_common/crash.c
+++ b/cpu/cortex-m3_common/panic.c
@@ -24,7 +24,7 @@
 #include "cpu.h"
 #include "irq.h"
 #include "lpm.h"
-#include "crash.h"
+#include "panic.h"
 
 #define PANIC_STR_SIZE 80
 
diff --git a/cpu/cortex-m4_common/crash.c b/cpu/cortex-m4_common/panic.c
similarity index 99%
rename from cpu/cortex-m4_common/crash.c
rename to cpu/cortex-m4_common/panic.c
index f10541300..ec5dbe902 100644
--- a/cpu/cortex-m4_common/crash.c
+++ b/cpu/cortex-m4_common/panic.c
@@ -24,7 +24,7 @@
 #include "cpu.h"
 #include "irq.h"
 #include "lpm.h"
-#include "crash.h"
+#include "panic.h"
 
 #define PANIC_STR_SIZE 80
 
diff --git a/cpu/kinetis_common/fault_handlers.c b/cpu/kinetis_common/fault_handlers.c
index 9b98d54d9..10126c261 100644
--- a/cpu/kinetis_common/fault_handlers.c
+++ b/cpu/kinetis_common/fault_handlers.c
@@ -21,7 +21,7 @@
  */
 
 #include <stdint.h>
-#include "crash.h"
+#include "panic.h"
 #include "fault_handlers.h"
 
 void isr_nmi(void)
diff --git a/cpu/msp430-common/hwtimer_cpu.c b/cpu/msp430-common/hwtimer_cpu.c
index 511d34181..f9875d940 100644
--- a/cpu/msp430-common/hwtimer_cpu.c
+++ b/cpu/msp430-common/hwtimer_cpu.c
@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 #include "cpu.h"
-#include "crash.h"
+#include "panic.h"
 #include "hwtimer.h"
 #include "arch/hwtimer_arch.h"
 
diff --git a/cpu/msp430-common/crash.c b/cpu/msp430-common/panic.c
similarity index 97%
rename from cpu/msp430-common/crash.c
rename to cpu/msp430-common/panic.c
index 4784f910b..5e3b71b4a 100644
--- a/cpu/msp430-common/crash.c
+++ b/cpu/msp430-common/panic.c
@@ -10,7 +10,7 @@
  * @ingroup  core_util
  * @{
  *
- * @file        crash.c
+ * @file        panic.c
  * @brief       Crash handling functions implementation for MSP430 MCUs
  *
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
@@ -18,7 +18,7 @@
 
 #include "cpu.h"
 #include "lpm.h"
-#include "crash.h"
+#include "panic.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/cpu/native/crash.c b/cpu/native/panic.c
similarity index 97%
rename from cpu/native/crash.c
rename to cpu/native/panic.c
index 40b9c6d1b..55fc2d918 100644
--- a/cpu/native/crash.c
+++ b/cpu/native/panic.c
@@ -10,7 +10,7 @@
  * @ingroup  core_util
  * @{
  *
- * @file        crash.c
+ * @file        panic.c
  * @brief       Crash handling functions implementation for 'native' port
  *
  * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "crash.h"
+#include "panic.h"
 #include "native_internal.h"
 
 /* "public" variables holding the crash data (look for them in your debugger) */
diff --git a/cpu/nrf51822/startup.c b/cpu/nrf51822/startup.c
index 4c58873c2..87676eb4a 100644
--- a/cpu/nrf51822/startup.c
+++ b/cpu/nrf51822/startup.c
@@ -22,7 +22,7 @@
 
 #include "board.h"
 #include "cpu.h"
-#include "crash.h"
+#include "panic.h"
 
 /**
  * memory markers as defined in the linker script
diff --git a/cpu/sam3x8e/startup.c b/cpu/sam3x8e/startup.c
index 0df580f59..52278ccde 100644
--- a/cpu/sam3x8e/startup.c
+++ b/cpu/sam3x8e/startup.c
@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 
-#include "crash.h"
+#include "panic.h"
 
 /**
  * memory markers as defined in the linker script
diff --git a/cpu/stm32f0/startup.c b/cpu/stm32f0/startup.c
index f4b4004c2..9dbe6497c 100644
--- a/cpu/stm32f0/startup.c
+++ b/cpu/stm32f0/startup.c
@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 
-#include "crash.h"
+#include "panic.h"
 
 /**
  * memory markers as defined in the linker script
diff --git a/cpu/stm32f1/startup.c b/cpu/stm32f1/startup.c
index 0e1358359..612ade611 100644
--- a/cpu/stm32f1/startup.c
+++ b/cpu/stm32f1/startup.c
@@ -20,7 +20,7 @@
  */
 
 #include <stdint.h>
-#include "crash.h"
+#include "panic.h"
 
 
 /**
diff --git a/cpu/stm32l1/startup.c b/cpu/stm32l1/startup.c
index 83f453bad..9802555c6 100644
--- a/cpu/stm32l1/startup.c
+++ b/cpu/stm32l1/startup.c
@@ -20,7 +20,7 @@
  */
 
 #include <stdint.h>
-#include "crash.h"
+#include "panic.h"
 
 
 /**
diff --git a/drivers/cc2420/cc2420.c b/drivers/cc2420/cc2420.c
index 9adf0b18a..3190f051e 100644
--- a/drivers/cc2420/cc2420.c
+++ b/drivers/cc2420/cc2420.c
@@ -8,7 +8,7 @@
  * directory for more details.
   */
 
-#include "crash.h"
+#include "panic.h"
 #include "cc2420.h"
 #include "cc2420_spi.h"
 #include "cc2420_settings.h"