diff --git a/Makefile-ARM b/Makefile-ARM
index af5d773..3ce77e9 100644
--- a/Makefile-ARM
+++ b/Makefile-ARM
@@ -99,7 +99,7 @@ TARGET = $(PROGRAM).hex
 # in #ifdef __AVR__. To avoid this, build only a selection for now:
 SOURCES  = mendel.c cpu.c serial.c sermsg.c sersendf.c delay.c
 ifeq ($(MCU), lpc1114)
-  SOURCES += mbed-system_LPC11xx.c
+  SOURCES += cmsis-system_lpc11xx.c
 endif
 
 # Other target MCU specific adjustments:
diff --git a/cmsis-lpc11xx.h b/cmsis-lpc11xx.h
index e7ff1d8..64d3630 100644
--- a/cmsis-lpc11xx.h
+++ b/cmsis-lpc11xx.h
@@ -122,7 +122,7 @@ typedef enum IRQn
 
 
 #include "cmsis-core_cm0.h"                 /* Cortex-M0 processor and core peripherals           */
-#include "mbed-system_LPC11xx.h"            /* System Header                                      */
+#include "cmsis-system_lpc11xx.h"           /* System Header                                      */
 
 
 /******************************************************************************/
diff --git a/mbed-system_LPC11xx.c b/cmsis-system_lpc11xx.c
similarity index 99%
rename from mbed-system_LPC11xx.c
rename to cmsis-system_lpc11xx.c
index 9ea97b4..484ed03 100644
--- a/mbed-system_LPC11xx.c
+++ b/cmsis-system_lpc11xx.c
@@ -45,7 +45,7 @@
 
 #ifdef __ARMEL__
 
-#include "mbed-system_LPC11xx.h"
+#include "cmsis-system_lpc11xx.h"
 #include "cmsis-lpc11xx.h"
 
 // Moved definitions from here to system_LPC11xx.h.
diff --git a/mbed-system_LPC11xx.h b/cmsis-system_lpc11xx.h
similarity index 100%
rename from mbed-system_LPC11xx.h
rename to cmsis-system_lpc11xx.h