diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/TOOLCHAIN_ARM_STD/startup_stm32f10x_md.s b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/startup_stm32f10x_md.s
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/TOOLCHAIN_ARM_STD/startup_stm32f10x_md.s
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/startup_stm32f10x_md.s
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/TOOLCHAIN_ARM_STD/stm32f10x.sct b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x.sct
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/TOOLCHAIN_ARM_STD/stm32f10x.sct
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x.sct
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/TOOLCHAIN_ARM_STD/sys.cpp b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/sys.cpp
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/TOOLCHAIN_ARM_STD/sys.cpp
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/cmsis.h b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/cmsis.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/cmsis.h
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/cmsis.h
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/cmsis_nvic.c
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/cmsis_nvic.c
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/cmsis_nvic.c
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/cmsis_nvic.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/cmsis_nvic.h
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/cmsis_nvic.h
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/stm32f10x.h b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/stm32f10x.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/stm32f10x.h
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/stm32f10x.h
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/system_stm32f10x.c b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/system_stm32f10x.c
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/system_stm32f10x.c
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/system_stm32f10x.c
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/system_stm32f10x.h b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/system_stm32f10x.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F10X/system_stm32f10x.h
rename to libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/system_stm32f10x.h
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PeripheralNames.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/PeripheralNames.h
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PeripheralNames.h
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/PinNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/PinNames.h
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/PortNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PortNames.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/PortNames.h
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PortNames.h
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/device.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/device.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/device.h
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/device.h
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/gpio_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/gpio_api.c
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/gpio_object.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/gpio_object.h
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_object.h
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/objects.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/objects.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/objects.h
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/objects.h
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/pinmap.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/pinmap.c
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/port_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/port_api.c
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/us_ticker.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO-F103RB/us_ticker.c
rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c