diff --git a/boards/nucleo-f207/Makefile b/boards/nucleo144-f207/Makefile
similarity index 100%
rename from boards/nucleo-f207/Makefile
rename to boards/nucleo144-f207/Makefile
diff --git a/boards/nucleo-f207/Makefile.dep b/boards/nucleo144-f207/Makefile.dep
similarity index 100%
rename from boards/nucleo-f207/Makefile.dep
rename to boards/nucleo144-f207/Makefile.dep
diff --git a/boards/nucleo-f207/Makefile.features b/boards/nucleo144-f207/Makefile.features
similarity index 100%
rename from boards/nucleo-f207/Makefile.features
rename to boards/nucleo144-f207/Makefile.features
diff --git a/boards/nucleo-f207/Makefile.include b/boards/nucleo144-f207/Makefile.include
similarity index 100%
rename from boards/nucleo-f207/Makefile.include
rename to boards/nucleo144-f207/Makefile.include
diff --git a/boards/nucleo-f207/board.c b/boards/nucleo144-f207/board.c
similarity index 77%
rename from boards/nucleo-f207/board.c
rename to boards/nucleo144-f207/board.c
index f4c74581aa..68853f5417 100644
--- a/boards/nucleo-f207/board.c
+++ b/boards/nucleo144-f207/board.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  OTA keys S.A.
+ * Copyright (C) 2016-2017  OTA keys S.A.
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -7,11 +7,11 @@
  */
 
 /**
- * @ingroup     boards_nucleo-f207
+ * @ingroup     boards_nucleo144-f207
  * @{
  *
  * @file
- * @brief       Board specific implementations for the nucleo-f207 board
+ * @brief       Board specific implementations for the nucleo144-f207 board
  *
  * @author      Vincent Dupont <vincent@otakeys.com>
  *
diff --git a/boards/nucleo-f207/dist/openocd.cfg b/boards/nucleo144-f207/dist/openocd.cfg
similarity index 100%
rename from boards/nucleo-f207/dist/openocd.cfg
rename to boards/nucleo144-f207/dist/openocd.cfg
diff --git a/boards/nucleo-f207/include/board.h b/boards/nucleo144-f207/include/board.h
similarity index 81%
rename from boards/nucleo-f207/include/board.h
rename to boards/nucleo144-f207/include/board.h
index 0d59473102..d6cf6b0927 100644
--- a/boards/nucleo-f207/include/board.h
+++ b/boards/nucleo144-f207/include/board.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  OTA keys S.A.
+ * Copyright (C) 2016-2017  OTA keys S.A.
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -7,13 +7,13 @@
  */
 
 /**
- * @defgroup    boards_nucleo-f207 Nucleo-F207
+ * @defgroup    boards_nucleo144-f207 Nucleo144-F207
  * @ingroup     boards
- * @brief       Board specific files for the nucleo-f207 board
+ * @brief       Board specific files for the nucleo144-f207 board
  * @{
  *
  * @file
- * @brief       Board specific definitions for the nucleo-f207 board
+ * @brief       Board specific definitions for the nucleo144-f207 board
  *
  * @author      Vincent Dupont <vincent@otakeys.com
  * @author      Toon Stegen <toon.stegen@altran.com>
@@ -22,8 +22,6 @@
 #ifndef BOARD_H
 #define BOARD_H
 
-#include "board_common.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -32,12 +30,6 @@ extern "C" {
  * @brief   LED pin definitions and handlers
  * @{
  */
-#undef LED0_PIN
-#undef LED0_MASK
-#undef LED0_ON
-#undef LED0_OFF
-#undef LED0_TOGGLE
-
 #define LED0_PIN            GPIO_PIN(PORT_B, 0)
 #define LED0_MASK           (1 << 0)
 #define LED0_ON             (GPIOB->BSRR = LED0_MASK)
@@ -57,6 +49,11 @@ extern "C" {
 #define LED2_TOGGLE         (GPIOB->ODR  ^= LED2_MASK)
 /** @} */
 
+/**
+ * @brief   User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
+
 /**
  * @brief   Initialize board specific hardware, including clock, LEDs and std-IO
  */
diff --git a/boards/nucleo-f207/include/periph_conf.h b/boards/nucleo144-f207/include/periph_conf.h
similarity index 97%
rename from boards/nucleo-f207/include/periph_conf.h
rename to boards/nucleo144-f207/include/periph_conf.h
index da5699bb34..311aacafad 100644
--- a/boards/nucleo-f207/include/periph_conf.h
+++ b/boards/nucleo144-f207/include/periph_conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  OTA keys S.A.
+ * Copyright (C) 2016-2017  OTA keys S.A.
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -7,11 +7,11 @@
  */
 
 /**
- * @ingroup     boards_nucleo-f207
+ * @ingroup     boards_nucleo144-f207
  * @{
  *
  * @file
- * @name        Peripheral MCU configuration for the nucleo-f207 board
+ * @name        Peripheral MCU configuration for the nucleo144-f207 board
  *
  * @author      Vincent Dupont <vincent@otakeys.com>
  * @author      Aurelien Gonce <aurelien.gonce@altran.fr>
@@ -254,7 +254,7 @@ static const spi_conf_t spi_config[] = {
  * @{
  */
 #define ADC_CONFIG {              \
-    {GPIO_PIN(PORT_A, 4), 0, 0},  \
+    {GPIO_PIN(PORT_A, 3), 0, 3},  \
     {GPIO_PIN(PORT_C, 0), 1, 0}  \
 }
 #define ADC_NUMOF          (2)