diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PeripheralNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralNames.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PeripheralNames.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralNames.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PinNames.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/PinNames.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PinNames.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM32L475VG.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM32L475VG.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM32L475VG.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM32L475VG.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM_TARGET.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM_TARGET.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM_TARGET.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM_TARGET.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_MICRO/startup_stm32l475xx.S b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_MICRO/startup_stm32l475xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_MICRO/startup_stm32l475xx.S
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_MICRO/startup_stm32l475xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/stm32l475xx.sct b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_STD/stm32l475xx.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/stm32l475xx.sct
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_STD/stm32l475xx.sct
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_STD/sys.cpp
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_ARM_STD/sys.cpp
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_GCC_ARM/STM32L475XX.ld b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_GCC_ARM/STM32L475XX.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_GCC_ARM/STM32L475XX.ld
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_GCC_ARM/STM32L475XX.ld
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_IAR/startup_stm32l475xx.S b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_IAR/startup_stm32l475xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_IAR/startup_stm32l475xx.S
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_IAR/startup_stm32l475xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_IAR/stm32l475xx.icf b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_IAR/stm32l475xx.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/TOOLCHAIN_IAR/stm32l475xx.icf
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_IAR/stm32l475xx.icf
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/cmsis.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/cmsis.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis_nvic.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/cmsis_nvic.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis_nvic.c
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/cmsis_nvic.c
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/cmsis_nvic.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/cmsis_nvic.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/cmsis_nvic.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/hal_tick.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/hal_tick.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/hal_tick.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/hal_tick.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/stm32l475xx.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/stm32l475xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/stm32l475xx.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/stm32l475xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/stm32l4xx.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/stm32l4xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/stm32l4xx.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/stm32l4xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/system_stm32l4xx.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/system_stm32l4xx.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/system_stm32l4xx.c
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/system_stm32l4xx.c
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/system_stm32l4xx.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/system_stm32l4xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/device/system_stm32l4xx.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/system_stm32l4xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/objects.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/objects.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L475VG_IOT01A/objects.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/objects.h
diff --git a/targets/targets.json b/targets/targets.json
index cc086043d1..8c3cf35af5 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1324,7 +1324,7 @@
     "DISCO_L475VG_IOT01A": {
         "inherits": ["Target"],
         "core": "Cortex-M4F",
-        "extra_labels": ["STM", "STM32L4", "STM32L475VG"],
+        "extra_labels": ["STM", "STM32L4", "STM32L475xG", "STM32L475VG"],
         "supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
         "default_toolchain": "ARM",
         "supported_form_factors": ["ARDUINO"],