diff --git a/boards/arm/stm32f7/nucleo-f722ze/Kconfig b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
index cc1912c99af..60ec42530ca 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
@@ -85,7 +85,7 @@ choice
 	default NUCLEO_F722ZE_CAN1_MAP_PD0PD1
 	depends on STM32F7_CAN1
 
-config NUCLEO_F722ZE_F722ZE_CAN1_MAP_D14D15
+config NUCLEO_F722ZE_CAN1_MAP_D14D15
 	bool "CAN1_TX=D14 CAN1_RX=D15"
 
 config NUCLEO_F722ZE_CAN1_MAP_PD0PD1
diff --git a/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
index b960a5907c0..13f00d142d4 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
@@ -8,8 +8,8 @@
 # CONFIG_ARCH_FPU is not set
 # CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD="nucleo-f722ze"
+CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP="stm32f7"
diff --git a/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
index 532251939f5..735779fd91a 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
@@ -10,8 +10,8 @@
 # CONFIG_NET_IPv4 is not set
 # CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD="nucleo-f722ze"
+CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP="stm32f7"
diff --git a/boards/arm/stm32f7/nucleo-f746zg/Kconfig b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
index 4f7bdfdbe73..c1d96afcf0b 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
@@ -85,7 +85,7 @@ choice
 	default NUCLEO_F746ZG_CAN1_MAP_PD0PD1
 	depends on STM32F7_CAN1
 
-config NUCLEO_F746ZG_F746ZG_CAN1_MAP_D14D15
+config NUCLEO_F746ZG_CAN1_MAP_D14D15
 	bool "CAN1_TX=D14 CAN1_RX=D15"
 
 config NUCLEO_F746ZG_CAN1_MAP_PD0PD1
diff --git a/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig b/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
index 88d1b897696..d19581f71e6 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
@@ -12,8 +12,8 @@ CONFIG_ADC=y
 CONFIG_ADC_FIFOSIZE=16
 CONFIG_ANALOG=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD="nucleo-f746zg"
+CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_NUCLEO_F746ZG=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP="stm32f7"
diff --git a/boards/arm/stm32f7/nucleo-f767zi/Kconfig b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
index 95614b81892..e8eb80d5fab 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
@@ -85,7 +85,7 @@ choice
 	default NUCLEO_F767ZI_CAN1_MAP_PD0PD1
 	depends on STM32F7_CAN1
 
-config NUCLEO_F767ZI_F767ZI_CAN1_MAP_D14D15
+config NUCLEO_F767ZI_CAN1_MAP_D14D15
 	bool "CAN1_TX=D14 CAN1_RX=D15"
 
 config NUCLEO_F767ZI_CAN1_MAP_PD0PD1