diff --git a/arch/risc-v/src/common/riscv_exception_common.S b/arch/risc-v/src/common/riscv_exception_common.S
index f0603f951e..bc2cb9be32 100644
--- a/arch/risc-v/src/common/riscv_exception_common.S
+++ b/arch/risc-v/src/common/riscv_exception_common.S
@@ -28,7 +28,7 @@
 #include <arch/irq.h>
 #include <arch/mode.h>
 
-#include "riscv_exception_macros.S"
+#include "riscv_macros.S"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/common/riscv_exception_macros.S b/arch/risc-v/src/common/riscv_macros.S
similarity index 98%
rename from arch/risc-v/src/common/riscv_exception_macros.S
rename to arch/risc-v/src/common/riscv_macros.S
index d2f3291503..2243698690 100644
--- a/arch/risc-v/src/common/riscv_exception_macros.S
+++ b/arch/risc-v/src/common/riscv_macros.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/common/supervisor/riscv_exception_macros.S
+ * arch/risc-v/src/common/riscv_macros.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
  *
  ****************************************************************************/
 
-.file "riscv_exception_macros.S"
+.file "riscv_macros.S"
 
 /****************************************************************************
  * Included Files
diff --git a/arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S b/arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S
index ed8a635743..791048e3be 100644
--- a/arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S
+++ b/arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 #include <arch/mode.h>
 
-#include "riscv_exception_macros.S"
+#include "riscv_macros.S"
 
 /****************************************************************************
  * Pre-processor Definitions