diff --git a/Kbuild b/Kbuild
index 539b5e4cfd5..ba9a09c574c 100644
--- a/Kbuild
+++ b/Kbuild
@@ -92,7 +92,7 @@ OFFSETS_INCLUDE = $(strip \
 		-include $(CURDIR)/include/generated/autoconf.h \
 		-I $(srctree)/include \
 		-I $(CURDIR)/include/generated \
-		-I $(srctree)/kernel/unified/include \
+		-I $(srctree)/kernel/include \
 		$(OFFSETS_INCLUDE_KERNEL_LOCATION) \
 		-I $(srctree)/lib/libc/minimal/include \
 		-I $(srctree)/arch/${ARCH}/include )
diff --git a/Makefile b/Makefile
index 16f5ddde754..0ed598b5f4c 100644
--- a/Makefile
+++ b/Makefile
@@ -366,7 +366,7 @@ export ARCH KERNEL_NAME KERNEL_ELF_NAME KERNEL_BIN_NAME KERNEL_HEX_NAME
 # Use ZEPHYRINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 ZEPHYRINCLUDE    = \
-		-I$(srctree)/kernel/unified/include \
+		-I$(srctree)/kernel/include \
 		-I$(srctree)/arch/$(ARCH)/include \
 		-I$(srctree)/arch/$(ARCH)/soc/$(SOC_PATH) \
 		-I$(srctree)/boards/$(ARCH)/$(BOARD_NAME) \
@@ -592,7 +592,7 @@ include/config/auto.conf: ;
 endif # $(dot-config)
 
 # kernel objects are built as a static library
-libs-y := kernel/unified/
+libs-y := kernel/
 core-y := lib/ misc/ boards/ ext/ subsys/ tests/ arch/
 drivers-y := drivers/
 
diff --git a/arch/arc/core/Makefile b/arch/arc/core/Makefile
index 0fe47d0f623..bc16184b0ba 100644
--- a/arch/arc/core/Makefile
+++ b/arch/arc/core/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 ccflags-y +=-I$(srctree)/arch/$(ARCH)/include
 
 obj-y += thread.o thread_entry_wrapper.o \
diff --git a/arch/arm/core/Makefile b/arch/arm/core/Makefile
index 18d8b102333..f738f43f8f3 100644
--- a/arch/arm/core/Makefile
+++ b/arch/arm/core/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 asflags-y := ${ccflags-y}
 
 obj-y = exc_exit.o irq_init.o \
diff --git a/arch/arm/core/cortex_m/Makefile b/arch/arm/core/cortex_m/Makefile
index dd2bf98ee67..a671b28f962 100644
--- a/arch/arm/core/cortex_m/Makefile
+++ b/arch/arm/core/cortex_m/Makefile
@@ -1,6 +1,6 @@
 ccflags-y +=-I$(srctree)/include/drivers
 ccflags-y +=-I$(srctree)/arch/arm/soc/$(SOC_PATH)
-ccflags-y +=-I$(srctree)/kernel/unified/include
+ccflags-y +=-I$(srctree)/kernel/include
 
 asflags-y = $(ccflags-y)
 
diff --git a/arch/nios2/core/Makefile b/arch/nios2/core/Makefile
index e0a9fd9066c..6ef0ce02384 100644
--- a/arch/nios2/core/Makefile
+++ b/arch/nios2/core/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 ccflags-y += -I$(srctree)/arch/$(ARCH)/include
 
 obj-y += reset.o irq_manage.o fatal.o swap.o thread.o \
diff --git a/arch/x86/core/Makefile b/arch/x86/core/Makefile
index b7d5a62d247..2f1e78fbcc3 100644
--- a/arch/x86/core/Makefile
+++ b/arch/x86/core/Makefile
@@ -1,5 +1,5 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
-asflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
+asflags-y += -I$(srctree)/kernel/include
 
 ifeq ($(COMPILER)$(CONFIG_X86_IAMCU),clang)
 # We rely on GAS for assembling, so don't use the integrated assembler
diff --git a/kernel/unified/Makefile b/kernel/Makefile
similarity index 93%
rename from kernel/unified/Makefile
rename to kernel/Makefile
index 78f50ad0866..6a4f6e85594 100644
--- a/kernel/unified/Makefile
+++ b/kernel/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/kernel/unified/include
+ccflags-y += -I$(srctree)/kernel/include
 
 asflags-y := ${ccflags-y}
 
diff --git a/kernel/unified/alert.c b/kernel/alert.c
similarity index 100%
rename from kernel/unified/alert.c
rename to kernel/alert.c
diff --git a/kernel/unified/atomic_c.c b/kernel/atomic_c.c
similarity index 100%
rename from kernel/unified/atomic_c.c
rename to kernel/atomic_c.c
diff --git a/kernel/unified/compiler_stack_protect.c b/kernel/compiler_stack_protect.c
similarity index 100%
rename from kernel/unified/compiler_stack_protect.c
rename to kernel/compiler_stack_protect.c
diff --git a/kernel/unified/device.c b/kernel/device.c
similarity index 100%
rename from kernel/unified/device.c
rename to kernel/device.c
diff --git a/kernel/unified/errno.c b/kernel/errno.c
similarity index 100%
rename from kernel/unified/errno.c
rename to kernel/errno.c
diff --git a/kernel/unified/event_logger.c b/kernel/event_logger.c
similarity index 100%
rename from kernel/unified/event_logger.c
rename to kernel/event_logger.c
diff --git a/kernel/unified/fifo.c b/kernel/fifo.c
similarity index 100%
rename from kernel/unified/fifo.c
rename to kernel/fifo.c
diff --git a/kernel/unified/idle.c b/kernel/idle.c
similarity index 100%
rename from kernel/unified/idle.c
rename to kernel/idle.c
diff --git a/kernel/unified/include/gen_offset.h b/kernel/include/gen_offset.h
similarity index 100%
rename from kernel/unified/include/gen_offset.h
rename to kernel/include/gen_offset.h
diff --git a/kernel/unified/include/kernel_offsets.h b/kernel/include/kernel_offsets.h
similarity index 100%
rename from kernel/unified/include/kernel_offsets.h
rename to kernel/include/kernel_offsets.h
diff --git a/kernel/unified/include/kernel_structs.h b/kernel/include/kernel_structs.h
similarity index 100%
rename from kernel/unified/include/kernel_structs.h
rename to kernel/include/kernel_structs.h
diff --git a/kernel/unified/include/ksched.h b/kernel/include/ksched.h
similarity index 100%
rename from kernel/unified/include/ksched.h
rename to kernel/include/ksched.h
diff --git a/kernel/unified/include/nano_internal.h b/kernel/include/nano_internal.h
similarity index 100%
rename from kernel/unified/include/nano_internal.h
rename to kernel/include/nano_internal.h
diff --git a/kernel/unified/include/offsets_short.h b/kernel/include/offsets_short.h
similarity index 100%
rename from kernel/unified/include/offsets_short.h
rename to kernel/include/offsets_short.h
diff --git a/kernel/unified/include/timeout_q.h b/kernel/include/timeout_q.h
similarity index 100%
rename from kernel/unified/include/timeout_q.h
rename to kernel/include/timeout_q.h
diff --git a/kernel/unified/include/wait_q.h b/kernel/include/wait_q.h
similarity index 100%
rename from kernel/unified/include/wait_q.h
rename to kernel/include/wait_q.h
diff --git a/kernel/unified/init.c b/kernel/init.c
similarity index 100%
rename from kernel/unified/init.c
rename to kernel/init.c
diff --git a/kernel/unified/int_latency_bench.c b/kernel/int_latency_bench.c
similarity index 100%
rename from kernel/unified/int_latency_bench.c
rename to kernel/int_latency_bench.c
diff --git a/kernel/unified/kernel_event_logger.c b/kernel/kernel_event_logger.c
similarity index 100%
rename from kernel/unified/kernel_event_logger.c
rename to kernel/kernel_event_logger.c
diff --git a/kernel/unified/legacy_offload.c b/kernel/legacy_offload.c
similarity index 100%
rename from kernel/unified/legacy_offload.c
rename to kernel/legacy_offload.c
diff --git a/kernel/unified/legacy_timer.c b/kernel/legacy_timer.c
similarity index 100%
rename from kernel/unified/legacy_timer.c
rename to kernel/legacy_timer.c
diff --git a/kernel/unified/lifo.c b/kernel/lifo.c
similarity index 100%
rename from kernel/unified/lifo.c
rename to kernel/lifo.c
diff --git a/kernel/unified/mailbox.c b/kernel/mailbox.c
similarity index 100%
rename from kernel/unified/mailbox.c
rename to kernel/mailbox.c
diff --git a/kernel/unified/mem_pool.c b/kernel/mem_pool.c
similarity index 100%
rename from kernel/unified/mem_pool.c
rename to kernel/mem_pool.c
diff --git a/kernel/unified/mem_slab.c b/kernel/mem_slab.c
similarity index 100%
rename from kernel/unified/mem_slab.c
rename to kernel/mem_slab.c
diff --git a/kernel/unified/msg_q.c b/kernel/msg_q.c
similarity index 100%
rename from kernel/unified/msg_q.c
rename to kernel/msg_q.c
diff --git a/kernel/unified/mutex.c b/kernel/mutex.c
similarity index 100%
rename from kernel/unified/mutex.c
rename to kernel/mutex.c
diff --git a/kernel/unified/pipes.c b/kernel/pipes.c
similarity index 100%
rename from kernel/unified/pipes.c
rename to kernel/pipes.c
diff --git a/kernel/unified/sched.c b/kernel/sched.c
similarity index 100%
rename from kernel/unified/sched.c
rename to kernel/sched.c
diff --git a/kernel/unified/sem.c b/kernel/sem.c
similarity index 100%
rename from kernel/unified/sem.c
rename to kernel/sem.c
diff --git a/kernel/unified/stack.c b/kernel/stack.c
similarity index 100%
rename from kernel/unified/stack.c
rename to kernel/stack.c
diff --git a/kernel/unified/sys_clock.c b/kernel/sys_clock.c
similarity index 100%
rename from kernel/unified/sys_clock.c
rename to kernel/sys_clock.c
diff --git a/kernel/unified/system_work_q.c b/kernel/system_work_q.c
similarity index 100%
rename from kernel/unified/system_work_q.c
rename to kernel/system_work_q.c
diff --git a/kernel/unified/thread.c b/kernel/thread.c
similarity index 100%
rename from kernel/unified/thread.c
rename to kernel/thread.c
diff --git a/kernel/unified/thread_abort.c b/kernel/thread_abort.c
similarity index 100%
rename from kernel/unified/thread_abort.c
rename to kernel/thread_abort.c
diff --git a/kernel/unified/timer.c b/kernel/timer.c
similarity index 100%
rename from kernel/unified/timer.c
rename to kernel/timer.c
diff --git a/kernel/unified/version.c b/kernel/version.c
similarity index 100%
rename from kernel/unified/version.c
rename to kernel/version.c
diff --git a/kernel/unified/work_q.c b/kernel/work_q.c
similarity index 100%
rename from kernel/unified/work_q.c
rename to kernel/work_q.c
diff --git a/samples/philosophers/src/main.c b/samples/philosophers/src/main.c
index d2bc79e3736..778eedcead1 100644
--- a/samples/philosophers/src/main.c
+++ b/samples/philosophers/src/main.c
@@ -17,7 +17,7 @@
 /**
  * @file
  *
- * Dining philosophers demo for unified kernel.
+ * Dining philosophers demo
  *
  * The demo can be configured to use different object types for its
  * synchronization: SEMAPHORES, MUTEXES, STACKS, FIFOS and LIFOS. To configure
diff --git a/subsys/net/ip/Kconfig.mgmt b/subsys/net/ip/Kconfig.mgmt
index f698eb42545..6308a8526b8 100644
--- a/subsys/net/ip/Kconfig.mgmt
+++ b/subsys/net/ip/Kconfig.mgmt
@@ -20,9 +20,7 @@ menuconfig NET_MGMT
 	help
 	Add support for NM API that enables managing different aspects
 	of the network stack as well as receiving notification on network
-	events (ip address change, iface up and running ...). Beware this
-	requires the new unified kernel (KERNEL_V2) and cannot be used in
-	former nanokernel.
+	events (ip address change, iface up and running ...).
 
 if NET_MGMT