diff --git a/src/isa/riscv64/csr.h b/src/isa/riscv64/csr.h
index d2613402555d4b1eaaca04d99bd38fdc19d6d5c4..c1f74bac015bfba33e57404e686086f8e35db9db 100644
--- a/src/isa/riscv64/csr.h
+++ b/src/isa/riscv64/csr.h
@@ -117,7 +117,7 @@ CSR_STRUCT_END(sepc)
 CSR_STRUCT_START(sscratch)
 CSR_STRUCT_END(sscratch)
 
-#define CSRS_DECL(name, val) extern concat(name, _t)* const name;
+#define CSRS_DECL(name, addr) extern concat(name, _t)* const name;
 MAP(CSRS, CSRS_DECL)
 
 word_t* csr_decode(uint32_t addr);
diff --git a/src/isa/riscv64/reg.c b/src/isa/riscv64/reg.c
index b94c25ade0d921214561c7eb0f14551dcfa228fb..cd210d574a7ee9b2ed24f7aa85346c1b69c00f93 100644
--- a/src/isa/riscv64/reg.c
+++ b/src/isa/riscv64/reg.c
@@ -38,11 +38,11 @@ rtlreg_t isa_reg_str2val(const char *s, bool *success) {
 
 static word_t csr_array[4096] = {};
 
-#define CSRS_DEF(name, val) \
-  concat(name, _t)* const name = (void *)&csr_array[val];
+#define CSRS_DEF(name, addr) \
+  concat(name, _t)* const name = (void *)&csr_array[addr];
 MAP(CSRS, CSRS_DEF)
 
-#define CSRS_EXIST(name, val) [val] = 1,
+#define CSRS_EXIST(name, addr) [addr] = 1,
 static bool csr_exist[4096] = {
   MAP(CSRS, CSRS_EXIST)
 };