diff --git a/features/unsupported/tests/mbed/analog/main.cpp b/features/unsupported/tests/mbed/analog/main.cpp
index 6bd58f407b..3b2cc2104e 100644
--- a/features/unsupported/tests/mbed/analog/main.cpp
+++ b/features/unsupported/tests/mbed/analog/main.cpp
@@ -66,7 +66,7 @@ AnalogOut out(A1);
       defined(TARGET_NUCLEO_F303ZE) || \
       defined(TARGET_NUCLEO_F410RB) || \
       defined(TARGET_NUCLEO_F446ZE) || \
-      defined(TARGET_NUCLEO_F429ZI) || defined(TARGET_DISCO_L475VG_IOT)
+      defined(TARGET_NUCLEO_F429ZI) || defined(TARGET_DISCO_L475VG_IOT01A)
 AnalogIn in(A0);
 AnalogOut out(D13);
 
diff --git a/features/unsupported/tests/mbed/can/main.cpp b/features/unsupported/tests/mbed/can/main.cpp
index 5436a7f01c..c4a787f679 100644
--- a/features/unsupported/tests/mbed/can/main.cpp
+++ b/features/unsupported/tests/mbed/can/main.cpp
@@ -69,7 +69,7 @@ int main() {
      !defined(TARGET_NUCLEO_F042K6) && !defined(TARGET_NUCLEO_F334R8) && \
      !defined(TARGET_NUCLEO_F303RE) && !defined(TARGET_NUCLEO_F303K8) && \
      !defined(TARGET_NUCLEO_F302R8) && !defined(TARGET_NUCLEO_F103RB) && \
-     !defined(TARGET_DISCO_L476VG) && !defined(TARGET_DISCO_L475VG_IOT) && !defined(TARGET_NUCLEO_L476RG) && \
+     !defined(TARGET_DISCO_L476VG) && !defined(TARGET_DISCO_L475VG_IOT01A) && !defined(TARGET_NUCLEO_L476RG) && \
      !defined(TARGET_NUCLEO_L432KC)) && !defined(TARGET_DISCO_F303VC)
       printf("loop()\n");
         if(can2.read(msg)) {
diff --git a/features/unsupported/tests/mbed/can_interrupt/main.cpp b/features/unsupported/tests/mbed/can_interrupt/main.cpp
index 4d4cc841f3..0ed1aad65c 100644
--- a/features/unsupported/tests/mbed/can_interrupt/main.cpp
+++ b/features/unsupported/tests/mbed/can_interrupt/main.cpp
@@ -64,7 +64,7 @@ void send() {
      !defined(TARGET_NUCLEO_F042K6) && !defined(TARGET_NUCLEO_F334R8) && \
      !defined(TARGET_NUCLEO_F303RE) && !defined(TARGET_NUCLEO_F303K8) && \
      !defined(TARGET_NUCLEO_F302R8) && !defined(TARGET_NUCLEO_F103RB) && \
-     !defined(TARGET_DISCO_L476VG) && !defined(TARGET_DISCO_L475VG_IOT) && !defined(TARGET_NUCLEO_L476RG) && \
+     !defined(TARGET_DISCO_L476VG) && !defined(TARGET_DISCO_L475VG_IOT01A) && !defined(TARGET_NUCLEO_L476RG) && \
      !defined(TARGET_NUCLEO_L432KC) && !defined(TARGET_DISCO_F303VC))
 void read() {
     CANMessage msg;
diff --git a/features/unsupported/tests/mbed/can_loopback/main.cpp b/features/unsupported/tests/mbed/can_loopback/main.cpp
index b5731c304b..4b60478a6b 100644
--- a/features/unsupported/tests/mbed/can_loopback/main.cpp
+++ b/features/unsupported/tests/mbed/can_loopback/main.cpp
@@ -18,7 +18,7 @@ CAN can1(P5_9, P5_10);
       defined(TARGET_NUCLEO_F303RE) || defined(TARGET_NUCLEO_F303K8) || \
       defined(TARGET_NUCLEO_F302R8) || defined(TARGET_NUCLEO_F446RE) || \
       defined(TARGET_DISCO_F429ZI)  || \
-      defined(TARGET_NUCLEO_F746ZG) || defined(TARGET_DISCO_L476VG)  || defined(TARGET_DISCO_L475VG_IOT) || \
+      defined(TARGET_NUCLEO_F746ZG) || defined(TARGET_DISCO_L476VG)  || defined(TARGET_DISCO_L475VG_IOT01A) || \
       defined(TARGET_NUCLEO_F412ZG) || \
       defined(TARGET_NUCLEO_L476RG) || defined(TARGET_NUCLEO_L432KC)
 CAN can1(PA_11, PA_12);
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/PeripheralNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PeripheralNames.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/PeripheralNames.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PeripheralNames.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/PeripheralPins.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/PeripheralPins.c
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PinNames.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/PinNames.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PinNames.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_MICRO/startup_stm32l475xx.S b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_MICRO/startup_stm32l475xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_MICRO/startup_stm32l475xx.S
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_MICRO/startup_stm32l475xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_STD/stm32l475xx.sct b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/stm32l475xx.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_STD/stm32l475xx.sct
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/stm32l475xx.sct
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/sys.cpp
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_ARM_STD/sys.cpp
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_GCC_ARM/STM32L475XX.ld b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_GCC_ARM/STM32L475XX.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_GCC_ARM/STM32L475XX.ld
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_GCC_ARM/STM32L475XX.ld
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_IAR/startup_stm32l475xx.S b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_IAR/startup_stm32l475xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_IAR/startup_stm32l475xx.S
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_IAR/startup_stm32l475xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_IAR/stm32l475xx.icf b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_IAR/stm32l475xx.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/TOOLCHAIN_IAR/stm32l475xx.icf
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_IAR/stm32l475xx.icf
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/cmsis.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/cmsis.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/cmsis_nvic.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis_nvic.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/cmsis_nvic.c
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis_nvic.c
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis_nvic.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/cmsis_nvic.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis_nvic.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/hal_tick.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/hal_tick.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/hal_tick.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/hal_tick.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/stm32l475xx.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/stm32l475xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/stm32l475xx.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/stm32l475xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/stm32l4xx.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/stm32l4xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/stm32l4xx.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/stm32l4xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/system_stm32l4xx.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/system_stm32l4xx.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/system_stm32l4xx.c
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/system_stm32l4xx.c
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/system_stm32l4xx.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/system_stm32l4xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/device/system_stm32l4xx.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/system_stm32l4xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/objects.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/objects.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT/objects.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/objects.h
diff --git a/targets/targets.json b/targets/targets.json
index b22b6e5d65..434af584d3 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1321,7 +1321,7 @@
         "release_versions": ["2", "5"],
         "device_name": "STM32F769NI"
     },
-    "DISCO_L475VG_IOT": {
+    "DISCO_L475VG_IOT01A": {
         "inherits": ["Target"],
         "core": "Cortex-M4F",
         "extra_labels": ["STM", "STM32L4", "STM32L475VG"],
diff --git a/tools/build_travis.py b/tools/build_travis.py
index ec99376beb..415787b81b 100644
--- a/tools/build_travis.py
+++ b/tools/build_travis.py
@@ -233,7 +233,7 @@ linking_list = [
                "usb"  : ["USB_1", "USB_2" ,"USB_3"],
              }
     },
-    {"target": "DISCO_L475VG_IOT",
+    {"target": "DISCO_L475VG_IOT01A",
      "toolchains": "GCC_ARM",
      "tests": {""     : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
                "rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
diff --git a/tools/tests.py b/tools/tests.py
index c475bd357a..7efcf797e4 100644
--- a/tools/tests.py
+++ b/tools/tests.py
@@ -116,7 +116,7 @@ Wiring:
      * NUCLEO_F103RB: (RX=PA_11, TX=PA_12)
      * NUCLEO_F746ZG: (RX=PA_11, TX=PA_12)
      * DISCO_F746NG:  (RX=PB_8, TX=PB_9)
-     * DISCO_L475VG_IOT:  (RX=PA_11, TX=PA_12)
+     * DISCO_L475VG_IOT01A:  (RX=PA_11, TX=PA_12)
      * DISCO_L476VG:  (RX=PA_11, TX=PA_12)
      * NUCLEO_L476RG: (RX=PA_11, TX=PA_12)
      * NUCLEO_L432KC: (RX=PA_11, TX=PA_12)
@@ -191,7 +191,7 @@ TESTS = [
                 "NUCLEO_F334R8", "NUCLEO_F303ZE", "NUCLEO_L053R8", "DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_L152RE",
                 "NUCLEO_F410RB", "NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F429ZI",
                 "DISCO_F407VG", "NUCLEO_F746ZG", "NUCLEO_L476RG",
-                "DISCO_L053C8", "DISCO_F334C8", "DISCO_L475VG_IOT", "DISCO_L476VG", "DISCO_F469NI", "DISCO_F429ZI", "DISCO_F769NI",
+                "DISCO_L053C8", "DISCO_F334C8", "DISCO_L475VG_IOT01A", "DISCO_L476VG", "DISCO_F469NI", "DISCO_F429ZI", "DISCO_F769NI",
                 "ARCH_MAX", "MAX32600MBED", "MOTE_L152RC", "B96B_F446VE"]
     },
     {
@@ -318,7 +318,7 @@ TESTS = [
                 "NUCLEO_F091RC", "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F207ZG",
         "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE","NUCLEO_F446ZE",
         "DISCO_F469NI", "DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG",
-        "DISCO_F746NG", "DISCO_L475VG_IOT", "DISCO_L476VG", "NUCLEO_L476RG", "NUCLEO_L432KC",
+        "DISCO_F746NG", "DISCO_L475VG_IOT01A", "DISCO_L476VG", "NUCLEO_L476RG", "NUCLEO_L432KC",
         "DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC", "NUCLEO_F412ZG"]
     },
     {
@@ -330,7 +330,7 @@ TESTS = [
                 "NUCLEO_F091RC", "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F207ZG",
         "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F446RE","NUCLEO_F446ZE",
         "DISCO_F469NI", "DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG",
-        "DISCO_F746NG", "DISCO_L475VG_IOT", "DISCO_L476VG", "NUCLEO_L476RG", "NUCLEO_L432KC",
+        "DISCO_F746NG", "DISCO_L475VG_IOT01A", "DISCO_L476VG", "NUCLEO_L476RG", "NUCLEO_L432KC",
         "DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC", "NUCLEO_F412ZG"]
     },
     {