diff --git a/targets/CMakeLists.txt b/targets/CMakeLists.txt
index fcf950221bf..608dae674bb 100644
--- a/targets/CMakeLists.txt
+++ b/targets/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 include(../tools/cmake/set_linker_script.cmake)
 
@@ -34,6 +34,8 @@ elseif("STM" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_STM)
 elseif("TOSHIBA" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_TOSHIBA)
-elseif("WICED" IN_LIST MBED_TARGET_LABELS)
+endif()
+
+if("WICED" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_WICED)
 endif()
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/TARGET_WIO_EMW3166/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/TARGET_WIO_EMW3166/CMakeLists.txt
index f354760aaf6..769b3118fe1 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/TARGET_WIO_EMW3166/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/TARGET_WIO_EMW3166/CMakeLists.txt
@@ -1,16 +1,16 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(WIO_EMW3166 INTERFACE)
+add_library(mbed-wio-emw3166 INTERFACE)
 
-target_sources(WIO_EMW3166
+target_sources(mbed-wio-emw3166
     INTERFACE
         PeripheralPins.c
 )
 
-target_include_directories(WIO_EMW3166
+target_include_directories(mbed-wio-emw3166
     INTERFACE
         .
 )
 
-target_link_libraries(WIO_EMW3166 INTERFACE STM32F412xG)
+target_link_libraries(mbed-wio-emw3166 INTERFACE mbed-wiced mbed-stm32f412xg)
diff --git a/targets/TARGET_WICED/CMakeLists.txt b/targets/TARGET_WICED/CMakeLists.txt
index ac1832a9ada..c6f83e6b9cb 100644
--- a/targets/TARGET_WICED/CMakeLists.txt
+++ b/targets/TARGET_WICED/CMakeLists.txt
@@ -1,22 +1,22 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("WIO_EMW3166" IN_LIST MBED_TARGET_LABELS)
-    if(${MBED_TOOLCHAIN} STREQUAL "ARM")
-        set(LIB_WICED_DRIVERS TOOLCHAIN_ARMC6/TARGET_WIO_EMW3166/libwiced_drivers.ar)
-    elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-        set(LIB_WICED_DRIVERS TOOLCHAIN_GCC_ARM/TARGET_WIO_EMW3166/libwiced_drivers.a)
-    endif()
+add_library(mbed-wiced INTERFACE)
+
+if(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    set(LIB_WICED_DRIVERS TOOLCHAIN_ARMC6/TARGET_WIO_EMW3166/libwiced_drivers.ar)
+elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    set(LIB_WICED_DRIVERS TOOLCHAIN_GCC_ARM/TARGET_WIO_EMW3166/libwiced_drivers.a)
 endif()
 
-target_link_libraries(mbed-core INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_WICED_DRIVERS})
+target_link_libraries(mbed-wiced INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_WICED_DRIVERS})
 
-target_include_directories(mbed-core
+target_include_directories(mbed-wiced
     INTERFACE
         wiced_interface
 )
 
-target_sources(mbed-core
+target_sources(mbed-wiced
     INTERFACE
         wiced_interface/default_wifi_interface.cpp
 )