diff --git a/arch/arm/include/stm32/chip.h b/arch/arm/include/stm32/chip.h
index 555669585b9..d46574554c5 100644
--- a/arch/arm/include/stm32/chip.h
+++ b/arch/arm/include/stm32/chip.h
@@ -591,7 +591,7 @@
  * differ only in the available FLASH and SRAM.
  */
 
-#elif defined(CONFIG_ARCH_CHIP_STM32F103RET6)
+#elif defined(CONFIG_ARCH_CHIP_STM32F103RE)
 #  undef  CONFIG_STM32_STM32L15XX            /* STM32L151xx and STM32L152xx family */
 #  undef  CONFIG_STM32_ENERGYLITE            /* STM32L EnergyLite family */
 #  define CONFIG_STM32_STM32F10XX        1   /* STM32F10xxx family */
@@ -629,7 +629,7 @@
  * only in the available FLASH and SRAM.
  */
 
-#elif defined(CONFIG_ARCH_CHIP_STM32F103VCT6) || defined(CONFIG_ARCH_CHIP_STM32F103VET6)
+#elif defined(CONFIG_ARCH_CHIP_STM32F103VC) || defined(CONFIG_ARCH_CHIP_STM32F103VE)
 #  undef  CONFIG_STM32_STM32L15XX            /* STM32L151xx and STM32L152xx family */
 #  undef  CONFIG_STM32_ENERGYLITE            /* STM32L EnergyLite family */
 #  define CONFIG_STM32_STM32F10XX        1   /* STM32F10xxx family */
@@ -667,7 +667,7 @@
  * only in the available FLASH and SRAM.
  */
 
-#elif defined(CONFIG_ARCH_CHIP_STM32F103ZET6)
+#elif defined(CONFIG_ARCH_CHIP_STM32F103ZE)
 #  undef  CONFIG_STM32_STM32L15XX            /* STM32L151xx and STM32L152xx family */
 #  undef  CONFIG_STM32_ENERGYLITE            /* STM32L EnergyLite family */
 #  define CONFIG_STM32_STM32F10XX        1   /* STM32F10xxx family */
@@ -703,7 +703,7 @@
 
 /* STM32 F105/F107 Connectivity Line *******************************************************/
 
-#elif defined(CONFIG_ARCH_CHIP_STM32F105VBT7)
+#elif defined(CONFIG_ARCH_CHIP_STM32F105VB)
 #  undef  CONFIG_STM32_STM32L15XX            /* STM32L151xx and STM32L152xx family */
 #  undef  CONFIG_STM32_ENERGYLITE            /* STM32L EnergyLite family */
 #  define CONFIG_STM32_STM32F10XX        1   /* STM32F10xxx family */
@@ -1722,4 +1722,3 @@
 #endif
 
 #endif /* __ARCH_ARM_INCLUDE_STM32_CHIP_H */
-
diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index a12f2ec82f4..9a344c86630 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -7,7 +7,7 @@ comment "STM32 Configuration Options"
 
 choice
 	prompt "STM32 Chip Selection"
-	default ARCH_CHIP_STM32F103ZET6
+	default ARCH_CHIP_STM32F103ZE
 	depends on ARCH_CHIP_STM32
 
 config ARCH_CHIP_STM32L151C6
@@ -311,35 +311,35 @@ config ARCH_CHIP_STM32F103VB
 	select STM32_PERFORMANCELINE
 	select STM32_MEDIUMDENSITY
 
-config ARCH_CHIP_STM32F103RET6
+config ARCH_CHIP_STM32F103RE
 	bool "STM32F103RET6"
 	select ARCH_CORTEXM3
 	select STM32_STM32F10XX
 	select STM32_PERFORMANCELINE
 	select STM32_HIGHDENSITY
 
-config ARCH_CHIP_STM32F103VCT6
+config ARCH_CHIP_STM32F103VC
 	bool "STM32F103VCT6"
 	select ARCH_CORTEXM3
 	select STM32_STM32F10XX
 	select STM32_PERFORMANCELINE
 	select STM32_HIGHDENSITY
 
-config ARCH_CHIP_STM32F103VET6
+config ARCH_CHIP_STM32F103VE
 	bool "STM32F103VET6"
 	select ARCH_CORTEXM3
 	select STM32_STM32F10XX
 	select STM32_PERFORMANCELINE
 	select STM32_HIGHDENSITY
 
-config ARCH_CHIP_STM32F103ZET6
+config ARCH_CHIP_STM32F103ZE
 	bool "STM32F103ZET6"
 	select ARCH_CORTEXM3
 	select STM32_STM32F10XX
 	select STM32_PERFORMANCELINE
 	select STM32_HIGHDENSITY
 
-config ARCH_CHIP_STM32F105VBT7
+config ARCH_CHIP_STM32F105VB
 	bool "STM32F105VBT7"
 	select ARCH_CORTEXM3
 	select STM32_STM32F10XX
diff --git a/arch/arm/src/stm32/chip.h b/arch/arm/src/stm32/chip.h
index 2876b73ac1f..764b3523646 100644
--- a/arch/arm/src/stm32/chip.h
+++ b/arch/arm/src/stm32/chip.h
@@ -72,8 +72,7 @@
 /* STM32 F103 Low / Medium Density Family */
 #  elif defined(CONFIG_ARCH_CHIP_STM32F103C4) || \
         defined(CONFIG_ARCH_CHIP_STM32F103C8) || \
-        defined(CONFIG_ARCH_CHIP_STM32F103CB) || \
-        defined(CONFIG_ARCH_CHIP_STM32F103RB)
+        defined(CONFIG_ARCH_CHIP_STM32F103CB)
 #    include "chip/stm32f103c_pinmap.h"
 
 /* STM32 F103 High Density Family */
@@ -81,25 +80,26 @@
  * only in the available FLASH and SRAM.
  */
 
-#  elif defined(CONFIG_ARCH_CHIP_STM32F103RET6)
+#  elif defined(CONFIG_ARCH_CHIP_STM32F103RE) || \
+        defined(CONFIG_ARCH_CHIP_STM32F103RB)
 #    include "chip/stm32f103re_pinmap.h"
 
 /* STM32F103VC, STM32F103VD, and STM32F103VE are all provided in 100 pin packages and differ
  * only in the available FLASH and SRAM.
  */
 
-#  elif defined(CONFIG_ARCH_CHIP_STM32F103VCT6) || defined(CONFIG_ARCH_CHIP_STM32F103VET6)
+#  elif defined(CONFIG_ARCH_CHIP_STM32F103VC) || defined(CONFIG_ARCH_CHIP_STM32F103VE)
 #    include "chip/stm32f103vc_pinmap.h"
 
 /* STM32F103ZC, STM32F103ZD, and STM32F103ZE are all provided in 144 pin packages and differ
  * only in the available FLASH and SRAM.
  */
-#  elif defined(CONFIG_ARCH_CHIP_STM32F103ZET6)
+#  elif defined(CONFIG_ARCH_CHIP_STM32F103ZE)
 #    include "chip/stm32f103ze_pinmap.h"
 
 /* STM32 F105/F107 Connectivity Line */
 
-#  elif defined(CONFIG_ARCH_CHIP_STM32F105VBT7)
+#  elif defined(CONFIG_ARCH_CHIP_STM32F105VB)
 #    include "chip/stm32f105vb_pinmap.h"
 
 #  elif defined(CONFIG_ARCH_CHIP_STM32F107VC)