diff --git a/boards/esp32-mh-et-live-minikit/include/periph_conf.h b/boards/esp32-mh-et-live-minikit/include/periph_conf.h
index 9238d2b39ea6b0a5ed737bc987a1423743988ae0..21350174118bca92b9ce9953b886b440d5ca7af2 100644
--- a/boards/esp32-mh-et-live-minikit/include/periph_conf.h
+++ b/boards/esp32-mh-et-live-minikit/include/periph_conf.h
@@ -120,8 +120,8 @@
  *
  * @{
  */
-#ifndef SPI0_DEV
-#define SPI0_DEV    VSPI    /**< VSPI is used as SPI_DEV(0) */
+#ifndef SPI0_CTRL
+#define SPI0_CTRL   VSPI    /**< VSPI is used as SPI_DEV(0) */
 #endif
 #ifndef SPI0_SCK
 #define SPI0_SCK    GPIO18  /**< VSPI SCK */
diff --git a/boards/esp32-olimex-evb/include/periph_conf.h b/boards/esp32-olimex-evb/include/periph_conf.h
index 7df3b12c676dc7fc0aa18771298224ffaf1e5568..c38f6ca7a47fe3d7ed44986e3232beab45e6d25f 100644
--- a/boards/esp32-olimex-evb/include/periph_conf.h
+++ b/boards/esp32-olimex-evb/include/periph_conf.h
@@ -165,8 +165,8 @@ extern "C" {
  * function. That is, they are not allocated as SPI signals before and can
  * be used for other purposes as long as the SPI interface is not used.
  */
-#ifndef SPI0_DEV
-#define SPI0_DEV    HSPI
+#ifndef SPI0_CTRL
+#define SPI0_CTRL   HSPI
 #endif
 
 #ifndef SPI0_SCK
diff --git a/boards/esp32-wemos-lolin-d32-pro/include/periph_conf.h b/boards/esp32-wemos-lolin-d32-pro/include/periph_conf.h
index 0724047463ff0cd1550506bc324d4c0826795e1a..e3d0812c79370114a477ef9959f899ecf9acf2c8 100644
--- a/boards/esp32-wemos-lolin-d32-pro/include/periph_conf.h
+++ b/boards/esp32-wemos-lolin-d32-pro/include/periph_conf.h
@@ -140,8 +140,8 @@
  *
  * @{
  */
-#ifndef SPI0_DEV
-#define SPI0_DEV    VSPI    /**< VSPI is used as SPI_DEV(0) */
+#ifndef SPI0_CTRL
+#define SPI0_CTRL   VSPI    /**< VSPI is used as SPI_DEV(0) */
 #endif
 #ifndef SPI0_SCK
 #define SPI0_SCK    GPIO18  /**< VSPI SCK */
diff --git a/boards/esp32-wroom-32/include/periph_conf.h b/boards/esp32-wroom-32/include/periph_conf.h
index b61b128abf4390618cc5db2e21a8fe435d8f4ace..5f63968e2623a04a016f30a80cf11968d71fd211 100644
--- a/boards/esp32-wroom-32/include/periph_conf.h
+++ b/boards/esp32-wroom-32/include/periph_conf.h
@@ -135,8 +135,8 @@ extern "C" {
  * be used for other purposes as long as the SPI interface is not used.
  * @{
  */
-#ifndef SPI0_DEV
-#define SPI0_DEV    VSPI    /**< VSPI is used as SPI_DEV(0) */
+#ifndef SPI0_CTRL
+#define SPI0_CTRL   VSPI    /**< VSPI is used as SPI_DEV(0) */
 #endif
 #ifndef SPI0_SCK
 #define SPI0_SCK    GPIO18  /**< VSPI SCK */
@@ -151,8 +151,8 @@ extern "C" {
 #define SPI0_CS0    GPIO5   /**< VSPI CS0 */
 #endif
 
-#ifndef SPI1_DEV
-#define SPI1_DEV    HSPI    /**< HSPI is used as SPI_DEV(1) */
+#ifndef SPI1_CTRL
+#define SPI1_CTRL   HSPI    /**< HSPI is used as SPI_DEV(1) */
 #endif
 #ifndef SPI1_SCK
 #define SPI1_SCK    GPIO14  /**< HSPI SCK */
diff --git a/boards/esp32-wrover-kit/include/periph_conf.h b/boards/esp32-wrover-kit/include/periph_conf.h
index ccb208d2705756e633f37c3100cc4add63037ceb..71da070629ae17890f6d3242ef344fbe23f48c05 100644
--- a/boards/esp32-wrover-kit/include/periph_conf.h
+++ b/boards/esp32-wrover-kit/include/periph_conf.h
@@ -146,8 +146,8 @@
  * @{
  */
 
-#ifndef SPI0_DEV
-#define SPI0_DEV    HSPI    /**< HSPI is configured as SPI_DEV(0) */
+#ifndef SPI0_CTRL
+#define SPI0_CTRL   HSPI    /**< HSPI is configured as SPI_DEV(0) */
 #endif
 
 #ifndef SPI0_SCK
@@ -174,8 +174,8 @@
  * be used for other purposes as long as the SPI interface is not used.
  *
  */
-#ifndef SPI1_DEV
-#define SPI1_DEV    VSPI
+#ifndef SPI1_CTRL
+#define SPI1_CTRL   VSPI
 #endif
 
 #ifndef SPI1_SCK