diff --git a/arch/arc/core/context.c b/arch/arc/core/context.c
index 8b7ffcbab6a..36dcfdbad16 100644
--- a/arch/arc/core/context.c
+++ b/arch/arc/core/context.c
@@ -39,7 +39,7 @@
 #include <nanokernel.h>
 #include <arch/cpu.h>
 #include <toolchain.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <wait_q.h>
 
diff --git a/arch/arc/core/cpu_idle.S b/arch/arc/core/cpu_idle.S
index ba180e3b257..a35a3741a22 100644
--- a/arch/arc/core/cpu_idle.S
+++ b/arch/arc/core/cpu_idle.S
@@ -37,7 +37,7 @@ CPU power management routines.
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/arch/arc/core/fast_irq.S b/arch/arc/core/fast_irq.S
index 119575f8c1b..a6980ec0025 100644
--- a/arch/arc/core/fast_irq.S
+++ b/arch/arc/core/fast_irq.S
@@ -39,7 +39,7 @@ See isr_wrapper.S for details.
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
diff --git a/arch/arc/core/fatal.c b/arch/arc/core/fatal.c
index 5e675128be7..1c8ee88e08e 100644
--- a/arch/arc/core/fatal.c
+++ b/arch/arc/core/fatal.c
@@ -36,7 +36,7 @@ This module implements the routines necessary for handling fatal faults on
 ARCv2 CPUs.
 */
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c
index 5615664178d..e996e1ac022 100644
--- a/arch/arc/core/fault.c
+++ b/arch/arc/core/fault.c
@@ -39,7 +39,7 @@
 #include <sections.h>
 
 #include <nanokernel.h>
-#include <nanok.h>
+#include <nano_private.h>
 
 #ifdef CONFIG_PRINTK
 #include <misc/printk.h>
diff --git a/arch/arc/core/irq_lock.S b/arch/arc/core/irq_lock.S
index 03ddd51101a..cda8819e84e 100644
--- a/arch/arc/core/irq_lock.S
+++ b/arch/arc/core/irq_lock.S
@@ -35,7 +35,7 @@
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
diff --git a/arch/arc/core/isr_wrapper.S b/arch/arc/core/isr_wrapper.S
index e407e1ca2ed..3fe32346e32 100644
--- a/arch/arc/core/isr_wrapper.S
+++ b/arch/arc/core/isr_wrapper.S
@@ -43,7 +43,7 @@ a parameter.
 #include <toolchain.h>
 #include <sections.h>
 #include <sw_isr_table.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/cpu.h>
 
 GTEXT(_isr_enter)
diff --git a/arch/arc/core/offsets/offsets.c b/arch/arc/core/offsets/offsets.c
index b4fea0af941..a4249c39c98 100644
--- a/arch/arc/core/offsets/offsets.c
+++ b/arch/arc/core/offsets/offsets.c
@@ -49,7 +49,7 @@ completeness.
 */
 
 #include <genOffset.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets/common.h>
 
 /* ARCv2-specific tCCS structure member offsets */
diff --git a/arch/arc/core/regular_irq.S b/arch/arc/core/regular_irq.S
index 975b4941fd4..e3dd6cf8495 100644
--- a/arch/arc/core/regular_irq.S
+++ b/arch/arc/core/regular_irq.S
@@ -40,7 +40,7 @@ See isr_wrapper.S for details.
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
diff --git a/arch/arc/core/swap.S b/arch/arc/core/swap.S
index 23990a4caac..c6c91d3310e 100644
--- a/arch/arc/core/swap.S
+++ b/arch/arc/core/swap.S
@@ -40,7 +40,7 @@ See isr_wrapper.S for details.
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
diff --git a/arch/arc/core/swap_macros.h b/arch/arc/core/swap_macros.h
index 2f4d55a24a5..5cdb1e45d9b 100644
--- a/arch/arc/core/swap_macros.h
+++ b/arch/arc/core/swap_macros.h
@@ -33,7 +33,7 @@
 #ifndef _SWAP_MACROS__H_
 #define _SWAP_MACROS__H_
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
diff --git a/arch/arc/include/nanok.h b/arch/arc/include/nano_private.h
similarity index 98%
rename from arch/arc/include/nanok.h
rename to arch/arc/include/nano_private.h
index 064cb0f022c..bbc97282efa 100644
--- a/arch/arc/include/nanok.h
+++ b/arch/arc/include/nano_private.h
@@ -1,4 +1,4 @@
-/* nanok.h - private nanokernel definitions */
+/* nano_private.h - private nanokernel definitions */
 
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
@@ -41,8 +41,8 @@ source files obtains structure offset values via "absolute symbols" in the
 offsets.o module.
 */
 
-#ifndef _NANOK__H_
-#define _NANOK__H_
+#ifndef _NANO_PRIVATE_H
+#define _NANO_PRIVATE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -286,4 +286,4 @@ static inline void _IntLibInit(void)
 }
 #endif
 
-#endif /* _NANOK__H_ */
+#endif /* _NANO_PRIVATE_H */
diff --git a/arch/arm/core/cpu_idle.S b/arch/arm/core/cpu_idle.S
index 8ae9fbcfe41..0422ad61263 100644
--- a/arch/arm/core/cpu_idle.S
+++ b/arch/arm/core/cpu_idle.S
@@ -41,7 +41,7 @@ DESCRIPTION
 #include <sections.h>
 #include <arch/cpu.h>
 #ifdef CONFIG_TICKLESS_IDLE
-#include <nanok.h>
+#include <nano_private.h>
 #endif
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm/core/exc_exit.S b/arch/arm/core/exc_exit.S
index 7cc0511568f..47083eaec42 100644
--- a/arch/arm/core/exc_exit.S
+++ b/arch/arm/core/exc_exit.S
@@ -40,7 +40,7 @@ wrapped around by _isr_wrapper()).
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
diff --git a/arch/arm/core/fault.c b/arch/arm/core/fault.c
index 1270f1eb55c..43612062aac 100644
--- a/arch/arm/core/fault.c
+++ b/arch/arm/core/fault.c
@@ -39,7 +39,7 @@ Common fault handler for ARM Cortex-M processors.
 #include <sections.h>
 
 #include <nanokernel.h>
-#include <nanok.h>
+#include <nano_private.h>
 
 #ifdef CONFIG_PRINTK
 #include <misc/printk.h>
diff --git a/arch/arm/core/gdb_stub.S b/arch/arm/core/gdb_stub.S
index d508365ed85..7800c5b5ab7 100644
--- a/arch/arm/core/gdb_stub.S
+++ b/arch/arm/core/gdb_stub.S
@@ -46,7 +46,7 @@ anymore.
 #include <offsets.h>
 #include <toolchain.h>
 #include <sections.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm/core/isr_wrapper.S b/arch/arm/core/isr_wrapper.S
index 77719666939..e6d90cbefe6 100644
--- a/arch/arm/core/isr_wrapper.S
+++ b/arch/arm/core/isr_wrapper.S
@@ -43,7 +43,7 @@ a parameter.
 #include <toolchain.h>
 #include <sections.h>
 #include <sw_isr_table.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm/core/nano_fiber_abort.c b/arch/arm/core/nano_fiber_abort.c
index 384ad152191..67511cd96f3 100644
--- a/arch/arm/core/nano_fiber_abort.c
+++ b/arch/arm/core/nano_fiber_abort.c
@@ -45,7 +45,7 @@ the PendSV exception.
 #include <micro_private_types.h>
 #endif
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <nanokernel.h>
diff --git a/arch/arm/core/nanocontext.c b/arch/arm/core/nanocontext.c
index a52db9e9069..d431d971e98 100644
--- a/arch/arm/core/nanocontext.c
+++ b/arch/arm/core/nanocontext.c
@@ -39,7 +39,7 @@ architecture.
 #include <nanokernel.h>
 #include <arch/cpu.h>
 #include <toolchain.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <wait_q.h>
 
 tNANO _nanokernel = {0};
diff --git a/arch/arm/core/nanofatal.c b/arch/arm/core/nanofatal.c
index 105c9ce7047..0d7bafc916c 100644
--- a/arch/arm/core/nanofatal.c
+++ b/arch/arm/core/nanofatal.c
@@ -39,7 +39,7 @@ This module provides the _NanoFatalErrorHandler() routine for ARM Cortex-M.
 #include <sections.h>
 
 #include <nanokernel.h>
-#include <nanok.h>
+#include <nano_private.h>
 
 #ifdef CONFIG_PRINTK
 #include <misc/printk.h>
diff --git a/arch/arm/core/offsets/offsets.c b/arch/arm/core/offsets/offsets.c
index 72de63c963d..e2a5c42386e 100644
--- a/arch/arm/core/offsets/offsets.c
+++ b/arch/arm/core/offsets/offsets.c
@@ -49,7 +49,7 @@ completeness.
 */
 
 #include <genOffset.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets/common.h>
 
 /* ARM-specific tNANO structure member offsets */
diff --git a/arch/arm/core/swap.S b/arch/arm/core/swap.S
index 18ffe5ec4c1..d4e985c9606 100644
--- a/arch/arm/core/swap.S
+++ b/arch/arm/core/swap.S
@@ -38,7 +38,7 @@ on ARM Cortex-M3/M4 CPUs.
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <offsets.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
diff --git a/arch/arm/core/task_abort.c b/arch/arm/core/task_abort.c
index b21d43e6cd0..8214e95ac3d 100644
--- a/arch/arm/core/task_abort.c
+++ b/arch/arm/core/task_abort.c
@@ -45,7 +45,7 @@ PendSV exception and cause the immediate context switch to K_swapper.
 #include <toolchain.h>
 #include <sections.h>
 #include <micro_private.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <microkernel.h>
 #include <nanokernel.h>
 #include <misc/__assert.h>
diff --git a/arch/arm/include/CortexM/stack.h b/arch/arm/include/CortexM/stack.h
index 75c85639dec..261da4a9c9f 100644
--- a/arch/arm/include/CortexM/stack.h
+++ b/arch/arm/include/CortexM/stack.h
@@ -38,7 +38,7 @@ Stack helper functions.
 #ifndef _ARM_CORTEXM_STACK__H_
 #define _ARM_CORTEXM_STACK__H_
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <asm_inline.h>
 
 #ifdef CONFIG_STACK_GROWS_DOWN
diff --git a/arch/arm/include/nanok.h b/arch/arm/include/nano_private.h
similarity index 97%
rename from arch/arm/include/nanok.h
rename to arch/arm/include/nano_private.h
index 17adc413486..3345259a21e 100644
--- a/arch/arm/include/nanok.h
+++ b/arch/arm/include/nano_private.h
@@ -1,4 +1,4 @@
-/* nanok.h - private nanokernel definitions (ARM) */
+/* nano_private.h - private nanokernel definitions (ARM) */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
@@ -41,8 +41,8 @@ source files obtains structure offset values via "absolute symbols" in the
 offsets.o module.
 */
 
-#ifndef _NANOK__H_
-#define _NANOK__H_
+#ifndef _NANO_PRIVATE_H
+#define _NANO_PRIVATE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -219,4 +219,4 @@ extern void _IntLibInit(void);
 }
 #endif
 
-#endif /* _NANOK__H_ */
+#endif /* _NANO_PRIVATE_H */
diff --git a/arch/arm/include/start_task_arch.h b/arch/arm/include/start_task_arch.h
index f0591fdfe95..1958a09f430 100644
--- a/arch/arm/include/start_task_arch.h
+++ b/arch/arm/include/start_task_arch.h
@@ -44,7 +44,7 @@ Currently empty, only here for abstraction.
 #include <sections.h>
 
 #include <micro_private.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <microkernel/task.h>
 
 #define _START_TASK_ARCH(pKproc, pOpt) \
diff --git a/arch/x86/core/excconnect.c b/arch/x86/core/excconnect.c
index c42ead87d4a..7f72a27c894 100644
--- a/arch/x86/core/excconnect.c
+++ b/arch/x86/core/excconnect.c
@@ -73,12 +73,12 @@ an error code is present on the stack or not.
 
 NOTE: Be sure to update the arch specific definition of the _EXC_STUB_SIZE
 macro to reflect the size of the full exception stub (as shown above).
-The _EXC_STUB_SIZE macro is defined in arch/x86/include/nanok.h.
+The _EXC_STUB_SIZE macro is defined in arch/x86/include/nano_private.h.
 */
 
 
 #include <nanokernel.h>
-#include <nanok.h>
+#include <nano_private.h>
 
 
 void _NanoCpuExcConnectAtDpl(unsigned int vector,
@@ -113,7 +113,7 @@ void _NanoCpuExcConnectAtDpl(unsigned int vector,
 * RETURNS: N/A
 *
 * INTERNAL
-* The function prototype for nanoCpuExcConnect() only exists in nanok.h,
+* The function prototype for nanoCpuExcConnect() only exists in nano_private.h,
 * in other words, it's still considered private since the definitions for
 * the NANO_ESF structures have not been completed.
 */
@@ -153,7 +153,7 @@ void nanoCpuExcConnect(unsigned int vector, /* interrupt vector: 0 to 255 on
 * RETURNS: N/A
 *
 * INTERNAL
-* The function prototype for nanoCpuExcConnect() only exists in nanok.h,
+* The function prototype for nanoCpuExcConnect() only exists in nano_private.h,
 * in other words, it's still considered private since the definitions for
 * the NANO_ESF structures have not been completed.
 */
diff --git a/arch/x86/core/excstub.S b/arch/x86/core/excstub.S
index 8b7915ace62..7f91deca7bb 100644
--- a/arch/x86/core/excstub.S
+++ b/arch/x86/core/excstub.S
@@ -40,7 +40,7 @@ and exiting a C exception handler.
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/x86/asm.h>
 #include <arch/x86/arch.h> /* For MK_ISR_NAME */
 #include <offsets.h>	/* nanokernel structure offset definitions */
diff --git a/arch/x86/core/gdt.c b/arch/x86/core/gdt.c
index 68ba17460a9..6096296c80c 100644
--- a/arch/x86/core/gdt.c
+++ b/arch/x86/core/gdt.c
@@ -40,7 +40,7 @@ for the IA-32 architecture.
 #include <toolchain.h>
 #include <sections.h>
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/cpu.h>
 #include <gdt.h>
 
diff --git a/arch/x86/core/intconnect.c b/arch/x86/core/intconnect.c
index 22c9a61eb42..5c8cc91f25f 100644
--- a/arch/x86/core/intconnect.c
+++ b/arch/x86/core/intconnect.c
@@ -91,7 +91,7 @@ The _INT_STUB_SIZE macro is defined in include/nanokernel/x86/arch.h.
 
 #include <nanokernel.h>
 #include <arch/cpu.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <misc/__assert.h>
 
 /* the _idt_base_address symbol is generated via a linker script */
@@ -106,7 +106,7 @@ extern void _SpuriousIntNoErrCodeHandler(void *);
  * the spurious interrupt handlers. They *must* be declared in a module other
  * than the one they are used in to get around garbage collection issues and
  * warnings issued some compilers that they aren't used. Therefore care must
- * be taken if they are to be moved. See nanok.h for more information.
+ * be taken if they are to be moved. See nano_private.h for more information.
  */
 void *_dummy_spurious_interrupt;
 void *_dummy_exception_vector_stub;
diff --git a/arch/x86/core/inthndlset.c b/arch/x86/core/inthndlset.c
index 6ab8ba63605..0e691baa6b3 100644
--- a/arch/x86/core/inthndlset.c
+++ b/arch/x86/core/inthndlset.c
@@ -42,7 +42,7 @@
 */
 
 
-#include <nanok.h>
+#include <nano_private.h>
 
 
 /* the _idt_base_address symbol is generated via a linker script */
diff --git a/arch/x86/core/intstub.S b/arch/x86/core/intstub.S
index 181dc49e08e..86c47a9ce8a 100644
--- a/arch/x86/core/intstub.S
+++ b/arch/x86/core/intstub.S
@@ -42,7 +42,7 @@ entering and exiting a C interrupt handler.
 
 #ifndef CONFIG_NO_ISRS
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/x86/asm.h>
 #include <offsets.h>	/* nanokernel structure offset definitions */
 #include <arch/cpu.h>	/* _NANO_ERR_SPURIOUS_INT */
diff --git a/arch/x86/core/msr.S b/arch/x86/core/msr.S
index 7505b2a99ec..b25259e4f77 100644
--- a/arch/x86/core/msr.S
+++ b/arch/x86/core/msr.S
@@ -56,7 +56,7 @@ utilities.
 *   void _MsrWrite (unsigned int msr, uint64_t msrData);
 *
 * The definitions of the so-called  "Architectural MSRs" are contained
-* in nanok.h and have the format: IA32_XXX_MSR
+* in nano_private.h and have the format: IA32_XXX_MSR
 *
 * INTERNAL
 * 1) The 'wrmsr' instruction was introduced in the Pentium processor; executing
@@ -87,7 +87,7 @@ SECTION_FUNC(TEXT, _MsrWrite)
 *   uint64_t _MsrRead (unsigned int msr);
 *
 * The definitions of the so-called  "Architectural MSRs" are contained
-* in nanok.h and have the format: IA32_XXX_MSR
+* in nano_private.h and have the format: IA32_XXX_MSR
 *
 * INTERNAL
 * 1) The 'rdmsr' instruction was introduced in the Pentium processor; executing
diff --git a/arch/x86/core/nanocontext.c b/arch/x86/core/nanocontext.c
index 4b93981a515..f562fbb427a 100644
--- a/arch/x86/core/nanocontext.c
+++ b/arch/x86/core/nanocontext.c
@@ -43,7 +43,7 @@ processor architecture.
 
 #include <toolchain.h>
 #include <sections.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <wait_q.h>
 
 
diff --git a/arch/x86/core/nanofatal.c b/arch/x86/core/nanofatal.c
index 5bd19f2442b..4de95766604 100644
--- a/arch/x86/core/nanofatal.c
+++ b/arch/x86/core/nanofatal.c
@@ -39,7 +39,7 @@ This module provides the _NanoFatalErrorHandler() routine.
 #include <sections.h>
 
 #include <nanokernel.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <misc/printk.h>
 
 
diff --git a/arch/x86/core/nanofloat.c b/arch/x86/core/nanofloat.c
index b6ce35ebf09..1d6b4734a63 100644
--- a/arch/x86/core/nanofloat.c
+++ b/arch/x86/core/nanofloat.c
@@ -100,7 +100,7 @@ enable FP resource sharing on its behalf.
 #include <micro_private_types.h>
 #endif /* CONFIG_MICROKERNEL */
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <asm_inline.h>
 
diff --git a/arch/x86/core/offsets/offsets.c b/arch/x86/core/offsets/offsets.c
index 6cc594c8eca..6c14474aed5 100644
--- a/arch/x86/core/offsets/offsets.c
+++ b/arch/x86/core/offsets/offsets.c
@@ -51,7 +51,7 @@ completeness.
 
 /* list of headers that define whose structure offsets will be generated */
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <swapstk.h>
 
 
diff --git a/arch/x86/core/swap.S b/arch/x86/core/swap.S
index ef3d36701ed..3b4f70c8d24 100644
--- a/arch/x86/core/swap.S
+++ b/arch/x86/core/swap.S
@@ -43,7 +43,7 @@ save frame on the stack.
 
 #define _ASMLANGUAGE
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/x86/asm.h>
 #include <offsets.h>	/* nanokernel structure offset definitions */
 
diff --git a/arch/x86/include/nanok.h b/arch/x86/include/nano_private.h
similarity index 99%
rename from arch/x86/include/nanok.h
rename to arch/x86/include/nano_private.h
index fabaf7f639e..e8f07158dbb 100644
--- a/arch/x86/include/nanok.h
+++ b/arch/x86/include/nano_private.h
@@ -1,4 +1,4 @@
-/* nanok.h - private nanokernel definitions (IA-32) */
+/* nano_private.h - private nanokernel definitions (IA-32) */
 
 /*
  * Copyright (c) 2010-2014 Wind River Systems, Inc.
@@ -44,8 +44,8 @@ source files obtains structure offset values via "absolute symbols" in the
 offsets.o module.
 */
 
-#ifndef _NANOK_H
-#define _NANOK_H
+#ifndef _NANO_PRIVATE_H
+#define _NANO_PRIVATE_H
 
 #include <toolchain.h>
 #include <sections.h>
@@ -900,4 +900,4 @@ static inline void _IntLibInit(void)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _NANOK_H */
+#endif /* _NANO_PRIVATE_H */
diff --git a/arch/x86/include/start_task_arch.h b/arch/x86/include/start_task_arch.h
index ff79607e3b7..d34891a9003 100644
--- a/arch/x86/include/start_task_arch.h
+++ b/arch/x86/include/start_task_arch.h
@@ -42,7 +42,7 @@ Intel-specific parts of start_task(). Only FP functionality currently.
 #include <sections.h>
 
 #include <micro_private.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <microkernel/task.h>
 
 extern void _StartTaskArch(struct k_proc *, unsigned int *);
diff --git a/kernel/microkernel/include/micro_private.h b/kernel/microkernel/include/micro_private.h
index bf831aae799..f1d36a68285 100644
--- a/kernel/microkernel/include/micro_private.h
+++ b/kernel/microkernel/include/micro_private.h
@@ -36,7 +36,7 @@
 #include <stddef.h>
 #include <micro_private_types.h>
 #include <kernel_main.h>
-#include <nanok.h>
+#include <nano_private.h>
 
 #define KERNEL_ENTRY(A) _k_task_call(A)
 
diff --git a/kernel/microkernel/k_idle.c b/kernel/microkernel/k_idle.c
index a412f0ab58e..b388c540b65 100644
--- a/kernel/microkernel/k_idle.c
+++ b/kernel/microkernel/k_idle.c
@@ -37,7 +37,7 @@ task, depending on how the kernel is configured.
 */
 
 #include <micro_private.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/kernel/microkernel/k_init.c b/kernel/microkernel/k_init.c
index 661aee78044..73cfb060ef5 100644
--- a/kernel/microkernel/k_init.c
+++ b/kernel/microkernel/k_init.c
@@ -32,7 +32,7 @@
 
 #include <micro_private.h>
 #include "nanokernel.h"
-#include "nanok.h"
+#include <nano_private.h>
 #include <string.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/kernel/microkernel/k_irq.c b/kernel/microkernel/k_irq.c
index 503fcf0d9da..f53466b6616 100644
--- a/kernel/microkernel/k_irq.c
+++ b/kernel/microkernel/k_irq.c
@@ -53,7 +53,7 @@ a task cannot impact the operation of an IRQ object it does not own.
 
 #if (CONFIG_MAX_NUM_TASK_IRQS > 0)
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <microkernel.h>
 #include <micro_private.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/k_mutex.c b/kernel/microkernel/k_mutex.c
index ac80e9fa29b..ffecd9cffa7 100644
--- a/kernel/microkernel/k_mutex.c
+++ b/kernel/microkernel/k_mutex.c
@@ -57,7 +57,7 @@ NOMANUAL
 
 #include <microkernel.h>
 #include <micro_private.h>
-#include <nanok.h>
+#include <nano_private.h>
 
 /*******************************************************************************
 *
diff --git a/kernel/microkernel/k_server.c b/kernel/microkernel/k_server.c
index 97fa70b66ad..6fb00b5ef2f 100644
--- a/kernel/microkernel/k_server.c
+++ b/kernel/microkernel/k_server.c
@@ -42,7 +42,7 @@ interfering with each other.
 #include <toolchain.h>
 #include <sections.h>
 #include <micro_private.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <microkernel.h>
 #include <nanokernel.h>
 #include <misc/__assert.h>
diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c
index b21421f44a7..f6a642ae5a2 100644
--- a/kernel/microkernel/k_task.c
+++ b/kernel/microkernel/k_task.c
@@ -39,7 +39,7 @@
 #include <sections.h>
 
 #include <micro_private.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <start_task_arch.h>
 
 
diff --git a/kernel/nanokernel/compiler_stack_protect.c b/kernel/nanokernel/compiler_stack_protect.c
index 56cc1efae6f..74a1b64505d 100644
--- a/kernel/nanokernel/compiler_stack_protect.c
+++ b/kernel/nanokernel/compiler_stack_protect.c
@@ -44,7 +44,7 @@ function __stack_chk_fail and global variable __stack_chk_guard.
 
 #if defined(CONFIG_STACK_CANARIES)
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
 
diff --git a/kernel/nanokernel/idle.c b/kernel/nanokernel/idle.c
index d5817c52f9b..630330c80db 100644
--- a/kernel/nanokernel/idle.c
+++ b/kernel/nanokernel/idle.c
@@ -39,7 +39,7 @@ data structure.
 #ifdef CONFIG_ADVANCED_POWER_MANAGEMENT
 
 #include <nanokernel.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
 
diff --git a/kernel/nanokernel/include/genOffset.h b/kernel/nanokernel/include/genOffset.h
index ee2549a19b4..a496b6e8606 100644
--- a/kernel/nanokernel/include/genOffset.h
+++ b/kernel/nanokernel/include/genOffset.h
@@ -70,7 +70,7 @@ in this file:
 
 /@ include struct definitions for which offsets symbols are to be generated @/
 
-#include <nanok.h>
+#include <nano_private.h>
 
 GEN_ABS_SYM_BEGIN (_OffsetAbsSyms)	/@ the name parameter is arbitrary @/
 
diff --git a/kernel/nanokernel/include/wait_q.h b/kernel/nanokernel/include/wait_q.h
index 076b6d1cc4a..6f908489191 100644
--- a/kernel/nanokernel/include/wait_q.h
+++ b/kernel/nanokernel/include/wait_q.h
@@ -33,7 +33,7 @@
 #ifndef _kernel_nanokernel_include_wait_q__h_
 #define _kernel_nanokernel_include_wait_q__h_
 
-#include <nanok.h>
+#include <nano_private.h>
 
 /* reset a wait queue, call during operation */
 static inline void _nano_wait_q_reset(struct _nano_queue *wait_q)
diff --git a/kernel/nanokernel/nano_context.c b/kernel/nanokernel/nano_context.c
index fbd6c8b8951..6b062930027 100644
--- a/kernel/nanokernel/nano_context.c
+++ b/kernel/nanokernel/nano_context.c
@@ -39,7 +39,7 @@ tasks or fibers.
 #include <toolchain.h>
 #include <sections.h>
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <misc/printk.h>
 
 /*******************************************************************************
diff --git a/kernel/nanokernel/nano_fiber.c b/kernel/nanokernel/nano_fiber.c
index ff4ae0dcbf8..2f2943424b0 100644
--- a/kernel/nanokernel/nano_fiber.c
+++ b/kernel/nanokernel/nano_fiber.c
@@ -36,7 +36,7 @@ This module provides various nanokernel fiber related primitives,
 either in the form of an actual function or an alias to a function.
 */
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <string.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/kernel/nanokernel/nano_fifo.c b/kernel/nanokernel/nano_fifo.c
index 6ad800700d4..8dc539f8145 100644
--- a/kernel/nanokernel/nano_fifo.c
+++ b/kernel/nanokernel/nano_fifo.c
@@ -46,7 +46,7 @@ In some cases the compiler "alias" attribute is used to map two or more
 APIs to the same function, since they have identical implementations.
 */
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <wait_q.h>
diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c
index d90270013a5..680cedd0f18 100644
--- a/kernel/nanokernel/nano_init.c
+++ b/kernel/nanokernel/nano_init.c
@@ -41,7 +41,7 @@ This module contains routines that are used to initialize the nanokernel.
 #include <drivers/rand32.h>
 #include <sections.h>
 #include <toolchain.h>
-#include <nanok.h>
+#include <nano_private.h>
 
 /* kernel build timestamp items */
 
diff --git a/kernel/nanokernel/nano_lifo.c b/kernel/nanokernel/nano_lifo.c
index 708d25441d1..7ee9b1bee19 100644
--- a/kernel/nanokernel/nano_lifo.c
+++ b/kernel/nanokernel/nano_lifo.c
@@ -45,7 +45,7 @@ In some cases the compiler "alias" attribute is used to map two or more
 APIs to the same function, since they have identical implementations.
 */
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <wait_q.h>
diff --git a/kernel/nanokernel/nano_sema.c b/kernel/nanokernel/nano_sema.c
index e95468b1c4a..74a8a81dd20 100644
--- a/kernel/nanokernel/nano_sema.c
+++ b/kernel/nanokernel/nano_sema.c
@@ -51,7 +51,7 @@ In some cases the compiler "alias" attribute is used to map two or more
 APIs to the same function, since they have identical implementations.
 */
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <wait_q.h>
diff --git a/kernel/nanokernel/nano_stack.c b/kernel/nanokernel/nano_stack.c
index 5430f52f046..df6c88ff65c 100644
--- a/kernel/nanokernel/nano_stack.c
+++ b/kernel/nanokernel/nano_stack.c
@@ -46,7 +46,7 @@ In some cases the compiler "alias" attribute is used to map two or more
 APIs to the same function, since they have identical implementations.
 */
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
 
diff --git a/kernel/nanokernel/nano_sys_clock.c b/kernel/nanokernel/nano_sys_clock.c
index b6ed2565a22..95672d639f1 100644
--- a/kernel/nanokernel/nano_sys_clock.c
+++ b/kernel/nanokernel/nano_sys_clock.c
@@ -31,7 +31,7 @@
  */
 
 
-#include <nanok.h>
+#include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <wait_q.h>
diff --git a/kernel/nanokernel/nano_timer.c b/kernel/nanokernel/nano_timer.c
index 7f711d12628..eafc5fd8996 100644
--- a/kernel/nanokernel/nano_timer.c
+++ b/kernel/nanokernel/nano_timer.c
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <nanok.h>
+#include <nano_private.h>
 
 struct nano_timer *_nano_timer_list = NULL;
 
diff --git a/samples/microkernel/test/test_static_idt/src/static_idt.c b/samples/microkernel/test/test_static_idt/src/static_idt.c
index 996e3941c3d..b0c1c61c6a5 100644
--- a/samples/microkernel/test/test_static_idt/src/static_idt.c
+++ b/samples/microkernel/test/test_static_idt/src/static_idt.c
@@ -39,7 +39,7 @@ Ensures interrupt and exception stubs are installed correctly.
 
 #include <nanokernel.h>
 #include <arch/cpu.h>
-#include <nanok.h>
+#include <nano_private.h>
 #if defined(__GNUC__)
 #include <test_asm_inline_gcc.h>
 #else
diff --git a/samples/microkernel/test/test_static_idt/src/test_stubs.S b/samples/microkernel/test/test_static_idt/src/test_stubs.S
index 46d6030eab4..4767f0d9100 100644
--- a/samples/microkernel/test/test_static_idt/src/test_stubs.S
+++ b/samples/microkernel/test/test_static_idt/src/test_stubs.S
@@ -43,7 +43,7 @@ testing.
 /* IA-32 specific */
 
 #include <arch/cpu.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/x86/asm.h>
 #include <asmPrv.h>
 #include <asm_inline.h>
diff --git a/samples/nanokernel/test/test_context/src/context.c b/samples/nanokernel/test/test_context/src/context.c
index 9f3c01d7129..7ffb9f13bf3 100644
--- a/samples/nanokernel/test/test_context/src/context.c
+++ b/samples/nanokernel/test/test_context/src/context.c
@@ -42,7 +42,7 @@ This module tests the following CPU and context related routines:
 */
 
 #include <tc_util.h>
-#include <nanok.h>
+#include <nano_private.h>
 #include <arch/cpu.h>
 
 /* test uses 1 software IRQs */