diff --git a/arch/risc-v/include/rv32im/syscall.h b/arch/risc-v/include/rv32im/syscall.h
index 0b07f51e7eb..c884bf2811c 100644
--- a/arch/risc-v/include/rv32im/syscall.h
+++ b/arch/risc-v/include/rv32im/syscall.h
@@ -133,7 +133,7 @@ extern "C"
 #endif
 
 /****************************************************************************
- * Name: up_syscall0
+ * Name: sys_call0
  *
  * Description:
  *   System call SYS_ argument and no additional parameters.
@@ -143,7 +143,7 @@ extern "C"
 uintptr_t sys_call0(unsigned int nbr);
 
 /****************************************************************************
- * Name: up_syscall1
+ * Name: sys_call1
  *
  * Description:
  *   System call SYS_ argument and one additional parameter.
@@ -153,7 +153,7 @@ uintptr_t sys_call0(unsigned int nbr);
 uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1);
 
 /****************************************************************************
- * Name: up_syscall2
+ * Name: sys_call2
  *
  * Description:
  *   System call SYS_ argument and two additional parameters.
@@ -163,7 +163,7 @@ uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1);
 uintptr_t sys_call2(unsigned int nbr, uintptr_t parm1, uintptr_t parm2);
 
 /****************************************************************************
- * Name: up_syscall3
+ * Name: sys_call3
  *
  * Description:
  *   System call SYS_ argument and three additional parameters.
@@ -174,7 +174,7 @@ uintptr_t sys_call3(unsigned int nbr, uintptr_t parm1, uintptr_t parm2,
                     uintptr_t parm3);
 
 /****************************************************************************
- * Name: up_syscall4
+ * Name: sys_call4
  *
  * Description:
  *   System call SYS_ argument and four additional parameters.
@@ -185,7 +185,7 @@ uintptr_t sys_call4(unsigned int nbr, uintptr_t parm1, uintptr_t parm2,
                     uintptr_t parm3, uintptr_t parm4);
 
 /****************************************************************************
- * Name: up_syscall5
+ * Name: sys_call5
  *
  * Description:
  *   System call SYS_ argument and five additional parameters.
diff --git a/arch/risc-v/include/rv64gc/syscall.h b/arch/risc-v/include/rv64gc/syscall.h
index e398cc424cf..71b941fec82 100644
--- a/arch/risc-v/include/rv64gc/syscall.h
+++ b/arch/risc-v/include/rv64gc/syscall.h
@@ -158,7 +158,7 @@ extern "C"
 #endif
 
 /****************************************************************************
- * Name: up_syscall0
+ * Name: sys_call0
  *
  * Description:
  *   System call SYS_ argument and no additional parameters.
@@ -181,7 +181,7 @@ static inline uintptr_t sys_call0(unsigned int nbr)
 }
 
 /****************************************************************************
- * Name: up_syscall1
+ * Name: sys_call1
  *
  * Description:
  *   System call SYS_ argument and one additional parameter.
@@ -205,7 +205,7 @@ static inline uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1)
 }
 
 /****************************************************************************
- * Name: up_syscall2
+ * Name: sys_call2
  *
  * Description:
  *   System call SYS_ argument and two additional parameters.
@@ -231,7 +231,7 @@ static inline uintptr_t sys_call2(unsigned int nbr, uintptr_t parm1,
 }
 
 /****************************************************************************
- * Name: up_syscall3
+ * Name: sys_call3
  *
  * Description:
  *   System call SYS_ argument and three additional parameters.
@@ -258,7 +258,7 @@ static inline uintptr_t sys_call3(unsigned int nbr, uintptr_t parm1,
 }
 
 /****************************************************************************
- * Name: up_syscall4
+ * Name: sys_call4
  *
  * Description:
  *   System call SYS_ argument and four additional parameters.
@@ -287,7 +287,7 @@ static inline uintptr_t sys_call4(unsigned int nbr, uintptr_t parm1,
 }
 
 /****************************************************************************
- * Name: up_syscall5
+ * Name: sys_call5
  *
  * Description:
  *   System call SYS_ argument and five additional parameters.
@@ -317,7 +317,7 @@ static inline uintptr_t sys_call5(unsigned int nbr, uintptr_t parm1,
 }
 
 /****************************************************************************
- * Name: up_syscall6
+ * Name: sys_call6
  *
  * Description:
  *   System call SYS_ argument and six additional parameters.