diff --git a/boards/b-l072z-lrwan1/include/board.h b/boards/b-l072z-lrwan1/include/board.h
index 5478d2b78f..464aa9114a 100644
--- a/boards/b-l072z-lrwan1/include/board.h
+++ b/boards/b-l072z-lrwan1/include/board.h
@@ -84,9 +84,12 @@ extern "C" {
 /** @} */
 
 /**
- * @brief   User button
+ * @name    User button pin configuration
+ * @{
  */
-#define BTN_B1_PIN          GPIO_PIN(PORT_B, 2)
+#define BTN0_PIN            GPIO_PIN(PORT_B, 2)     /**< User button pin */
+#define BTN0_MODE           GPIO_IN_PU              /**< User button pin mode */
+/** @} */
 
 /**
  * @brief   Initialize board specific hardware, including clock, LEDs and std-IO
diff --git a/boards/b-l072z-lrwan1/include/gpio_params.h b/boards/b-l072z-lrwan1/include/gpio_params.h
index baa05f694a..b9439313a7 100644
--- a/boards/b-l072z-lrwan1/include/gpio_params.h
+++ b/boards/b-l072z-lrwan1/include/gpio_params.h
@@ -55,8 +55,8 @@ static const  saul_gpio_params_t saul_gpio_params[] =
     },
     {
         .name = "Button(B1 User)",
-        .pin = BTN_B1_PIN,
-        .mode = GPIO_IN_PU
+        .pin = BTN0_PIN,
+        .mode = BTN0_MODE
     },
 };
 
diff --git a/boards/b-l475e-iot01a/include/board.h b/boards/b-l475e-iot01a/include/board.h
index d12a9b06b2..51a3c6cdf1 100644
--- a/boards/b-l475e-iot01a/include/board.h
+++ b/boards/b-l475e-iot01a/include/board.h
@@ -47,9 +47,12 @@ extern "C" {
 /** @} */
 
 /**
- * @brief   User button
+ * @name    User button pin configuration
+ * @{
  */
-#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
+#define BTN0_PIN            GPIO_PIN(PORT_C, 13)    /**< User button pin */
+#define BTN0_MODE           GPIO_IN_PU              /**< User button pin mode */
+/** @} */
 
 /**
  * @name    HTS221 temperature/humidity sensor configuration
diff --git a/boards/b-l475e-iot01a/include/gpio_params.h b/boards/b-l475e-iot01a/include/gpio_params.h
index 792138ac44..0bb84e0dae 100644
--- a/boards/b-l475e-iot01a/include/gpio_params.h
+++ b/boards/b-l475e-iot01a/include/gpio_params.h
@@ -47,8 +47,8 @@ static const  saul_gpio_params_t saul_gpio_params[] =
     },
     {
         .name = "Button(B1 User)",
-        .pin = BTN_B1_PIN,
-        .mode = GPIO_IN_PU,
+        .pin = BTN0_PIN,
+        .mode = BTN0_MODE,
         .flags = SAUL_GPIO_INVERTED
     }
 };
diff --git a/boards/pyboard/include/board.h b/boards/pyboard/include/board.h
index 7a7d5a2441..14f90dceb1 100644
--- a/boards/pyboard/include/board.h
+++ b/boards/pyboard/include/board.h
@@ -42,9 +42,12 @@ extern "C" {
 /** @} */
 
 /**
- * @brief   User button
+ * @name    User button pin configuration
+ * @{
  */
-#define BTN_B1_PIN          GPIO_PIN(PORT_B, 3)
+#define BTN0_PIN            GPIO_PIN(PORT_B, 3)     /**< User button pin */
+#define BTN0_MODE           GPIO_IN_PU              /**< User button pin mode */
+/** @} */
 
 /**
  * @brief   Initialize board specific hardware, including clock, LEDs and stdio
diff --git a/boards/pyboard/include/gpio_params.h b/boards/pyboard/include/gpio_params.h
index c8454ac99a..3410f302f1 100644
--- a/boards/pyboard/include/gpio_params.h
+++ b/boards/pyboard/include/gpio_params.h
@@ -40,8 +40,8 @@ static const saul_gpio_params_t saul_gpio_params[] =
     },
     {
         .name = "Button(B1 User)",
-        .pin = BTN_B1_PIN,
-        .mode = GPIO_IN_PU,
+        .pin = BTN0_PIN,
+        .mode = BTN0_MODE,
         .flags = SAUL_GPIO_INVERTED
     }
 };
diff --git a/boards/ublox-c030-u201/include/board.h b/boards/ublox-c030-u201/include/board.h
index 90449132cb..c0b417e371 100644
--- a/boards/ublox-c030-u201/include/board.h
+++ b/boards/ublox-c030-u201/include/board.h
@@ -56,9 +56,12 @@ extern "C" {
 /** @} */
 
 /**
- * @brief   User button
+ * @name    User button pin configuration
+ * @{
  */
-#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
+#define BTN0_PIN            GPIO_PIN(PORT_C, 13)    /**< User button pin */
+#define BTN0_MODE           GPIO_IN                 /**< User button pin mode */
+/** @} */
 
 /**
  * @name    si7034 temperature sensor configuration
diff --git a/boards/ublox-c030-u201/include/gpio_params.h b/boards/ublox-c030-u201/include/gpio_params.h
index 659cccc681..1b7f969712 100644
--- a/boards/ublox-c030-u201/include/gpio_params.h
+++ b/boards/ublox-c030-u201/include/gpio_params.h
@@ -51,8 +51,8 @@ static const  saul_gpio_params_t saul_gpio_params[] =
     },
     {
         .name = "Button(B1 User)",
-        .pin = BTN_B1_PIN,
-        .mode = GPIO_IN,
+        .pin = BTN0_PIN,
+        .mode = BTN0_MODE,
     },
 };