diff --git a/os/hal/boards/MIKROE_CLICKER2_STM32/board.mk b/os/hal/boards/MIKROE_CLICKER2_STM32/board.mk
index adb081500..24b736373 100644
--- a/os/hal/boards/MIKROE_CLICKER2_STM32/board.mk
+++ b/os/hal/boards/MIKROE_CLICKER2_STM32/board.mk
@@ -1,5 +1,5 @@
 # List of all the board related files.
-BOARDSRC = ${CHIBIOS}/os/hal/boards/CLICKER_2_FOR_STM32/board.c
+BOARDSRC = ${CHIBIOS}/os/hal/boards/MIKROE_CLICKER_2_FOR_STM32/board.c
 
 # Required include directories
-BOARDINC = ${CHIBIOS}/os/hal/boards/CLICKER_2_FOR_STM32
+BOARDINC = ${CHIBIOS}/os/hal/boards/MIKROE_CLICKER_2_FOR_STM32
diff --git a/os/hal/boards/MIKROE_CLICKER2_STM32/cfg/board.chcfg b/os/hal/boards/MIKROE_CLICKER2_STM32/cfg/board.chcfg
index dc5895572..1e9f7b138 100644
--- a/os/hal/boards/MIKROE_CLICKER2_STM32/cfg/board.chcfg
+++ b/os/hal/boards/MIKROE_CLICKER2_STM32/cfg/board.chcfg
@@ -8,8 +8,8 @@
     <output_path>..</output_path>
     <hal_version>3.0.x</hal_version>
   </configuration_settings>
-  <board_name>Clicker 2 for STM32</board_name>
-  <board_id>CLICKER_2_FOR_STM32</board_id>
+  <board_name>Mikroe Clicker 2 for STM32</board_name>
+  <board_id>MIKROE_CLICKER_2_FOR_STM32</board_id>
   <board_functions></board_functions>
   <subtype>STM32F407xx</subtype>
   <clocks