From c1347b47303a0e60efb6e1d7824c6abf69090ea8 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Fri, 23 Dec 2016 08:35:34 -0500
Subject: [PATCH] kernel: replace all remaining nanokernel occurances

replace include <nanokernel.h> with <kernel.h> everywhere and also fix
any remaining mentions of nanokernel.

Keep the legacy samples/tests as is.

Change-Id: Iac48447bd191e83f21a719c69dc26233216d08dc
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 MAINTAINERS                                       | 5 ++---
 arch/arc/core/cache.c                             | 2 +-
 arch/arc/core/fault.c                             | 2 +-
 arch/arc/core/irq_manage.c                        | 2 +-
 arch/arc/core/irq_offload.c                       | 2 +-
 arch/arc/core/sys_fatal_error_handler.c           | 2 +-
 arch/arc/core/thread.c                            | 2 +-
 arch/arc/soc/quark_se_c1000_ss/soc.c              | 2 +-
 arch/arm/core/cortex_m/exc_manage.c               | 2 +-
 arch/arm/core/cortex_m/nmi.c                      | 2 +-
 arch/arm/core/cortex_m/prep_c.c                   | 2 +-
 arch/arm/core/cortex_m/scb.c                      | 2 +-
 arch/arm/core/cortex_m/scs.c                      | 2 +-
 arch/arm/core/fatal.c                             | 2 +-
 arch/arm/core/fault.c                             | 2 +-
 arch/arm/core/irq_init.c                          | 2 +-
 arch/arm/core/irq_manage.c                        | 2 +-
 arch/arm/core/irq_offload.c                       | 2 +-
 arch/arm/core/thread.c                            | 2 +-
 arch/arm/soc/arm/beetle/soc.c                     | 2 +-
 arch/arm/soc/atmel_sam3/soc.c                     | 2 +-
 arch/arm/soc/nordic_nrf5/nrf51/soc.c              | 2 +-
 arch/arm/soc/nordic_nrf5/nrf52/soc.c              | 2 +-
 arch/arm/soc/nxp_kinetis/k6x/soc.c                | 2 +-
 arch/arm/soc/nxp_kinetis/k6x/soc_config.c         | 2 +-
 arch/arm/soc/st_stm32/stm32f1/soc.c               | 2 +-
 arch/arm/soc/st_stm32/stm32f4/soc.c               | 2 +-
 arch/arm/soc/st_stm32/stm32l4/soc.c               | 2 +-
 arch/arm/soc/ti_lm3s6965/soc.c                    | 2 +-
 arch/arm/soc/ti_lm3s6965/soc_config.c             | 2 +-
 arch/arm/soc/ti_simplelink/cc32xx/soc.c           | 2 +-
 arch/nios2/core/cpu_idle.c                        | 2 +-
 arch/nios2/core/fatal.c                           | 2 +-
 arch/nios2/core/irq_manage.c                      | 2 +-
 arch/nios2/core/irq_offload.c                     | 2 +-
 arch/nios2/core/swap.S                            | 2 +-
 arch/x86/core/cache.c                             | 2 +-
 arch/x86/core/debug/debug_frames.c                | 2 +-
 arch/x86/core/fatal.c                             | 2 +-
 arch/x86/core/irq_manage.c                        | 2 +-
 arch/x86/core/irq_offload.c                       | 2 +-
 arch/x86/core/reboot_rst_cnt.c                    | 2 +-
 arch/x86/core/sys_fatal_error_handler.c           | 2 +-
 arch/x86/debug/gdb_arch.c                         | 2 +-
 arch/x86/soc/atom/soc.c                           | 2 +-
 arch/x86/soc/ia32/soc.c                           | 2 +-
 arch/x86/soc/intel_quark/quark_se/eoi.c           | 2 +-
 arch/x86/soc/intel_quark/quark_se/soc.c           | 2 +-
 arch/x86/soc/intel_quark/quark_se/soc_config.c    | 2 +-
 arch/x86/soc/intel_quark/quark_x1000/soc.c        | 2 +-
 drivers/gpio/gpio_cc32xx.c                        | 2 +-
 drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c | 2 +-
 misc/reboot.c                                     | 2 +-
 samples/philosophers/README.txt                   | 6 ++----
 samples/usb/dfu/src/usb_dfu.c                     | 2 +-
 subsys/debug/gdb_server.c                         | 2 +-
 subsys/debug/mem_safe_check_boundaries.c          | 2 +-
 57 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3da30ee7c2..daf3fb049c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -252,7 +252,6 @@ S:	Supported
 F:	kernel/
 F:	include/nanokernel.h
 F:	include/microkernel.h
-F:	include/microkernel/
 F:	include/misc/
 F:	include/toolchain/
 F:	include/atomic.h
@@ -357,8 +356,8 @@ F:	arch/x86/core/crt0.S
 F:	include/device.h
 F:	include/init.h
 F:	include/power.h
-F:	kernel/microkernel/k_idle.c
-F:	kernel/nanokernel/device.c
+F:	kernel/k_idle.c
+F:	kernel/device.c
 F:	samples/power/
 
 QMSI
diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c
index af8a3f12c0..0f4483ee12 100644
--- a/arch/arc/core/cache.c
+++ b/arch/arc/core/cache.c
@@ -23,7 +23,7 @@
  * This module contains functions for manipulation of the d-cache.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/util.h>
 #include <toolchain.h>
diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c
index da690ee9af..711b026d97 100644
--- a/arch/arc/core/fault.c
+++ b/arch/arc/core/fault.c
@@ -25,7 +25,7 @@
 #include <sections.h>
 #include <inttypes.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 #ifdef CONFIG_PRINTK
diff --git a/arch/arc/core/irq_manage.c b/arch/arc/core/irq_manage.c
index 30f043be98..64d61cfdb1 100644
--- a/arch/arc/core/irq_manage.c
+++ b/arch/arc/core/irq_manage.c
@@ -27,7 +27,7 @@
  * number from 16 to last IRQ number on the platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <toolchain.h>
diff --git a/arch/arc/core/irq_offload.c b/arch/arc/core/irq_offload.c
index 0c5a4c867a..c92a0aa846 100644
--- a/arch/arc/core/irq_offload.c
+++ b/arch/arc/core/irq_offload.c
@@ -18,7 +18,7 @@
  * @file Software interrupts utility code - ARC implementation
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <irq_offload.h>
 
 static irq_offload_routine_t offload_routine;
diff --git a/arch/arc/core/sys_fatal_error_handler.c b/arch/arc/core/sys_fatal_error_handler.c
index f3a5f41b36..0fe2ba96ec 100644
--- a/arch/arc/core/sys_fatal_error_handler.c
+++ b/arch/arc/core/sys_fatal_error_handler.c
@@ -21,7 +21,7 @@
  * This module provides the _SysFatalErrorHandler() routine for ARCv2 BSPs.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <kernel_structs.h>
diff --git a/arch/arc/core/thread.c b/arch/arc/core/thread.c
index 517ce508ad..143fd94324 100644
--- a/arch/arc/core/thread.c
+++ b/arch/arc/core/thread.c
@@ -21,7 +21,7 @@
  * Core thread related primitives for the ARCv2 processor architecture.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <kernel_structs.h>
 #include <offsets_short.h>
diff --git a/arch/arc/soc/quark_se_c1000_ss/soc.c b/arch/arc/soc/quark_se_c1000_ss/soc.c
index ebdb10fd0c..fc5ca1e8b3 100644
--- a/arch/arc/soc/quark_se_c1000_ss/soc.c
+++ b/arch/arc/soc/quark_se_c1000_ss/soc.c
@@ -21,7 +21,7 @@
  * for the Quark SE platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include "soc.h"
 #include <init.h>
 #include <quark_se/shared_mem.h>
diff --git a/arch/arm/core/cortex_m/exc_manage.c b/arch/arm/core/cortex_m/exc_manage.c
index dfaa23c836..70df9568fa 100644
--- a/arch/arm/core/cortex_m/exc_manage.c
+++ b/arch/arm/core/cortex_m/exc_manage.c
@@ -18,7 +18,7 @@
  * @file exception related routines
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <inttypes.h>
 
diff --git a/arch/arm/core/cortex_m/nmi.c b/arch/arm/core/cortex_m/nmi.c
index 8a7b644f43..468fe3c8ba 100644
--- a/arch/arm/core/cortex_m/nmi.c
+++ b/arch/arm/core/cortex_m/nmi.c
@@ -23,7 +23,7 @@
  * custom run time handler.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/printk.h>
 #include <misc/reboot.h>
diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
index 4311e889ad..449d2be700 100644
--- a/arch/arm/core/cortex_m/prep_c.c
+++ b/arch/arm/core/cortex_m/prep_c.c
@@ -26,7 +26,7 @@
  * initialization is performed.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <stdint.h>
 #include <toolchain.h>
 #include <linker-defs.h>
diff --git a/arch/arm/core/cortex_m/scb.c b/arch/arm/core/cortex_m/scb.c
index 0408d9d079..9f05b2b199 100644
--- a/arch/arm/core/cortex_m/scb.c
+++ b/arch/arm/core/cortex_m/scb.c
@@ -24,7 +24,7 @@
  * definitions and more complex routines, if needed.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/util.h>
 
diff --git a/arch/arm/core/cortex_m/scs.c b/arch/arm/core/cortex_m/scs.c
index e40cafba6b..f63ff8481d 100644
--- a/arch/arm/core/cortex_m/scs.c
+++ b/arch/arm/core/cortex_m/scs.c
@@ -23,7 +23,7 @@
  * definitions and more complex routines, if needed.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/arch/arm/core/fatal.c b/arch/arm/core/fatal.c
index fd17f37d33..2d784cf532 100644
--- a/arch/arm/core/fatal.c
+++ b/arch/arm/core/fatal.c
@@ -25,7 +25,7 @@
 #include <sections.h>
 #include <inttypes.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 #ifdef CONFIG_PRINTK
diff --git a/arch/arm/core/fault.c b/arch/arm/core/fault.c
index 7969d816ac..040b1e97e0 100644
--- a/arch/arm/core/fault.c
+++ b/arch/arm/core/fault.c
@@ -24,7 +24,7 @@
 #include <toolchain.h>
 #include <sections.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <inttypes.h>
 
diff --git a/arch/arm/core/irq_init.c b/arch/arm/core/irq_init.c
index 957806a737..856c19685c 100644
--- a/arch/arm/core/irq_init.c
+++ b/arch/arm/core/irq_init.c
@@ -28,7 +28,7 @@
 
 #include <toolchain.h>
 #include <sections.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 /**
diff --git a/arch/arm/core/irq_manage.c b/arch/arm/core/irq_manage.c
index b889bc0f59..214913067b 100644
--- a/arch/arm/core/irq_manage.c
+++ b/arch/arm/core/irq_manage.c
@@ -24,7 +24,7 @@
  * connecting ISRs at runtime.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <toolchain.h>
diff --git a/arch/arm/core/irq_offload.c b/arch/arm/core/irq_offload.c
index a608b175dd..0236e36644 100644
--- a/arch/arm/core/irq_offload.c
+++ b/arch/arm/core/irq_offload.c
@@ -18,7 +18,7 @@
  * @file Software interrupts utility code - ARM implementation
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <irq_offload.h>
 
 static irq_offload_routine_t offload_routine;
diff --git a/arch/arm/core/thread.c b/arch/arm/core/thread.c
index 922f7857f1..fdfd775f9f 100644
--- a/arch/arm/core/thread.c
+++ b/arch/arm/core/thread.c
@@ -21,7 +21,7 @@
  * Core thread related primitives for the ARM Cortex-M processor architecture.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <kernel_structs.h>
 #include <wait_q.h>
diff --git a/arch/arm/soc/arm/beetle/soc.c b/arch/arm/soc/arm/beetle/soc.c
index d804e5dd33..950a0e464f 100644
--- a/arch/arm/soc/arm/beetle/soc.c
+++ b/arch/arm/soc/arm/beetle/soc.c
@@ -22,7 +22,7 @@
  * for the ARM LTD Beetle SoC.
  */
 
- #include <nanokernel.h>
+ #include <kernel.h>
  #include <device.h>
  #include <init.h>
  #include <soc.h>
diff --git a/arch/arm/soc/atmel_sam3/soc.c b/arch/arm/soc/atmel_sam3/soc.c
index bdd572f1b9..0620b0834b 100644
--- a/arch/arm/soc/atmel_sam3/soc.c
+++ b/arch/arm/soc/atmel_sam3/soc.c
@@ -23,7 +23,7 @@
  * for the Atmel SAM3 family processor.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/nordic_nrf5/nrf51/soc.c b/arch/arm/soc/nordic_nrf5/nrf51/soc.c
index 10dd7e98e2..cea06efea7 100644
--- a/arch/arm/soc/nordic_nrf5/nrf51/soc.c
+++ b/arch/arm/soc/nordic_nrf5/nrf51/soc.c
@@ -23,7 +23,7 @@
  * for the Nordic Semiconductor nRF51 family processor.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/nordic_nrf5/nrf52/soc.c b/arch/arm/soc/nordic_nrf5/nrf52/soc.c
index 0a4224682b..d0a9afc40f 100644
--- a/arch/arm/soc/nordic_nrf5/nrf52/soc.c
+++ b/arch/arm/soc/nordic_nrf5/nrf52/soc.c
@@ -22,7 +22,7 @@
  * for the Nordic Semiconductor nRF52 family processor.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.c b/arch/arm/soc/nxp_kinetis/k6x/soc.c
index af93bf814a..972c14ad95 100644
--- a/arch/arm/soc/nxp_kinetis/k6x/soc.c
+++ b/arch/arm/soc/nxp_kinetis/k6x/soc.c
@@ -23,7 +23,7 @@
  * hardware for the fsl_frdm_k64f platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc_config.c b/arch/arm/soc/nxp_kinetis/k6x/soc_config.c
index de7754759a..1cefe52faf 100644
--- a/arch/arm/soc/nxp_kinetis/k6x/soc_config.c
+++ b/arch/arm/soc/nxp_kinetis/k6x/soc_config.c
@@ -22,7 +22,7 @@
 #include <device.h>
 #include <init.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include "soc.h"
 #include <fsl_common.h>
diff --git a/arch/arm/soc/st_stm32/stm32f1/soc.c b/arch/arm/soc/st_stm32/stm32f1/soc.c
index a0a05df1ee..efd2520424 100644
--- a/arch/arm/soc/st_stm32/stm32f1/soc.c
+++ b/arch/arm/soc/st_stm32/stm32f1/soc.c
@@ -19,7 +19,7 @@
  * @brief System/hardware module for STM32F1 processor
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/st_stm32/stm32f4/soc.c b/arch/arm/soc/st_stm32/stm32f4/soc.c
index 622b105ea2..cecdd30e02 100644
--- a/arch/arm/soc/st_stm32/stm32f4/soc.c
+++ b/arch/arm/soc/st_stm32/stm32f4/soc.c
@@ -20,7 +20,7 @@
  * @brief System/hardware module for STM32F4 processor
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/st_stm32/stm32l4/soc.c b/arch/arm/soc/st_stm32/stm32l4/soc.c
index f957577c48..28cfe4b323 100644
--- a/arch/arm/soc/st_stm32/stm32l4/soc.c
+++ b/arch/arm/soc/st_stm32/stm32l4/soc.c
@@ -20,7 +20,7 @@
  * @brief System/hardware module for STM32L4 processor
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/ti_lm3s6965/soc.c b/arch/arm/soc/ti_lm3s6965/soc.c
index d55017eff7..0d4043afa5 100644
--- a/arch/arm/soc/ti_lm3s6965/soc.c
+++ b/arch/arm/soc/ti_lm3s6965/soc.c
@@ -22,7 +22,7 @@
  * for the ti_lm3s6965 platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/arm/soc/ti_lm3s6965/soc_config.c b/arch/arm/soc/ti_lm3s6965/soc_config.c
index 3b1ce56919..71c59df8b3 100644
--- a/arch/arm/soc/ti_lm3s6965/soc_config.c
+++ b/arch/arm/soc/ti_lm3s6965/soc_config.c
@@ -21,7 +21,7 @@
 #include <device.h>
 #include <init.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include "soc.h"
 
diff --git a/arch/arm/soc/ti_simplelink/cc32xx/soc.c b/arch/arm/soc/ti_simplelink/cc32xx/soc.c
index 82631167aa..2477151e70 100644
--- a/arch/arm/soc/ti_simplelink/cc32xx/soc.c
+++ b/arch/arm/soc/ti_simplelink/cc32xx/soc.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/arch/nios2/core/cpu_idle.c b/arch/nios2/core/cpu_idle.c
index 99b8d12fd0..8b10c5638b 100644
--- a/arch/nios2/core/cpu_idle.c
+++ b/arch/nios2/core/cpu_idle.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 /**
diff --git a/arch/nios2/core/fatal.c b/arch/nios2/core/fatal.c
index 3e92f15580..5156d51bbc 100644
--- a/arch/nios2/core/fatal.c
+++ b/arch/nios2/core/fatal.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <kernel_structs.h>
 #include <misc/printk.h>
diff --git a/arch/nios2/core/irq_manage.c b/arch/nios2/core/irq_manage.c
index 1caa5a514e..707faeca02 100644
--- a/arch/nios2/core/irq_manage.c
+++ b/arch/nios2/core/irq_manage.c
@@ -21,7 +21,7 @@
  */
 
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <arch/cpu.h>
 #include <irq.h>
diff --git a/arch/nios2/core/irq_offload.c b/arch/nios2/core/irq_offload.c
index ba2f59af9c..921e6d9c79 100644
--- a/arch/nios2/core/irq_offload.c
+++ b/arch/nios2/core/irq_offload.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <irq_offload.h>
 
diff --git a/arch/nios2/core/swap.S b/arch/nios2/core/swap.S
index f97b56648b..6427c037a6 100644
--- a/arch/nios2/core/swap.S
+++ b/arch/nios2/core/swap.S
@@ -37,7 +37,7 @@ SECTION_FUNC(exception.other, _Swap)
 	movhi r10, %hi(_kernel)
 	ori   r10, r10, %lo(_kernel)
 
-	/* Get the pointer to nanokernel->current */
+	/* Get the pointer to kernel->current */
 	ldw  r11, _kernel_offset_to_current(r10)
 
 	/* Store all the callee saved registers. We either got here via
diff --git a/arch/x86/core/cache.c b/arch/x86/core/cache.c
index f5dfce0bac..cd9f2906ae 100644
--- a/arch/x86/core/cache.c
+++ b/arch/x86/core/cache.c
@@ -20,7 +20,7 @@
  * This module contains functions for manipulation caches.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/util.h>
 #include <toolchain.h>
diff --git a/arch/x86/core/debug/debug_frames.c b/arch/x86/core/debug/debug_frames.c
index a6b5a58ac5..d6e75e1e16 100644
--- a/arch/x86/core/debug/debug_frames.c
+++ b/arch/x86/core/debug/debug_frames.c
@@ -22,7 +22,7 @@
  * the current interrupt stack frame.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 
 NANO_ISF *sys_debug_current_isf_get(void)
diff --git a/arch/x86/core/fatal.c b/arch/x86/core/fatal.c
index e66c919651..bf12239452 100644
--- a/arch/x86/core/fatal.c
+++ b/arch/x86/core/fatal.c
@@ -24,7 +24,7 @@
 #include <toolchain.h>
 #include <sections.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <misc/printk.h>
 #include <arch/x86/irq_controller.h>
diff --git a/arch/x86/core/irq_manage.c b/arch/x86/core/irq_manage.c
index 5db238069e..3cf05a66af 100644
--- a/arch/x86/core/irq_manage.c
+++ b/arch/x86/core/irq_manage.c
@@ -24,7 +24,7 @@
  * global variable.)
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <kernel_structs.h>
 #include <misc/__assert.h>
diff --git a/arch/x86/core/irq_offload.c b/arch/x86/core/irq_offload.c
index d04cd1a924..e46d0c61e1 100644
--- a/arch/x86/core/irq_offload.c
+++ b/arch/x86/core/irq_offload.c
@@ -18,7 +18,7 @@
  * @file IRQ offload - x86 implementation
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <irq_offload.h>
 
 extern void (*_irq_sw_handler)(void);
diff --git a/arch/x86/core/reboot_rst_cnt.c b/arch/x86/core/reboot_rst_cnt.c
index 0a8b6111c2..8f1679e284 100644
--- a/arch/x86/core/reboot_rst_cnt.c
+++ b/arch/x86/core/reboot_rst_cnt.c
@@ -20,7 +20,7 @@
  * @details Implements the required 'arch' sub-APIs.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <misc/reboot.h>
 
 static inline void cold_reboot(void)
diff --git a/arch/x86/core/sys_fatal_error_handler.c b/arch/x86/core/sys_fatal_error_handler.c
index dbf0079985..233c2fb2b8 100644
--- a/arch/x86/core/sys_fatal_error_handler.c
+++ b/arch/x86/core/sys_fatal_error_handler.c
@@ -22,7 +22,7 @@
  * supported platforms.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <kernel_structs.h>
diff --git a/arch/x86/debug/gdb_arch.c b/arch/x86/debug/gdb_arch.c
index e849258c55..718b382ce2 100644
--- a/arch/x86/debug/gdb_arch.c
+++ b/arch/x86/debug/gdb_arch.c
@@ -19,7 +19,7 @@
  * x86 part of the GDB server
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <kernel_structs.h>
 #include <string.h>
 #include <debug/gdb_arch.h>
diff --git a/arch/x86/soc/atom/soc.c b/arch/x86/soc/atom/soc.c
index 0e254304a2..5b46d7e763 100644
--- a/arch/x86/soc/atom/soc.c
+++ b/arch/x86/soc/atom/soc.c
@@ -22,7 +22,7 @@
  * for the ia32 platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include "soc.h"
 #include <uart.h>
 #include <device.h>
diff --git a/arch/x86/soc/ia32/soc.c b/arch/x86/soc/ia32/soc.c
index 0e254304a2..5b46d7e763 100644
--- a/arch/x86/soc/ia32/soc.c
+++ b/arch/x86/soc/ia32/soc.c
@@ -22,7 +22,7 @@
  * for the ia32 platform.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include "soc.h"
 #include <uart.h>
 #include <device.h>
diff --git a/arch/x86/soc/intel_quark/quark_se/eoi.c b/arch/x86/soc/intel_quark/quark_se/eoi.c
index bc56161f19..402bcf244b 100644
--- a/arch/x86/soc/intel_quark/quark_se/eoi.c
+++ b/arch/x86/soc/intel_quark/quark_se/eoi.c
@@ -24,7 +24,7 @@
  * with the vector of the interrupt.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/x86/irq_controller.h>
 #include <sys_io.h>
 #include <interrupt_controller/ioapic_priv.h>
diff --git a/arch/x86/soc/intel_quark/quark_se/soc.c b/arch/x86/soc/intel_quark/quark_se/soc.c
index 7572cbc2eb..8fd69f703b 100644
--- a/arch/x86/soc/intel_quark/quark_se/soc.c
+++ b/arch/x86/soc/intel_quark/quark_se/soc.c
@@ -24,7 +24,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
 #include "soc.h"
diff --git a/arch/x86/soc/intel_quark/quark_se/soc_config.c b/arch/x86/soc/intel_quark/quark_se/soc_config.c
index f9575589a3..7b1ef7337d 100644
--- a/arch/x86/soc/intel_quark/quark_se/soc_config.c
+++ b/arch/x86/soc/intel_quark/quark_se/soc_config.c
@@ -20,7 +20,7 @@
 #include <init.h>
 
 #include "board.h"
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #if CONFIG_IPM_QUARK_SE
diff --git a/arch/x86/soc/intel_quark/quark_x1000/soc.c b/arch/x86/soc/intel_quark/quark_x1000/soc.c
index bfce3c7345..8c3e4d8bd6 100644
--- a/arch/x86/soc/intel_quark/quark_x1000/soc.c
+++ b/arch/x86/soc/intel_quark/quark_x1000/soc.c
@@ -25,7 +25,7 @@
  * Handlers for the secondary serial port have not been added.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <init.h>
 #include <device.h>
 #include <misc/printk.h>
diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c
index c8e0c67e9a..de8c8dc7be 100644
--- a/drivers/gpio/gpio_cc32xx.c
+++ b/drivers/gpio/gpio_cc32xx.c
@@ -18,7 +18,7 @@
 #include <device.h>
 #include <gpio.h>
 #include <init.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <sys_io.h>
 
 /* Driverlib includes */
diff --git a/drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c b/drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c
index 0124647ded..dcd234b255 100644
--- a/drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c
+++ b/drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
diff --git a/misc/reboot.c b/misc/reboot.c
index b626b27da1..85c0835ea6 100644
--- a/misc/reboot.c
+++ b/misc/reboot.c
@@ -20,7 +20,7 @@
  * @details See misc/Kconfig and the reboot help for details.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <drivers/system_timer.h>
 #include <misc/printk.h>
 #include <misc/reboot.h>
diff --git a/samples/philosophers/README.txt b/samples/philosophers/README.txt
index c9f2ba2c73..547885f613 100644
--- a/samples/philosophers/README.txt
+++ b/samples/philosophers/README.txt
@@ -3,9 +3,7 @@ Title: Dining Philosophers
 Description:
 
 An implementation of a solution to the Dining Philosophers problem
-(a classic multi-thread synchronization problem).  This particular
-implementation demonstrates the usage of nanokernel semaphores and
-timers from multiple (6) fibers.
+(a classic multi-thread synchronization problem).
 
 The philosopher always tries to get the lowest fork first (f1 then f2).  When
 done, he will give back the forks in the reverse order (f2 then f1).  If he
@@ -20,7 +18,7 @@ Each Philosopher will randomly alternate between the EATING and THINKING state.
 
 Building and Running Project:
 
-This nanokernel project outputs to the console.  It can be built and executed
+This project outputs to the console.  It can be built and executed
 on QEMU as follows:
 
     make qemu
diff --git a/samples/usb/dfu/src/usb_dfu.c b/samples/usb/dfu/src/usb_dfu.c
index a53334d757..476313791c 100644
--- a/samples/usb/dfu/src/usb_dfu.c
+++ b/samples/usb/dfu/src/usb_dfu.c
@@ -37,7 +37,7 @@
  *
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <stdio.h>
 #include <errno.h>
 #include <flash.h>
diff --git a/subsys/debug/gdb_server.c b/subsys/debug/gdb_server.c
index 35e220cd96..363d1776b9 100644
--- a/subsys/debug/gdb_server.c
+++ b/subsys/debug/gdb_server.c
@@ -324,7 +324,7 @@
  *       %CONFIG_GDB_REMOTE_SERIAL_EXT_NOTIF_PREFIX_STR:<notificationData>#<checksum>
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/subsys/debug/mem_safe_check_boundaries.c b/subsys/debug/mem_safe_check_boundaries.c
index 31f46d72df..d253ddf9d1 100644
--- a/subsys/debug/mem_safe_check_boundaries.c
+++ b/subsys/debug/mem_safe_check_boundaries.c
@@ -21,7 +21,7 @@
  * @details See debug/Kconfig and the "Safe memory access" help for details.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <init.h>
 #include <errno.h>
 #include <toolchain.h>