diff --git a/mbed-core_cm4.h b/cmsis-core_cm4.h
similarity index 99%
rename from mbed-core_cm4.h
rename to cmsis-core_cm4.h
index 0f4df03..135d961 100644
--- a/mbed-core_cm4.h
+++ b/cmsis-core_cm4.h
@@ -180,7 +180,7 @@
 #include <stdint.h>                      /* standard types definitions                      */
 //#include "mbed-core_cmInstr.h"                /* Core Instruction Access                         */
 //#include "mbed-core_cmFunc.h"                 /* Core Function Access                            */
-#include "mbed-core_cm4_simd.h"               /* Compiler specific SIMD Intrinsics               */
+#include "cmsis-core_cm4_simd.h"               /* Compiler specific SIMD Intrinsics               */
 
 /** \brief  Count leading zeros
 
diff --git a/mbed-core_cm4_simd.h b/cmsis-core_cm4_simd.h
similarity index 100%
rename from mbed-core_cm4_simd.h
rename to cmsis-core_cm4_simd.h
diff --git a/cmsis-stm32f4xx.h b/cmsis-stm32f4xx.h
index e723fea..6c643fa 100644
--- a/cmsis-stm32f4xx.h
+++ b/cmsis-stm32f4xx.h
@@ -225,7 +225,7 @@ typedef enum
   * @}
   */
 
-#include "mbed-core_cm4.h"             /* Cortex-M4 processor and core peripherals */
+#include "cmsis-core_cm4.h"             /* Cortex-M4 processor and core peripherals */
 #include "mbed-system_stm32f4xx.h"
 #include <stdint.h>