diff --git a/cpu/cc2538/include/cc2538-gpio.h b/cpu/cc2538/include/cc2538_gpio.h
similarity index 100%
rename from cpu/cc2538/include/cc2538-gpio.h
rename to cpu/cc2538/include/cc2538_gpio.h
diff --git a/cpu/cc2538/include/gptimer.h b/cpu/cc2538/include/cc2538_gptimer.h
similarity index 100%
rename from cpu/cc2538/include/gptimer.h
rename to cpu/cc2538/include/cc2538_gptimer.h
diff --git a/cpu/cc2538/include/ioc.h b/cpu/cc2538/include/cc2538_ioc.h
similarity index 100%
rename from cpu/cc2538/include/ioc.h
rename to cpu/cc2538/include/cc2538_ioc.h
diff --git a/cpu/cc2538/include/rfcore.h b/cpu/cc2538/include/cc2538_rfcore.h
similarity index 100%
rename from cpu/cc2538/include/rfcore.h
rename to cpu/cc2538/include/cc2538_rfcore.h
diff --git a/cpu/cc2538/include/soc-adc.h b/cpu/cc2538/include/cc2538_soc_adc.h
similarity index 100%
rename from cpu/cc2538/include/soc-adc.h
rename to cpu/cc2538/include/cc2538_soc_adc.h
diff --git a/cpu/cc2538/include/sys-ctrl.h b/cpu/cc2538/include/cc2538_sys_ctrl.h
similarity index 100%
rename from cpu/cc2538/include/sys-ctrl.h
rename to cpu/cc2538/include/cc2538_sys_ctrl.h
diff --git a/cpu/cc2538/include/cc2538-uart.h b/cpu/cc2538/include/cc2538_uart.h
similarity index 100%
rename from cpu/cc2538/include/cc2538-uart.h
rename to cpu/cc2538/include/cc2538_uart.h
diff --git a/cpu/cc2538/include/cpu_conf.h b/cpu/cc2538/include/cpu_conf.h
index 7b5a98532acb5f8b2c668a643c1d4c0c406d4f73..e415ccdf91d7837edd2efcb4f866f6d583f27c43 100644
--- a/cpu/cc2538/include/cpu_conf.h
+++ b/cpu/cc2538/include/cpu_conf.h
@@ -20,13 +20,13 @@
 #define __CPU_CONF_H
 
 #include "cc2538.h"
-#include "cc2538-gpio.h"
-#include "cc2538-uart.h"
-#include "gptimer.h"
-#include "ioc.h"
-#include "soc-adc.h"
-#include "rfcore.h"
-#include "sys-ctrl.h"
+#include "cc2538_gpio.h"
+#include "cc2538_uart.h"
+#include "cc2538_gptimer.h"
+#include "cc2538_ioc.h"
+#include "cc2538_soc_adc.h"
+#include "cc2538_rfcore.h"
+#include "cc2538_sys_ctrl.h"
 
 #ifdef __cplusplus
 extern "C" {