diff --git a/data/chips/STM32H503CB.json b/data/chips/STM32H503CB.json
index 33ba72c..d9cbe02 100644
--- a/data/chips/STM32H503CB.json
+++ b/data/chips/STM32H503CB.json
@@ -1825,7 +1825,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1985,7 +1985,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H503EB.json b/data/chips/STM32H503EB.json
index 319b4a4..2c4eaaa 100644
--- a/data/chips/STM32H503EB.json
+++ b/data/chips/STM32H503EB.json
@@ -1285,7 +1285,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1410,7 +1410,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H503KB.json b/data/chips/STM32H503KB.json
index fa6d264..3ada9c1 100644
--- a/data/chips/STM32H503KB.json
+++ b/data/chips/STM32H503KB.json
@@ -1376,7 +1376,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1521,7 +1521,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H503RB.json b/data/chips/STM32H503RB.json
index 4431891..97d87eb 100644
--- a/data/chips/STM32H503RB.json
+++ b/data/chips/STM32H503RB.json
@@ -1781,7 +1781,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1951,7 +1951,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523CC.json b/data/chips/STM32H523CC.json
index 011b8bd..6e3587d 100644
--- a/data/chips/STM32H523CC.json
+++ b/data/chips/STM32H523CC.json
@@ -1986,7 +1986,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2071,7 +2071,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523CE.json b/data/chips/STM32H523CE.json
index cc010ee..83d38be 100644
--- a/data/chips/STM32H523CE.json
+++ b/data/chips/STM32H523CE.json
@@ -1986,7 +1986,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2071,7 +2071,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523HE.json b/data/chips/STM32H523HE.json
index bb26758..b50de9e 100644
--- a/data/chips/STM32H523HE.json
+++ b/data/chips/STM32H523HE.json
@@ -1573,7 +1573,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1653,7 +1653,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523RC.json b/data/chips/STM32H523RC.json
index 841dcec..08cc8fb 100644
--- a/data/chips/STM32H523RC.json
+++ b/data/chips/STM32H523RC.json
@@ -2034,7 +2034,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2119,7 +2119,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523RE.json b/data/chips/STM32H523RE.json
index b2d1150..d5895ea 100644
--- a/data/chips/STM32H523RE.json
+++ b/data/chips/STM32H523RE.json
@@ -2034,7 +2034,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2119,7 +2119,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523VC.json b/data/chips/STM32H523VC.json
index 34fb38c..e2a4d91 100644
--- a/data/chips/STM32H523VC.json
+++ b/data/chips/STM32H523VC.json
@@ -3315,7 +3315,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3420,7 +3420,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523VE.json b/data/chips/STM32H523VE.json
index fe8208c..72a361f 100644
--- a/data/chips/STM32H523VE.json
+++ b/data/chips/STM32H523VE.json
@@ -3315,7 +3315,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3420,7 +3420,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523ZC.json b/data/chips/STM32H523ZC.json
index c21ca52..6ae84ce 100644
--- a/data/chips/STM32H523ZC.json
+++ b/data/chips/STM32H523ZC.json
@@ -4075,7 +4075,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4205,7 +4205,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H523ZE.json b/data/chips/STM32H523ZE.json
index f0858c0..12c4787 100644
--- a/data/chips/STM32H523ZE.json
+++ b/data/chips/STM32H523ZE.json
@@ -4075,7 +4075,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4205,7 +4205,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H533CE.json b/data/chips/STM32H533CE.json
index da868aa..33a6eb1 100644
--- a/data/chips/STM32H533CE.json
+++ b/data/chips/STM32H533CE.json
@@ -2035,7 +2035,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2120,7 +2120,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H533HE.json b/data/chips/STM32H533HE.json
index 26f4ec0..22d1c58 100644
--- a/data/chips/STM32H533HE.json
+++ b/data/chips/STM32H533HE.json
@@ -1622,7 +1622,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1702,7 +1702,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H533RE.json b/data/chips/STM32H533RE.json
index 8181966..938dfca 100644
--- a/data/chips/STM32H533RE.json
+++ b/data/chips/STM32H533RE.json
@@ -2083,7 +2083,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2168,7 +2168,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H533VE.json b/data/chips/STM32H533VE.json
index 67854c4..4ce756c 100644
--- a/data/chips/STM32H533VE.json
+++ b/data/chips/STM32H533VE.json
@@ -3364,7 +3364,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3469,7 +3469,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H533ZE.json b/data/chips/STM32H533ZE.json
index 29785cc..bc8a4dd 100644
--- a/data/chips/STM32H533ZE.json
+++ b/data/chips/STM32H533ZE.json
@@ -4124,7 +4124,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4254,7 +4254,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32H562AG.json b/data/chips/STM32H562AG.json
index 2d1d1bb..b502edd 100644
--- a/data/chips/STM32H562AG.json
+++ b/data/chips/STM32H562AG.json
@@ -3688,7 +3688,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3833,7 +3833,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3958,7 +3958,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4156,7 +4156,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4286,7 +4286,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562AI.json b/data/chips/STM32H562AI.json
index ae81f8a..b6252ad 100644
--- a/data/chips/STM32H562AI.json
+++ b/data/chips/STM32H562AI.json
@@ -3688,7 +3688,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3833,7 +3833,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3958,7 +3958,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4156,7 +4156,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4286,7 +4286,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562IG.json b/data/chips/STM32H562IG.json
index 832a76c..4eb40ca 100644
--- a/data/chips/STM32H562IG.json
+++ b/data/chips/STM32H562IG.json
@@ -4967,7 +4967,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5112,7 +5112,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5237,7 +5237,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5435,7 +5435,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5565,7 +5565,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562II.json b/data/chips/STM32H562II.json
index 4be8709..90ed181 100644
--- a/data/chips/STM32H562II.json
+++ b/data/chips/STM32H562II.json
@@ -4967,7 +4967,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5112,7 +5112,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5237,7 +5237,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5435,7 +5435,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5565,7 +5565,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562RG.json b/data/chips/STM32H562RG.json
index 1d2ed30..05628b5 100644
--- a/data/chips/STM32H562RG.json
+++ b/data/chips/STM32H562RG.json
@@ -2574,7 +2574,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2669,7 +2669,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2784,7 +2784,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2932,7 +2932,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3002,7 +3002,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562RI.json b/data/chips/STM32H562RI.json
index ba58391..a9719c7 100644
--- a/data/chips/STM32H562RI.json
+++ b/data/chips/STM32H562RI.json
@@ -2574,7 +2574,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2669,7 +2669,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2784,7 +2784,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2932,7 +2932,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3002,7 +3002,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562VG.json b/data/chips/STM32H562VG.json
index c8d3621..d114dbb 100644
--- a/data/chips/STM32H562VG.json
+++ b/data/chips/STM32H562VG.json
@@ -2810,7 +2810,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2915,7 +2915,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3035,7 +3035,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3193,7 +3193,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3263,7 +3263,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562VI.json b/data/chips/STM32H562VI.json
index 841de2d..dff483a 100644
--- a/data/chips/STM32H562VI.json
+++ b/data/chips/STM32H562VI.json
@@ -2810,7 +2810,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2915,7 +2915,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3035,7 +3035,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3193,7 +3193,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3263,7 +3263,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562ZG.json b/data/chips/STM32H562ZG.json
index c23b6ea..37eebb5 100644
--- a/data/chips/STM32H562ZG.json
+++ b/data/chips/STM32H562ZG.json
@@ -3348,7 +3348,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3478,7 +3478,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3598,7 +3598,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3796,7 +3796,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3926,7 +3926,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H562ZI.json b/data/chips/STM32H562ZI.json
index 83cb43b..6c6a171 100644
--- a/data/chips/STM32H562ZI.json
+++ b/data/chips/STM32H562ZI.json
@@ -3348,7 +3348,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3478,7 +3478,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3598,7 +3598,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3796,7 +3796,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3926,7 +3926,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563AG.json b/data/chips/STM32H563AG.json
index c6141f6..dbb33f6 100644
--- a/data/chips/STM32H563AG.json
+++ b/data/chips/STM32H563AG.json
@@ -3961,7 +3961,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4106,7 +4106,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4231,7 +4231,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4429,7 +4429,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4559,7 +4559,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563AI.json b/data/chips/STM32H563AI.json
index 0afe39f..c5aad63 100644
--- a/data/chips/STM32H563AI.json
+++ b/data/chips/STM32H563AI.json
@@ -4996,7 +4996,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5141,7 +5141,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5266,7 +5266,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5464,7 +5464,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5594,7 +5594,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563IG.json b/data/chips/STM32H563IG.json
index 5f09a31..dbcb3d0 100644
--- a/data/chips/STM32H563IG.json
+++ b/data/chips/STM32H563IG.json
@@ -5245,7 +5245,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5390,7 +5390,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5515,7 +5515,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5713,7 +5713,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5843,7 +5843,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563II.json b/data/chips/STM32H563II.json
index 5a73364..326ec72 100644
--- a/data/chips/STM32H563II.json
+++ b/data/chips/STM32H563II.json
@@ -7519,7 +7519,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -7664,7 +7664,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -7789,7 +7789,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -7987,7 +7987,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -8117,7 +8117,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563MI.json b/data/chips/STM32H563MI.json
index fc0ec7d..d1b2dfe 100644
--- a/data/chips/STM32H563MI.json
+++ b/data/chips/STM32H563MI.json
@@ -2633,7 +2633,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2718,7 +2718,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2808,7 +2808,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2956,7 +2956,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3026,7 +3026,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563RG.json b/data/chips/STM32H563RG.json
index 9687179..768e332 100644
--- a/data/chips/STM32H563RG.json
+++ b/data/chips/STM32H563RG.json
@@ -2792,7 +2792,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2887,7 +2887,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3002,7 +3002,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3150,7 +3150,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3220,7 +3220,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563RI.json b/data/chips/STM32H563RI.json
index 9a469cc..b8c26bf 100644
--- a/data/chips/STM32H563RI.json
+++ b/data/chips/STM32H563RI.json
@@ -2792,7 +2792,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2887,7 +2887,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3002,7 +3002,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3150,7 +3150,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3220,7 +3220,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563VG.json b/data/chips/STM32H563VG.json
index b1c4419..9c4de4c 100644
--- a/data/chips/STM32H563VG.json
+++ b/data/chips/STM32H563VG.json
@@ -3033,7 +3033,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3138,7 +3138,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3258,7 +3258,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3416,7 +3416,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3486,7 +3486,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563VI.json b/data/chips/STM32H563VI.json
index af5c3c3..96ea2fa 100644
--- a/data/chips/STM32H563VI.json
+++ b/data/chips/STM32H563VI.json
@@ -3654,7 +3654,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3759,7 +3759,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3884,7 +3884,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4042,7 +4042,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4112,7 +4112,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563ZG.json b/data/chips/STM32H563ZG.json
index 027ceab..9e3cb96 100644
--- a/data/chips/STM32H563ZG.json
+++ b/data/chips/STM32H563ZG.json
@@ -3596,7 +3596,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3726,7 +3726,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3846,7 +3846,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4044,7 +4044,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4174,7 +4174,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H563ZI.json b/data/chips/STM32H563ZI.json
index cb7e52b..76450c2 100644
--- a/data/chips/STM32H563ZI.json
+++ b/data/chips/STM32H563ZI.json
@@ -4496,7 +4496,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4631,7 +4631,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4756,7 +4756,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4954,7 +4954,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5084,7 +5084,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H573AI.json b/data/chips/STM32H573AI.json
index ef28911..d806720 100644
--- a/data/chips/STM32H573AI.json
+++ b/data/chips/STM32H573AI.json
@@ -5045,7 +5045,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5190,7 +5190,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5315,7 +5315,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5513,7 +5513,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5643,7 +5643,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H573II.json b/data/chips/STM32H573II.json
index ac04849..d8c50bb 100644
--- a/data/chips/STM32H573II.json
+++ b/data/chips/STM32H573II.json
@@ -7568,7 +7568,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -7713,7 +7713,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -7838,7 +7838,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -8036,7 +8036,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -8166,7 +8166,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H573MI.json b/data/chips/STM32H573MI.json
index 107d0d6..37b9a25 100644
--- a/data/chips/STM32H573MI.json
+++ b/data/chips/STM32H573MI.json
@@ -2682,7 +2682,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2767,7 +2767,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2857,7 +2857,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3005,7 +3005,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3075,7 +3075,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H573RI.json b/data/chips/STM32H573RI.json
index a2a1db5..cc917c7 100644
--- a/data/chips/STM32H573RI.json
+++ b/data/chips/STM32H573RI.json
@@ -2841,7 +2841,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2936,7 +2936,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3051,7 +3051,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3199,7 +3199,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3269,7 +3269,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H573VI.json b/data/chips/STM32H573VI.json
index 04eda61..4187367 100644
--- a/data/chips/STM32H573VI.json
+++ b/data/chips/STM32H573VI.json
@@ -3703,7 +3703,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3808,7 +3808,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3933,7 +3933,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4091,7 +4091,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4161,7 +4161,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32H573ZI.json b/data/chips/STM32H573ZI.json
index 72a094f..a61bca9 100644
--- a/data/chips/STM32H573ZI.json
+++ b/data/chips/STM32H573ZI.json
@@ -4545,7 +4545,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4680,7 +4680,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4805,7 +4805,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5003,7 +5003,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5133,7 +5133,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535CB.json b/data/chips/STM32U535CB.json
index 8b9725b..7e9603a 100644
--- a/data/chips/STM32U535CB.json
+++ b/data/chips/STM32U535CB.json
@@ -2544,7 +2544,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2649,7 +2649,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2734,7 +2734,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535CC.json b/data/chips/STM32U535CC.json
index 3683842..1f28d7c 100644
--- a/data/chips/STM32U535CC.json
+++ b/data/chips/STM32U535CC.json
@@ -2544,7 +2544,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2649,7 +2649,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2734,7 +2734,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535CE.json b/data/chips/STM32U535CE.json
index 2a5c39a..635c135 100644
--- a/data/chips/STM32U535CE.json
+++ b/data/chips/STM32U535CE.json
@@ -2544,7 +2544,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2649,7 +2649,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2734,7 +2734,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535JE.json b/data/chips/STM32U535JE.json
index f667e89..1d7a1fa 100644
--- a/data/chips/STM32U535JE.json
+++ b/data/chips/STM32U535JE.json
@@ -1834,7 +1834,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1969,7 +1969,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2054,7 +2054,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535NC.json b/data/chips/STM32U535NC.json
index 4680fa7..e17a0cb 100644
--- a/data/chips/STM32U535NC.json
+++ b/data/chips/STM32U535NC.json
@@ -1695,7 +1695,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1800,7 +1800,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -1885,7 +1885,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535NE.json b/data/chips/STM32U535NE.json
index 0931b92..4aa2da5 100644
--- a/data/chips/STM32U535NE.json
+++ b/data/chips/STM32U535NE.json
@@ -1695,7 +1695,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1800,7 +1800,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -1885,7 +1885,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535RB.json b/data/chips/STM32U535RB.json
index 0caf454..4217c26 100644
--- a/data/chips/STM32U535RB.json
+++ b/data/chips/STM32U535RB.json
@@ -3004,7 +3004,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3129,7 +3129,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3229,7 +3229,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535RC.json b/data/chips/STM32U535RC.json
index 7a60dd0..ffd3706 100644
--- a/data/chips/STM32U535RC.json
+++ b/data/chips/STM32U535RC.json
@@ -3004,7 +3004,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3129,7 +3129,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3229,7 +3229,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535RE.json b/data/chips/STM32U535RE.json
index 4661e02..fcfd897 100644
--- a/data/chips/STM32U535RE.json
+++ b/data/chips/STM32U535RE.json
@@ -3004,7 +3004,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3129,7 +3129,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3229,7 +3229,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535VC.json b/data/chips/STM32U535VC.json
index 1039294..86d3a6b 100644
--- a/data/chips/STM32U535VC.json
+++ b/data/chips/STM32U535VC.json
@@ -4101,7 +4101,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4226,7 +4226,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4351,7 +4351,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U535VE.json b/data/chips/STM32U535VE.json
index acbb80d..e6741c5 100644
--- a/data/chips/STM32U535VE.json
+++ b/data/chips/STM32U535VE.json
@@ -4101,7 +4101,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4226,7 +4226,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4351,7 +4351,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U545CE.json b/data/chips/STM32U545CE.json
index aa0abc4..cb8243d 100644
--- a/data/chips/STM32U545CE.json
+++ b/data/chips/STM32U545CE.json
@@ -2583,7 +2583,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2688,7 +2688,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2773,7 +2773,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U545JE.json b/data/chips/STM32U545JE.json
index 4c4f419..4d4f9a4 100644
--- a/data/chips/STM32U545JE.json
+++ b/data/chips/STM32U545JE.json
@@ -1873,7 +1873,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2008,7 +2008,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2093,7 +2093,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U545NE.json b/data/chips/STM32U545NE.json
index ac4fbc4..3e98601 100644
--- a/data/chips/STM32U545NE.json
+++ b/data/chips/STM32U545NE.json
@@ -1734,7 +1734,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -1839,7 +1839,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -1924,7 +1924,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U545RE.json b/data/chips/STM32U545RE.json
index c972f3e..dc65bad 100644
--- a/data/chips/STM32U545RE.json
+++ b/data/chips/STM32U545RE.json
@@ -3043,7 +3043,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3168,7 +3168,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3268,7 +3268,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U545VE.json b/data/chips/STM32U545VE.json
index ce2ebfd..37bbfac 100644
--- a/data/chips/STM32U545VE.json
+++ b/data/chips/STM32U545VE.json
@@ -4140,7 +4140,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4265,7 +4265,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4390,7 +4390,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575AG.json b/data/chips/STM32U575AG.json
index 34c1341..51e8d61 100644
--- a/data/chips/STM32U575AG.json
+++ b/data/chips/STM32U575AG.json
@@ -4825,7 +4825,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4975,7 +4975,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5100,7 +5100,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575AI.json b/data/chips/STM32U575AI.json
index 2e2fe79..687adc3 100644
--- a/data/chips/STM32U575AI.json
+++ b/data/chips/STM32U575AI.json
@@ -4825,7 +4825,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4975,7 +4975,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5100,7 +5100,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575CG.json b/data/chips/STM32U575CG.json
index 743e7e0..bc3dc9b 100644
--- a/data/chips/STM32U575CG.json
+++ b/data/chips/STM32U575CG.json
@@ -3024,7 +3024,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3129,7 +3129,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3214,7 +3214,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575CI.json b/data/chips/STM32U575CI.json
index 1b976db..e24469a 100644
--- a/data/chips/STM32U575CI.json
+++ b/data/chips/STM32U575CI.json
@@ -3024,7 +3024,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3129,7 +3129,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3214,7 +3214,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575OG.json b/data/chips/STM32U575OG.json
index 9cef97e..b8eb4d9 100644
--- a/data/chips/STM32U575OG.json
+++ b/data/chips/STM32U575OG.json
@@ -2791,7 +2791,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2936,7 +2936,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3036,7 +3036,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575OI.json b/data/chips/STM32U575OI.json
index 5d091ee..262e774 100644
--- a/data/chips/STM32U575OI.json
+++ b/data/chips/STM32U575OI.json
@@ -2791,7 +2791,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2936,7 +2936,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3036,7 +3036,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575QG.json b/data/chips/STM32U575QG.json
index ecae410..c2ec64d 100644
--- a/data/chips/STM32U575QG.json
+++ b/data/chips/STM32U575QG.json
@@ -4231,7 +4231,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4381,7 +4381,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4506,7 +4506,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575QI.json b/data/chips/STM32U575QI.json
index 2d8ba80..38f9f06 100644
--- a/data/chips/STM32U575QI.json
+++ b/data/chips/STM32U575QI.json
@@ -4231,7 +4231,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4381,7 +4381,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4506,7 +4506,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575RG.json b/data/chips/STM32U575RG.json
index dd8a2df..d2fb272 100644
--- a/data/chips/STM32U575RG.json
+++ b/data/chips/STM32U575RG.json
@@ -2835,7 +2835,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2960,7 +2960,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3060,7 +3060,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575RI.json b/data/chips/STM32U575RI.json
index dc273ea..1cadcb4 100644
--- a/data/chips/STM32U575RI.json
+++ b/data/chips/STM32U575RI.json
@@ -2835,7 +2835,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2960,7 +2960,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3060,7 +3060,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575VG.json b/data/chips/STM32U575VG.json
index d166dd1..d4f7756 100644
--- a/data/chips/STM32U575VG.json
+++ b/data/chips/STM32U575VG.json
@@ -3646,7 +3646,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3771,7 +3771,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3896,7 +3896,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575VI.json b/data/chips/STM32U575VI.json
index e9f237e..d5c18cc 100644
--- a/data/chips/STM32U575VI.json
+++ b/data/chips/STM32U575VI.json
@@ -3646,7 +3646,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3771,7 +3771,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3896,7 +3896,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575ZG.json b/data/chips/STM32U575ZG.json
index c6f48e3..75527a7 100644
--- a/data/chips/STM32U575ZG.json
+++ b/data/chips/STM32U575ZG.json
@@ -4395,7 +4395,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4545,7 +4545,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4670,7 +4670,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U575ZI.json b/data/chips/STM32U575ZI.json
index 246b788..8326c0b 100644
--- a/data/chips/STM32U575ZI.json
+++ b/data/chips/STM32U575ZI.json
@@ -4395,7 +4395,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4545,7 +4545,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4670,7 +4670,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U585AI.json b/data/chips/STM32U585AI.json
index 365eb19..c02ad32 100644
--- a/data/chips/STM32U585AI.json
+++ b/data/chips/STM32U585AI.json
@@ -4870,7 +4870,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5020,7 +5020,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5145,7 +5145,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U585CI.json b/data/chips/STM32U585CI.json
index 13315de..268a22f 100644
--- a/data/chips/STM32U585CI.json
+++ b/data/chips/STM32U585CI.json
@@ -3069,7 +3069,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3174,7 +3174,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3259,7 +3259,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U585OI.json b/data/chips/STM32U585OI.json
index f8ac168..58ee8aa 100644
--- a/data/chips/STM32U585OI.json
+++ b/data/chips/STM32U585OI.json
@@ -2836,7 +2836,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2981,7 +2981,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3081,7 +3081,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U585QI.json b/data/chips/STM32U585QI.json
index ef268db..eb74954 100644
--- a/data/chips/STM32U585QI.json
+++ b/data/chips/STM32U585QI.json
@@ -4276,7 +4276,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4426,7 +4426,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4551,7 +4551,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U585RI.json b/data/chips/STM32U585RI.json
index 0df3b95..ac60570 100644
--- a/data/chips/STM32U585RI.json
+++ b/data/chips/STM32U585RI.json
@@ -2880,7 +2880,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3005,7 +3005,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3105,7 +3105,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U585VI.json b/data/chips/STM32U585VI.json
index d7982eb..d2b0dbf 100644
--- a/data/chips/STM32U585VI.json
+++ b/data/chips/STM32U585VI.json
@@ -3691,7 +3691,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3816,7 +3816,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3941,7 +3941,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U585ZI.json b/data/chips/STM32U585ZI.json
index 0f32813..10203d3 100644
--- a/data/chips/STM32U585ZI.json
+++ b/data/chips/STM32U585ZI.json
@@ -4440,7 +4440,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4590,7 +4590,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4715,7 +4715,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595AI.json b/data/chips/STM32U595AI.json
index 869e4df..fb7b415 100644
--- a/data/chips/STM32U595AI.json
+++ b/data/chips/STM32U595AI.json
@@ -4732,7 +4732,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4882,7 +4882,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5007,7 +5007,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595AJ.json b/data/chips/STM32U595AJ.json
index 8b2699c..d99fa09 100644
--- a/data/chips/STM32U595AJ.json
+++ b/data/chips/STM32U595AJ.json
@@ -4732,7 +4732,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4882,7 +4882,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5007,7 +5007,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595QI.json b/data/chips/STM32U595QI.json
index c91f345..38935e8 100644
--- a/data/chips/STM32U595QI.json
+++ b/data/chips/STM32U595QI.json
@@ -4123,7 +4123,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4273,7 +4273,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4398,7 +4398,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595QJ.json b/data/chips/STM32U595QJ.json
index 33bec1f..ec070b9 100644
--- a/data/chips/STM32U595QJ.json
+++ b/data/chips/STM32U595QJ.json
@@ -4123,7 +4123,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4273,7 +4273,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4398,7 +4398,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595RI.json b/data/chips/STM32U595RI.json
index b236de2..7021ffc 100644
--- a/data/chips/STM32U595RI.json
+++ b/data/chips/STM32U595RI.json
@@ -2590,7 +2590,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2715,7 +2715,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2815,7 +2815,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595RJ.json b/data/chips/STM32U595RJ.json
index 7dfe3a5..e73c4c7 100644
--- a/data/chips/STM32U595RJ.json
+++ b/data/chips/STM32U595RJ.json
@@ -2590,7 +2590,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2715,7 +2715,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2815,7 +2815,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595VI.json b/data/chips/STM32U595VI.json
index c05fcb9..58a858f 100644
--- a/data/chips/STM32U595VI.json
+++ b/data/chips/STM32U595VI.json
@@ -3518,7 +3518,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3643,7 +3643,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3768,7 +3768,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595VJ.json b/data/chips/STM32U595VJ.json
index 636ee37..8333dbe 100644
--- a/data/chips/STM32U595VJ.json
+++ b/data/chips/STM32U595VJ.json
@@ -3518,7 +3518,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3643,7 +3643,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3768,7 +3768,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595ZI.json b/data/chips/STM32U595ZI.json
index f477ba1..34f7d1e 100644
--- a/data/chips/STM32U595ZI.json
+++ b/data/chips/STM32U595ZI.json
@@ -5193,7 +5193,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5343,7 +5343,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5468,7 +5468,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U595ZJ.json b/data/chips/STM32U595ZJ.json
index 775e8a5..ef5f47b 100644
--- a/data/chips/STM32U595ZJ.json
+++ b/data/chips/STM32U595ZJ.json
@@ -5193,7 +5193,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5343,7 +5343,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5468,7 +5468,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U599BJ.json b/data/chips/STM32U599BJ.json
index 989f1eb..8156252 100644
--- a/data/chips/STM32U599BJ.json
+++ b/data/chips/STM32U599BJ.json
@@ -4202,7 +4202,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4352,7 +4352,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4477,7 +4477,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U599NI.json b/data/chips/STM32U599NI.json
index 1209437..9f4b15e 100644
--- a/data/chips/STM32U599NI.json
+++ b/data/chips/STM32U599NI.json
@@ -4275,7 +4275,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4425,7 +4425,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4550,7 +4550,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U599NJ.json b/data/chips/STM32U599NJ.json
index 3f4b592..7003364 100644
--- a/data/chips/STM32U599NJ.json
+++ b/data/chips/STM32U599NJ.json
@@ -4275,7 +4275,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4425,7 +4425,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4550,7 +4550,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U599VI.json b/data/chips/STM32U599VI.json
index fbf03d8..9e14047 100644
--- a/data/chips/STM32U599VI.json
+++ b/data/chips/STM32U599VI.json
@@ -2927,7 +2927,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3052,7 +3052,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3177,7 +3177,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U599VJ.json b/data/chips/STM32U599VJ.json
index a794b1e..b54afe6 100644
--- a/data/chips/STM32U599VJ.json
+++ b/data/chips/STM32U599VJ.json
@@ -3590,7 +3590,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3715,7 +3715,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3840,7 +3840,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U599ZI.json b/data/chips/STM32U599ZI.json
index df07231..55ebab5 100644
--- a/data/chips/STM32U599ZI.json
+++ b/data/chips/STM32U599ZI.json
@@ -4442,7 +4442,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4587,7 +4587,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4712,7 +4712,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U599ZJ.json b/data/chips/STM32U599ZJ.json
index ce09404..def327c 100644
--- a/data/chips/STM32U599ZJ.json
+++ b/data/chips/STM32U599ZJ.json
@@ -4442,7 +4442,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4587,7 +4587,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4712,7 +4712,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A5AJ.json b/data/chips/STM32U5A5AJ.json
index 5fbd96b..3c67452 100644
--- a/data/chips/STM32U5A5AJ.json
+++ b/data/chips/STM32U5A5AJ.json
@@ -4771,7 +4771,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4921,7 +4921,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5046,7 +5046,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A5QI.json b/data/chips/STM32U5A5QI.json
index 185e7be..12a6dc2 100644
--- a/data/chips/STM32U5A5QI.json
+++ b/data/chips/STM32U5A5QI.json
@@ -3334,7 +3334,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3469,7 +3469,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3594,7 +3594,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A5QJ.json b/data/chips/STM32U5A5QJ.json
index 6d986c3..3b8033e 100644
--- a/data/chips/STM32U5A5QJ.json
+++ b/data/chips/STM32U5A5QJ.json
@@ -4162,7 +4162,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4312,7 +4312,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4437,7 +4437,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A5RJ.json b/data/chips/STM32U5A5RJ.json
index 25d1b0b..f0de58b 100644
--- a/data/chips/STM32U5A5RJ.json
+++ b/data/chips/STM32U5A5RJ.json
@@ -2629,7 +2629,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -2754,7 +2754,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -2854,7 +2854,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A5VJ.json b/data/chips/STM32U5A5VJ.json
index f98c83e..ae377a6 100644
--- a/data/chips/STM32U5A5VJ.json
+++ b/data/chips/STM32U5A5VJ.json
@@ -3557,7 +3557,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3682,7 +3682,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3807,7 +3807,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A5ZJ.json b/data/chips/STM32U5A5ZJ.json
index 998c472..389c939 100644
--- a/data/chips/STM32U5A5ZJ.json
+++ b/data/chips/STM32U5A5ZJ.json
@@ -5232,7 +5232,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -5382,7 +5382,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -5507,7 +5507,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A9BJ.json b/data/chips/STM32U5A9BJ.json
index fb86d6d..bef84bb 100644
--- a/data/chips/STM32U5A9BJ.json
+++ b/data/chips/STM32U5A9BJ.json
@@ -4241,7 +4241,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4391,7 +4391,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4516,7 +4516,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A9NJ.json b/data/chips/STM32U5A9NJ.json
index 9d2eb8a..d6121cf 100644
--- a/data/chips/STM32U5A9NJ.json
+++ b/data/chips/STM32U5A9NJ.json
@@ -4314,7 +4314,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4464,7 +4464,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4589,7 +4589,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A9VJ.json b/data/chips/STM32U5A9VJ.json
index 56901eb..cc37f15 100644
--- a/data/chips/STM32U5A9VJ.json
+++ b/data/chips/STM32U5A9VJ.json
@@ -2966,7 +2966,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3091,7 +3091,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3216,7 +3216,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5A9ZJ.json b/data/chips/STM32U5A9ZJ.json
index 543c97e..a741449 100644
--- a/data/chips/STM32U5A9ZJ.json
+++ b/data/chips/STM32U5A9ZJ.json
@@ -4481,7 +4481,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4626,7 +4626,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4751,7 +4751,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5F7VI.json b/data/chips/STM32U5F7VI.json
index ff25024..00e86b9 100644
--- a/data/chips/STM32U5F7VI.json
+++ b/data/chips/STM32U5F7VI.json
@@ -3729,7 +3729,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3854,7 +3854,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3979,7 +3979,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5F7VJ.json b/data/chips/STM32U5F7VJ.json
index 075c06d..52668c9 100644
--- a/data/chips/STM32U5F7VJ.json
+++ b/data/chips/STM32U5F7VJ.json
@@ -3729,7 +3729,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3854,7 +3854,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3979,7 +3979,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5F9BJ.json b/data/chips/STM32U5F9BJ.json
index 510d112..9731a87 100644
--- a/data/chips/STM32U5F9BJ.json
+++ b/data/chips/STM32U5F9BJ.json
@@ -4271,7 +4271,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4421,7 +4421,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4546,7 +4546,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5F9NJ.json b/data/chips/STM32U5F9NJ.json
index 350704b..f2e77f2 100644
--- a/data/chips/STM32U5F9NJ.json
+++ b/data/chips/STM32U5F9NJ.json
@@ -4439,7 +4439,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4589,7 +4589,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4714,7 +4714,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5F9VI.json b/data/chips/STM32U5F9VI.json
index 3887e94..3c7e361 100644
--- a/data/chips/STM32U5F9VI.json
+++ b/data/chips/STM32U5F9VI.json
@@ -2938,7 +2938,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3063,7 +3063,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3158,7 +3158,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5F9VJ.json b/data/chips/STM32U5F9VJ.json
index 9ac1c9f..1a4dc3e 100644
--- a/data/chips/STM32U5F9VJ.json
+++ b/data/chips/STM32U5F9VJ.json
@@ -2938,7 +2938,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3063,7 +3063,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3158,7 +3158,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5F9ZI.json b/data/chips/STM32U5F9ZI.json
index 5682072..e808c56 100644
--- a/data/chips/STM32U5F9ZI.json
+++ b/data/chips/STM32U5F9ZI.json
@@ -4485,7 +4485,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4630,7 +4630,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4755,7 +4755,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5F9ZJ.json b/data/chips/STM32U5F9ZJ.json
index b51bbd4..676dd3f 100644
--- a/data/chips/STM32U5F9ZJ.json
+++ b/data/chips/STM32U5F9ZJ.json
@@ -4485,7 +4485,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4630,7 +4630,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4755,7 +4755,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5G7VJ.json b/data/chips/STM32U5G7VJ.json
index 00c57f8..f7be066 100644
--- a/data/chips/STM32U5G7VJ.json
+++ b/data/chips/STM32U5G7VJ.json
@@ -3768,7 +3768,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3893,7 +3893,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4018,7 +4018,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5G9BJ.json b/data/chips/STM32U5G9BJ.json
index efc8bd3..52b1310 100644
--- a/data/chips/STM32U5G9BJ.json
+++ b/data/chips/STM32U5G9BJ.json
@@ -4310,7 +4310,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4460,7 +4460,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4585,7 +4585,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5G9NJ.json b/data/chips/STM32U5G9NJ.json
index 48314a9..ade3068 100644
--- a/data/chips/STM32U5G9NJ.json
+++ b/data/chips/STM32U5G9NJ.json
@@ -4478,7 +4478,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4628,7 +4628,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4753,7 +4753,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5G9VJ.json b/data/chips/STM32U5G9VJ.json
index 3254699..94d5e40 100644
--- a/data/chips/STM32U5G9VJ.json
+++ b/data/chips/STM32U5G9VJ.json
@@ -2977,7 +2977,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -3102,7 +3102,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -3197,7 +3197,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32U5G9ZJ.json b/data/chips/STM32U5G9ZJ.json
index 2fac439..79fd956 100644
--- a/data/chips/STM32U5G9ZJ.json
+++ b/data/chips/STM32U5G9ZJ.json
@@ -4524,7 +4524,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
@@ -4669,7 +4669,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
@@ -4794,7 +4794,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK3",
diff --git a/data/chips/STM32WBA50KE.json b/data/chips/STM32WBA50KE.json
index 45d6483..f06170c 100644
--- a/data/chips/STM32WBA50KE.json
+++ b/data/chips/STM32WBA50KE.json
@@ -775,7 +775,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
diff --git a/data/chips/STM32WBA50KG.json b/data/chips/STM32WBA50KG.json
index 4605e6d..0d66d7c 100644
--- a/data/chips/STM32WBA50KG.json
+++ b/data/chips/STM32WBA50KG.json
@@ -775,7 +775,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
diff --git a/data/chips/STM32WBA52CE.json b/data/chips/STM32WBA52CE.json
index a6ccc72..38de9db 100644
--- a/data/chips/STM32WBA52CE.json
+++ b/data/chips/STM32WBA52CE.json
@@ -963,7 +963,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1048,7 +1048,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA52CG.json b/data/chips/STM32WBA52CG.json
index c2bd96c..70d8c3d 100644
--- a/data/chips/STM32WBA52CG.json
+++ b/data/chips/STM32WBA52CG.json
@@ -963,7 +963,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1048,7 +1048,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA52KE.json b/data/chips/STM32WBA52KE.json
index 536c17e..7c2e343 100644
--- a/data/chips/STM32WBA52KE.json
+++ b/data/chips/STM32WBA52KE.json
@@ -843,7 +843,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -918,7 +918,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA52KG.json b/data/chips/STM32WBA52KG.json
index 62d50c4..838b170 100644
--- a/data/chips/STM32WBA52KG.json
+++ b/data/chips/STM32WBA52KG.json
@@ -843,7 +843,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -918,7 +918,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA54CE.json b/data/chips/STM32WBA54CE.json
index 0f072e2..fc21e1e 100644
--- a/data/chips/STM32WBA54CE.json
+++ b/data/chips/STM32WBA54CE.json
@@ -1023,7 +1023,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1108,7 +1108,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA54CG.json b/data/chips/STM32WBA54CG.json
index a54fbe2..c7da4c6 100644
--- a/data/chips/STM32WBA54CG.json
+++ b/data/chips/STM32WBA54CG.json
@@ -1023,7 +1023,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1108,7 +1108,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA54KE.json b/data/chips/STM32WBA54KE.json
index 12fd3f1..d889696 100644
--- a/data/chips/STM32WBA54KE.json
+++ b/data/chips/STM32WBA54KE.json
@@ -903,7 +903,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -978,7 +978,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA54KG.json b/data/chips/STM32WBA54KG.json
index 84efe46..cb417c1 100644
--- a/data/chips/STM32WBA54KG.json
+++ b/data/chips/STM32WBA54KG.json
@@ -903,7 +903,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -978,7 +978,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA55CE.json b/data/chips/STM32WBA55CE.json
index e6d886e..f4f46b0 100644
--- a/data/chips/STM32WBA55CE.json
+++ b/data/chips/STM32WBA55CE.json
@@ -1019,7 +1019,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1094,7 +1094,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA55CG.json b/data/chips/STM32WBA55CG.json
index b4b3f5c..586d379 100644
--- a/data/chips/STM32WBA55CG.json
+++ b/data/chips/STM32WBA55CG.json
@@ -1019,7 +1019,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1094,7 +1094,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA55HE.json b/data/chips/STM32WBA55HE.json
index c9549c6..11b2566 100644
--- a/data/chips/STM32WBA55HE.json
+++ b/data/chips/STM32WBA55HE.json
@@ -1023,7 +1023,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1108,7 +1108,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA55HG.json b/data/chips/STM32WBA55HG.json
index fa03628..51a44ac 100644
--- a/data/chips/STM32WBA55HG.json
+++ b/data/chips/STM32WBA55HG.json
@@ -1023,7 +1023,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1108,7 +1108,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA55UE.json b/data/chips/STM32WBA55UE.json
index b456750..93f2da1 100644
--- a/data/chips/STM32WBA55UE.json
+++ b/data/chips/STM32WBA55UE.json
@@ -1087,7 +1087,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1172,7 +1172,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/chips/STM32WBA55UG.json b/data/chips/STM32WBA55UG.json
index cdb27a0..18b119c 100644
--- a/data/chips/STM32WBA55UG.json
+++ b/data/chips/STM32WBA55UG.json
@@ -1087,7 +1087,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK7",
@@ -1172,7 +1172,7 @@
           "registers": {
             "kind": "lptim",
             "version": "v2a",
-            "block": "LPTIM_ADV"
+            "block": "LPTIM"
           },
           "rcc": {
             "bus_clock": "PCLK1",
diff --git a/data/registers/lptim_v2a.json b/data/registers/lptim_v2a.json
index b94eaee..a1a692a 100644
--- a/data/registers/lptim_v2a.json
+++ b/data/registers/lptim_v2a.json
@@ -1,5 +1,5 @@
 {
-  "block/LPTIM_ADV": {
+  "block/LPTIM": {
     "extends": "LPTIM_BASIC",
     "description": "Low power timer with Output Compare",
     "items": [
@@ -34,6 +34,10 @@
       {
         "name": "CCMR",
         "description": "LPTIM capture/compare mode register 1.",
+        "array": {
+          "len": 1,
+          "stride": 1
+        },
         "byte_offset": 44,
         "fieldset": "CCMR"
       }
diff --git a/data/registers/lptim_v2b.json b/data/registers/lptim_v2b.json
index e18663e..57accb8 100644
--- a/data/registers/lptim_v2b.json
+++ b/data/registers/lptim_v2b.json
@@ -72,7 +72,7 @@
       },
       {
         "name": "CCMR",
-        "description": "LPTIM capture/compare mode register 1.",
+        "description": "LPTIM capture/compare mode register.",
         "array": {
           "len": 2,
           "stride": 1
@@ -94,11 +94,11 @@
     ]
   },
   "fieldset/CCMR": {
-    "description": "LPTIM capture/compare mode register 1.",
+    "description": "LPTIM capture/compare mode register.",
     "fields": [
       {
         "name": "CCSEL",
-        "description": "Capture/compare 1 selection This bitfield defines the direction of the channel input (capture) or output mode.",
+        "description": "Capture/compare selection. This bitfield defines the direction of the channel input (capture) or output mode.",
         "bit_offset": 0,
         "bit_size": 1,
         "array": {
@@ -109,7 +109,7 @@
       },
       {
         "name": "CCE",
-        "description": "Capture/compare 1 output enable. This bit determines if a capture of the counter value can actually be done into the input capture/compare register 1 (LPTIM_CCR1) or not.",
+        "description": "Capture/compare output enable. This bit determines if a capture of the counter value can actually be done into the input capture/compare register 1 (LPTIM_CCR1) or not.",
         "bit_offset": 1,
         "bit_size": 1,
         "array": {
@@ -119,7 +119,7 @@
       },
       {
         "name": "CCP_Input",
-        "description": "Capture/compare 1 output polarity. Only bit2 is used to set polarity when output mode is enabled, bit3 is don't care. This field is used to select the IC1 polarity for capture operations.",
+        "description": "Capture/compare output polarity. Only bit2 is used to set polarity when output mode is enabled, bit3 is don't care. This field is used to select the IC1 polarity for capture operations.",
         "bit_offset": 2,
         "bit_size": 2,
         "array": {
@@ -130,7 +130,7 @@
       },
       {
         "name": "CCP_Output",
-        "description": "Capture/compare 1 output polarity. Only bit2 is used to set polarity when output mode is enabled, bit3 is don't care. This field is used to select the IC1 polarity for capture operations.",
+        "description": "Capture/compare output polarity. Only bit2 is used to set polarity when output mode is enabled, bit3 is don't care. This field is used to select the IC1 polarity for capture operations.",
         "bit_offset": 2,
         "bit_size": 2,
         "array": {
@@ -141,7 +141,7 @@
       },
       {
         "name": "ICPSC",
-        "description": "Input capture 1 prescaler This bitfield defines the ratio of the prescaler acting on the CC1 input (IC1).",
+        "description": "Input capture prescaler This bitfield defines the ratio of the prescaler acting on the CC1 input (IC1).",
         "bit_offset": 8,
         "bit_size": 2,
         "array": {
@@ -152,7 +152,7 @@
       },
       {
         "name": "ICF",
-        "description": "Input capture 1 filter This bitfield defines the number of consecutive equal samples that should be detected when a level change occurs on an external input capture signal before it is considered as a valid level transition. An internal clock source must be present to use this feature.",
+        "description": "Input capture filter This bitfield defines the number of consecutive equal samples that should be detected when a level change occurs on an external input capture signal before it is considered as a valid level transition. An internal clock source must be present to use this feature.",
         "bit_offset": 12,
         "bit_size": 2,
         "array": {