diff --git a/Makefile-ARM b/Makefile-ARM
index 0c003ce..f16f0b4 100644
--- a/Makefile-ARM
+++ b/Makefile-ARM
@@ -118,10 +118,6 @@ TARGET = $(PROGRAM).hex
 # to keep this working and can take a shortcut:
 SOURCES = $(wildcard *.c)
 
-ifeq ($(MCU), stm32f411)
-  SOURCES += mbed-system_stm32f4xx.c
-endif
-
 # Other target MCU specific adjustments:
 ifeq ($(MCU), lpc1114)
   STARTUP_FILE = cmsis-startup_lpc11xx.s
diff --git a/cmsis-stm32f4xx.h b/cmsis-stm32f4xx.h
index 47e7798..69e8511 100644
--- a/cmsis-stm32f4xx.h
+++ b/cmsis-stm32f4xx.h
@@ -222,7 +222,7 @@ typedef enum
   */
 
 #include "cmsis-core_cm4.h"             /* Cortex-M4 processor and core peripherals */
-#include "mbed-system_stm32f4xx.h"
+#include "cmsis-system_stm32f4xx.h"
 #include <stdint.h>
 
 /** @addtogroup Peripheral_registers_structures
diff --git a/mbed-system_stm32f4xx.c b/cmsis-system_stm32f4xx.c
similarity index 100%
rename from mbed-system_stm32f4xx.c
rename to cmsis-system_stm32f4xx.c
diff --git a/mbed-system_stm32f4xx.h b/cmsis-system_stm32f4xx.h
similarity index 100%
rename from mbed-system_stm32f4xx.h
rename to cmsis-system_stm32f4xx.h