diff --git a/boards.txt b/boards.txt
index a4c5bfa3ce..a7fafc3db2 100644
--- a/boards.txt
+++ b/boards.txt
@@ -771,7 +771,7 @@ Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.product_line=STM32L433xx
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.variant=STM32L4xx/L433RCTxP
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.openocd.target=stm32l4x
-Nucleo_64.menu.pnum.NUCLEO_L433RC_P.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+Nucleo_64.menu.pnum.NUCLEO_L433RC_P.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # NUCLEO_L452RE board
 Nucleo_64.menu.pnum.NUCLEO_L452RE=Nucleo L452RE
@@ -786,7 +786,7 @@ Nucleo_64.menu.pnum.NUCLEO_L452RE.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.product_line=STM32L452xx
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 Nucleo_64.menu.pnum.NUCLEO_L452RE.openocd.target=stm32l4x
-Nucleo_64.menu.pnum.NUCLEO_L452RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+Nucleo_64.menu.pnum.NUCLEO_L452RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # NUCLEO_L452RE-P board
 Nucleo_64.menu.pnum.NUCLEO_L452REP=Nucleo L452RE-P
@@ -801,7 +801,7 @@ Nucleo_64.menu.pnum.NUCLEO_L452REP.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L452REP.build.product_line=STM32L452xx
 Nucleo_64.menu.pnum.NUCLEO_L452REP.build.variant=STM32L4xx/L452RETxP
 Nucleo_64.menu.pnum.NUCLEO_L452REP.openocd.target=stm32l4x
-Nucleo_64.menu.pnum.NUCLEO_L452REP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+Nucleo_64.menu.pnum.NUCLEO_L452REP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # NUCLEO_L476RG board
 Nucleo_64.menu.pnum.NUCLEO_L476RG=Nucleo L476RG
@@ -1099,7 +1099,7 @@ Nucleo_32.menu.pnum.NUCLEO_L432KC.build.series=STM32L4xx
 Nucleo_32.menu.pnum.NUCLEO_L432KC.build.product_line=STM32L432xx
 Nucleo_32.menu.pnum.NUCLEO_L432KC.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
 Nucleo_32.menu.pnum.NUCLEO_L432KC.openocd.target=stm32l4x
-Nucleo_32.menu.pnum.NUCLEO_L432KC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+Nucleo_32.menu.pnum.NUCLEO_L432KC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L432.svd
 
 # Upload menu
 Nucleo_32.menu.upload_method.MassStorage=Mass Storage
@@ -1213,7 +1213,7 @@ Disco.menu.pnum.B_L475E_IOT01A.build.product_line=STM32L475xx
 Disco.menu.pnum.B_L475E_IOT01A.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
 Disco.menu.pnum.B_L475E_IOT01A.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Disco.menu.pnum.B_L475E_IOT01A.openocd.target=stm32l4x
-Disco.menu.pnum.B_L475E_IOT01A.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+Disco.menu.pnum.B_L475E_IOT01A.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # B_L4S5I_IOT01A board
 Disco.menu.pnum.B_L4S5I_IOT01A=B-L4S5I-IOT01A
@@ -3605,7 +3605,7 @@ GenF2.menu.pnum.GENERIC_F205RBTX.upload.maximum_data_size=65536
 GenF2.menu.pnum.GENERIC_F205RBTX.build.board=GENERIC_F205RBTX
 GenF2.menu.pnum.GENERIC_F205RBTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RBTX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RCTx
 GenF2.menu.pnum.GENERIC_F205RCTX=Generic F205RCTx
@@ -3614,7 +3614,7 @@ GenF2.menu.pnum.GENERIC_F205RCTX.upload.maximum_data_size=98304
 GenF2.menu.pnum.GENERIC_F205RCTX.build.board=GENERIC_F205RCTX
 GenF2.menu.pnum.GENERIC_F205RCTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RCTX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RETx
 GenF2.menu.pnum.GENERIC_F205RETX=Generic F205RETx
@@ -3623,7 +3623,7 @@ GenF2.menu.pnum.GENERIC_F205RETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RETX.build.board=GENERIC_F205RETX
 GenF2.menu.pnum.GENERIC_F205RETX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RETX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RFTx
 GenF2.menu.pnum.GENERIC_F205RFTX=Generic F205RFTx
@@ -3632,7 +3632,7 @@ GenF2.menu.pnum.GENERIC_F205RFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RFTX.build.board=GENERIC_F205RFTX
 GenF2.menu.pnum.GENERIC_F205RFTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RFTX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RGTx
 GenF2.menu.pnum.GENERIC_F205RGTX=Generic F205RGTx
@@ -3641,7 +3641,7 @@ GenF2.menu.pnum.GENERIC_F205RGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RGTX.build.board=GENERIC_F205RGTX
 GenF2.menu.pnum.GENERIC_F205RGTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RGTX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205REYx
 GenF2.menu.pnum.GENERIC_F205REYX=Generic F205REYx
@@ -3650,7 +3650,7 @@ GenF2.menu.pnum.GENERIC_F205REYX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205REYX.build.board=GENERIC_F205REYX
 GenF2.menu.pnum.GENERIC_F205REYX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205REYX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RGYx
 GenF2.menu.pnum.GENERIC_F205RGYX=Generic F205RGYx
@@ -3659,7 +3659,7 @@ GenF2.menu.pnum.GENERIC_F205RGYX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RGYX.build.board=GENERIC_F205RGYX
 GenF2.menu.pnum.GENERIC_F205RGYX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RGYX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RGYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RGYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RGEx
 GenF2.menu.pnum.GENERIC_F205RGEX=Generic F205RGEx
@@ -3668,7 +3668,7 @@ GenF2.menu.pnum.GENERIC_F205RGEX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RGEX.build.board=GENERIC_F205RGEX
 GenF2.menu.pnum.GENERIC_F205RGEX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RGEX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RGEX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RGEX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VBTx
 GenF2.menu.pnum.GENERIC_F205VBTX=Generic F205VBTx
@@ -3677,7 +3677,7 @@ GenF2.menu.pnum.GENERIC_F205VBTX.upload.maximum_data_size=65536
 GenF2.menu.pnum.GENERIC_F205VBTX.build.board=GENERIC_F205VBTX
 GenF2.menu.pnum.GENERIC_F205VBTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VBTX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VCTx
 GenF2.menu.pnum.GENERIC_F205VCTX=Generic F205VCTx
@@ -3686,7 +3686,7 @@ GenF2.menu.pnum.GENERIC_F205VCTX.upload.maximum_data_size=98304
 GenF2.menu.pnum.GENERIC_F205VCTX.build.board=GENERIC_F205VCTX
 GenF2.menu.pnum.GENERIC_F205VCTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VCTX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VETx
 GenF2.menu.pnum.GENERIC_F205VETX=Generic F205VETx
@@ -3695,7 +3695,7 @@ GenF2.menu.pnum.GENERIC_F205VETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205VETX.build.board=GENERIC_F205VETX
 GenF2.menu.pnum.GENERIC_F205VETX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VETX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VFTx
 GenF2.menu.pnum.GENERIC_F205VFTX=Generic F205VFTx
@@ -3704,7 +3704,7 @@ GenF2.menu.pnum.GENERIC_F205VFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205VFTX.build.board=GENERIC_F205VFTX
 GenF2.menu.pnum.GENERIC_F205VFTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VFTX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VGTx
 GenF2.menu.pnum.GENERIC_F205VGTX=Generic F205VGTx
@@ -3713,7 +3713,7 @@ GenF2.menu.pnum.GENERIC_F205VGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205VGTX.build.board=GENERIC_F205VGTX
 GenF2.menu.pnum.GENERIC_F205VGTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VGTX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205ZCTx
 GenF2.menu.pnum.GENERIC_F205ZCTX=Generic F205ZCTx
@@ -3722,7 +3722,7 @@ GenF2.menu.pnum.GENERIC_F205ZCTX.upload.maximum_data_size=98304
 GenF2.menu.pnum.GENERIC_F205ZCTX.build.board=GENERIC_F205ZCTX
 GenF2.menu.pnum.GENERIC_F205ZCTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205ZCTX.build.variant=STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T
-GenF2.menu.pnum.GENERIC_F205ZCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205ZCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205ZETx
 GenF2.menu.pnum.GENERIC_F205ZETX=Generic F205ZETx
@@ -3731,7 +3731,7 @@ GenF2.menu.pnum.GENERIC_F205ZETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205ZETX.build.board=GENERIC_F205ZETX
 GenF2.menu.pnum.GENERIC_F205ZETX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205ZETX.build.variant=STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T
-GenF2.menu.pnum.GENERIC_F205ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205ZFTx
 GenF2.menu.pnum.GENERIC_F205ZFTX=Generic F205ZFTx
@@ -3740,7 +3740,7 @@ GenF2.menu.pnum.GENERIC_F205ZFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205ZFTX.build.board=GENERIC_F205ZFTX
 GenF2.menu.pnum.GENERIC_F205ZFTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205ZFTX.build.variant=STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T
-GenF2.menu.pnum.GENERIC_F205ZFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205ZFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205ZGTx
 GenF2.menu.pnum.GENERIC_F205ZGTX=Generic F205ZGTx
@@ -3749,7 +3749,7 @@ GenF2.menu.pnum.GENERIC_F205ZGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205ZGTX.build.board=GENERIC_F205ZGTX
 GenF2.menu.pnum.GENERIC_F205ZGTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205ZGTX.build.variant=STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T
-GenF2.menu.pnum.GENERIC_F205ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F207ICHx
 GenF2.menu.pnum.GENERIC_F207ICHX=Generic F207ICHx
@@ -3758,7 +3758,7 @@ GenF2.menu.pnum.GENERIC_F207ICHX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ICHX.build.board=GENERIC_F207ICHX
 GenF2.menu.pnum.GENERIC_F207ICHX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ICHX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207ICHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ICHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IEHx
 GenF2.menu.pnum.GENERIC_F207IEHX=Generic F207IEHx
@@ -3767,7 +3767,7 @@ GenF2.menu.pnum.GENERIC_F207IEHX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IEHX.build.board=GENERIC_F207IEHX
 GenF2.menu.pnum.GENERIC_F207IEHX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IEHX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IEHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IEHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IFHx
 GenF2.menu.pnum.GENERIC_F207IFHX=Generic F207IFHx
@@ -3776,7 +3776,7 @@ GenF2.menu.pnum.GENERIC_F207IFHX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IFHX.build.board=GENERIC_F207IFHX
 GenF2.menu.pnum.GENERIC_F207IFHX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IFHX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IFHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IFHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IGHx
 GenF2.menu.pnum.GENERIC_F207IGHX=Generic F207IGHx
@@ -3785,7 +3785,7 @@ GenF2.menu.pnum.GENERIC_F207IGHX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IGHX.build.board=GENERIC_F207IGHX
 GenF2.menu.pnum.GENERIC_F207IGHX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IGHX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IGHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IGHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ICTx
 GenF2.menu.pnum.GENERIC_F207ICTX=Generic F207ICTx
@@ -3794,7 +3794,7 @@ GenF2.menu.pnum.GENERIC_F207ICTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ICTX.build.board=GENERIC_F207ICTX
 GenF2.menu.pnum.GENERIC_F207ICTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ICTX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207ICTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ICTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IETx
 GenF2.menu.pnum.GENERIC_F207IETX=Generic F207IETx
@@ -3803,7 +3803,7 @@ GenF2.menu.pnum.GENERIC_F207IETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IETX.build.board=GENERIC_F207IETX
 GenF2.menu.pnum.GENERIC_F207IETX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IETX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IFTx
 GenF2.menu.pnum.GENERIC_F207IFTX=Generic F207IFTx
@@ -3812,7 +3812,7 @@ GenF2.menu.pnum.GENERIC_F207IFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IFTX.build.board=GENERIC_F207IFTX
 GenF2.menu.pnum.GENERIC_F207IFTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IFTX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IGTx
 GenF2.menu.pnum.GENERIC_F207IGTX=Generic F207IGTx
@@ -3821,7 +3821,7 @@ GenF2.menu.pnum.GENERIC_F207IGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IGTX.build.board=GENERIC_F207IGTX
 GenF2.menu.pnum.GENERIC_F207IGTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IGTX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207VCTx
 GenF2.menu.pnum.GENERIC_F207VCTX=Generic F207VCTx
@@ -3830,7 +3830,7 @@ GenF2.menu.pnum.GENERIC_F207VCTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207VCTX.build.board=GENERIC_F207VCTX
 GenF2.menu.pnum.GENERIC_F207VCTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207VCTX.build.variant=STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T
-GenF2.menu.pnum.GENERIC_F207VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207VETx
 GenF2.menu.pnum.GENERIC_F207VETX=Generic F207VETx
@@ -3839,7 +3839,7 @@ GenF2.menu.pnum.GENERIC_F207VETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207VETX.build.board=GENERIC_F207VETX
 GenF2.menu.pnum.GENERIC_F207VETX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207VETX.build.variant=STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T
-GenF2.menu.pnum.GENERIC_F207VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207VFTx
 GenF2.menu.pnum.GENERIC_F207VFTX=Generic F207VFTx
@@ -3848,7 +3848,7 @@ GenF2.menu.pnum.GENERIC_F207VFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207VFTX.build.board=GENERIC_F207VFTX
 GenF2.menu.pnum.GENERIC_F207VFTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207VFTX.build.variant=STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T
-GenF2.menu.pnum.GENERIC_F207VFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207VFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207VGTx
 GenF2.menu.pnum.GENERIC_F207VGTX=Generic F207VGTx
@@ -3857,7 +3857,7 @@ GenF2.menu.pnum.GENERIC_F207VGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207VGTX.build.board=GENERIC_F207VGTX
 GenF2.menu.pnum.GENERIC_F207VGTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207VGTX.build.variant=STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T
-GenF2.menu.pnum.GENERIC_F207VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ZCTx
 GenF2.menu.pnum.GENERIC_F207ZCTX=Generic F207ZCTx
@@ -3866,7 +3866,7 @@ GenF2.menu.pnum.GENERIC_F207ZCTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ZCTX.build.board=GENERIC_F207ZCTX
 GenF2.menu.pnum.GENERIC_F207ZCTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ZCTX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
-GenF2.menu.pnum.GENERIC_F207ZCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ZCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ZETx
 GenF2.menu.pnum.GENERIC_F207ZETX=Generic F207ZETx
@@ -3875,7 +3875,7 @@ GenF2.menu.pnum.GENERIC_F207ZETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ZETX.build.board=GENERIC_F207ZETX
 GenF2.menu.pnum.GENERIC_F207ZETX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ZETX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
-GenF2.menu.pnum.GENERIC_F207ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ZFTx
 GenF2.menu.pnum.GENERIC_F207ZFTX=Generic F207ZFTx
@@ -3884,7 +3884,7 @@ GenF2.menu.pnum.GENERIC_F207ZFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ZFTX.build.board=GENERIC_F207ZFTX
 GenF2.menu.pnum.GENERIC_F207ZFTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ZFTX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
-GenF2.menu.pnum.GENERIC_F207ZFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ZFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ZGTx
 GenF2.menu.pnum.GENERIC_F207ZGTX=Generic F207ZGTx
@@ -3893,7 +3893,7 @@ GenF2.menu.pnum.GENERIC_F207ZGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ZGTX.build.board=GENERIC_F207ZGTX
 GenF2.menu.pnum.GENERIC_F207ZGTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ZGTX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
-GenF2.menu.pnum.GENERIC_F207ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F215RETx
 GenF2.menu.pnum.GENERIC_F215RETX=Generic F215RETx
@@ -11417,7 +11417,7 @@ GenL4.menu.pnum.LEAFONY_AP03.build.board=LEAFONY_AP03
 GenL4.menu.pnum.LEAFONY_AP03.build.product_line=STM32L452xx
 GenL4.menu.pnum.LEAFONY_AP03.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
 GenL4.menu.pnum.LEAFONY_AP03.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-GenL4.menu.pnum.LEAFONY_AP03.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.LEAFONY_AP03.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L412K8Tx
 GenL4.menu.pnum.GENERIC_L412K8TX=Generic L412K8Tx
@@ -11462,7 +11462,7 @@ GenL4.menu.pnum.GENERIC_L422KBTX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422KBTX.build.board=GENERIC_L422KBTX
 GenL4.menu.pnum.GENERIC_L422KBTX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422KBTX.build.variant=STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)
-GenL4.menu.pnum.GENERIC_L422KBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422KBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
 # Generic L422KBUx
 GenL4.menu.pnum.GENERIC_L422KBUX=Generic L422KBUx
@@ -11471,7 +11471,7 @@ GenL4.menu.pnum.GENERIC_L422KBUX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422KBUX.build.board=GENERIC_L422KBUX
 GenL4.menu.pnum.GENERIC_L422KBUX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422KBUX.build.variant=STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)
-GenL4.menu.pnum.GENERIC_L422KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
 # Generic L431CBTx
 GenL4.menu.pnum.GENERIC_L431CBTX=Generic L431CBTx
@@ -11480,7 +11480,7 @@ GenL4.menu.pnum.GENERIC_L431CBTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CBTX.build.board=GENERIC_L431CBTX
 GenL4.menu.pnum.GENERIC_L431CBTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CBTX.build.variant=STM32L4xx/L431C(B-C)(T-U)
-GenL4.menu.pnum.GENERIC_L431CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431CBUx
 GenL4.menu.pnum.GENERIC_L431CBUX=Generic L431CBUx
@@ -11489,7 +11489,7 @@ GenL4.menu.pnum.GENERIC_L431CBUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CBUX.build.board=GENERIC_L431CBUX
 GenL4.menu.pnum.GENERIC_L431CBUX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CBUX.build.variant=STM32L4xx/L431C(B-C)(T-U)
-GenL4.menu.pnum.GENERIC_L431CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431CCTx
 GenL4.menu.pnum.GENERIC_L431CCTX=Generic L431CCTx
@@ -11498,7 +11498,7 @@ GenL4.menu.pnum.GENERIC_L431CCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CCTX.build.board=GENERIC_L431CCTX
 GenL4.menu.pnum.GENERIC_L431CCTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CCTX.build.variant=STM32L4xx/L431C(B-C)(T-U)
-GenL4.menu.pnum.GENERIC_L431CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431CCUx
 GenL4.menu.pnum.GENERIC_L431CCUX=Generic L431CCUx
@@ -11507,7 +11507,7 @@ GenL4.menu.pnum.GENERIC_L431CCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CCUX.build.board=GENERIC_L431CCUX
 GenL4.menu.pnum.GENERIC_L431CCUX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CCUX.build.variant=STM32L4xx/L431C(B-C)(T-U)
-GenL4.menu.pnum.GENERIC_L431CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RBIx
 GenL4.menu.pnum.GENERIC_L431RBIX=Generic L431RBIx
@@ -11516,7 +11516,7 @@ GenL4.menu.pnum.GENERIC_L431RBIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RBIX.build.board=GENERIC_L431RBIX
 GenL4.menu.pnum.GENERIC_L431RBIX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RBIX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RCIx
 GenL4.menu.pnum.GENERIC_L431RCIX=Generic L431RCIx
@@ -11525,7 +11525,7 @@ GenL4.menu.pnum.GENERIC_L431RCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RCIX.build.board=GENERIC_L431RCIX
 GenL4.menu.pnum.GENERIC_L431RCIX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RCIX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RBTx
 GenL4.menu.pnum.GENERIC_L431RBTX=Generic L431RBTx
@@ -11534,7 +11534,7 @@ GenL4.menu.pnum.GENERIC_L431RBTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RBTX.build.board=GENERIC_L431RBTX
 GenL4.menu.pnum.GENERIC_L431RBTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RBTX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RCTx
 GenL4.menu.pnum.GENERIC_L431RCTX=Generic L431RCTx
@@ -11543,7 +11543,7 @@ GenL4.menu.pnum.GENERIC_L431RCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RCTX.build.board=GENERIC_L431RCTX
 GenL4.menu.pnum.GENERIC_L431RCTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RCTX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RBYx
 GenL4.menu.pnum.GENERIC_L431RBYX=Generic L431RBYx
@@ -11552,7 +11552,7 @@ GenL4.menu.pnum.GENERIC_L431RBYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RBYX.build.board=GENERIC_L431RBYX
 GenL4.menu.pnum.GENERIC_L431RBYX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RBYX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RCYx
 GenL4.menu.pnum.GENERIC_L431RCYX=Generic L431RCYx
@@ -11561,7 +11561,7 @@ GenL4.menu.pnum.GENERIC_L431RCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RCYX.build.board=GENERIC_L431RCYX
 GenL4.menu.pnum.GENERIC_L431RCYX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RCYX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L432KBUx
 GenL4.menu.pnum.GENERIC_L432KBUX=Generic L432KBUx
@@ -11570,7 +11570,7 @@ GenL4.menu.pnum.GENERIC_L432KBUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L432KBUX.build.board=GENERIC_L432KBUX
 GenL4.menu.pnum.GENERIC_L432KBUX.build.product_line=STM32L432xx
 GenL4.menu.pnum.GENERIC_L432KBUX.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
-GenL4.menu.pnum.GENERIC_L432KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L432KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L432.svd
 
 # Generic L432KCUx
 GenL4.menu.pnum.GENERIC_L432KCUX=Generic L432KCUx
@@ -11579,7 +11579,7 @@ GenL4.menu.pnum.GENERIC_L432KCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L432KCUX.build.board=GENERIC_L432KCUX
 GenL4.menu.pnum.GENERIC_L432KCUX.build.product_line=STM32L432xx
 GenL4.menu.pnum.GENERIC_L432KCUX.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
-GenL4.menu.pnum.GENERIC_L432KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L432KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L432.svd
 
 # Generic L442KCUx
 GenL4.menu.pnum.GENERIC_L442KCUX=Generic L442KCUx
@@ -11588,7 +11588,7 @@ GenL4.menu.pnum.GENERIC_L442KCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L442KCUX.build.board=GENERIC_L442KCUX
 GenL4.menu.pnum.GENERIC_L442KCUX.build.product_line=STM32L442xx
 GenL4.menu.pnum.GENERIC_L442KCUX.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
-GenL4.menu.pnum.GENERIC_L442KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L442KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L442.svd
 
 # Generic L433CBTx
 GenL4.menu.pnum.GENERIC_L433CBTX=Generic L433CBTx
@@ -11597,7 +11597,7 @@ GenL4.menu.pnum.GENERIC_L433CBTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CBTX.build.board=GENERIC_L433CBTX
 GenL4.menu.pnum.GENERIC_L433CBTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CBTX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L433CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433CCTx
 GenL4.menu.pnum.GENERIC_L433CCTX=Generic L433CCTx
@@ -11606,7 +11606,7 @@ GenL4.menu.pnum.GENERIC_L433CCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CCTX.build.board=GENERIC_L433CCTX
 GenL4.menu.pnum.GENERIC_L433CCTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CCTX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L433CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433CBUx
 GenL4.menu.pnum.GENERIC_L433CBUX=Generic L433CBUx
@@ -11615,7 +11615,7 @@ GenL4.menu.pnum.GENERIC_L433CBUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CBUX.build.board=GENERIC_L433CBUX
 GenL4.menu.pnum.GENERIC_L433CBUX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CBUX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L433CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433CCUx
 GenL4.menu.pnum.GENERIC_L433CCUX=Generic L433CCUx
@@ -11624,7 +11624,7 @@ GenL4.menu.pnum.GENERIC_L433CCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CCUX.build.board=GENERIC_L433CCUX
 GenL4.menu.pnum.GENERIC_L433CCUX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CCUX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L433CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RBIx
 GenL4.menu.pnum.GENERIC_L433RBIX=Generic L433RBIx
@@ -11633,7 +11633,7 @@ GenL4.menu.pnum.GENERIC_L433RBIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RBIX.build.board=GENERIC_L433RBIX
 GenL4.menu.pnum.GENERIC_L433RBIX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RBIX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RCIx
 GenL4.menu.pnum.GENERIC_L433RCIX=Generic L433RCIx
@@ -11642,7 +11642,7 @@ GenL4.menu.pnum.GENERIC_L433RCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RCIX.build.board=GENERIC_L433RCIX
 GenL4.menu.pnum.GENERIC_L433RCIX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RCIX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RBTx
 GenL4.menu.pnum.GENERIC_L433RBTX=Generic L433RBTx
@@ -11651,7 +11651,7 @@ GenL4.menu.pnum.GENERIC_L433RBTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RBTX.build.board=GENERIC_L433RBTX
 GenL4.menu.pnum.GENERIC_L433RBTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RBTX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RCTx
 GenL4.menu.pnum.GENERIC_L433RCTX=Generic L433RCTx
@@ -11660,7 +11660,7 @@ GenL4.menu.pnum.GENERIC_L433RCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RCTX.build.board=GENERIC_L433RCTX
 GenL4.menu.pnum.GENERIC_L433RCTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RCTX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RBYx
 GenL4.menu.pnum.GENERIC_L433RBYX=Generic L433RBYx
@@ -11669,7 +11669,7 @@ GenL4.menu.pnum.GENERIC_L433RBYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RBYX.build.board=GENERIC_L433RBYX
 GenL4.menu.pnum.GENERIC_L433RBYX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RBYX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RCYx
 GenL4.menu.pnum.GENERIC_L433RCYX=Generic L433RCYx
@@ -11678,7 +11678,7 @@ GenL4.menu.pnum.GENERIC_L433RCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RCYX.build.board=GENERIC_L433RCYX
 GenL4.menu.pnum.GENERIC_L433RCYX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RCYX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L443RCIx
 GenL4.menu.pnum.GENERIC_L443RCIX=Generic L443RCIx
@@ -11687,7 +11687,7 @@ GenL4.menu.pnum.GENERIC_L443RCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443RCIX.build.board=GENERIC_L443RCIX
 GenL4.menu.pnum.GENERIC_L443RCIX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443RCIX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L443RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L443RCTx
 GenL4.menu.pnum.GENERIC_L443RCTX=Generic L443RCTx
@@ -11696,7 +11696,7 @@ GenL4.menu.pnum.GENERIC_L443RCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443RCTX.build.board=GENERIC_L443RCTX
 GenL4.menu.pnum.GENERIC_L443RCTX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443RCTX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L443RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L443RCYx
 GenL4.menu.pnum.GENERIC_L443RCYX=Generic L443RCYx
@@ -11705,7 +11705,7 @@ GenL4.menu.pnum.GENERIC_L443RCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443RCYX.build.board=GENERIC_L443RCYX
 GenL4.menu.pnum.GENERIC_L443RCYX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443RCYX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L443RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L433RCTxP
 GenL4.menu.pnum.GENERIC_L433RCTXP=Generic L433RCTxP
@@ -11714,7 +11714,7 @@ GenL4.menu.pnum.GENERIC_L433RCTXP.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RCTXP.build.board=GENERIC_L433RCTXP
 GenL4.menu.pnum.GENERIC_L433RCTXP.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RCTXP.build.variant=STM32L4xx/L433RCTxP
-GenL4.menu.pnum.GENERIC_L433RCTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RCTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L443CCTx
 GenL4.menu.pnum.GENERIC_L443CCTX=Generic L443CCTx
@@ -11723,7 +11723,7 @@ GenL4.menu.pnum.GENERIC_L443CCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443CCTX.build.board=GENERIC_L443CCTX
 GenL4.menu.pnum.GENERIC_L443CCTX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443CCTX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L443CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L443CCUx
 GenL4.menu.pnum.GENERIC_L443CCUX=Generic L443CCUx
@@ -11732,7 +11732,7 @@ GenL4.menu.pnum.GENERIC_L443CCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443CCUX.build.board=GENERIC_L443CCUX
 GenL4.menu.pnum.GENERIC_L443CCUX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443CCUX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L443CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L452RCIx
 GenL4.menu.pnum.GENERIC_L452RCIX=Generic L452RCIx
@@ -11741,7 +11741,7 @@ GenL4.menu.pnum.GENERIC_L452RCIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCIX.build.board=GENERIC_L452RCIX
 GenL4.menu.pnum.GENERIC_L452RCIX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RCIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452REIx
 GenL4.menu.pnum.GENERIC_L452REIX=Generic L452REIx
@@ -11750,7 +11750,7 @@ GenL4.menu.pnum.GENERIC_L452REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REIX.build.board=GENERIC_L452REIX
 GenL4.menu.pnum.GENERIC_L452REIX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452REIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452RCTx
 GenL4.menu.pnum.GENERIC_L452RCTX=Generic L452RCTx
@@ -11759,7 +11759,7 @@ GenL4.menu.pnum.GENERIC_L452RCTX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCTX.build.board=GENERIC_L452RCTX
 GenL4.menu.pnum.GENERIC_L452RCTX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RCTX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452RETx
 GenL4.menu.pnum.GENERIC_L452RETX=Generic L452RETx
@@ -11768,7 +11768,7 @@ GenL4.menu.pnum.GENERIC_L452RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RETX.build.board=GENERIC_L452RETX
 GenL4.menu.pnum.GENERIC_L452RETX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RETX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452RCYx
 GenL4.menu.pnum.GENERIC_L452RCYX=Generic L452RCYx
@@ -11777,7 +11777,7 @@ GenL4.menu.pnum.GENERIC_L452RCYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCYX.build.board=GENERIC_L452RCYX
 GenL4.menu.pnum.GENERIC_L452RCYX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RCYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452REYx
 GenL4.menu.pnum.GENERIC_L452REYX=Generic L452REYx
@@ -11786,7 +11786,7 @@ GenL4.menu.pnum.GENERIC_L452REYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REYX.build.board=GENERIC_L452REYX
 GenL4.menu.pnum.GENERIC_L452REYX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452REYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452RETxP
 GenL4.menu.pnum.GENERIC_L452RETXP=Generic L452RETxP
@@ -11795,7 +11795,7 @@ GenL4.menu.pnum.GENERIC_L452RETXP.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RETXP.build.board=GENERIC_L452RETXP
 GenL4.menu.pnum.GENERIC_L452RETXP.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RETXP.build.variant=STM32L4xx/L452RETxP
-GenL4.menu.pnum.GENERIC_L452RETXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RETXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L462REIx
 GenL4.menu.pnum.GENERIC_L462REIX=Generic L462REIx
@@ -11804,7 +11804,7 @@ GenL4.menu.pnum.GENERIC_L462REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462REIX.build.board=GENERIC_L462REIX
 GenL4.menu.pnum.GENERIC_L462REIX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462REIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L462REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
 # Generic L462RETx
 GenL4.menu.pnum.GENERIC_L462RETX=Generic L462RETx
@@ -11813,7 +11813,7 @@ GenL4.menu.pnum.GENERIC_L462RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462RETX.build.board=GENERIC_L462RETX
 GenL4.menu.pnum.GENERIC_L462RETX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462RETX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L462RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
 # Generic L462REYx
 GenL4.menu.pnum.GENERIC_L462REYX=Generic L462REYx
@@ -11831,7 +11831,7 @@ GenL4.menu.pnum.GENERIC_L475RCTX.upload.maximum_data_size=98304
 GenL4.menu.pnum.GENERIC_L475RCTX.build.board=GENERIC_L475RCTX
 GenL4.menu.pnum.GENERIC_L475RCTX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475RCTX.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-GenL4.menu.pnum.GENERIC_L475RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475RETx
 GenL4.menu.pnum.GENERIC_L475RETX=Generic L475RETx
@@ -11840,7 +11840,7 @@ GenL4.menu.pnum.GENERIC_L475RETX.upload.maximum_data_size=98304
 GenL4.menu.pnum.GENERIC_L475RETX.build.board=GENERIC_L475RETX
 GenL4.menu.pnum.GENERIC_L475RETX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475RETX.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-GenL4.menu.pnum.GENERIC_L475RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475RGTx
 GenL4.menu.pnum.GENERIC_L475RGTX=Generic L475RGTx
@@ -11849,7 +11849,7 @@ GenL4.menu.pnum.GENERIC_L475RGTX.upload.maximum_data_size=98304
 GenL4.menu.pnum.GENERIC_L475RGTX.build.board=GENERIC_L475RGTX
 GenL4.menu.pnum.GENERIC_L475RGTX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475RGTX.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-GenL4.menu.pnum.GENERIC_L475RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475VCTx
 GenL4.menu.pnum.GENERIC_L475VCTX=Generic L475VCTx
@@ -11858,7 +11858,7 @@ GenL4.menu.pnum.GENERIC_L475VCTX.upload.maximum_data_size=98304
 GenL4.menu.pnum.GENERIC_L475VCTX.build.board=GENERIC_L475VCTX
 GenL4.menu.pnum.GENERIC_L475VCTX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475VCTX.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
-GenL4.menu.pnum.GENERIC_L475VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475VETx
 GenL4.menu.pnum.GENERIC_L475VETX=Generic L475VETx
@@ -11867,7 +11867,7 @@ GenL4.menu.pnum.GENERIC_L475VETX.upload.maximum_data_size=98304
 GenL4.menu.pnum.GENERIC_L475VETX.build.board=GENERIC_L475VETX
 GenL4.menu.pnum.GENERIC_L475VETX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475VETX.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
-GenL4.menu.pnum.GENERIC_L475VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475VGTx
 GenL4.menu.pnum.GENERIC_L475VGTX=Generic L475VGTx
@@ -11876,7 +11876,7 @@ GenL4.menu.pnum.GENERIC_L475VGTX.upload.maximum_data_size=98304
 GenL4.menu.pnum.GENERIC_L475VGTX.build.board=GENERIC_L475VGTX
 GenL4.menu.pnum.GENERIC_L475VGTX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475VGTX.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
-GenL4.menu.pnum.GENERIC_L475VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L476RCTx
 GenL4.menu.pnum.GENERIC_L476RCTX=Generic L476RCTx
@@ -11939,7 +11939,7 @@ GenL4.menu.pnum.GENERIC_L486RGTX.upload.maximum_data_size=98304
 GenL4.menu.pnum.GENERIC_L486RGTX.build.board=GENERIC_L486RGTX
 GenL4.menu.pnum.GENERIC_L486RGTX.build.product_line=STM32L486xx
 GenL4.menu.pnum.GENERIC_L486RGTX.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-GenL4.menu.pnum.GENERIC_L486RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L486RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L486.svd
 
 # Generic L486VGTx
 GenL4.menu.pnum.GENERIC_L486VGTX=Generic L486VGTx
@@ -11948,7 +11948,7 @@ GenL4.menu.pnum.GENERIC_L486VGTX.upload.maximum_data_size=98304
 GenL4.menu.pnum.GENERIC_L486VGTX.build.board=GENERIC_L486VGTX
 GenL4.menu.pnum.GENERIC_L486VGTX.build.product_line=STM32L486xx
 GenL4.menu.pnum.GENERIC_L486VGTX.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
-GenL4.menu.pnum.GENERIC_L486VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L486VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L486.svd
 
 # Generic L496ZETx
 GenL4.menu.pnum.GENERIC_L496ZETX=Generic L496ZETx
@@ -11984,7 +11984,7 @@ GenL4.menu.pnum.GENERIC_L4A6ZGTX.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6ZGTX.build.board=GENERIC_L4A6ZGTX
 GenL4.menu.pnum.GENERIC_L4A6ZGTX.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6ZGTX.build.variant=STM32L4xx/L496Z(E-G)T_L4A6ZGT
-GenL4.menu.pnum.GENERIC_L4A6ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
 # Generic L4A6ZGTxP
 GenL4.menu.pnum.GENERIC_L4A6ZGTXP=Generic L4A6ZGTxP
@@ -11993,7 +11993,7 @@ GenL4.menu.pnum.GENERIC_L4A6ZGTXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6ZGTXP.build.board=GENERIC_L4A6ZGTXP
 GenL4.menu.pnum.GENERIC_L4A6ZGTXP.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6ZGTXP.build.variant=STM32L4xx/L496ZGTxP_L4A6ZGTxP
-GenL4.menu.pnum.GENERIC_L4A6ZGTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6ZGTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
 # Generic L4R5VGTx
 GenL4.menu.pnum.GENERIC_L4R5VGTX=Generic L4R5VGTx
@@ -13408,7 +13408,7 @@ Blues.menu.pnum.CYGNET.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Blues.menu.pnum.CYGNET.vid.0=0x30A4
 Blues.menu.pnum.CYGNET.pid.0=0x0003
 Blues.menu.pnum.CYGNET.openocd.target=stm32l4x
-Blues.menu.pnum.CYGNET.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+Blues.menu.pnum.CYGNET.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Upload menu
 Blues.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
diff --git a/variants/STM32F1xx/F105R(8-B-C)T/boards_entry.txt b/variants/STM32F1xx/F105R(8-B-C)T/boards_entry.txt
index 508008da4c..6a53be46d5 100644
--- a/variants/STM32F1xx/F105R(8-B-C)T/boards_entry.txt
+++ b/variants/STM32F1xx/F105R(8-B-C)T/boards_entry.txt
@@ -10,7 +10,7 @@ GenF1.menu.pnum.GENERIC_F105R8TX.upload.maximum_data_size=65536
 GenF1.menu.pnum.GENERIC_F105R8TX.build.board=GENERIC_F105R8TX
 GenF1.menu.pnum.GENERIC_F105R8TX.build.product_line=STM32F105xC
 GenF1.menu.pnum.GENERIC_F105R8TX.build.variant=STM32F1xx/F105R(8-B-C)T
-GenF1.menu.pnum.GENERIC_F105R8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F107.svd
+GenF1.menu.pnum.GENERIC_F105R8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F105.svd
 
 # Generic F105RBTx
 GenF1.menu.pnum.GENERIC_F105RBTX=Generic F105RBTx
@@ -19,7 +19,7 @@ GenF1.menu.pnum.GENERIC_F105RBTX.upload.maximum_data_size=65536
 GenF1.menu.pnum.GENERIC_F105RBTX.build.board=GENERIC_F105RBTX
 GenF1.menu.pnum.GENERIC_F105RBTX.build.product_line=STM32F105xC
 GenF1.menu.pnum.GENERIC_F105RBTX.build.variant=STM32F1xx/F105R(8-B-C)T
-GenF1.menu.pnum.GENERIC_F105RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F107.svd
+GenF1.menu.pnum.GENERIC_F105RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F105.svd
 
 # Generic F105RCTx
 GenF1.menu.pnum.GENERIC_F105RCTX=Generic F105RCTx
@@ -28,5 +28,5 @@ GenF1.menu.pnum.GENERIC_F105RCTX.upload.maximum_data_size=65536
 GenF1.menu.pnum.GENERIC_F105RCTX.build.board=GENERIC_F105RCTX
 GenF1.menu.pnum.GENERIC_F105RCTX.build.product_line=STM32F105xC
 GenF1.menu.pnum.GENERIC_F105RCTX.build.variant=STM32F1xx/F105R(8-B-C)T
-GenF1.menu.pnum.GENERIC_F105RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F107.svd
+GenF1.menu.pnum.GENERIC_F105RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F105.svd
 
diff --git a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/boards_entry.txt b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/boards_entry.txt
index 18f77a3b49..ed1ae9f0d5 100644
--- a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/boards_entry.txt
+++ b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/boards_entry.txt
@@ -10,7 +10,7 @@ GenF1.menu.pnum.GENERIC_F105V8HX.upload.maximum_data_size=65536
 GenF1.menu.pnum.GENERIC_F105V8HX.build.board=GENERIC_F105V8HX
 GenF1.menu.pnum.GENERIC_F105V8HX.build.product_line=STM32F105xC
 GenF1.menu.pnum.GENERIC_F105V8HX.build.variant=STM32F1xx/F105V(8-B)(H-T)_F105VCT
-GenF1.menu.pnum.GENERIC_F105V8HX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F107.svd
+GenF1.menu.pnum.GENERIC_F105V8HX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F105.svd
 
 # Generic F105VBHx
 GenF1.menu.pnum.GENERIC_F105VBHX=Generic F105VBHx
@@ -19,7 +19,7 @@ GenF1.menu.pnum.GENERIC_F105VBHX.upload.maximum_data_size=65536
 GenF1.menu.pnum.GENERIC_F105VBHX.build.board=GENERIC_F105VBHX
 GenF1.menu.pnum.GENERIC_F105VBHX.build.product_line=STM32F105xC
 GenF1.menu.pnum.GENERIC_F105VBHX.build.variant=STM32F1xx/F105V(8-B)(H-T)_F105VCT
-GenF1.menu.pnum.GENERIC_F105VBHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F107.svd
+GenF1.menu.pnum.GENERIC_F105VBHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F105.svd
 
 # Generic F105V8Tx
 GenF1.menu.pnum.GENERIC_F105V8TX=Generic F105V8Tx
@@ -28,7 +28,7 @@ GenF1.menu.pnum.GENERIC_F105V8TX.upload.maximum_data_size=65536
 GenF1.menu.pnum.GENERIC_F105V8TX.build.board=GENERIC_F105V8TX
 GenF1.menu.pnum.GENERIC_F105V8TX.build.product_line=STM32F105xC
 GenF1.menu.pnum.GENERIC_F105V8TX.build.variant=STM32F1xx/F105V(8-B)(H-T)_F105VCT
-GenF1.menu.pnum.GENERIC_F105V8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F107.svd
+GenF1.menu.pnum.GENERIC_F105V8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F105.svd
 
 # Generic F105VBTx
 GenF1.menu.pnum.GENERIC_F105VBTX=Generic F105VBTx
@@ -37,7 +37,7 @@ GenF1.menu.pnum.GENERIC_F105VBTX.upload.maximum_data_size=65536
 GenF1.menu.pnum.GENERIC_F105VBTX.build.board=GENERIC_F105VBTX
 GenF1.menu.pnum.GENERIC_F105VBTX.build.product_line=STM32F105xC
 GenF1.menu.pnum.GENERIC_F105VBTX.build.variant=STM32F1xx/F105V(8-B)(H-T)_F105VCT
-GenF1.menu.pnum.GENERIC_F105VBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F107.svd
+GenF1.menu.pnum.GENERIC_F105VBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F105.svd
 
 # Generic F105VCTx
 GenF1.menu.pnum.GENERIC_F105VCTX=Generic F105VCTx
@@ -46,5 +46,5 @@ GenF1.menu.pnum.GENERIC_F105VCTX.upload.maximum_data_size=65536
 GenF1.menu.pnum.GENERIC_F105VCTX.build.board=GENERIC_F105VCTX
 GenF1.menu.pnum.GENERIC_F105VCTX.build.product_line=STM32F105xC
 GenF1.menu.pnum.GENERIC_F105VCTX.build.variant=STM32F1xx/F105V(8-B)(H-T)_F105VCT
-GenF1.menu.pnum.GENERIC_F105VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F107.svd
+GenF1.menu.pnum.GENERIC_F105VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F105.svd
 
diff --git a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/boards_entry.txt b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/boards_entry.txt
index 90f73aaccc..ba768f4094 100644
--- a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/boards_entry.txt
+++ b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/boards_entry.txt
@@ -10,7 +10,7 @@ GenF2.menu.pnum.GENERIC_F205RBTX.upload.maximum_data_size=65536
 GenF2.menu.pnum.GENERIC_F205RBTX.build.board=GENERIC_F205RBTX
 GenF2.menu.pnum.GENERIC_F205RBTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RBTX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RCTx
 GenF2.menu.pnum.GENERIC_F205RCTX=Generic F205RCTx
@@ -19,7 +19,7 @@ GenF2.menu.pnum.GENERIC_F205RCTX.upload.maximum_data_size=98304
 GenF2.menu.pnum.GENERIC_F205RCTX.build.board=GENERIC_F205RCTX
 GenF2.menu.pnum.GENERIC_F205RCTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RCTX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RETx
 GenF2.menu.pnum.GENERIC_F205RETX=Generic F205RETx
@@ -28,7 +28,7 @@ GenF2.menu.pnum.GENERIC_F205RETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RETX.build.board=GENERIC_F205RETX
 GenF2.menu.pnum.GENERIC_F205RETX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RETX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RFTx
 GenF2.menu.pnum.GENERIC_F205RFTX=Generic F205RFTx
@@ -37,7 +37,7 @@ GenF2.menu.pnum.GENERIC_F205RFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RFTX.build.board=GENERIC_F205RFTX
 GenF2.menu.pnum.GENERIC_F205RFTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RFTX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RGTx
 GenF2.menu.pnum.GENERIC_F205RGTX=Generic F205RGTx
@@ -46,7 +46,7 @@ GenF2.menu.pnum.GENERIC_F205RGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RGTX.build.board=GENERIC_F205RGTX
 GenF2.menu.pnum.GENERIC_F205RGTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RGTX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205REYx
 GenF2.menu.pnum.GENERIC_F205REYX=Generic F205REYx
@@ -55,7 +55,7 @@ GenF2.menu.pnum.GENERIC_F205REYX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205REYX.build.board=GENERIC_F205REYX
 GenF2.menu.pnum.GENERIC_F205REYX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205REYX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RGYx
 GenF2.menu.pnum.GENERIC_F205RGYX=Generic F205RGYx
@@ -64,7 +64,7 @@ GenF2.menu.pnum.GENERIC_F205RGYX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RGYX.build.board=GENERIC_F205RGYX
 GenF2.menu.pnum.GENERIC_F205RGYX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RGYX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RGYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RGYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205RGEx
 GenF2.menu.pnum.GENERIC_F205RGEX=Generic F205RGEx
@@ -73,7 +73,7 @@ GenF2.menu.pnum.GENERIC_F205RGEX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205RGEX.build.board=GENERIC_F205RGEX
 GenF2.menu.pnum.GENERIC_F205RGEX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205RGEX.build.variant=STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T
-GenF2.menu.pnum.GENERIC_F205RGEX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205RGEX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F215RETx
 GenF2.menu.pnum.GENERIC_F215RETX=Generic F215RETx
diff --git a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/boards_entry.txt b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/boards_entry.txt
index 5e4191e923..0925b12f8e 100644
--- a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/boards_entry.txt
+++ b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/boards_entry.txt
@@ -10,7 +10,7 @@ GenF2.menu.pnum.GENERIC_F205VBTX.upload.maximum_data_size=65536
 GenF2.menu.pnum.GENERIC_F205VBTX.build.board=GENERIC_F205VBTX
 GenF2.menu.pnum.GENERIC_F205VBTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VBTX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VCTx
 GenF2.menu.pnum.GENERIC_F205VCTX=Generic F205VCTx
@@ -19,7 +19,7 @@ GenF2.menu.pnum.GENERIC_F205VCTX.upload.maximum_data_size=98304
 GenF2.menu.pnum.GENERIC_F205VCTX.build.board=GENERIC_F205VCTX
 GenF2.menu.pnum.GENERIC_F205VCTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VCTX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VETx
 GenF2.menu.pnum.GENERIC_F205VETX=Generic F205VETx
@@ -28,7 +28,7 @@ GenF2.menu.pnum.GENERIC_F205VETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205VETX.build.board=GENERIC_F205VETX
 GenF2.menu.pnum.GENERIC_F205VETX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VETX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VFTx
 GenF2.menu.pnum.GENERIC_F205VFTX=Generic F205VFTx
@@ -37,7 +37,7 @@ GenF2.menu.pnum.GENERIC_F205VFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205VFTX.build.board=GENERIC_F205VFTX
 GenF2.menu.pnum.GENERIC_F205VFTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VFTX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205VGTx
 GenF2.menu.pnum.GENERIC_F205VGTX=Generic F205VGTx
@@ -46,7 +46,7 @@ GenF2.menu.pnum.GENERIC_F205VGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205VGTX.build.board=GENERIC_F205VGTX
 GenF2.menu.pnum.GENERIC_F205VGTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205VGTX.build.variant=STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T
-GenF2.menu.pnum.GENERIC_F205VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F215VETx
 GenF2.menu.pnum.GENERIC_F215VETX=Generic F215VETx
diff --git a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/boards_entry.txt b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/boards_entry.txt
index 82c987b4c5..f567cd7147 100644
--- a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/boards_entry.txt
+++ b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/boards_entry.txt
@@ -10,7 +10,7 @@ GenF2.menu.pnum.GENERIC_F205ZCTX.upload.maximum_data_size=98304
 GenF2.menu.pnum.GENERIC_F205ZCTX.build.board=GENERIC_F205ZCTX
 GenF2.menu.pnum.GENERIC_F205ZCTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205ZCTX.build.variant=STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T
-GenF2.menu.pnum.GENERIC_F205ZCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205ZCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205ZETx
 GenF2.menu.pnum.GENERIC_F205ZETX=Generic F205ZETx
@@ -19,7 +19,7 @@ GenF2.menu.pnum.GENERIC_F205ZETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205ZETX.build.board=GENERIC_F205ZETX
 GenF2.menu.pnum.GENERIC_F205ZETX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205ZETX.build.variant=STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T
-GenF2.menu.pnum.GENERIC_F205ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205ZFTx
 GenF2.menu.pnum.GENERIC_F205ZFTX=Generic F205ZFTx
@@ -28,7 +28,7 @@ GenF2.menu.pnum.GENERIC_F205ZFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205ZFTX.build.board=GENERIC_F205ZFTX
 GenF2.menu.pnum.GENERIC_F205ZFTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205ZFTX.build.variant=STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T
-GenF2.menu.pnum.GENERIC_F205ZFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205ZFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F205ZGTx
 GenF2.menu.pnum.GENERIC_F205ZGTX=Generic F205ZGTx
@@ -37,7 +37,7 @@ GenF2.menu.pnum.GENERIC_F205ZGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F205ZGTX.build.board=GENERIC_F205ZGTX
 GenF2.menu.pnum.GENERIC_F205ZGTX.build.product_line=STM32F205xx
 GenF2.menu.pnum.GENERIC_F205ZGTX.build.variant=STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T
-GenF2.menu.pnum.GENERIC_F205ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F215.svd
+GenF2.menu.pnum.GENERIC_F205ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F205.svd
 
 # Generic F215ZETx
 GenF2.menu.pnum.GENERIC_F215ZETX=Generic F215ZETx
diff --git a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/boards_entry.txt b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/boards_entry.txt
index 3078181f6c..2103990f68 100644
--- a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/boards_entry.txt
+++ b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/boards_entry.txt
@@ -10,7 +10,7 @@ GenF2.menu.pnum.GENERIC_F207ICHX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ICHX.build.board=GENERIC_F207ICHX
 GenF2.menu.pnum.GENERIC_F207ICHX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ICHX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207ICHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ICHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IEHx
 GenF2.menu.pnum.GENERIC_F207IEHX=Generic F207IEHx
@@ -19,7 +19,7 @@ GenF2.menu.pnum.GENERIC_F207IEHX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IEHX.build.board=GENERIC_F207IEHX
 GenF2.menu.pnum.GENERIC_F207IEHX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IEHX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IEHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IEHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IFHx
 GenF2.menu.pnum.GENERIC_F207IFHX=Generic F207IFHx
@@ -28,7 +28,7 @@ GenF2.menu.pnum.GENERIC_F207IFHX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IFHX.build.board=GENERIC_F207IFHX
 GenF2.menu.pnum.GENERIC_F207IFHX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IFHX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IFHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IFHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IGHx
 GenF2.menu.pnum.GENERIC_F207IGHX=Generic F207IGHx
@@ -37,7 +37,7 @@ GenF2.menu.pnum.GENERIC_F207IGHX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IGHX.build.board=GENERIC_F207IGHX
 GenF2.menu.pnum.GENERIC_F207IGHX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IGHX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IGHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IGHX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ICTx
 GenF2.menu.pnum.GENERIC_F207ICTX=Generic F207ICTx
@@ -46,7 +46,7 @@ GenF2.menu.pnum.GENERIC_F207ICTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ICTX.build.board=GENERIC_F207ICTX
 GenF2.menu.pnum.GENERIC_F207ICTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ICTX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207ICTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ICTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IETx
 GenF2.menu.pnum.GENERIC_F207IETX=Generic F207IETx
@@ -55,7 +55,7 @@ GenF2.menu.pnum.GENERIC_F207IETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IETX.build.board=GENERIC_F207IETX
 GenF2.menu.pnum.GENERIC_F207IETX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IETX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IFTx
 GenF2.menu.pnum.GENERIC_F207IFTX=Generic F207IFTx
@@ -64,7 +64,7 @@ GenF2.menu.pnum.GENERIC_F207IFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IFTX.build.board=GENERIC_F207IFTX
 GenF2.menu.pnum.GENERIC_F207IFTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IFTX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207IGTx
 GenF2.menu.pnum.GENERIC_F207IGTX=Generic F207IGTx
@@ -73,7 +73,7 @@ GenF2.menu.pnum.GENERIC_F207IGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207IGTX.build.board=GENERIC_F207IGTX
 GenF2.menu.pnum.GENERIC_F207IGTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207IGTX.build.variant=STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)
-GenF2.menu.pnum.GENERIC_F207IGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207IGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F217IEHx
 GenF2.menu.pnum.GENERIC_F217IEHX=Generic F217IEHx
diff --git a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/boards_entry.txt b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/boards_entry.txt
index 90d98dbfdc..0c645214e2 100644
--- a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/boards_entry.txt
+++ b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/boards_entry.txt
@@ -10,7 +10,7 @@ GenF2.menu.pnum.GENERIC_F207VCTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207VCTX.build.board=GENERIC_F207VCTX
 GenF2.menu.pnum.GENERIC_F207VCTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207VCTX.build.variant=STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T
-GenF2.menu.pnum.GENERIC_F207VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207VETx
 GenF2.menu.pnum.GENERIC_F207VETX=Generic F207VETx
@@ -19,7 +19,7 @@ GenF2.menu.pnum.GENERIC_F207VETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207VETX.build.board=GENERIC_F207VETX
 GenF2.menu.pnum.GENERIC_F207VETX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207VETX.build.variant=STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T
-GenF2.menu.pnum.GENERIC_F207VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207VFTx
 GenF2.menu.pnum.GENERIC_F207VFTX=Generic F207VFTx
@@ -28,7 +28,7 @@ GenF2.menu.pnum.GENERIC_F207VFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207VFTX.build.board=GENERIC_F207VFTX
 GenF2.menu.pnum.GENERIC_F207VFTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207VFTX.build.variant=STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T
-GenF2.menu.pnum.GENERIC_F207VFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207VFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207VGTx
 GenF2.menu.pnum.GENERIC_F207VGTX=Generic F207VGTx
@@ -37,7 +37,7 @@ GenF2.menu.pnum.GENERIC_F207VGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207VGTX.build.board=GENERIC_F207VGTX
 GenF2.menu.pnum.GENERIC_F207VGTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207VGTX.build.variant=STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T
-GenF2.menu.pnum.GENERIC_F207VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F217VETx
 GenF2.menu.pnum.GENERIC_F217VETX=Generic F217VETx
diff --git a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/boards_entry.txt b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/boards_entry.txt
index 980df32416..e683d5942a 100644
--- a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/boards_entry.txt
+++ b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/boards_entry.txt
@@ -10,7 +10,7 @@ GenF2.menu.pnum.GENERIC_F207ZCTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ZCTX.build.board=GENERIC_F207ZCTX
 GenF2.menu.pnum.GENERIC_F207ZCTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ZCTX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
-GenF2.menu.pnum.GENERIC_F207ZCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ZCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ZETx
 GenF2.menu.pnum.GENERIC_F207ZETX=Generic F207ZETx
@@ -19,7 +19,7 @@ GenF2.menu.pnum.GENERIC_F207ZETX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ZETX.build.board=GENERIC_F207ZETX
 GenF2.menu.pnum.GENERIC_F207ZETX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ZETX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
-GenF2.menu.pnum.GENERIC_F207ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ZFTx
 GenF2.menu.pnum.GENERIC_F207ZFTX=Generic F207ZFTx
@@ -28,7 +28,7 @@ GenF2.menu.pnum.GENERIC_F207ZFTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ZFTX.build.board=GENERIC_F207ZFTX
 GenF2.menu.pnum.GENERIC_F207ZFTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ZFTX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
-GenF2.menu.pnum.GENERIC_F207ZFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ZFTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F207ZGTx
 GenF2.menu.pnum.GENERIC_F207ZGTX=Generic F207ZGTx
@@ -37,7 +37,7 @@ GenF2.menu.pnum.GENERIC_F207ZGTX.upload.maximum_data_size=131072
 GenF2.menu.pnum.GENERIC_F207ZGTX.build.board=GENERIC_F207ZGTX
 GenF2.menu.pnum.GENERIC_F207ZGTX.build.product_line=STM32F207xx
 GenF2.menu.pnum.GENERIC_F207ZGTX.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
-GenF2.menu.pnum.GENERIC_F207ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
+GenF2.menu.pnum.GENERIC_F207ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F207.svd
 
 # Generic F217ZETx
 GenF2.menu.pnum.GENERIC_F217ZETX=Generic F217ZETx
diff --git a/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/boards_entry.txt b/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/boards_entry.txt
index 103f70fd0e..dc0288d1cc 100644
--- a/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/boards_entry.txt
+++ b/variants/STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)/boards_entry.txt
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L422CBTX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422CBTX.build.board=GENERIC_L422CBTX
 GenL4.menu.pnum.GENERIC_L422CBTX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422CBTX.build.variant=STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)
-GenL4.menu.pnum.GENERIC_L422CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
 # Generic L422CBUx
 GenL4.menu.pnum.GENERIC_L422CBUX=Generic L422CBUx
@@ -55,5 +55,5 @@ GenL4.menu.pnum.GENERIC_L422CBUX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422CBUX.build.board=GENERIC_L422CBUX
 GenL4.menu.pnum.GENERIC_L422CBUX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422CBUX.build.variant=STM32L4xx/L412C(8-B)(T-U)_L422CB(T-U)
-GenL4.menu.pnum.GENERIC_L422CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
diff --git a/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/boards_entry.txt b/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/boards_entry.txt
index 6b52f65f2e..b208022763 100644
--- a/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/boards_entry.txt
+++ b/variants/STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)/boards_entry.txt
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L422KBTX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422KBTX.build.board=GENERIC_L422KBTX
 GenL4.menu.pnum.GENERIC_L422KBTX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422KBTX.build.variant=STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)
-GenL4.menu.pnum.GENERIC_L422KBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422KBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
 # Generic L422KBUx
 GenL4.menu.pnum.GENERIC_L422KBUX=Generic L422KBUx
@@ -55,5 +55,5 @@ GenL4.menu.pnum.GENERIC_L422KBUX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422KBUX.build.board=GENERIC_L422KBUX
 GenL4.menu.pnum.GENERIC_L422KBUX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422KBUX.build.variant=STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)
-GenL4.menu.pnum.GENERIC_L422KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
diff --git a/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/boards_entry.txt b/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/boards_entry.txt
index ea1705a984..06ab6d4a8d 100644
--- a/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/boards_entry.txt
+++ b/variants/STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)/boards_entry.txt
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L422RBIX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422RBIX.build.board=GENERIC_L422RBIX
 GenL4.menu.pnum.GENERIC_L422RBIX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422RBIX.build.variant=STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)
-GenL4.menu.pnum.GENERIC_L422RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
 # Generic L422RBTx
 GenL4.menu.pnum.GENERIC_L422RBTX=Generic L422RBTx
@@ -55,5 +55,5 @@ GenL4.menu.pnum.GENERIC_L422RBTX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422RBTX.build.board=GENERIC_L422RBTX
 GenL4.menu.pnum.GENERIC_L422RBTX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422RBTX.build.variant=STM32L4xx/L412R(8-B)(I-T)_L422RB(I-T)
-GenL4.menu.pnum.GENERIC_L422RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
diff --git a/variants/STM32L4xx/L412T(8-B)Y_L422TBY/boards_entry.txt b/variants/STM32L4xx/L412T(8-B)Y_L422TBY/boards_entry.txt
index c131e8ff7b..67b1d578d6 100644
--- a/variants/STM32L4xx/L412T(8-B)Y_L422TBY/boards_entry.txt
+++ b/variants/STM32L4xx/L412T(8-B)Y_L422TBY/boards_entry.txt
@@ -28,5 +28,5 @@ GenL4.menu.pnum.GENERIC_L422TBYX.upload.maximum_data_size=40960
 GenL4.menu.pnum.GENERIC_L422TBYX.build.board=GENERIC_L422TBYX
 GenL4.menu.pnum.GENERIC_L422TBYX.build.product_line=STM32L422xx
 GenL4.menu.pnum.GENERIC_L422TBYX.build.variant=STM32L4xx/L412T(8-B)Y_L422TBY
-GenL4.menu.pnum.GENERIC_L422TBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L422TBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L422.svd
 
diff --git a/variants/STM32L4xx/L431C(B-C)(T-U)/boards_entry.txt b/variants/STM32L4xx/L431C(B-C)(T-U)/boards_entry.txt
index 976755c746..1c61371cc4 100644
--- a/variants/STM32L4xx/L431C(B-C)(T-U)/boards_entry.txt
+++ b/variants/STM32L4xx/L431C(B-C)(T-U)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L431CBTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CBTX.build.board=GENERIC_L431CBTX
 GenL4.menu.pnum.GENERIC_L431CBTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CBTX.build.variant=STM32L4xx/L431C(B-C)(T-U)
-GenL4.menu.pnum.GENERIC_L431CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431CCTx
 GenL4.menu.pnum.GENERIC_L431CCTX=Generic L431CCTx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L431CCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CCTX.build.board=GENERIC_L431CCTX
 GenL4.menu.pnum.GENERIC_L431CCTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CCTX.build.variant=STM32L4xx/L431C(B-C)(T-U)
-GenL4.menu.pnum.GENERIC_L431CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431CBUx
 GenL4.menu.pnum.GENERIC_L431CBUX=Generic L431CBUx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L431CBUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CBUX.build.board=GENERIC_L431CBUX
 GenL4.menu.pnum.GENERIC_L431CBUX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CBUX.build.variant=STM32L4xx/L431C(B-C)(T-U)
-GenL4.menu.pnum.GENERIC_L431CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431CCUx
 GenL4.menu.pnum.GENERIC_L431CCUX=Generic L431CCUx
@@ -37,5 +37,5 @@ GenL4.menu.pnum.GENERIC_L431CCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CCUX.build.board=GENERIC_L431CCUX
 GenL4.menu.pnum.GENERIC_L431CCUX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CCUX.build.variant=STM32L4xx/L431C(B-C)(T-U)
-GenL4.menu.pnum.GENERIC_L431CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
diff --git a/variants/STM32L4xx/L431C(B-C)Y/boards_entry.txt b/variants/STM32L4xx/L431C(B-C)Y/boards_entry.txt
index d41b42626c..8a0cb86839 100644
--- a/variants/STM32L4xx/L431C(B-C)Y/boards_entry.txt
+++ b/variants/STM32L4xx/L431C(B-C)Y/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L431CBYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CBYX.build.board=GENERIC_L431CBYX
 GenL4.menu.pnum.GENERIC_L431CBYX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CBYX.build.variant=STM32L4xx/L431C(B-C)Y
-GenL4.menu.pnum.GENERIC_L431CBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431CCYx
 GenL4.menu.pnum.GENERIC_L431CCYX=Generic L431CCYx
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L431CCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431CCYX.build.board=GENERIC_L431CCYX
 GenL4.menu.pnum.GENERIC_L431CCYX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431CCYX.build.variant=STM32L4xx/L431C(B-C)Y
-GenL4.menu.pnum.GENERIC_L431CCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431CCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
diff --git a/variants/STM32L4xx/L431K(B-C)U/boards_entry.txt b/variants/STM32L4xx/L431K(B-C)U/boards_entry.txt
index eeab18f5cc..3702ad5450 100644
--- a/variants/STM32L4xx/L431K(B-C)U/boards_entry.txt
+++ b/variants/STM32L4xx/L431K(B-C)U/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L431KBUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431KBUX.build.board=GENERIC_L431KBUX
 GenL4.menu.pnum.GENERIC_L431KBUX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431KBUX.build.variant=STM32L4xx/L431K(B-C)U
-GenL4.menu.pnum.GENERIC_L431KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431KCUx
 GenL4.menu.pnum.GENERIC_L431KCUX=Generic L431KCUx
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L431KCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431KCUX.build.board=GENERIC_L431KCUX
 GenL4.menu.pnum.GENERIC_L431KCUX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431KCUX.build.variant=STM32L4xx/L431K(B-C)U
-GenL4.menu.pnum.GENERIC_L431KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
diff --git a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/boards_entry.txt b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/boards_entry.txt
index 346859ba4d..3e9f6cfa58 100644
--- a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/boards_entry.txt
+++ b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L431RBIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RBIX.build.board=GENERIC_L431RBIX
 GenL4.menu.pnum.GENERIC_L431RBIX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RBIX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RCIx
 GenL4.menu.pnum.GENERIC_L431RCIX=Generic L431RCIx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L431RCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RCIX.build.board=GENERIC_L431RCIX
 GenL4.menu.pnum.GENERIC_L431RCIX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RCIX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RBTx
 GenL4.menu.pnum.GENERIC_L431RBTX=Generic L431RBTx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L431RBTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RBTX.build.board=GENERIC_L431RBTX
 GenL4.menu.pnum.GENERIC_L431RBTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RBTX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RCTx
 GenL4.menu.pnum.GENERIC_L431RCTX=Generic L431RCTx
@@ -37,7 +37,7 @@ GenL4.menu.pnum.GENERIC_L431RCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RCTX.build.board=GENERIC_L431RCTX
 GenL4.menu.pnum.GENERIC_L431RCTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RCTX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RBYx
 GenL4.menu.pnum.GENERIC_L431RBYX=Generic L431RBYx
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L431RBYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RBYX.build.board=GENERIC_L431RBYX
 GenL4.menu.pnum.GENERIC_L431RBYX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RBYX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431RCYx
 GenL4.menu.pnum.GENERIC_L431RCYX=Generic L431RCYx
@@ -55,5 +55,5 @@ GenL4.menu.pnum.GENERIC_L431RCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431RCYX.build.board=GENERIC_L431RCYX
 GenL4.menu.pnum.GENERIC_L431RCYX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431RCYX.build.variant=STM32L4xx/L431R(B-C)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L431RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
diff --git a/variants/STM32L4xx/L431VC(I-T)/boards_entry.txt b/variants/STM32L4xx/L431VC(I-T)/boards_entry.txt
index 38eea45932..a2c5289ef1 100644
--- a/variants/STM32L4xx/L431VC(I-T)/boards_entry.txt
+++ b/variants/STM32L4xx/L431VC(I-T)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L431VCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431VCIX.build.board=GENERIC_L431VCIX
 GenL4.menu.pnum.GENERIC_L431VCIX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431VCIX.build.variant=STM32L4xx/L431VC(I-T)
-GenL4.menu.pnum.GENERIC_L431VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
 # Generic L431VCTx
 GenL4.menu.pnum.GENERIC_L431VCTX=Generic L431VCTx
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L431VCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L431VCTX.build.board=GENERIC_L431VCTX
 GenL4.menu.pnum.GENERIC_L431VCTX.build.product_line=STM32L431xx
 GenL4.menu.pnum.GENERIC_L431VCTX.build.variant=STM32L4xx/L431VC(I-T)
-GenL4.menu.pnum.GENERIC_L431VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L431VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L431.svd
 
diff --git a/variants/STM32L4xx/L432K(B-C)U_L442KCU/boards_entry.txt b/variants/STM32L4xx/L432K(B-C)U_L442KCU/boards_entry.txt
index 72a220b5d5..3de31ed418 100644
--- a/variants/STM32L4xx/L432K(B-C)U_L442KCU/boards_entry.txt
+++ b/variants/STM32L4xx/L432K(B-C)U_L442KCU/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L432KBUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L432KBUX.build.board=GENERIC_L432KBUX
 GenL4.menu.pnum.GENERIC_L432KBUX.build.product_line=STM32L432xx
 GenL4.menu.pnum.GENERIC_L432KBUX.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
-GenL4.menu.pnum.GENERIC_L432KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L432KBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L432.svd
 
 # Generic L432KCUx
 GenL4.menu.pnum.GENERIC_L432KCUX=Generic L432KCUx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L432KCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L432KCUX.build.board=GENERIC_L432KCUX
 GenL4.menu.pnum.GENERIC_L432KCUX.build.product_line=STM32L432xx
 GenL4.menu.pnum.GENERIC_L432KCUX.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
-GenL4.menu.pnum.GENERIC_L432KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L432KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L432.svd
 
 # Generic L442KCUx
 GenL4.menu.pnum.GENERIC_L442KCUX=Generic L442KCUx
@@ -28,5 +28,5 @@ GenL4.menu.pnum.GENERIC_L442KCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L442KCUX.build.board=GENERIC_L442KCUX
 GenL4.menu.pnum.GENERIC_L442KCUX.build.product_line=STM32L442xx
 GenL4.menu.pnum.GENERIC_L442KCUX.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
-GenL4.menu.pnum.GENERIC_L442KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L442KCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L442.svd
 
diff --git a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/boards_entry.txt b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/boards_entry.txt
index 86346e3435..e753c71fe9 100644
--- a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/boards_entry.txt
+++ b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L433CBTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CBTX.build.board=GENERIC_L433CBTX
 GenL4.menu.pnum.GENERIC_L433CBTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CBTX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L433CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433CCTx
 GenL4.menu.pnum.GENERIC_L433CCTX=Generic L433CCTx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L433CCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CCTX.build.board=GENERIC_L433CCTX
 GenL4.menu.pnum.GENERIC_L433CCTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CCTX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L433CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433CBUx
 GenL4.menu.pnum.GENERIC_L433CBUX=Generic L433CBUx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L433CBUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CBUX.build.board=GENERIC_L433CBUX
 GenL4.menu.pnum.GENERIC_L433CBUX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CBUX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L433CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433CCUx
 GenL4.menu.pnum.GENERIC_L433CCUX=Generic L433CCUx
@@ -37,7 +37,7 @@ GenL4.menu.pnum.GENERIC_L433CCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CCUX.build.board=GENERIC_L433CCUX
 GenL4.menu.pnum.GENERIC_L433CCUX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CCUX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L433CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L443CCTx
 GenL4.menu.pnum.GENERIC_L443CCTX=Generic L443CCTx
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L443CCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443CCTX.build.board=GENERIC_L443CCTX
 GenL4.menu.pnum.GENERIC_L443CCTX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443CCTX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L443CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L443CCUx
 GenL4.menu.pnum.GENERIC_L443CCUX=Generic L443CCUx
@@ -55,5 +55,5 @@ GenL4.menu.pnum.GENERIC_L443CCUX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443CCUX.build.board=GENERIC_L443CCUX
 GenL4.menu.pnum.GENERIC_L443CCUX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443CCUX.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
-GenL4.menu.pnum.GENERIC_L443CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
diff --git a/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/boards_entry.txt b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/boards_entry.txt
index 4960dcb673..386c71ae0e 100644
--- a/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/boards_entry.txt
+++ b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L433CBYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CBYX.build.board=GENERIC_L433CBYX
 GenL4.menu.pnum.GENERIC_L433CBYX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CBYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CC(F-Y)
-GenL4.menu.pnum.GENERIC_L433CBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433CCYx
 GenL4.menu.pnum.GENERIC_L433CCYX=Generic L433CCYx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L433CCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433CCYX.build.board=GENERIC_L433CCYX
 GenL4.menu.pnum.GENERIC_L433CCYX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433CCYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CC(F-Y)
-GenL4.menu.pnum.GENERIC_L433CCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433CCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L443CCFx
 GenL4.menu.pnum.GENERIC_L443CCFX=Generic L443CCFx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L443CCFX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443CCFX.build.board=GENERIC_L443CCFX
 GenL4.menu.pnum.GENERIC_L443CCFX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443CCFX.build.variant=STM32L4xx/L433C(B-C)Y_L443CC(F-Y)
-GenL4.menu.pnum.GENERIC_L443CCFX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443CCFX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L443CCYx
 GenL4.menu.pnum.GENERIC_L443CCYX=Generic L443CCYx
@@ -37,5 +37,5 @@ GenL4.menu.pnum.GENERIC_L443CCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443CCYX.build.board=GENERIC_L443CCYX
 GenL4.menu.pnum.GENERIC_L443CCYX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443CCYX.build.variant=STM32L4xx/L433C(B-C)Y_L443CC(F-Y)
-GenL4.menu.pnum.GENERIC_L443CCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443CCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
diff --git a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/boards_entry.txt b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/boards_entry.txt
index 60cf5105d1..a8a54a8a25 100644
--- a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/boards_entry.txt
+++ b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L433RBIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RBIX.build.board=GENERIC_L433RBIX
 GenL4.menu.pnum.GENERIC_L433RBIX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RBIX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RCIx
 GenL4.menu.pnum.GENERIC_L433RCIX=Generic L433RCIx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L433RCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RCIX.build.board=GENERIC_L433RCIX
 GenL4.menu.pnum.GENERIC_L433RCIX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RCIX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RBTx
 GenL4.menu.pnum.GENERIC_L433RBTX=Generic L433RBTx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L433RBTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RBTX.build.board=GENERIC_L433RBTX
 GenL4.menu.pnum.GENERIC_L433RBTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RBTX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RCTx
 GenL4.menu.pnum.GENERIC_L433RCTX=Generic L433RCTx
@@ -37,7 +37,7 @@ GenL4.menu.pnum.GENERIC_L433RCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RCTX.build.board=GENERIC_L433RCTX
 GenL4.menu.pnum.GENERIC_L433RCTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RCTX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RBYx
 GenL4.menu.pnum.GENERIC_L433RBYX=Generic L433RBYx
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L433RBYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RBYX.build.board=GENERIC_L433RBYX
 GenL4.menu.pnum.GENERIC_L433RBYX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RBYX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RBYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433RCYx
 GenL4.menu.pnum.GENERIC_L433RCYX=Generic L433RCYx
@@ -55,7 +55,7 @@ GenL4.menu.pnum.GENERIC_L433RCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RCYX.build.board=GENERIC_L433RCYX
 GenL4.menu.pnum.GENERIC_L433RCYX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RCYX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L433RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L443RCIx
 GenL4.menu.pnum.GENERIC_L443RCIX=Generic L443RCIx
@@ -64,7 +64,7 @@ GenL4.menu.pnum.GENERIC_L443RCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443RCIX.build.board=GENERIC_L443RCIX
 GenL4.menu.pnum.GENERIC_L443RCIX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443RCIX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L443RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L443RCTx
 GenL4.menu.pnum.GENERIC_L443RCTX=Generic L443RCTx
@@ -73,7 +73,7 @@ GenL4.menu.pnum.GENERIC_L443RCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443RCTX.build.board=GENERIC_L443RCTX
 GenL4.menu.pnum.GENERIC_L443RCTX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443RCTX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L443RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L443RCYx
 GenL4.menu.pnum.GENERIC_L443RCYX=Generic L443RCYx
@@ -82,5 +82,5 @@ GenL4.menu.pnum.GENERIC_L443RCYX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443RCYX.build.board=GENERIC_L443RCYX
 GenL4.menu.pnum.GENERIC_L443RCYX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443RCYX.build.variant=STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)
-GenL4.menu.pnum.GENERIC_L443RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
diff --git a/variants/STM32L4xx/L433RCTxP/boards_entry.txt b/variants/STM32L4xx/L433RCTxP/boards_entry.txt
index c20b8f83e3..380ce58fd6 100644
--- a/variants/STM32L4xx/L433RCTxP/boards_entry.txt
+++ b/variants/STM32L4xx/L433RCTxP/boards_entry.txt
@@ -10,5 +10,5 @@ GenL4.menu.pnum.GENERIC_L433RCTXP.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433RCTXP.build.board=GENERIC_L433RCTXP
 GenL4.menu.pnum.GENERIC_L433RCTXP.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433RCTXP.build.variant=STM32L4xx/L433RCTxP
-GenL4.menu.pnum.GENERIC_L433RCTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433RCTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
diff --git a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/boards_entry.txt b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/boards_entry.txt
index 1375225673..69e0bc2e81 100644
--- a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/boards_entry.txt
+++ b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L433VCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433VCIX.build.board=GENERIC_L433VCIX
 GenL4.menu.pnum.GENERIC_L433VCIX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433VCIX.build.variant=STM32L4xx/L433VC(I-T)_L443VC(I-T)
-GenL4.menu.pnum.GENERIC_L433VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L433VCTx
 GenL4.menu.pnum.GENERIC_L433VCTX=Generic L433VCTx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L433VCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L433VCTX.build.board=GENERIC_L433VCTX
 GenL4.menu.pnum.GENERIC_L433VCTX.build.product_line=STM32L433xx
 GenL4.menu.pnum.GENERIC_L433VCTX.build.variant=STM32L4xx/L433VC(I-T)_L443VC(I-T)
-GenL4.menu.pnum.GENERIC_L433VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L433VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L433.svd
 
 # Generic L443VCIx
 GenL4.menu.pnum.GENERIC_L443VCIX=Generic L443VCIx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L443VCIX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443VCIX.build.board=GENERIC_L443VCIX
 GenL4.menu.pnum.GENERIC_L443VCIX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443VCIX.build.variant=STM32L4xx/L433VC(I-T)_L443VC(I-T)
-GenL4.menu.pnum.GENERIC_L443VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
 # Generic L443VCTx
 GenL4.menu.pnum.GENERIC_L443VCTX=Generic L443VCTx
@@ -37,5 +37,5 @@ GenL4.menu.pnum.GENERIC_L443VCTX.upload.maximum_data_size=65536
 GenL4.menu.pnum.GENERIC_L443VCTX.build.board=GENERIC_L443VCTX
 GenL4.menu.pnum.GENERIC_L443VCTX.build.product_line=STM32L443xx
 GenL4.menu.pnum.GENERIC_L443VCTX.build.variant=STM32L4xx/L433VC(I-T)_L443VC(I-T)
-GenL4.menu.pnum.GENERIC_L443VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
+GenL4.menu.pnum.GENERIC_L443VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L443.svd
 
diff --git a/variants/STM32L4xx/L451CCU_L451CE(T-U)/boards_entry.txt b/variants/STM32L4xx/L451CCU_L451CE(T-U)/boards_entry.txt
index ad3f368df5..17b95cfab1 100644
--- a/variants/STM32L4xx/L451CCU_L451CE(T-U)/boards_entry.txt
+++ b/variants/STM32L4xx/L451CCU_L451CE(T-U)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L451CCUX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451CCUX.build.board=GENERIC_L451CCUX
 GenL4.menu.pnum.GENERIC_L451CCUX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451CCUX.build.variant=STM32L4xx/L451CCU_L451CE(T-U)
-GenL4.menu.pnum.GENERIC_L451CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451CEUx
 GenL4.menu.pnum.GENERIC_L451CEUX=Generic L451CEUx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L451CEUX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451CEUX.build.board=GENERIC_L451CEUX
 GenL4.menu.pnum.GENERIC_L451CEUX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451CEUX.build.variant=STM32L4xx/L451CCU_L451CE(T-U)
-GenL4.menu.pnum.GENERIC_L451CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451CETx
 GenL4.menu.pnum.GENERIC_L451CETX=Generic L451CETx
@@ -28,5 +28,5 @@ GenL4.menu.pnum.GENERIC_L451CETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451CETX.build.board=GENERIC_L451CETX
 GenL4.menu.pnum.GENERIC_L451CETX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451CETX.build.variant=STM32L4xx/L451CCU_L451CE(T-U)
-GenL4.menu.pnum.GENERIC_L451CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
diff --git a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/boards_entry.txt b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/boards_entry.txt
index ecaa58b8e0..7f1b386d77 100644
--- a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/boards_entry.txt
+++ b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L451RCIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451RCIX.build.board=GENERIC_L451RCIX
 GenL4.menu.pnum.GENERIC_L451RCIX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451RCIX.build.variant=STM32L4xx/L451R(C-E)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L451RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451REIx
 GenL4.menu.pnum.GENERIC_L451REIX=Generic L451REIx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L451REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451REIX.build.board=GENERIC_L451REIX
 GenL4.menu.pnum.GENERIC_L451REIX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451REIX.build.variant=STM32L4xx/L451R(C-E)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L451REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451RCTx
 GenL4.menu.pnum.GENERIC_L451RCTX=Generic L451RCTx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L451RCTX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451RCTX.build.board=GENERIC_L451RCTX
 GenL4.menu.pnum.GENERIC_L451RCTX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451RCTX.build.variant=STM32L4xx/L451R(C-E)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L451RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451RETx
 GenL4.menu.pnum.GENERIC_L451RETX=Generic L451RETx
@@ -37,7 +37,7 @@ GenL4.menu.pnum.GENERIC_L451RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451RETX.build.board=GENERIC_L451RETX
 GenL4.menu.pnum.GENERIC_L451RETX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451RETX.build.variant=STM32L4xx/L451R(C-E)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L451RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451RCYx
 GenL4.menu.pnum.GENERIC_L451RCYX=Generic L451RCYx
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L451RCYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451RCYX.build.board=GENERIC_L451RCYX
 GenL4.menu.pnum.GENERIC_L451RCYX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451RCYX.build.variant=STM32L4xx/L451R(C-E)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L451RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451REYx
 GenL4.menu.pnum.GENERIC_L451REYX=Generic L451REYx
@@ -55,5 +55,5 @@ GenL4.menu.pnum.GENERIC_L451REYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451REYX.build.board=GENERIC_L451REYX
 GenL4.menu.pnum.GENERIC_L451REYX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451REYX.build.variant=STM32L4xx/L451R(C-E)(I-T-Y)
-GenL4.menu.pnum.GENERIC_L451REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
diff --git a/variants/STM32L4xx/L451V(C-E)(I-T)/boards_entry.txt b/variants/STM32L4xx/L451V(C-E)(I-T)/boards_entry.txt
index 22c61a2d22..fecc7335f6 100644
--- a/variants/STM32L4xx/L451V(C-E)(I-T)/boards_entry.txt
+++ b/variants/STM32L4xx/L451V(C-E)(I-T)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L451VCIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451VCIX.build.board=GENERIC_L451VCIX
 GenL4.menu.pnum.GENERIC_L451VCIX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451VCIX.build.variant=STM32L4xx/L451V(C-E)(I-T)
-GenL4.menu.pnum.GENERIC_L451VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451VEIx
 GenL4.menu.pnum.GENERIC_L451VEIX=Generic L451VEIx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L451VEIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451VEIX.build.board=GENERIC_L451VEIX
 GenL4.menu.pnum.GENERIC_L451VEIX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451VEIX.build.variant=STM32L4xx/L451V(C-E)(I-T)
-GenL4.menu.pnum.GENERIC_L451VEIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451VEIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451VCTx
 GenL4.menu.pnum.GENERIC_L451VCTX=Generic L451VCTx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L451VCTX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451VCTX.build.board=GENERIC_L451VCTX
 GenL4.menu.pnum.GENERIC_L451VCTX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451VCTX.build.variant=STM32L4xx/L451V(C-E)(I-T)
-GenL4.menu.pnum.GENERIC_L451VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
 # Generic L451VETx
 GenL4.menu.pnum.GENERIC_L451VETX=Generic L451VETx
@@ -37,5 +37,5 @@ GenL4.menu.pnum.GENERIC_L451VETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L451VETX.build.board=GENERIC_L451VETX
 GenL4.menu.pnum.GENERIC_L451VETX.build.product_line=STM32L451xx
 GenL4.menu.pnum.GENERIC_L451VETX.build.variant=STM32L4xx/L451V(C-E)(I-T)
-GenL4.menu.pnum.GENERIC_L451VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L451VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L451.svd
 
diff --git a/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/boards_entry.txt b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/boards_entry.txt
index b7784f034b..608bb357fe 100644
--- a/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/boards_entry.txt
+++ b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L452CCUX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452CCUX.build.board=GENERIC_L452CCUX
 GenL4.menu.pnum.GENERIC_L452CCUX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452CCUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
-GenL4.menu.pnum.GENERIC_L452CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452CEUx
 GenL4.menu.pnum.GENERIC_L452CEUX=Generic L452CEUx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L452CEUX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452CEUX.build.board=GENERIC_L452CEUX
 GenL4.menu.pnum.GENERIC_L452CEUX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452CEUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
-GenL4.menu.pnum.GENERIC_L452CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452CETx
 GenL4.menu.pnum.GENERIC_L452CETX=Generic L452CETx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L452CETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452CETX.build.board=GENERIC_L452CETX
 GenL4.menu.pnum.GENERIC_L452CETX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452CETX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
-GenL4.menu.pnum.GENERIC_L452CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452CETxP
 GenL4.menu.pnum.GENERIC_L452CETXP=Generic L452CETxP
@@ -37,7 +37,7 @@ GenL4.menu.pnum.GENERIC_L452CETXP.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452CETXP.build.board=GENERIC_L452CETXP
 GenL4.menu.pnum.GENERIC_L452CETXP.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452CETXP.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
-GenL4.menu.pnum.GENERIC_L452CETXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452CETXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L462CETx
 GenL4.menu.pnum.GENERIC_L462CETX=Generic L462CETx
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L462CETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462CETX.build.board=GENERIC_L462CETX
 GenL4.menu.pnum.GENERIC_L462CETX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462CETX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
-GenL4.menu.pnum.GENERIC_L462CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
 # Generic L462CEUx
 GenL4.menu.pnum.GENERIC_L462CEUX=Generic L462CEUx
@@ -55,5 +55,5 @@ GenL4.menu.pnum.GENERIC_L462CEUX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462CEUX.build.board=GENERIC_L462CEUX
 GenL4.menu.pnum.GENERIC_L462CEUX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462CEUX.build.variant=STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)
-GenL4.menu.pnum.GENERIC_L462CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
diff --git a/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/boards_entry.txt b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/boards_entry.txt
index 5121a5f4ff..d64cf4e8fb 100644
--- a/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/boards_entry.txt
+++ b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L452RCIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCIX.build.board=GENERIC_L452RCIX
 GenL4.menu.pnum.GENERIC_L452RCIX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RCIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452REIx
 GenL4.menu.pnum.GENERIC_L452REIX=Generic L452REIx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L452REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REIX.build.board=GENERIC_L452REIX
 GenL4.menu.pnum.GENERIC_L452REIX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452REIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452RCTx
 GenL4.menu.pnum.GENERIC_L452RCTX=Generic L452RCTx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L452RCTX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCTX.build.board=GENERIC_L452RCTX
 GenL4.menu.pnum.GENERIC_L452RCTX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RCTX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452RETx
 GenL4.menu.pnum.GENERIC_L452RETX=Generic L452RETx
@@ -37,7 +37,7 @@ GenL4.menu.pnum.GENERIC_L452RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RETX.build.board=GENERIC_L452RETX
 GenL4.menu.pnum.GENERIC_L452RETX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RETX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452RCYx
 GenL4.menu.pnum.GENERIC_L452RCYX=Generic L452RCYx
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L452RCYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RCYX.build.board=GENERIC_L452RCYX
 GenL4.menu.pnum.GENERIC_L452RCYX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RCYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RCYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452REYx
 GenL4.menu.pnum.GENERIC_L452REYX=Generic L452REYx
@@ -55,7 +55,7 @@ GenL4.menu.pnum.GENERIC_L452REYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REYX.build.board=GENERIC_L452REYX
 GenL4.menu.pnum.GENERIC_L452REYX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452REYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452REYxP
 GenL4.menu.pnum.GENERIC_L452REYXP=Generic L452REYxP
@@ -64,7 +64,7 @@ GenL4.menu.pnum.GENERIC_L452REYXP.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452REYXP.build.board=GENERIC_L452REYXP
 GenL4.menu.pnum.GENERIC_L452REYXP.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452REYXP.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L452REYXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452REYXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L462REIx
 GenL4.menu.pnum.GENERIC_L462REIX=Generic L462REIx
@@ -73,7 +73,7 @@ GenL4.menu.pnum.GENERIC_L462REIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462REIX.build.board=GENERIC_L462REIX
 GenL4.menu.pnum.GENERIC_L462REIX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462REIX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L462REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
 # Generic L462RETx
 GenL4.menu.pnum.GENERIC_L462RETX=Generic L462RETx
@@ -82,7 +82,7 @@ GenL4.menu.pnum.GENERIC_L462RETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462RETX.build.board=GENERIC_L462RETX
 GenL4.menu.pnum.GENERIC_L462RETX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462RETX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L462RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
 # Generic L462REYx
 GenL4.menu.pnum.GENERIC_L462REYX=Generic L462REYx
@@ -91,5 +91,5 @@ GenL4.menu.pnum.GENERIC_L462REYX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462REYX.build.board=GENERIC_L462REYX
 GenL4.menu.pnum.GENERIC_L462REYX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462REYX.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-GenL4.menu.pnum.GENERIC_L462REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
diff --git a/variants/STM32L4xx/L452RETxP/boards_entry.txt b/variants/STM32L4xx/L452RETxP/boards_entry.txt
index 9a50a78e29..7214e8c91a 100644
--- a/variants/STM32L4xx/L452RETxP/boards_entry.txt
+++ b/variants/STM32L4xx/L452RETxP/boards_entry.txt
@@ -10,5 +10,5 @@ GenL4.menu.pnum.GENERIC_L452RETXP.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452RETXP.build.board=GENERIC_L452RETXP
 GenL4.menu.pnum.GENERIC_L452RETXP.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452RETXP.build.variant=STM32L4xx/L452RETxP
-GenL4.menu.pnum.GENERIC_L452RETXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452RETXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
diff --git a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/boards_entry.txt b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/boards_entry.txt
index 2d40ac56e0..08b042911e 100644
--- a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/boards_entry.txt
+++ b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L452VCIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452VCIX.build.board=GENERIC_L452VCIX
 GenL4.menu.pnum.GENERIC_L452VCIX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452VCIX.build.variant=STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)
-GenL4.menu.pnum.GENERIC_L452VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452VCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452VEIx
 GenL4.menu.pnum.GENERIC_L452VEIX=Generic L452VEIx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L452VEIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452VEIX.build.board=GENERIC_L452VEIX
 GenL4.menu.pnum.GENERIC_L452VEIX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452VEIX.build.variant=STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)
-GenL4.menu.pnum.GENERIC_L452VEIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452VEIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452VCTx
 GenL4.menu.pnum.GENERIC_L452VCTX=Generic L452VCTx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L452VCTX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452VCTX.build.board=GENERIC_L452VCTX
 GenL4.menu.pnum.GENERIC_L452VCTX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452VCTX.build.variant=STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)
-GenL4.menu.pnum.GENERIC_L452VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L452VETx
 GenL4.menu.pnum.GENERIC_L452VETX=Generic L452VETx
@@ -37,7 +37,7 @@ GenL4.menu.pnum.GENERIC_L452VETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L452VETX.build.board=GENERIC_L452VETX
 GenL4.menu.pnum.GENERIC_L452VETX.build.product_line=STM32L452xx
 GenL4.menu.pnum.GENERIC_L452VETX.build.variant=STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)
-GenL4.menu.pnum.GENERIC_L452VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L452VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L452.svd
 
 # Generic L462VEIx
 GenL4.menu.pnum.GENERIC_L462VEIX=Generic L462VEIx
@@ -46,7 +46,7 @@ GenL4.menu.pnum.GENERIC_L462VEIX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462VEIX.build.board=GENERIC_L462VEIX
 GenL4.menu.pnum.GENERIC_L462VEIX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462VEIX.build.variant=STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)
-GenL4.menu.pnum.GENERIC_L462VEIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462VEIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
 # Generic L462VETx
 GenL4.menu.pnum.GENERIC_L462VETX=Generic L462VETx
@@ -55,5 +55,5 @@ GenL4.menu.pnum.GENERIC_L462VETX.upload.maximum_data_size=163840
 GenL4.menu.pnum.GENERIC_L462VETX.build.board=GENERIC_L462VETX
 GenL4.menu.pnum.GENERIC_L462VETX.build.product_line=STM32L462xx
 GenL4.menu.pnum.GENERIC_L462VETX.build.variant=STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)
-GenL4.menu.pnum.GENERIC_L462VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
+GenL4.menu.pnum.GENERIC_L462VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L462.svd
 
diff --git a/variants/STM32L4xx/L471Q(E-G)I/boards_entry.txt b/variants/STM32L4xx/L471Q(E-G)I/boards_entry.txt
index d674433ec4..5bfc3f4848 100644
--- a/variants/STM32L4xx/L471Q(E-G)I/boards_entry.txt
+++ b/variants/STM32L4xx/L471Q(E-G)I/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L471QEIX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471QEIX.build.board=GENERIC_L471QEIX
 GenL4.menu.pnum.GENERIC_L471QEIX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471QEIX.build.variant=STM32L4xx/L471Q(E-G)I
-GenL4.menu.pnum.GENERIC_L471QEIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471QEIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
 # Generic L471QGIx
 GenL4.menu.pnum.GENERIC_L471QGIX=Generic L471QGIx
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L471QGIX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471QGIX.build.board=GENERIC_L471QGIX
 GenL4.menu.pnum.GENERIC_L471QGIX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471QGIX.build.variant=STM32L4xx/L471Q(E-G)I
-GenL4.menu.pnum.GENERIC_L471QGIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471QGIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
diff --git a/variants/STM32L4xx/L471R(E-G)T/boards_entry.txt b/variants/STM32L4xx/L471R(E-G)T/boards_entry.txt
index 9ec38ebd27..d50c3a93df 100644
--- a/variants/STM32L4xx/L471R(E-G)T/boards_entry.txt
+++ b/variants/STM32L4xx/L471R(E-G)T/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L471RETX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471RETX.build.board=GENERIC_L471RETX
 GenL4.menu.pnum.GENERIC_L471RETX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471RETX.build.variant=STM32L4xx/L471R(E-G)T
-GenL4.menu.pnum.GENERIC_L471RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
 # Generic L471RGTx
 GenL4.menu.pnum.GENERIC_L471RGTX=Generic L471RGTx
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L471RGTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471RGTX.build.board=GENERIC_L471RGTX
 GenL4.menu.pnum.GENERIC_L471RGTX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471RGTX.build.variant=STM32L4xx/L471R(E-G)T
-GenL4.menu.pnum.GENERIC_L471RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
diff --git a/variants/STM32L4xx/L471V(E-G)T/boards_entry.txt b/variants/STM32L4xx/L471V(E-G)T/boards_entry.txt
index c2e6ccaa31..ec3f309282 100644
--- a/variants/STM32L4xx/L471V(E-G)T/boards_entry.txt
+++ b/variants/STM32L4xx/L471V(E-G)T/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L471VETX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471VETX.build.board=GENERIC_L471VETX
 GenL4.menu.pnum.GENERIC_L471VETX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471VETX.build.variant=STM32L4xx/L471V(E-G)T
-GenL4.menu.pnum.GENERIC_L471VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
 # Generic L471VGTx
 GenL4.menu.pnum.GENERIC_L471VGTX=Generic L471VGTx
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L471VGTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471VGTX.build.board=GENERIC_L471VGTX
 GenL4.menu.pnum.GENERIC_L471VGTX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471VGTX.build.variant=STM32L4xx/L471V(E-G)T
-GenL4.menu.pnum.GENERIC_L471VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
diff --git a/variants/STM32L4xx/L471Z(E-G)(J-T)/boards_entry.txt b/variants/STM32L4xx/L471Z(E-G)(J-T)/boards_entry.txt
index fb01a2d02c..04eacd3b6d 100644
--- a/variants/STM32L4xx/L471Z(E-G)(J-T)/boards_entry.txt
+++ b/variants/STM32L4xx/L471Z(E-G)(J-T)/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L471ZEJX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471ZEJX.build.board=GENERIC_L471ZEJX
 GenL4.menu.pnum.GENERIC_L471ZEJX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471ZEJX.build.variant=STM32L4xx/L471Z(E-G)(J-T)
-GenL4.menu.pnum.GENERIC_L471ZEJX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471ZEJX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
 # Generic L471ZGJx
 GenL4.menu.pnum.GENERIC_L471ZGJX=Generic L471ZGJx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L471ZGJX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471ZGJX.build.board=GENERIC_L471ZGJX
 GenL4.menu.pnum.GENERIC_L471ZGJX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471ZGJX.build.variant=STM32L4xx/L471Z(E-G)(J-T)
-GenL4.menu.pnum.GENERIC_L471ZGJX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471ZGJX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
 # Generic L471ZETx
 GenL4.menu.pnum.GENERIC_L471ZETX=Generic L471ZETx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L471ZETX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471ZETX.build.board=GENERIC_L471ZETX
 GenL4.menu.pnum.GENERIC_L471ZETX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471ZETX.build.variant=STM32L4xx/L471Z(E-G)(J-T)
-GenL4.menu.pnum.GENERIC_L471ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471ZETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
 # Generic L471ZGTx
 GenL4.menu.pnum.GENERIC_L471ZGTX=Generic L471ZGTx
@@ -37,5 +37,5 @@ GenL4.menu.pnum.GENERIC_L471ZGTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L471ZGTX.build.board=GENERIC_L471ZGTX
 GenL4.menu.pnum.GENERIC_L471ZGTX.build.product_line=STM32L471xx
 GenL4.menu.pnum.GENERIC_L471ZGTX.build.variant=STM32L4xx/L471Z(E-G)(J-T)
-GenL4.menu.pnum.GENERIC_L471ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x1.svd
+GenL4.menu.pnum.GENERIC_L471ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L471.svd
 
diff --git a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/boards_entry.txt b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/boards_entry.txt
index 4c495885d0..22574260ad 100644
--- a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/boards_entry.txt
+++ b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L475RCTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L475RCTX.build.board=GENERIC_L475RCTX
 GenL4.menu.pnum.GENERIC_L475RCTX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475RCTX.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-GenL4.menu.pnum.GENERIC_L475RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475RETx
 GenL4.menu.pnum.GENERIC_L475RETX=Generic L475RETx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L475RETX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L475RETX.build.board=GENERIC_L475RETX
 GenL4.menu.pnum.GENERIC_L475RETX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475RETX.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-GenL4.menu.pnum.GENERIC_L475RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475RGTx
 GenL4.menu.pnum.GENERIC_L475RGTX=Generic L475RGTx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L475RGTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L475RGTX.build.board=GENERIC_L475RGTX
 GenL4.menu.pnum.GENERIC_L475RGTX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475RGTX.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-GenL4.menu.pnum.GENERIC_L475RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L476RCTx
 GenL4.menu.pnum.GENERIC_L476RCTX=Generic L476RCTx
@@ -64,5 +64,5 @@ GenL4.menu.pnum.GENERIC_L486RGTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L486RGTX.build.board=GENERIC_L486RGTX
 GenL4.menu.pnum.GENERIC_L486RGTX.build.product_line=STM32L486xx
 GenL4.menu.pnum.GENERIC_L486RGTX.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-GenL4.menu.pnum.GENERIC_L486RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L486RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L486.svd
 
diff --git a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/boards_entry.txt b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/boards_entry.txt
index d7eab878c2..fed5ad3625 100644
--- a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/boards_entry.txt
+++ b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/boards_entry.txt
@@ -10,7 +10,7 @@ GenL4.menu.pnum.GENERIC_L475VCTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L475VCTX.build.board=GENERIC_L475VCTX
 GenL4.menu.pnum.GENERIC_L475VCTX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475VCTX.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
-GenL4.menu.pnum.GENERIC_L475VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475VCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475VETx
 GenL4.menu.pnum.GENERIC_L475VETX=Generic L475VETx
@@ -19,7 +19,7 @@ GenL4.menu.pnum.GENERIC_L475VETX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L475VETX.build.board=GENERIC_L475VETX
 GenL4.menu.pnum.GENERIC_L475VETX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475VETX.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
-GenL4.menu.pnum.GENERIC_L475VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L475VGTx
 GenL4.menu.pnum.GENERIC_L475VGTX=Generic L475VGTx
@@ -28,7 +28,7 @@ GenL4.menu.pnum.GENERIC_L475VGTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L475VGTX.build.board=GENERIC_L475VGTX
 GenL4.menu.pnum.GENERIC_L475VGTX.build.product_line=STM32L475xx
 GenL4.menu.pnum.GENERIC_L475VGTX.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
-GenL4.menu.pnum.GENERIC_L475VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
+GenL4.menu.pnum.GENERIC_L475VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L475.svd
 
 # Generic L476VCTx
 GenL4.menu.pnum.GENERIC_L476VCTX=Generic L476VCTx
@@ -64,5 +64,5 @@ GenL4.menu.pnum.GENERIC_L486VGTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L486VGTX.build.board=GENERIC_L486VGTX
 GenL4.menu.pnum.GENERIC_L486VGTX.build.product_line=STM32L486xx
 GenL4.menu.pnum.GENERIC_L486VGTX.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
-GenL4.menu.pnum.GENERIC_L486VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L486VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L486.svd
 
diff --git a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/boards_entry.txt b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/boards_entry.txt
index 524310a354..c6025610c0 100644
--- a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/boards_entry.txt
+++ b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/boards_entry.txt
@@ -46,5 +46,5 @@ GenL4.menu.pnum.GENERIC_L486JGYX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L486JGYX.build.board=GENERIC_L486JGYX
 GenL4.menu.pnum.GENERIC_L486JGYX.build.product_line=STM32L486xx
 GenL4.menu.pnum.GENERIC_L486JGYX.build.variant=STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY
-GenL4.menu.pnum.GENERIC_L486JGYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L486JGYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L486.svd
 
diff --git a/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/boards_entry.txt b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/boards_entry.txt
index df8193d866..67e581db2e 100644
--- a/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/boards_entry.txt
+++ b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/boards_entry.txt
@@ -37,5 +37,5 @@ GenL4.menu.pnum.GENERIC_L486QGIX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L486QGIX.build.board=GENERIC_L486QGIX
 GenL4.menu.pnum.GENERIC_L486QGIX.build.product_line=STM32L486xx
 GenL4.menu.pnum.GENERIC_L486QGIX.build.variant=STM32L4xx/L476QEI_L476QGIx(P)_L486QGI
-GenL4.menu.pnum.GENERIC_L486QGIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L486QGIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L486.svd
 
diff --git a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/boards_entry.txt b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/boards_entry.txt
index 2a6c70bfa1..6e51016c47 100644
--- a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/boards_entry.txt
+++ b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/boards_entry.txt
@@ -37,5 +37,5 @@ GenL4.menu.pnum.GENERIC_L486ZGTX.upload.maximum_data_size=131072
 GenL4.menu.pnum.GENERIC_L486ZGTX.build.board=GENERIC_L486ZGTX
 GenL4.menu.pnum.GENERIC_L486ZGTX.build.product_line=STM32L486xx
 GenL4.menu.pnum.GENERIC_L486ZGTX.build.variant=STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT
-GenL4.menu.pnum.GENERIC_L486ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L486ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L486.svd
 
diff --git a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/boards_entry.txt b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/boards_entry.txt
index d3241a9684..98d48252c1 100644
--- a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/boards_entry.txt
+++ b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/boards_entry.txt
@@ -28,5 +28,5 @@ GenL4.menu.pnum.GENERIC_L4A6AGIX.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6AGIX.build.board=GENERIC_L4A6AGIX
 GenL4.menu.pnum.GENERIC_L4A6AGIX.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6AGIX.build.variant=STM32L4xx/L496A(E-G)I_L4A6AGI
-GenL4.menu.pnum.GENERIC_L4A6AGIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6AGIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/boards_entry.txt b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/boards_entry.txt
index 92e238c4cc..48da953b3e 100644
--- a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/boards_entry.txt
+++ b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/boards_entry.txt
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L4A6AGIXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6AGIXP.build.board=GENERIC_L4A6AGIXP
 GenL4.menu.pnum.GENERIC_L4A6AGIXP.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6AGIXP.build.variant=STM32L4xx/L496AGIxP_L4A6AGIxP
-GenL4.menu.pnum.GENERIC_L4A6AGIXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6AGIXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496QEI_L496QGIx(S)_L4A6QGI/boards_entry.txt b/variants/STM32L4xx/L496QEI_L496QGIx(S)_L4A6QGI/boards_entry.txt
index bb2790e408..05357016c5 100644
--- a/variants/STM32L4xx/L496QEI_L496QGIx(S)_L4A6QGI/boards_entry.txt
+++ b/variants/STM32L4xx/L496QEI_L496QGIx(S)_L4A6QGI/boards_entry.txt
@@ -37,5 +37,5 @@ GenL4.menu.pnum.GENERIC_L4A6QGIX.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6QGIX.build.board=GENERIC_L4A6QGIX
 GenL4.menu.pnum.GENERIC_L4A6QGIX.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6QGIX.build.variant=STM32L4xx/L496QEI_L496QGIx(S)_L4A6QGI
-GenL4.menu.pnum.GENERIC_L4A6QGIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6QGIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/boards_entry.txt b/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/boards_entry.txt
index a6ee5ac962..290e7227f8 100644
--- a/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/boards_entry.txt
+++ b/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/boards_entry.txt
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L4A6QGIXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6QGIXP.build.board=GENERIC_L4A6QGIXP
 GenL4.menu.pnum.GENERIC_L4A6QGIXP.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6QGIXP.build.variant=STM32L4xx/L496QGIxP_L4A6QGIxP
-GenL4.menu.pnum.GENERIC_L4A6QGIXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6QGIXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/boards_entry.txt b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/boards_entry.txt
index f97e2701af..242b7d6485 100644
--- a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/boards_entry.txt
+++ b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/boards_entry.txt
@@ -28,5 +28,5 @@ GenL4.menu.pnum.GENERIC_L4A6RGTX.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6RGTX.build.board=GENERIC_L4A6RGTX
 GenL4.menu.pnum.GENERIC_L4A6RGTX.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6RGTX.build.variant=STM32L4xx/L496R(E-G)T_L4A6RGT
-GenL4.menu.pnum.GENERIC_L4A6RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/boards_entry.txt b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/boards_entry.txt
index 18a873f7be..9d7d35bc66 100644
--- a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/boards_entry.txt
+++ b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/boards_entry.txt
@@ -28,5 +28,5 @@ GenL4.menu.pnum.GENERIC_L4A6VGTX.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6VGTX.build.board=GENERIC_L4A6VGTX
 GenL4.menu.pnum.GENERIC_L4A6VGTX.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6VGTX.build.variant=STM32L4xx/L496V(E-G)T_L4A6VGT
-GenL4.menu.pnum.GENERIC_L4A6VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6VGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/boards_entry.txt b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/boards_entry.txt
index 9e6327020b..5a80884198 100644
--- a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/boards_entry.txt
+++ b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/boards_entry.txt
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L4A6VGTXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6VGTXP.build.board=GENERIC_L4A6VGTXP
 GenL4.menu.pnum.GENERIC_L4A6VGTXP.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6VGTXP.build.variant=STM32L4xx/L496VGTxP_L4A6VGTxP
-GenL4.menu.pnum.GENERIC_L4A6VGTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6VGTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496VGY_L4A6VGY/boards_entry.txt b/variants/STM32L4xx/L496VGY_L4A6VGY/boards_entry.txt
index cea9992419..7f75e865d6 100644
--- a/variants/STM32L4xx/L496VGY_L4A6VGY/boards_entry.txt
+++ b/variants/STM32L4xx/L496VGY_L4A6VGY/boards_entry.txt
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L4A6VGYX.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6VGYX.build.board=GENERIC_L4A6VGYX
 GenL4.menu.pnum.GENERIC_L4A6VGYX.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6VGYX.build.variant=STM32L4xx/L496VGY_L4A6VGY
-GenL4.menu.pnum.GENERIC_L4A6VGYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6VGYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/boards_entry.txt b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/boards_entry.txt
index bcc4460e85..9b2b918679 100644
--- a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/boards_entry.txt
+++ b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/boards_entry.txt
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L4A6VGYXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6VGYXP.build.board=GENERIC_L4A6VGYXP
 GenL4.menu.pnum.GENERIC_L4A6VGYXP.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6VGYXP.build.variant=STM32L4xx/L496VGYxP_L4A6VGYxP
-GenL4.menu.pnum.GENERIC_L4A6VGYXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6VGYXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/boards_entry.txt b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/boards_entry.txt
index 795ba308a2..71787cbcab 100644
--- a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/boards_entry.txt
+++ b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/boards_entry.txt
@@ -28,5 +28,5 @@ GenL4.menu.pnum.GENERIC_L4A6ZGTX.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6ZGTX.build.board=GENERIC_L4A6ZGTX
 GenL4.menu.pnum.GENERIC_L4A6ZGTX.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6ZGTX.build.variant=STM32L4xx/L496Z(E-G)T_L4A6ZGT
-GenL4.menu.pnum.GENERIC_L4A6ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6ZGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/boards_entry.txt b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/boards_entry.txt
index 50ca7b5047..f152ad0d53 100644
--- a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/boards_entry.txt
+++ b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/boards_entry.txt
@@ -19,5 +19,5 @@ GenL4.menu.pnum.GENERIC_L4A6ZGTXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6ZGTXP.build.board=GENERIC_L4A6ZGTXP
 GenL4.menu.pnum.GENERIC_L4A6ZGTXP.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6ZGTXP.build.variant=STM32L4xx/L496ZGTxP_L4A6ZGTxP
-GenL4.menu.pnum.GENERIC_L4A6ZGTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6ZGTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32L4xx/L4A6RGTxP/boards_entry.txt b/variants/STM32L4xx/L4A6RGTxP/boards_entry.txt
index 0b524a1e46..b2e0ae75f0 100644
--- a/variants/STM32L4xx/L4A6RGTxP/boards_entry.txt
+++ b/variants/STM32L4xx/L4A6RGTxP/boards_entry.txt
@@ -10,5 +10,5 @@ GenL4.menu.pnum.GENERIC_L4A6RGTXP.upload.maximum_data_size=327680
 GenL4.menu.pnum.GENERIC_L4A6RGTXP.build.board=GENERIC_L4A6RGTXP
 GenL4.menu.pnum.GENERIC_L4A6RGTXP.build.product_line=STM32L4A6xx
 GenL4.menu.pnum.GENERIC_L4A6RGTXP.build.variant=STM32L4xx/L4A6RGTxP
-GenL4.menu.pnum.GENERIC_L4A6RGTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x6.svd
+GenL4.menu.pnum.GENERIC_L4A6RGTXP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4A6.svd
 
diff --git a/variants/STM32U5xx/U5F9BJYxQ_U5G9BJYxQ/boards_entry.txt b/variants/STM32U5xx/U5F9BJYxQ_U5G9BJYxQ/boards_entry.txt
index 1a52b69336..5f443ff715 100644
--- a/variants/STM32U5xx/U5F9BJYxQ_U5G9BJYxQ/boards_entry.txt
+++ b/variants/STM32U5xx/U5F9BJYxQ_U5G9BJYxQ/boards_entry.txt
@@ -19,5 +19,5 @@ GenU5.menu.pnum.GENERIC_U5G9BJYXQ.upload.maximum_data_size=3098624
 GenU5.menu.pnum.GENERIC_U5G9BJYXQ.build.board=GENERIC_U5G9BJYXQ
 GenU5.menu.pnum.GENERIC_U5G9BJYXQ.build.product_line=STM32U5G9xx
 GenU5.menu.pnum.GENERIC_U5G9BJYXQ.build.variant=STM32U5xx/U5F9BJYxQ_U5G9BJYxQ
-GenU5.menu.pnum.GENERIC_U5G9BJYXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5Gx.svd
+GenU5.menu.pnum.GENERIC_U5G9BJYXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5G9.svd
 
diff --git a/variants/STM32U5xx/U5G7VJT/boards_entry.txt b/variants/STM32U5xx/U5G7VJT/boards_entry.txt
index d278cddcb2..c710e8f358 100644
--- a/variants/STM32U5xx/U5G7VJT/boards_entry.txt
+++ b/variants/STM32U5xx/U5G7VJT/boards_entry.txt
@@ -10,5 +10,5 @@ GenU5.menu.pnum.GENERIC_U5G7VJTX.upload.maximum_data_size=3098624
 GenU5.menu.pnum.GENERIC_U5G7VJTX.build.board=GENERIC_U5G7VJTX
 GenU5.menu.pnum.GENERIC_U5G7VJTX.build.product_line=STM32U5G7xx
 GenU5.menu.pnum.GENERIC_U5G7VJTX.build.variant=STM32U5xx/U5G7VJT
-GenU5.menu.pnum.GENERIC_U5G7VJTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5Gx.svd
+GenU5.menu.pnum.GENERIC_U5G7VJTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5G7.svd
 
diff --git a/variants/STM32U5xx/U5G7VJTxQ/boards_entry.txt b/variants/STM32U5xx/U5G7VJTxQ/boards_entry.txt
index 8b93c7ddb8..9b1c6e4c9f 100644
--- a/variants/STM32U5xx/U5G7VJTxQ/boards_entry.txt
+++ b/variants/STM32U5xx/U5G7VJTxQ/boards_entry.txt
@@ -10,5 +10,5 @@ GenU5.menu.pnum.GENERIC_U5G7VJTXQ.upload.maximum_data_size=3098624
 GenU5.menu.pnum.GENERIC_U5G7VJTXQ.build.board=GENERIC_U5G7VJTXQ
 GenU5.menu.pnum.GENERIC_U5G7VJTXQ.build.product_line=STM32U5G7xx
 GenU5.menu.pnum.GENERIC_U5G7VJTXQ.build.variant=STM32U5xx/U5G7VJTxQ
-GenU5.menu.pnum.GENERIC_U5G7VJTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5Gx.svd
+GenU5.menu.pnum.GENERIC_U5G7VJTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5G7.svd
 
diff --git a/variants/STM32U5xx/U5G9NJHxQ/boards_entry.txt b/variants/STM32U5xx/U5G9NJHxQ/boards_entry.txt
index f26fdae5a2..840412d4d3 100644
--- a/variants/STM32U5xx/U5G9NJHxQ/boards_entry.txt
+++ b/variants/STM32U5xx/U5G9NJHxQ/boards_entry.txt
@@ -10,5 +10,5 @@ GenU5.menu.pnum.GENERIC_U5G9NJHXQ.upload.maximum_data_size=3098624
 GenU5.menu.pnum.GENERIC_U5G9NJHXQ.build.board=GENERIC_U5G9NJHXQ
 GenU5.menu.pnum.GENERIC_U5G9NJHXQ.build.product_line=STM32U5G9xx
 GenU5.menu.pnum.GENERIC_U5G9NJHXQ.build.variant=STM32U5xx/U5G9NJHxQ
-GenU5.menu.pnum.GENERIC_U5G9NJHXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5Gx.svd
+GenU5.menu.pnum.GENERIC_U5G9NJHXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5G9.svd
 
diff --git a/variants/STM32U5xx/U5G9VJTxQ/boards_entry.txt b/variants/STM32U5xx/U5G9VJTxQ/boards_entry.txt
index b1865c44be..1a5c9ea358 100644
--- a/variants/STM32U5xx/U5G9VJTxQ/boards_entry.txt
+++ b/variants/STM32U5xx/U5G9VJTxQ/boards_entry.txt
@@ -10,5 +10,5 @@ GenU5.menu.pnum.GENERIC_U5G9VJTXQ.upload.maximum_data_size=3098624
 GenU5.menu.pnum.GENERIC_U5G9VJTXQ.build.board=GENERIC_U5G9VJTXQ
 GenU5.menu.pnum.GENERIC_U5G9VJTXQ.build.product_line=STM32U5G9xx
 GenU5.menu.pnum.GENERIC_U5G9VJTXQ.build.variant=STM32U5xx/U5G9VJTxQ
-GenU5.menu.pnum.GENERIC_U5G9VJTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5Gx.svd
+GenU5.menu.pnum.GENERIC_U5G9VJTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5G9.svd
 
diff --git a/variants/STM32U5xx/U5G9ZJJxQ/boards_entry.txt b/variants/STM32U5xx/U5G9ZJJxQ/boards_entry.txt
index 034870e360..8478449708 100644
--- a/variants/STM32U5xx/U5G9ZJJxQ/boards_entry.txt
+++ b/variants/STM32U5xx/U5G9ZJJxQ/boards_entry.txt
@@ -10,5 +10,5 @@ GenU5.menu.pnum.GENERIC_U5G9ZJJXQ.upload.maximum_data_size=3098624
 GenU5.menu.pnum.GENERIC_U5G9ZJJXQ.build.board=GENERIC_U5G9ZJJXQ
 GenU5.menu.pnum.GENERIC_U5G9ZJJXQ.build.product_line=STM32U5G9xx
 GenU5.menu.pnum.GENERIC_U5G9ZJJXQ.build.variant=STM32U5xx/U5G9ZJJxQ
-GenU5.menu.pnum.GENERIC_U5G9ZJJXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5Gx.svd
+GenU5.menu.pnum.GENERIC_U5G9ZJJXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5G9.svd
 
diff --git a/variants/STM32U5xx/U5G9ZJTxQ/boards_entry.txt b/variants/STM32U5xx/U5G9ZJTxQ/boards_entry.txt
index 6961ebc40f..5068a6e135 100644
--- a/variants/STM32U5xx/U5G9ZJTxQ/boards_entry.txt
+++ b/variants/STM32U5xx/U5G9ZJTxQ/boards_entry.txt
@@ -10,5 +10,5 @@ GenU5.menu.pnum.GENERIC_U5G9ZJTXQ.upload.maximum_data_size=3098624
 GenU5.menu.pnum.GENERIC_U5G9ZJTXQ.build.board=GENERIC_U5G9ZJTXQ
 GenU5.menu.pnum.GENERIC_U5G9ZJTXQ.build.product_line=STM32U5G9xx
 GenU5.menu.pnum.GENERIC_U5G9ZJTXQ.build.variant=STM32U5xx/U5G9ZJTxQ
-GenU5.menu.pnum.GENERIC_U5G9ZJTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5Gx.svd
+GenU5.menu.pnum.GENERIC_U5G9ZJTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U5G9.svd
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/stm32duino/Arduino_Core_STM32/pull/2680.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/stm32duino/Arduino_Core_STM32/pull/2680.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/stm32duino/Arduino_Core_STM32/pull/2680.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/stm32duino/Arduino_Core_STM32/pull/2680.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>