diff --git a/targets/TARGET_ARM_FM/CMakeLists.txt b/targets/TARGET_ARM_FM/CMakeLists.txt
index 26c9500017..2743e280d9 100644
--- a/targets/TARGET_ARM_FM/CMakeLists.txt
+++ b/targets/TARGET_ARM_FM/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(ARM_FM INTERFACE)
+add_library(mbed-arm-fm INTERFACE)
 
 add_subdirectory(TARGET_FVP_MPS2 EXCLUDE_FROM_ALL)
 
-target_include_directories(ARM_FM
+target_include_directories(mbed-arm-fm
     INTERFACE
         .
 )
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt
index da43a5b8b4..be56afbae7 100644
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt
@@ -7,16 +7,16 @@ add_subdirectory(TARGET_FVP_MPS2_M3 EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_FVP_MPS2_M4 EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_FVP_MPS2_M7 EXCLUDE_FROM_ALL)
 
-add_library(FVP_MPS2 INTERFACE)
+add_library(mbed-fvp-mps2 INTERFACE)
 
-target_include_directories(FVP_MPS2
+target_include_directories(mbed-fvp-mps2
     INTERFACE
         .
         drivers
         SDK
 )
 
-target_sources(FVP_MPS2
+target_sources(mbed-fvp-mps2
     INTERFACE
         analogin_api.c
         flash_api.c
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt
index 8dd98a1b32..ccb8a71353 100644
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(FVP_MPS2_M0 INTERFACE)
+add_library(mbed-fvp-mps2-m0 INTERFACE)
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct)
@@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
 endif()
 
-mbed_set_linker_script(FVP_MPS2_M0 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-fvp-mps2-m0 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_include_directories(FVP_MPS2_M0
+target_include_directories(mbed-fvp-mps2-m0
     INTERFACE
         device
 )
 
-target_sources(FVP_MPS2_M0
+target_sources(mbed-fvp-mps2-m0
     INTERFACE
         device/system_CMSDK_CM0.c
         ${STARTUP_FILE}
 )
 
-target_link_libraries(FVP_MPS2_M0 INTERFACE FVP_MPS2 ARM_FM)
+target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2 mbed-arm-fm)
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt
index 467a882790..fb8f1f41a9 100644
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(FVP_MPS2_M0P INTERFACE)
+add_library(mbed-fvp-mps2-m0p INTERFACE)
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct)
@@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
 endif()
 
-mbed_set_linker_script(FVP_MPS2_M0P ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-fvp-mps2-m0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_include_directories(FVP_MPS2_M0P
+target_include_directories(mbed-fvp-mps2-m0p
     INTERFACE
         device
 )
 
-target_sources(FVP_MPS2_M0P
+target_sources(mbed-fvp-mps2-m0p
     INTERFACE
         device/system_CMSDK_CM0plus.c
         ${STARTUP_FILE}
 )
 
-target_link_libraries(FVP_MPS2_M0P INTERFACE FVP_MPS2 ARM_FM)
+target_link_libraries(mbed-fvp-mps2-m0p INTERFACE mbed-fvp-mps2 mbed-arm-fm)
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt
index 01389329b2..3290c51a09 100644
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(FVP_MPS2_M3 INTERFACE)
+add_library(mbed-fvp-mps2-m3 INTERFACE)
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct)
@@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
 endif()
 
-mbed_set_linker_script(FVP_MPS2_M3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-fvp-mps2-m3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_include_directories(FVP_MPS2_M3
+target_include_directories(mbed-fvp-mps2-m3
     INTERFACE
         device
 )
 
-target_sources(FVP_MPS2_M3
+target_sources(mbed-fvp-mps2-m3
     INTERFACE
         device/system_CMSDK_CM3.c
         ${STARTUP_FILE}
 )
 
-target_link_libraries(FVP_MPS2_M3 INTERFACE FVP_MPS2 ARM_FM)
+target_link_libraries(mbed-fvp-mps2-m3 INTERFACE mbed-fvp-mps2 mbed-arm-fm)
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt
index 92cbb0e1ca..6e95c6fbd1 100644
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt
@@ -1,9 +1,9 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(FVP_MPS2_M4 INTERFACE)
+add_library(mbed-fvp-mps2-m4 INTERFACE)
 
-target_include_directories(FVP_MPS2_M4
+target_include_directories(mbed-fvp-mps2-m4
     INTERFACE
         device
 )
@@ -15,17 +15,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/MPS2.ld)
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
 endif()
-mbed_set_linker_script(FVP_MPS2_M4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-fvp-mps2-m4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_include_directories(FVP_MPS2_M4
+target_include_directories(mbed-fvp-mps2-m4
     INTERFACE
         device
 )
 
-target_sources(FVP_MPS2_M4
+target_sources(mbed-fvp-mps2-m4
     INTERFACE
         device/system_CMSDK_CM4.c
         ${STARTUP_FILE}
 )
 
-target_link_libraries(FVP_MPS2_M4 INTERFACE FVP_MPS2 ARM_FM)
+target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2 mbed-arm-fm)
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt
index 6d84433580..cd4dc90ded 100644
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt
@@ -1,9 +1,9 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(FVP_MPS2_M7 INTERFACE)
+add_library(mbed-fvp-mps2-m7 INTERFACE)
 
-target_include_directories(FVP_MPS2_M7
+target_include_directories(mbed-fvp-mps2-m7
     INTERFACE
         device
 )
@@ -16,17 +16,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
 endif()
 
-mbed_set_linker_script(FVP_MPS2_M7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-fvp-mps2-m7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_include_directories(FVP_MPS2_M7
+target_include_directories(mbed-fvp-mps2-m7
     INTERFACE
         device
 )
 
-target_sources(FVP_MPS2_M7
+target_sources(mbed-fvp-mps2-m7
     INTERFACE
         device/system_CMSDK_CM7.c
         ${STARTUP_FILE}
 )
 
-target_link_libraries(FVP_MPS2_M7 INTERFACE FVP_MPS2 ARM_FM)
+target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2 mbed-arm-fm)