diff --git a/boards/xtensa/esp32/common/include/esp32_timer.h b/boards/xtensa/esp32/common/include/esp32_board_tim.h
similarity index 90%
rename from boards/xtensa/esp32/common/include/esp32_timer.h
rename to boards/xtensa/esp32/common/include/esp32_board_tim.h
index b7ce3ee36c..9c728cd4a8 100644
--- a/boards/xtensa/esp32/common/include/esp32_timer.h
+++ b/boards/xtensa/esp32/common/include/esp32_board_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/xtensa/esp32/common/include/esp32_timer.h
+ * boards/xtensa/esp32/common/include/esp32_board_tim.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_TIMER_H
-#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_TIMER_H
+#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIMER_H
+#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIMER_H
 
 /****************************************************************************
  * Included Files
@@ -75,4 +75,4 @@ int board_timer_init(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_TIMER_H */
+#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_TIMER_H */
diff --git a/boards/xtensa/esp32/common/include/esp32_wdt.h b/boards/xtensa/esp32/common/include/esp32_board_wdt.h
similarity index 93%
rename from boards/xtensa/esp32/common/include/esp32_wdt.h
rename to boards/xtensa/esp32/common/include/esp32_board_wdt.h
index bcbaf32ae9..616bc1bb63 100644
--- a/boards/xtensa/esp32/common/include/esp32_wdt.h
+++ b/boards/xtensa/esp32/common/include/esp32_board_wdt.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_WDT_H
-#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_WDT_H
+#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WDT_H
+#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WDT_H
 
 /****************************************************************************
  * Included Files
@@ -75,4 +75,4 @@ int board_wdt_init(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_WDT_H */
+#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WDT_H */
diff --git a/boards/xtensa/esp32/common/src/Make.defs b/boards/xtensa/esp32/common/src/Make.defs
index 782d9677f0..a0215a2e93 100644
--- a/boards/xtensa/esp32/common/src/Make.defs
+++ b/boards/xtensa/esp32/common/src/Make.defs
@@ -19,11 +19,11 @@
 #############################################################################
 
 ifeq ($(CONFIG_TIMER),y)
-  CSRCS += esp32_timer.c
+  CSRCS += esp32_board_tim.c
 endif
 
-ifeq ($(CONFIG_WDT),y)
-  CSRCS += esp32_wdt.c
+ifeq ($(CONFIG_WATCHDOG),y)
+  CSRCS += esp32_board_wdt.c
 endif
 
 DEPPATH += --dep-path src
diff --git a/boards/xtensa/esp32/common/src/esp32_timer.c b/boards/xtensa/esp32/common/src/esp32_board_tim.c
similarity index 97%
rename from boards/xtensa/esp32/common/src/esp32_timer.c
rename to boards/xtensa/esp32/common/src/esp32_board_tim.c
index 1dec7dc3e6..fcc976ac99 100644
--- a/boards/xtensa/esp32/common/src/esp32_timer.c
+++ b/boards/xtensa/esp32/common/src/esp32_board_tim.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/xtensa/esp32/common/src/esp32_timer.c
+ * boards/xtensa/esp32/common/src/esp32_board_tim.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -29,6 +29,7 @@
 #include <nuttx/timers/timer.h>
 
 #include "esp32_tim_lowerhalf.h"
+#include "esp32_board_tim.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/boards/xtensa/esp32/common/src/esp32_wdt.c b/boards/xtensa/esp32/common/src/esp32_board_wdt.c
similarity index 99%
rename from boards/xtensa/esp32/common/src/esp32_wdt.c
rename to boards/xtensa/esp32/common/src/esp32_board_wdt.c
index 3daec64324..94f57d6b54 100644
--- a/boards/xtensa/esp32/common/src/esp32_wdt.c
+++ b/boards/xtensa/esp32/common/src/esp32_board_wdt.c
@@ -28,6 +28,7 @@
 #include <debug.h>
 
 #include "esp32_wtd_lowerhalf.h"
+#include "esp32_board_wdt.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c
index d6ba4b070c..541edaccf7 100644
--- a/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c
@@ -65,12 +65,12 @@
 #  include <nuttx/leds/userled.h>
 #endif
 
-#ifdef CONFIG_ESP32_TIMER
-#  include "esp32_timer.h"
+#ifdef CONFIG_TIMER
+#  include "esp32_board_tim.h"
 #endif
 
-#ifdef CONFIG_ESP32_WDT
-#  include "esp32_wdt.h"
+#ifdef CONFIG_WATCHDOG
+#  include "esp32_board_wdt.h"
 #endif
 
 #include "esp32-core.h"
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
index 0cb7c4d9cb..34038f9ec0 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
@@ -50,12 +50,12 @@
 #  include <nuttx/leds/userled.h>
 #endif
 
-#ifdef CONFIG_ESP32_TIMER
-#  include "esp32_timer.h"
+#ifdef CONFIG_TIMER
+#  include "esp32_board_tim.h"
 #endif
 
-#ifdef CONFIG_ESP32_WDT
-#  include "esp32_wdt.h"
+#ifdef CONFIG_WATCHDOG
+#  include "esp32_board_wdt.h"
 #endif
 
 #include "esp32-ethernet-kit.h"