diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h
index 29e66102..8532c03b 100644
--- a/include/sbi/sbi_platform.h
+++ b/include/sbi/sbi_platform.h
@@ -36,8 +36,8 @@ struct sbi_platform {
 	u64 disabled_hart_mask;
 	int (*early_init)(u32 hartid, bool cold_boot);
 	int (*final_init)(u32 hartid, bool cold_boot);
-	u32 (*pmp_region_count)(u32 target_hart);
-	int (*pmp_region_info)(u32 target_hart, u32 index,
+	u32 (*pmp_region_count)(u32 hartid);
+	int (*pmp_region_info)(u32 hartid, u32 index,
 			       ulong *prot, ulong *addr, ulong *log2size);
 	void (*console_putc)(char ch);
 	char (*console_getc)(void);
@@ -117,21 +117,21 @@ static inline int sbi_platform_final_init(struct sbi_platform *plat,
 }
 
 static inline u32 sbi_platform_pmp_region_count(struct sbi_platform *plat,
-						u32 target_hart)
+						u32 hartid)
 {
 	if (plat && plat->pmp_region_count)
-		return plat->pmp_region_count(target_hart);
+		return plat->pmp_region_count(hartid);
 	return 0;
 }
 
 static inline int sbi_platform_pmp_region_info(struct sbi_platform *plat,
-					       u32 target_hart, u32 index,
+					       u32 hartid, u32 index,
 					       ulong *prot, ulong *addr,
 					       ulong *log2size)
 {
 	if (plat && plat->pmp_region_info)
-		return plat->pmp_region_info(target_hart, index,
-					      prot, addr, log2size);
+		return plat->pmp_region_info(hartid, index,
+					     prot, addr, log2size);
 	return 0;
 }
 
diff --git a/platform/qemu/sifive_u/platform.c b/platform/qemu/sifive_u/platform.c
index 7f41fe15..cf6efbda 100644
--- a/platform/qemu/sifive_u/platform.c
+++ b/platform/qemu/sifive_u/platform.c
@@ -44,12 +44,12 @@ static int sifive_u_final_init(u32 hartid, bool cold_boot)
 	return 0;
 }
 
-static u32 sifive_u_pmp_region_count(u32 target_hart)
+static u32 sifive_u_pmp_region_count(u32 hartid)
 {
 	return 1;
 }
 
-static int sifive_u_pmp_region_info(u32 target_hart, u32 index,
+static int sifive_u_pmp_region_info(u32 hartid, u32 index,
 				    ulong *prot, ulong *addr, ulong *log2size)
 {
 	int ret = 0;
diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c
index c83f8f2b..71ddc759 100644
--- a/platform/qemu/virt/platform.c
+++ b/platform/qemu/virt/platform.c
@@ -44,12 +44,12 @@ static int virt_final_init(u32 hartid, bool cold_boot)
 	return 0;
 }
 
-static u32 virt_pmp_region_count(u32 target_hart)
+static u32 virt_pmp_region_count(u32 hartid)
 {
 	return 1;
 }
 
-static int virt_pmp_region_info(u32 target_hart, u32 index,
+static int virt_pmp_region_info(u32 hartid, u32 index,
 				ulong *prot, ulong *addr, ulong *log2size)
 {
 	int ret = 0;
diff --git a/platform/sifive/hifive_u540/platform.c b/platform/sifive/hifive_u540/platform.c
index c81697f1..5528b0c0 100644
--- a/platform/sifive/hifive_u540/platform.c
+++ b/platform/sifive/hifive_u540/platform.c
@@ -54,12 +54,12 @@ static int sifive_u_final_init(u32 hartid, bool cold_boot)
 	return 0;
 }
 
-static u32 sifive_u_pmp_region_count(u32 target_hart)
+static u32 sifive_u_pmp_region_count(u32 hartid)
 {
 	return 1;
 }
 
-static int sifive_u_pmp_region_info(u32 target_hart, u32 index,
+static int sifive_u_pmp_region_info(u32 hartid, u32 index,
 				    ulong *prot, ulong *addr, ulong *log2size)
 {
 	int ret = 0;