diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 624595324f2..6581944190a 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -187,8 +187,8 @@
 #define BUTTON_SW2        0
 #define BUTTON_SW3        1
 
-#define BUTTON_SW2_BIT    (1 << BUTTON_WAKEUP)
-#define BUTTON_SW3_BIT    (1 << BUTTON_TAMPER)
+#define BUTTON_SW2_BIT    (1 << BUTTON_SW2)
+#define BUTTON_SW3_BIT    (1 << BUTTON_SW3)
 
 /* Alternative pin resolution *******************************************************/
 /* If there are alternative configurations for various pins in the
diff --git a/configs/stm32l476vg-disco/include/board.h b/configs/stm32l476vg-disco/include/board.h
index c05f74a7e5d..ee28c35a06e 100644
--- a/configs/stm32l476vg-disco/include/board.h
+++ b/configs/stm32l476vg-disco/include/board.h
@@ -271,7 +271,7 @@
 #define BUTTON_CENTER_BIT  (1 << BUTTON_CENTER)
 #define BUTTON_LEFT_BIT    (1 << BUTTON_LEFT)
 #define BUTTON_DOWN_BIT    (1 << BUTTON_DOWN)
-#define BUTTON_TIGHT_BIT   (1 << BUTTON_RIGHT)
+#define BUTTON_RIGHT_BIT   (1 << BUTTON_RIGHT)
 #define BUTTON_UP_BIT      (1 << BUTTON_UP)
 
 /************************************************************************************
diff --git a/configs/twr-k60n512/include/board.h b/configs/twr-k60n512/include/board.h
index 92c6dce9404..ea464c0d439 100644
--- a/configs/twr-k60n512/include/board.h
+++ b/configs/twr-k60n512/include/board.h
@@ -154,8 +154,8 @@
 #define BUTTON_SW1        0
 #define BUTTON_SW2        1
 
-#define BUTTON_SW1_BIT    (1 << BUTTON_WAKEUP)
-#define BUTTON_SW2_BIT    (1 << BUTTON_TAMPER)
+#define BUTTON_SW1_BIT    (1 << BUTTON_SW1)
+#define BUTTON_SW2_BIT    (1 << BUTTON_SW2)
 
 /* Alternative pin resolution *******************************************************/
 /* If there are alternative configurations for various pins in the