diff --git a/arch/arm/src/armv7-a/arm_perf.c b/arch/arm/src/armv7-a/arm_perf.c
index 424596acaa6..f06785f8c98 100644
--- a/arch/arm/src/armv7-a/arm_perf.c
+++ b/arch/arm/src/armv7-a/arm_perf.c
@@ -31,7 +31,7 @@
 #include "arm_timer.h"
 #include "sctlr.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/arm/src/armv7-m/arm_perf.c b/arch/arm/src/armv7-m/arm_perf.c
index 28dd4f236e2..a8b58c5ea94 100644
--- a/arch/arm/src/armv7-m/arm_perf.c
+++ b/arch/arm/src/armv7-m/arm_perf.c
@@ -32,7 +32,7 @@
 #include "itm.h"
 #include "nvic.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/arm/src/armv7-r/arm_perf.c b/arch/arm/src/armv7-r/arm_perf.c
index 63fe29057c2..d32a7a365e1 100644
--- a/arch/arm/src/armv7-r/arm_perf.c
+++ b/arch/arm/src/armv7-r/arm_perf.c
@@ -31,7 +31,7 @@
 #include "arm_timer.h"
 #include "sctlr.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/arm/src/armv8-m/arm_perf.c b/arch/arm/src/armv8-m/arm_perf.c
index e7b1e56ed68..826d4a31d4e 100644
--- a/arch/arm/src/armv8-m/arm_perf.c
+++ b/arch/arm/src/armv8-m/arm_perf.c
@@ -32,7 +32,7 @@
 #include "itm.h"
 #include "nvic.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/arm/src/armv8-r/arm_perf.c b/arch/arm/src/armv8-r/arm_perf.c
index 51e04b36f83..5123562d458 100644
--- a/arch/arm/src/armv8-r/arm_perf.c
+++ b/arch/arm/src/armv8-r/arm_perf.c
@@ -30,7 +30,7 @@
 #include "arm_internal.h"
 #include "sctlr.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/arm64/src/common/arm64_perf.c b/arch/arm64/src/common/arm64_perf.c
index c1ddeb488cf..6d042ee7780 100644
--- a/arch/arm64/src/common/arm64_perf.c
+++ b/arch/arm64/src/common/arm64_perf.c
@@ -28,7 +28,7 @@
 
 #include "arm64_pmu.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/risc-v/src/common/riscv_perf_cycle.c b/arch/risc-v/src/common/riscv_perf_cycle.c
index 1bceac80b3a..5ff5803a9ba 100644
--- a/arch/risc-v/src/common/riscv_perf_cycle.c
+++ b/arch/risc-v/src/common/riscv_perf_cycle.c
@@ -32,7 +32,7 @@
 
 #include "riscv_internal.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/risc-v/src/common/riscv_perf_time.c b/arch/risc-v/src/common/riscv_perf_time.c
index 2d27eb18422..d7eaff4e750 100644
--- a/arch/risc-v/src/common/riscv_perf_time.c
+++ b/arch/risc-v/src/common/riscv_perf_time.c
@@ -32,7 +32,7 @@
 
 #include "riscv_internal.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_perf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_perf.c
index 49c25c35d82..4cb6af9fe4f 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_perf.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_perf.c
@@ -35,7 +35,7 @@
 #include "hardware/esp32c3_system.h"
 #include "esp32c3_clockconfig.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86_64/src/intel64/intel64_perf.c b/arch/x86_64/src/intel64/intel64_perf.c
index d744c6f1784..cd0c2813728 100644
--- a/arch/x86_64/src/intel64/intel64_perf.c
+++ b/arch/x86_64/src/intel64/intel64_perf.c
@@ -29,7 +29,7 @@
 
 #include "x86_64_internal.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/arch/xtensa/src/common/xtensa_perf.c b/arch/xtensa/src/common/xtensa_perf.c
index b45b7b6660c..9898337afd7 100644
--- a/arch/xtensa/src/common/xtensa_perf.c
+++ b/arch/xtensa/src/common/xtensa_perf.c
@@ -30,7 +30,7 @@
 #include "xtensa_counter.h"
 #include "xtensa.h"
 
-#ifdef CONFIG_ARCH_PERF_EVENTS
+#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
 
 /****************************************************************************
  * Private Data
diff --git a/drivers/timers/arch_alarm.c b/drivers/timers/arch_alarm.c
index d2a3b0b8db4..8133ec0ff85 100644
--- a/drivers/timers/arch_alarm.c
+++ b/drivers/timers/arch_alarm.c
@@ -351,7 +351,7 @@ int weak_function up_alarm_tick_start(clock_t ticks)
  *   units.
  ****************************************************************************/
 
-#ifndef CONFIG_ARCH_PERF_EVENTS
+#ifndef CONFIG_ARCH_HAVE_PERF_EVENTS
 void up_perf_init(FAR void *arg)
 {
   UNUSED(arg);
diff --git a/drivers/timers/arch_timer.c b/drivers/timers/arch_timer.c
index 8622e6b7058..a6caacb59b3 100644
--- a/drivers/timers/arch_timer.c
+++ b/drivers/timers/arch_timer.c
@@ -399,7 +399,7 @@ int weak_function up_timer_tick_start(clock_t ticks)
  *   units.
  ****************************************************************************/
 
-#ifndef CONFIG_ARCH_PERF_EVENTS
+#ifndef CONFIG_ARCH_HAVE_PERF_EVENTS
 void up_perf_init(FAR void *arg)
 {
   UNUSED(arg);