diff --git a/arch/arm/core/nano_fiber_abort.c b/arch/arm/core/nano_fiber_abort.c
index 395cc5e2b32..a7d2a77d072 100644
--- a/arch/arm/core/nano_fiber_abort.c
+++ b/arch/arm/core/nano_fiber_abort.c
@@ -51,7 +51,7 @@ the PendSV exception.
 #include <nanokernel.h>
 #include <nanokernel/cpu.h>
 
-extern void _NanoFiberSwap(void);
+extern void _nano_fiber_swap(void);
 
 /*******************************************************************************
 *
@@ -70,7 +70,7 @@ void fiber_abort(void)
 {
 	_context_exit(_NanoKernel.current);
 	if (_ScbIsInThreadMode()) {
-		_NanoFiberSwap();
+		_nano_fiber_swap();
 	} else {
 		_ScbPendsvSet();
 	}
diff --git a/kernel/nanokernel/core/nanofiber.c b/kernel/nanokernel/core/nanofiber.c
index f3777f400cd..46dcce5d3fa 100644
--- a/kernel/nanokernel/core/nanofiber.c
+++ b/kernel/nanokernel/core/nanofiber.c
@@ -257,7 +257,7 @@ void fiber_yield(void)
 
 /*******************************************************************************
 *
-* _NanoFiberSwap - pass control from the currently executing fiber
+* _nano_fiber_swap - pass control from the currently executing fiber
 *
 * This routine is used when a fiber voluntarily gives up control of the CPU.
 *
@@ -266,7 +266,7 @@ void fiber_yield(void)
 * RETURNS: This function never returns
 */
 
-FUNC_NORETURN void _NanoFiberSwap(void)
+FUNC_NORETURN void _nano_fiber_swap(void)
 {
 	unsigned int imask;
 
@@ -310,7 +310,7 @@ FUNC_NORETURN void fiber_abort(void)
 	/* Do normal context exit cleanup, then give up CPU control */
 
 	_context_exit(_NanoKernel.current);
-	_NanoFiberSwap();
+	_nano_fiber_swap();
 }
 #endif
 
@@ -336,9 +336,9 @@ FUNC_NORETURN void fiber_abort(void)
 void _NanoStart(void)
 {
 	PRINT_BOOT_BANNER();
-	_NanoFiberSwap();
+	_nano_fiber_swap();
 }
 
 #else
-FUNC_ALIAS(_NanoFiberSwap, _NanoStart, void);
+FUNC_ALIAS(_nano_fiber_swap, _NanoStart, void);
 #endif