diff --git a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/CMakeLists.txt
index e1604becb1..00796a2485 100644
--- a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/CMakeLists.txt
@@ -11,19 +11,19 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE TOOLCHAIN_ARM/stm32f070xb.sct)
 endif()
 
-add_library(mbed-stm32f070xB INTERFACE)
+add_library(mbed-stm32f070xb INTERFACE)
 
-target_sources(mbed-stm32f070xB
+target_sources(mbed-stm32f070xb
     INTERFACE
         system_clock.c
         ${STARTUP_FILE}
 )
 
-target_include_directories(mbed-stm32f070xB
+target_include_directories(mbed-stm32f070xb
     INTERFACE
         .
 )
 
-mbed_set_linker_script(mbed-stm32f070xB ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-stm32f070xb ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(mbed-stm32f070xB INTERFACE mbed-stm32f0)
+target_link_libraries(mbed-stm32f070xb INTERFACE mbed-stm32f0)
diff --git a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/TARGET_NUCLEO_F070RB/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/TARGET_NUCLEO_F070RB/CMakeLists.txt
index d82d891ba2..0ebc95c21e 100644
--- a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/TARGET_NUCLEO_F070RB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/TARGET_NUCLEO_F070RB/CMakeLists.txt
@@ -13,4 +13,4 @@ target_include_directories(mbed-nucleo-f070rb
         .
 )
 
-target_link_libraries(mbed-nucleo-f070rb INTERFACE mbed-stm32f070xB)
+target_link_libraries(mbed-nucleo-f070rb INTERFACE mbed-stm32f070xb)
diff --git a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F072xB/TARGET_NUCLEO_F072RB/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F072xB/TARGET_NUCLEO_F072RB/CMakeLists.txt
index 5bfe425136..7bcd4e3cae 100644
--- a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F072xB/TARGET_NUCLEO_F072RB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F072xB/TARGET_NUCLEO_F072RB/CMakeLists.txt
@@ -13,4 +13,4 @@ target_include_directories(mbed-nucleo-f072rb
         .
 )
 
-target_link_libraries(mbed-nucleo-f072rb INTERFACE mbed-stm32f072xB)
+target_link_libraries(mbed-nucleo-f072rb INTERFACE mbed-stm32f072xb)
diff --git a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F091xC/TARGET_NUCLEO_F091RC/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F091xC/TARGET_NUCLEO_F091RC/CMakeLists.txt
index e1527b4606..583957becb 100644
--- a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F091xC/TARGET_NUCLEO_F091RC/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F091xC/TARGET_NUCLEO_F091RC/CMakeLists.txt
@@ -13,4 +13,4 @@ target_include_directories(mbed-nucleo-f091rc
         .
 )
 
-target_link_libraries(mbed-nucleo-f091rc INTERFACE mbed-stm32f091xC)
+target_link_libraries(mbed-nucleo-f091rc INTERFACE mbed-stm32f091xc)
diff --git a/targets/TARGET_STM/TARGET_STM32F1/TARGET_STM32F103xB/TARGET_NUCLEO_F103RB/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F1/TARGET_STM32F103xB/TARGET_NUCLEO_F103RB/CMakeLists.txt
index 784a7bcc36..493f15101c 100644
--- a/targets/TARGET_STM/TARGET_STM32F1/TARGET_STM32F103xB/TARGET_NUCLEO_F103RB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F1/TARGET_STM32F103xB/TARGET_NUCLEO_F103RB/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-nucleo-f103RB INTERFACE)
+add_library(mbed-nucleo-f103rb INTERFACE)
 
-target_sources(mbed-nucleo-f103RB
+target_sources(mbed-nucleo-f103rb
     INTERFACE
         PeripheralPins.c
 )
 
-target_include_directories(mbed-nucleo-f103RB
+target_include_directories(mbed-nucleo-f103rb
     INTERFACE
         .
 )
 
-target_link_libraries(mbed-nucleo-f103RB INTERFACE mbed-stm32f103xb)
+target_link_libraries(mbed-nucleo-f103rb INTERFACE mbed-stm32f103xb)
diff --git a/targets/TARGET_STM/TARGET_STM32F2/TARGET_STM32F207xG/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F2/TARGET_STM32F207xG/CMakeLists.txt
index 6d02f4de33..77a1c383c0 100644
--- a/targets/TARGET_STM/TARGET_STM32F2/TARGET_STM32F207xG/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F2/TARGET_STM32F207xG/CMakeLists.txt
@@ -11,19 +11,19 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE TOOLCHAIN_ARM/stm32f207xg.sct)
 endif()
 
-add_library(mbed-stm32f207xG INTERFACE)
+add_library(mbed-stm32f207xg INTERFACE)
 
-target_sources(mbed-stm32f207xG
+target_sources(mbed-stm32f207xg
     INTERFACE
         system_clock.c
         ${STARTUP_FILE}
 )
 
-target_include_directories(mbed-stm32f207xG
+target_include_directories(mbed-stm32f207xg
     INTERFACE
         .
 )
 
-mbed_set_linker_script(mbed-stm32f207xG ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-stm32f207xg ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(mbed-stm32f207xG INTERFACE mbed-stm32f2)
+target_link_libraries(mbed-stm32f207xg INTERFACE mbed-stm32f2)
diff --git a/targets/TARGET_STM/TARGET_STM32F3/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F3/CMakeLists.txt
index 4a9a78fcbe..b13377e017 100644
--- a/targets/TARGET_STM/TARGET_STM32F3/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F3/CMakeLists.txt
@@ -26,4 +26,4 @@ target_sources(mbed-stm32f3
         spi_api.c
 )
 
-target_link_libraries(mbed-stm32f3 INTERFACE mbed-stm mbed-stm32cube-fw)
+target_link_libraries(mbed-stm32f3 INTERFACE mbed-stm mbed-stm32f3cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TARGET_NUCLEO_F303K8/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TARGET_NUCLEO_F303K8/CMakeLists.txt
index 4a8d2142d4..dd555f057a 100644
--- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TARGET_NUCLEO_F303K8/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TARGET_NUCLEO_F303K8/CMakeLists.txt
@@ -13,4 +13,4 @@ target_sources(mbed-nucleo-f303k8
         PeripheralPins.c
 )
 
-target_link_libraries(mbed-nucleo-f303k8 INTERFACE STM32F303x8)
+target_link_libraries(mbed-nucleo-f303k8 INTERFACE mbed-stm32f303x8)
diff --git a/targets/TARGET_STM/TARGET_STM32L1/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L1/CMakeLists.txt
index b2437872f1..35855d85f8 100644
--- a/targets/TARGET_STM/TARGET_STM32L1/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L1/CMakeLists.txt
@@ -85,4 +85,4 @@ target_include_directories(mbed-stm32l1
         device
 )
 
-target_link_libraries(mbed-stm32l1 INTERFACE STM)
+target_link_libraries(mbed-stm32l1 INTERFACE mbed-stm)
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/CMakeLists.txt
index 4c1acc0ccb..6290a66601 100644
--- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/CMakeLists.txt
@@ -29,3 +29,10 @@ target_include_directories(mbed-xdot-l151cc
 mbed_set_linker_script(mbed-xdot-l151cc ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
 target_link_libraries(mbed-xdot-l151cc INTERFACE mbed-stm32l1)
+
+
+# Same target as XDOT_L151CC
+add_library(mbed-ff-1705-l151cc INTERFACE)
+
+target_link_libraries(mbed-xdot-l151cc INTERFACE mbed-xdot-l151cc)
+
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L471xG/TARGET_MTS_DRAGONFLY_L471QG/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L471xG/TARGET_MTS_DRAGONFLY_L471QG/CMakeLists.txt
index 0a8c0eff55..0179089191 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L471xG/TARGET_MTS_DRAGONFLY_L471QG/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L471xG/TARGET_MTS_DRAGONFLY_L471QG/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-mts-dragonfly-L471qg INTERFACE)
+add_library(mbed-mts-dragonfly-l471qg INTERFACE)
 
-target_sources(mbed-mts-dragonfly-L471qg
+target_sources(mbed-mts-dragonfly-l471qg
     INTERFACE
         mtqn_low_power.c
         ONBOARD_SARA4_PPP.cpp
@@ -11,9 +11,9 @@ target_sources(mbed-mts-dragonfly-L471qg
         PeripheralPins.c
 )
 
-target_include_directories(mbed-mts-dragonfly-L471qg
+target_include_directories(mbed-mts-dragonfly-l471qg
     INTERFACE
         .
 )
 
-target_link_libraries(mbed-mts-dragonfly-L471qg INTERFACE mbed-stm32l471xg)
+target_link_libraries(mbed-mts-dragonfly-l471qg INTERFACE mbed-stm32l471xg)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/CMakeLists.txt
index 479864a089..f4cf2a182d 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-disco-l475vg_iot01a INTERFACE)
+add_library(mbed-disco-l475vg-iot01a INTERFACE)
 
-target_sources(mbed-disco-l475vg_iot01a
+target_sources(mbed-disco-l475vg-iot01a
     INTERFACE
         PeripheralPins.c
 )
 
-target_include_directories(mbed-disco-l475vg_iot01a
+target_include_directories(mbed-disco-l475vg-iot01a
     INTERFACE
         .
 )
 
-target_link_libraries(mbed-disco-l475vg_iot01a INTERFACE mbed-stm32l475xg)
+target_link_libraries(mbed-disco-l475vg-iot01a INTERFACE mbed-stm32l475xg)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_ADV_WISE_1570/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_ADV_WISE_1570/CMakeLists.txt
index 1831832c8d..cd01c74a63 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_ADV_WISE_1570/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_ADV_WISE_1570/CMakeLists.txt
@@ -1,18 +1,18 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(adv-wise-1570 INTERFACE)
+add_library(mbed-adv-wise-1570 INTERFACE)
 
-target_sources(adv-wise-1570
+target_sources(mbed-adv-wise-1570
     INTERFACE
         ONBOARD_QUECTEL_BC95.cpp
         PeripheralPins.c
         system_clock.c
 )
 
-target_include_directories(adv-wise-1570
+target_include_directories(mbed-adv-wise-1570
     INTERFACE
         .
 )
 
-target_link_libraries(adv-wise-1570 INTERFACE mbed-stm32l486xg)
+target_link_libraries(mbed-adv-wise-1570 INTERFACE mbed-stm32l486xg)
diff --git a/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L562xE/TARGET_DISCO_L562QE/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L562xE/TARGET_DISCO_L562QE/CMakeLists.txt
index 6d20467883..3e1d43d515 100644
--- a/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L562xE/TARGET_DISCO_L562QE/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L562xE/TARGET_DISCO_L562QE/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-discol562qe INTERFACE)
+add_library(mbed-disco-l562qe INTERFACE)
 
-target_sources(mbed-discol562qe
+target_sources(mbed-disco-l562qe
     INTERFACE
         PeripheralPins.c
 )
 
-target_include_directories(mbed-discol562qe
+target_include_directories(mbed-disco-l562qe
     INTERFACE
         .
 )
 
-target_link_libraries(mbed-discol562qe INTERFACE mbed-stm32l562xe)
+target_link_libraries(mbed-disco-l562qe INTERFACE mbed-stm32l562xe)