diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c
index d97cc1f58a5..54fc76d8d45 100644
--- a/arch/arc/core/cache.c
+++ b/arch/arc/core/cache.c
@@ -20,7 +20,7 @@
 #include <cache.h>
 #include <linker/linker-defs.h>
 #include <arch/arc/v2/aux_regs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <misc/__assert.h>
 #include <init.h>
 
diff --git a/arch/arc/core/prep_c.c b/arch/arc/core/prep_c.c
index c40ea9e44e9..77c77241a14 100644
--- a/arch/arc/core/prep_c.c
+++ b/arch/arc/core/prep_c.c
@@ -21,7 +21,7 @@
 #include <linker/linker-defs.h>
 #include <arch/arc/v2/aux_regs.h>
 #include <kernel_structs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 
 /* XXX - keep for future use in full-featured cache APIs */
diff --git a/arch/arc/include/kernel_arch_data.h b/arch/arc/include/kernel_arch_data.h
index 548fc67a0bf..34cf9bb0fc6 100644
--- a/arch/arc/include/kernel_arch_data.h
+++ b/arch/arc/include/kernel_arch_data.h
@@ -32,7 +32,7 @@ extern "C" {
 
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <zephyr/types.h>
 #include <misc/util.h>
 #include <misc/dlist.h>
diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
index 334896314f0..f5737a0e73b 100644
--- a/arch/arm/core/cortex_m/prep_c.c
+++ b/arch/arm/core/cortex_m/prep_c.c
@@ -20,7 +20,7 @@
 #include <zephyr/types.h>
 #include <toolchain.h>
 #include <linker/linker-defs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <arch/arm/cortex_m/cmsis.h>
 #include <string.h>
 
diff --git a/arch/arm/include/kernel_arch_data.h b/arch/arm/include/kernel_arch_data.h
index 2979c7ab68f..51f1a3cceed 100644
--- a/arch/arm/include/kernel_arch_data.h
+++ b/arch/arm/include/kernel_arch_data.h
@@ -31,7 +31,7 @@ extern "C" {
 
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <zephyr/types.h>
 #include <misc/dlist.h>
 #include <atomic.h>
diff --git a/arch/nios2/core/prep_c.c b/arch/nios2/core/prep_c.c
index 04a04a029ef..52b19dce1e0 100644
--- a/arch/nios2/core/prep_c.c
+++ b/arch/nios2/core/prep_c.c
@@ -20,7 +20,7 @@
 #include <toolchain.h>
 #include <linker/linker-defs.h>
 #include <kernel_structs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 /**
  *
diff --git a/arch/nios2/core/thread.c b/arch/nios2/core/thread.c
index 98bcffca39d..2f6108ea138 100644
--- a/arch/nios2/core/thread.c
+++ b/arch/nios2/core/thread.c
@@ -5,7 +5,7 @@
  */
 
 #include <kernel.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <kernel_structs.h>
 #include <wait_q.h>
 #include <string.h>
diff --git a/arch/nios2/include/kernel_arch_data.h b/arch/nios2/include/kernel_arch_data.h
index c8d6e31636f..13c7878de34 100644
--- a/arch/nios2/include/kernel_arch_data.h
+++ b/arch/nios2/include/kernel_arch_data.h
@@ -32,7 +32,7 @@ extern "C" {
 
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <zephyr/types.h>
 #include <misc/util.h>
 #include <misc/dlist.h>
diff --git a/arch/posix/core/posix_core.c b/arch/posix/core/posix_core.c
index 3fdc9594f1d..debc4892231 100644
--- a/arch/posix/core/posix_core.c
+++ b/arch/posix/core/posix_core.c
@@ -44,7 +44,7 @@
 
 #include "posix_core.h"
 #include "posix_soc_if.h"
-#include "nano_internal.h"
+#include "kernel_internal.h"
 #include "kernel_structs.h"
 #include "ksched.h"
 
diff --git a/arch/posix/include/kernel_arch_data.h b/arch/posix/include/kernel_arch_data.h
index bd0aedb7116..e8a9fe50589 100644
--- a/arch/posix/include/kernel_arch_data.h
+++ b/arch/posix/include/kernel_arch_data.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 /* stacks */
 #define STACK_ROUND_UP(x) ROUND_UP(x, STACK_ALIGN_SIZE)
diff --git a/arch/posix/soc/inf_clock/soc.c b/arch/posix/soc/inf_clock/soc.c
index ace8c28992b..cf560dfe321 100644
--- a/arch/posix/soc/inf_clock/soc.c
+++ b/arch/posix/soc/inf_clock/soc.c
@@ -32,7 +32,7 @@
 #include "posix_soc.h"
 #include "posix_board_if.h"
 #include "posix_core.h"
-#include "nano_internal.h"
+#include "kernel_internal.h"
 
 #define POSIX_ARCH_SOC_DEBUG_PRINTS 0
 
diff --git a/arch/riscv32/core/prep_c.c b/arch/riscv32/core/prep_c.c
index a92f1001a56..e131857a98b 100644
--- a/arch/riscv32/core/prep_c.c
+++ b/arch/riscv32/core/prep_c.c
@@ -18,7 +18,7 @@
 #include <stddef.h>
 #include <toolchain.h>
 #include <kernel_structs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 /**
  *
diff --git a/arch/riscv32/include/kernel_arch_data.h b/arch/riscv32/include/kernel_arch_data.h
index a0eae52a1b9..0d0d9b5962b 100644
--- a/arch/riscv32/include/kernel_arch_data.h
+++ b/arch/riscv32/include/kernel_arch_data.h
@@ -29,7 +29,7 @@ extern "C" {
 #include <zephyr/types.h>
 #include <misc/util.h>
 #include <misc/dlist.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 struct _kernel_arch {
 	/* nothing for now */
diff --git a/arch/x86/include/kernel_arch_data.h b/arch/x86/include/kernel_arch_data.h
index c368810868b..9f82a292f02 100644
--- a/arch/x86/include/kernel_arch_data.h
+++ b/arch/x86/include/kernel_arch_data.h
@@ -34,7 +34,7 @@
 
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <zephyr/types.h>
 #include <misc/dlist.h>
 #endif
diff --git a/arch/xtensa/include/kernel_arch_data.h b/arch/xtensa/include/kernel_arch_data.h
index 08354208462..a694a54214d 100644
--- a/arch/xtensa/include/kernel_arch_data.h
+++ b/arch/xtensa/include/kernel_arch_data.h
@@ -31,7 +31,7 @@ extern "C" {
 
 #if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__)
 #include <kernel.h>            /* public kernel API */
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <zephyr/types.h>
 #include <misc/dlist.h>
 #include <misc/util.h>
diff --git a/kernel/include/nano_internal.h b/kernel/include/kernel_internal.h
similarity index 100%
rename from kernel/include/nano_internal.h
rename to kernel/include/kernel_internal.h
diff --git a/kernel/include/syscall_handler.h b/kernel/include/syscall_handler.h
index 970a10400bf..8df61823f23 100644
--- a/kernel/include/syscall_handler.h
+++ b/kernel/include/syscall_handler.h
@@ -13,7 +13,7 @@
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
 #include <misc/printk.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 extern const _k_syscall_handler_t _k_syscall_table[K_SYSCALL_LIMIT];
 
diff --git a/kernel/mem_domain.c b/kernel/mem_domain.c
index c50e19e5c84..51f369e2039 100644
--- a/kernel/mem_domain.c
+++ b/kernel/mem_domain.c
@@ -7,7 +7,7 @@
 #include <init.h>
 #include <kernel.h>
 #include <kernel_structs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <misc/__assert.h>
 
 static u8_t max_partitions;
diff --git a/kernel/thread_abort.c b/kernel/thread_abort.c
index 0298b93e452..ea87bc1b327 100644
--- a/kernel/thread_abort.c
+++ b/kernel/thread_abort.c
@@ -12,7 +12,7 @@
 
 #include <kernel.h>
 #include <kernel_structs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <string.h>
 #include <toolchain.h>
 #include <linker/sections.h>
diff --git a/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c b/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
index 137c24f0132..a53b3973cd2 100644
--- a/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
+++ b/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
@@ -11,7 +11,7 @@
 #include <linker/linker-defs.h>
 #include <arch/x86/arch.h>
 #include <ztest.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 #define SKIP_SIZE 5
 #define BUFF_SIZE 10