diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs
index 83970f36c7..95f7854c3e 100644
--- a/arch/risc-v/src/common/Toolchain.defs
+++ b/arch/risc-v/src/common/Toolchain.defs
@@ -82,7 +82,7 @@ ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
   endif
 
   ifeq ($(CONFIG_ARCH_FPU),y)
-      ARCHRVISAF = f
+    ARCHRVISAF = f
   endif
 
   ifeq ($(CONFIG_ARCH_DPFPU),y)
diff --git a/include/nuttx/serial/uart_rpmsg.h b/include/nuttx/serial/uart_rpmsg.h
index c4e2de8e8e..d7029149b8 100644
--- a/include/nuttx/serial/uart_rpmsg.h
+++ b/include/nuttx/serial/uart_rpmsg.h
@@ -43,7 +43,7 @@ extern "C"
 #define EXTERN extern
 #endif
 
-int uart_rpmsg_init(FAR const char *cpu_name, FAR const char *dev_name,
+int uart_rpmsg_init(FAR const char *cpuname, FAR const char *devname,
                     int buf_size, bool isconsole);
 
 #undef EXTERN