diff --git a/arch/arc/core/swap.S b/arch/arc/core/swap.S
index 1e698697080..7df1c1f1073 100644
--- a/arch/arc/core/swap.S
+++ b/arch/arc/core/swap.S
@@ -62,7 +62,8 @@ GDATA(_kernel)
  * When _Swap() is invoked, we know the decision to perform a context switch or
  * not has already been taken and a context switch must happen.
  *
- * @return may contain a return value setup by a call to fiberRtnValueSet()
+ * @return may contain a return value setup by a call to
+ * _set_thread_return_value()
  *
  * C function prototype:
  *
@@ -85,7 +86,7 @@ SECTION_FUNC(TEXT, _Swap)
          * Carve space for the return value. Setting it to a defafult of
          * -EAGAIN eliminates the need for the timeout code to set it.
          * If another value is ever needed, it can be modified with
-         * fiberRtnValueSet().
+         * _set_thread_return_value().
          */
 	ld r3, [_k_neg_eagain]
 	st_s r3, [r2, _thread_offset_to_return_value]
diff --git a/arch/arm/core/swap.S b/arch/arm/core/swap.S
index ef550f5a4a9..03002b5f081 100644
--- a/arch/arm/core/swap.S
+++ b/arch/arm/core/swap.S
@@ -267,7 +267,8 @@ _context_switch:
  * On Cortex-M0/M0+ the intlock key is represented by the PRIMASK register,
  * as BASEPRI is not available.
  *
- * @return may contain a return value setup by a call to fiberRtnValueSet()
+ * @return may contain a return value setup by a call to
+ * _set_thread_return_value()
  *
  * C function prototype:
  *
diff --git a/arch/nios2/core/swap.S b/arch/nios2/core/swap.S
index f3920dd80fa..f97b56648b5 100644
--- a/arch/nios2/core/swap.S
+++ b/arch/nios2/core/swap.S
@@ -108,9 +108,10 @@ SECTION_FUNC(exception.other, _Swap)
 	 */
 	ldw r3, _thread_offset_to_key(r2)
 
-	/* Load return value into r2 (return value register). -EAGAIN
-	 * unless someone previously called fiberRtnValueSet(). Do this
-	 * before we potentially unlock interrupts.
+	/*
+	 * Load return value into r2 (return value register). -EAGAIN unless
+	 * someone previously called _set_thread_return_value(). Do this before
+	 * we potentially unlock interrupts.
 	 */
 	ldw r2, _thread_offset_to_retval(r2)
 
diff --git a/arch/x86/core/swap.S b/arch/x86/core/swap.S
index bb355ca1300..abbb2357a47 100644
--- a/arch/x86/core/swap.S
+++ b/arch/x86/core/swap.S
@@ -80,7 +80,8 @@
  * Floating point registers are currently NOT scrubbed, and are subject to
  * potential security leaks.
  *
- * @return -EAGAIN, or a return value set by a call to fiberRtnValueSet()
+ * @return -EAGAIN, or a return value set by a call to
+ * _set_thread_return_value()
  *
  * C function prototype:
  *
@@ -115,7 +116,7 @@ SECTION_FUNC(TEXT, _Swap)
 	 * Carve space for the return value. Setting it to a defafult of
 	 * -EAGAIN eliminates the need for the timeout code to set it.
 	 * If another value is ever needed, it can be modified with
-	 * fiberRtnValueSet().
+	 * _set_thread_return_value().
 	 */
 
 	pushl   _k_neg_eagain
@@ -302,7 +303,7 @@ CROHandlingDone:
 	movl	_thread_offset_to_esp(%eax), %esp
 
 
-	/* load return value from a possible fiberRtnValueSet() */
+	/* load return value from a possible _set_thread_return_value() */
 
 	popl	%eax
 
@@ -317,7 +318,7 @@ CROHandlingDone:
 	 * %eax may contain one of these values:
 	 *
 	 * - the return value for _Swap() that was set up by a call to
-	 * fiberRtnValueSet()
+	 * _set_thread_return_value()
 	 * - in legacy kernel, same value as %ebx, which is non-volatile
 	 * - in unified kernel, -EINVAL
 	 */