diff --git a/bsps/riscv/riscv/irq/irq.c b/bsps/riscv/riscv/irq/irq.c
index f3aea1203a..fc70c59c05 100644
--- a/bsps/riscv/riscv/irq/irq.c
+++ b/bsps/riscv/riscv/irq/irq.c
@@ -204,7 +204,7 @@ static void riscv_clint_init(const void *fdt)
     hart_index = riscv_get_hart_index_by_phandle(fdt32_to_cpu(val[i / 4]));
 
 #ifdef RTEMS_SMP
-    cpu_index = _RISCV_Map_hardid_to_cpu_index(hart_index);
+    cpu_index = _RISCV_Map_hartid_to_cpu_index(hart_index);
     if (cpu_index >= rtems_configuration_get_maximum_processors()) {
       continue;
     }
@@ -292,7 +292,7 @@ static void riscv_plic_init(const void *fdt)
     hart_index = riscv_get_hart_index_by_phandle(fdt32_to_cpu(val[i / 4]));
 
 #ifdef RTEMS_SMP
-    cpu_index = _RISCV_Map_hardid_to_cpu_index(hart_index);
+    cpu_index = _RISCV_Map_hartid_to_cpu_index(hart_index);
     if (cpu_index >= rtems_configuration_get_maximum_processors()) {
       continue;
     }
diff --git a/cpukit/score/cpu/riscv/include/rtems/score/cpuimpl.h b/cpukit/score/cpu/riscv/include/rtems/score/cpuimpl.h
index 65bdbd42ba..8f7a010612 100644
--- a/cpukit/score/cpu/riscv/include/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/cpuimpl.h
@@ -298,12 +298,12 @@
 extern "C" {
 #endif
 
-static inline uint32_t _RISCV_Map_hardid_to_cpu_index( uint32_t hardid )
+static inline uint32_t _RISCV_Map_hartid_to_cpu_index( uint32_t hartid )
 {
-  return hardid - RISCV_BOOT_HARTID;
+  return hartid - RISCV_BOOT_HARTID;
 }
 
-static inline uint32_t _RISCV_Map_cpu_index_to_hardid( uint32_t cpu_index )
+static inline uint32_t _RISCV_Map_cpu_index_to_hartid( uint32_t cpu_index )
 {
   return cpu_index + RISCV_BOOT_HARTID;
 }