diff --git a/arch/arm/core/Makefile b/arch/arm/core/Makefile
index a29ee79f2b5..aef6381f8d3 100644
--- a/arch/arm/core/Makefile
+++ b/arch/arm/core/Makefile
@@ -5,10 +5,10 @@ ccflags-y += -I$(srctree)/target/src/bsp/arm
 asflags-y := ${ccflags-y}
 
 obj-y = atomic.o exc_exit.o ffs.o irq_init.o \
-	nano_fiber_abort.o swap.o basepri.o \
+	fiber_abort.o swap.o basepri.o \
 	fault.o gdb_stub_irq_vector_table.o \
-	irq_manage.o nanocontext.o cpu_idle.o \
+	irq_manage.o context.o cpu_idle.o \
 	fault_s.o gdb_stub.o isr_wrapper.o \
-	nanofatal.o
+	fatal.o
 
 obj-$(CONFIG_MICROKERNEL) += task_abort.o
diff --git a/arch/arm/core/nanocontext.c b/arch/arm/core/context.c
similarity index 98%
rename from arch/arm/core/nanocontext.c
rename to arch/arm/core/context.c
index d431d971e98..3a86cd683a9 100644
--- a/arch/arm/core/nanocontext.c
+++ b/arch/arm/core/context.c
@@ -1,4 +1,4 @@
-/* nanocontext.c - new context creation for ARM Cortex-M */
+/* context.c - new context creation for ARM Cortex-M */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
diff --git a/arch/arm/core/nanofatal.c b/arch/arm/core/fatal.c
similarity index 98%
rename from arch/arm/core/nanofatal.c
rename to arch/arm/core/fatal.c
index 0d7bafc916c..b6b4ebd4234 100644
--- a/arch/arm/core/nanofatal.c
+++ b/arch/arm/core/fatal.c
@@ -1,4 +1,4 @@
-/* nanofatal.c - nanokernel fatal error handler for ARM Cortex-M */
+/* fatal.c - nanokernel fatal error handler for ARM Cortex-M */
 
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
diff --git a/arch/arm/core/nano_fiber_abort.c b/arch/arm/core/fiber_abort.c
similarity index 97%
rename from arch/arm/core/nano_fiber_abort.c
rename to arch/arm/core/fiber_abort.c
index 67511cd96f3..193c453fdfa 100644
--- a/arch/arm/core/nano_fiber_abort.c
+++ b/arch/arm/core/fiber_abort.c
@@ -1,4 +1,4 @@
-/* nano_fiber_abort.c - ARM Cortex-M fiber_abort() routine */
+/* fiber_abort.c - ARM Cortex-M fiber_abort() routine */
 
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.