diff --git a/arch/arm/core/swap_helper.S b/arch/arm/core/swap_helper.S
index 3ee0e2d54d5..8ec52a4b813 100644
--- a/arch/arm/core/swap_helper.S
+++ b/arch/arm/core/swap_helper.S
@@ -426,7 +426,7 @@ _oops:
 
 #if defined(CONFIG_USERSPACE)
     /*
-     * System call will setup a jump to the _do_arm_syscall function
+     * System call will setup a jump to the z_arm_do_syscall() function
      * when the SVC returns via the bx lr.
      *
      * There is some trickery involved here because we have to preserve
@@ -456,7 +456,7 @@ _do_syscall:
     cmp r6, ip
     blt valid_syscall_id
 
-    /* bad syscall id.  Set arg0 to bad id and set call_id to SYSCALL_BAD */
+    /* bad syscall id.  Set arg1 to bad id and set call_id to SYSCALL_BAD */
     str r6, [r0, #0]
     ldr r6, =K_SYSCALL_BAD
 
diff --git a/kernel/include/syscall_handler.h b/kernel/include/syscall_handler.h
index a477c9e7874..d5e3b626aee 100644
--- a/kernel/include/syscall_handler.h
+++ b/kernel/include/syscall_handler.h
@@ -519,7 +519,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
  * the bolierplate. The macros ensure that the seventh argument is named
  * "ssf" as this is now referenced by various other Z_SYSCALL macros.
  *
- * Use the Z_SYSCALL_HANDLER(name_, arg0, ..., arg6) variant, as it will
+ * Use the Z_SYSCALL_HANDLER(name_, arg1, ..., arg6) variant, as it will
  * automatically deduce the correct version of Z__SYSCALL_HANDLERn() to
  * use depending on the number of arguments.
  */