diff --git a/boards/ST_STM32F0_DISCOVERY/board.h b/boards/ST_STM32F0_DISCOVERY/board.h
index fe34c8190..65e5595aa 100644
--- a/boards/ST_STM32F0_DISCOVERY/board.h
+++ b/boards/ST_STM32F0_DISCOVERY/board.h
@@ -28,7 +28,7 @@
 /*
  * Board identifier.
  */
-#define BOARD_BOARD_ST_STM32F0_DISCOVERY
+#define BOARD_ST_STM32F0_DISCOVERY
 #define BOARD_NAME                  "ST STM32F0-Discovery"
 
 
diff --git a/boards/ST_STM32F0_DISCOVERY/board.mk b/boards/ST_STM32F0_DISCOVERY/board.mk
index b01198769..144ae4963 100644
--- a/boards/ST_STM32F0_DISCOVERY/board.mk
+++ b/boards/ST_STM32F0_DISCOVERY/board.mk
@@ -1,5 +1,5 @@
 # List of all the board related files.
-BOARDSRC = ${CHIBIOS}/boards/BOARD_ST_STM32F0_DISCOVERY/board.c
+BOARDSRC = ${CHIBIOS}/boards/ST_STM32F0_DISCOVERY/board.c
 
 # Required include directories
-BOARDINC = ${CHIBIOS}/boards/BOARD_ST_STM32F0_DISCOVERY
+BOARDINC = ${CHIBIOS}/boards/ST_STM32F0_DISCOVERY
diff --git a/boards/ST_STM32F0_DISCOVERY/cfg/board.chxml b/boards/ST_STM32F0_DISCOVERY/cfg/board.chxml
index 6679b29eb..391fc47f7 100644
--- a/boards/ST_STM32F0_DISCOVERY/cfg/board.chxml
+++ b/boards/ST_STM32F0_DISCOVERY/cfg/board.chxml
@@ -4,7 +4,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:noNamespaceSchemaLocation="http://www.chibios.org/xml/schema/boards/stm32f0xx_board.xsd">
   <board_name>ST STM32F0-Discovery</board_name>
-  <board_id>BOARD_ST_STM32F0_DISCOVERY</board_id>
+  <board_id>ST_STM32F0_DISCOVERY</board_id>
   <board_functions></board_functions>
   <clocks
     HSEFrequency="0"