diff --git a/arch/x86/core/Makefile b/arch/x86/core/Makefile
index 35e6c1c94c9..9f511b17700 100644
--- a/arch/x86/core/Makefile
+++ b/arch/x86/core/Makefile
@@ -1,17 +1,17 @@
 ccflags-y += -I$(srctree)/kernel/nanokernel/include
 ccflags-y += -I$(srctree)/kernel/microkernel/include
 
-obj-y = gdt.o nanocontext.o nanofatal.o cpuhalt.o \
+obj-y = gdt.o context.o fatal.o cpuhalt.o \
 	excstub.o swap.o ffs.o intboiexit.o msr.o \
 	excconnect.o inthndlset.o
 
 ifeq ($(CONFIG_LOCK_INSTRUCTION_UNSUPPORTED),y)
-obj-y += nanoatomic_nolock.o
+obj-y += atomic_nolock.o
 else
-obj-y += nanoatomic.o
+obj-y += atomic.o
 endif
 
-obj-$(CONFIG_FP_SHARING) += nanofloat.o
+obj-$(CONFIG_FP_SHARING) += float.o
 obj-$(CONFIG_UNALIGNED_WRITE_UNSUPPORTED) += unaligned.o
 
 ifneq ($(CONFIG_NO_ISRS),y)
diff --git a/arch/x86/core/nanoatomic.S b/arch/x86/core/atomic.S
similarity index 99%
rename from arch/x86/core/nanoatomic.S
rename to arch/x86/core/atomic.S
index ea80b915df1..7bd91acf1c8 100644
--- a/arch/x86/core/nanoatomic.S
+++ b/arch/x86/core/atomic.S
@@ -1,4 +1,4 @@
-/* nanoatomic.S - nanokernel atomic operators for IA-32 */
+/* atomic.S - nanokernel atomic operators for IA-32 */
 
 /*
  * Copyright (c) 2011-2014 Wind River Systems, Inc.
diff --git a/arch/x86/core/nanoatomic_nolock.c b/arch/x86/core/atomic_nolock.c
similarity index 99%
rename from arch/x86/core/nanoatomic_nolock.c
rename to arch/x86/core/atomic_nolock.c
index 90237fc6bfa..79d7b1fa188 100644
--- a/arch/x86/core/nanoatomic_nolock.c
+++ b/arch/x86/core/atomic_nolock.c
@@ -1,4 +1,4 @@
-/* nanoatomic_nolock.c - nanokernel atomic operators for IA-32 */
+/* atomic_nolock.c - nanokernel atomic operators for IA-32 */
 
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
diff --git a/arch/x86/core/nanocontext.c b/arch/x86/core/context.c
similarity index 99%
rename from arch/x86/core/nanocontext.c
rename to arch/x86/core/context.c
index f562fbb427a..dc3c92214e2 100644
--- a/arch/x86/core/nanocontext.c
+++ b/arch/x86/core/context.c
@@ -1,4 +1,4 @@
-/* nanocontext.c - nanokernel context support primitives */
+/* context.c - nanokernel context support primitives */
 
 /*
  * Copyright (c) 2010-2015 Wind River Systems, Inc.
diff --git a/arch/x86/core/nanofatal.c b/arch/x86/core/fatal.c
similarity index 98%
rename from arch/x86/core/nanofatal.c
rename to arch/x86/core/fatal.c
index 4de95766604..6066fa422cf 100644
--- a/arch/x86/core/nanofatal.c
+++ b/arch/x86/core/fatal.c
@@ -1,4 +1,4 @@
-/* nanofatal.c - nanokernel fatal error handler */
+/* fatal.c - nanokernel fatal error handler */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
diff --git a/arch/x86/core/nanofloat.c b/arch/x86/core/float.c
similarity index 99%
rename from arch/x86/core/nanofloat.c
rename to arch/x86/core/float.c
index 1d6b4734a63..a6817330426 100644
--- a/arch/x86/core/nanofloat.c
+++ b/arch/x86/core/float.c
@@ -1,4 +1,4 @@
-/* nanofloat.c - floating point resource sharing routines */
+/* float.c - floating point resource sharing routines */
 
 /*
  * Copyright (c) 2010-2014 Wind River Systems, Inc.
diff --git a/arch/x86/task/strtask.c b/arch/x86/task/strtask.c
index c51571909a4..cfcfbd62f06 100644
--- a/arch/x86/task/strtask.c
+++ b/arch/x86/task/strtask.c
@@ -42,7 +42,7 @@ Intel-specific parts of start_task(). Only FP functionality currently.
 /*
  * The following IA-32-specific task group is used for tasks that use SSE
  * instructions. It is *not* formally reserved by SysGen for this purpose.
- * See comments in nanocontext.c regarding the use of SSE_GROUP, and comments
+ * See comments in context.c regarding the use of SSE_GROUP, and comments
  * in task.h regarding task groups reserved by SysGen.
  *
  * This identifier corresponds to the first user-defined task group.